Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-26 10:39:07 +00:00
Code Issues Releases Activity

Auto stash before revert of "f"

Browse Source
This commit is contained in:
cyberpwn
2021-08-21 09:31:15 -04:00
parent 19ef661457
commit 0080110fad
12 changed files with 236 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/volmit/iris/engine/IrisEngine.java
View File

@@ -423,14 +423,21 @@ public class IrisEngine extends BlockPopulator implements Engine {
switch (getDimension().getTerrainMode()) {
case NORMAL -> {
getMantle().generateMatter(x >> 4, z >> 4, multicore);
getTerrainActuator().actuate(x, z, vblocks, multicore);
getBiomeActuator().actuate(x, z, vbiomes, multicore);
getCaveModifier().modify(x, z, vblocks, multicore);
getRavineModifier().modify(x, z, vblocks, multicore);
getPostModifier().modify(x, z, vblocks, multicore);
getDecorantActuator().actuate(x, z, blocks, multicore);
getMantle().insertMatter(x >> 4, z >> 4, BlockData.class, blocks, multicore);
getDepositModifier().modify(x, z, blocks, multicore);
burst().burst(
() ->getTerrainActuator().actuate(x, z, vblocks, multicore),
() ->getBiomeActuator().actuate(x, z, vbiomes, multicore)
);
burst().burst(
() ->getCaveModifier().modify(x, z, vblocks, multicore),
()->getDecorantActuator().actuate(x, z, blocks, multicore),
()->getRavineModifier().modify(x, z, vblocks, multicore),
()->getPostModifier().modify(x, z, vblocks, multicore)
);
burst().burst(
()->getDecorantActuator().actuate(x, z, blocks, multicore),
()->getMantle().insertMatter(x >> 4, z >> 4, BlockData.class, blocks, multicore),
()->getDepositModifier().modify(x, z, blocks, multicore)
);
}
case ISLANDS -> {
getTerrainActuator().actuate(x, z, vblocks, multicore);

18
src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
View File

@@ -53,6 +53,7 @@ import org.bukkit.util.BlockVector;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -63,8 +64,6 @@ public class IrisEngineMantle implements EngineMantle {
private final KList<MantleComponent> components;
private final int radius;
private final AtomicCache<Integer> radCache = new AtomicCache<>();
private ProceduralStream<KList<IrisFeaturePositional>> featureChunkStream;
private ProceduralStream<KList<IrisFeaturePositional>> featureStream;
public IrisEngineMantle(Engine engine) {
this.engine = engine;
@@ -74,21 +73,6 @@ public class IrisEngineMantle implements EngineMantle {
registerComponent(new MantleFeatureComponent(this));
registerComponent(new MantleJigsawComponent(this));
registerComponent(new MantleObjectComponent(this));
featureChunkStream = ProceduralStream.of((x, z)
-> EngineMantle.super.getFeaturesInChunk(x.intValue(), z.intValue()),
Interpolated.of((i) -> 0D, (i) -> new KList<IrisFeaturePositional>())).cache2D(2048);
featureStream = ProceduralStream.of(EngineMantle.super::forEachFeature,
Interpolated.of((i) -> 0D, (i) -> new KList<IrisFeaturePositional>())).cache2D(8192);
}
@ChunkCoordinates
public KList<IrisFeaturePositional> getFeaturesInChunk(int x, int z) {
return featureChunkStream.get(x, z);
}
@BlockCoordinates
public KList<IrisFeaturePositional> forEachFeature(double x, double z) {
return featureStream.get(x, z);
}
@Override

5
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -211,7 +211,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
.shuffleCopy(RNG.r).stream()
.filter(this::canSpawn),
getData().getSpawnerLoader().streamAll(getEngine().getMantle()
.getFeaturesInChunk(c).stream()
.forEachFeature(c).stream()
.flatMap((o) -> o.getFeature().getEntitySpawners().stream()))
.filter(this::canSpawn))
.filter((i) -> i.isValid(biome))
@@ -294,6 +294,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
private KList<IrisEntitySpawn> spawnRandomly(List<IrisEntitySpawn> types) {
KList<IrisEntitySpawn> rarityTypes = new KList<>();
int totalRarity = 0;
for (IrisEntitySpawn i : types) {
totalRarity += IRare.get(i);
}
@@ -344,7 +345,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
public void onChunkLoad(Chunk e, boolean generated) {
if (generated) {
energy += 1.2;
spawnIn(e, true);
J.a(() -> spawnIn(e, true), RNG.r.i(5, 50));
} else {
energy += 0.3;
}

2
src/main/java/com/volmit/iris/engine/framework/Engine.java
View File

@@ -243,7 +243,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
updateLighting(x, y, z, c);
}
}
}, MantleFlag.UPDATE);
});
getMetrics().getUpdates().put(p.getMilliseconds());
}

33
src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
View File

@@ -34,12 +34,14 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.hunk.Hunk;
import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.mantle.MantleFlag;
import com.volmit.iris.util.noise.CNG;
import com.volmit.iris.util.parallel.BurstExecutor;
import com.volmit.iris.util.parallel.MultiBurst;
import org.bukkit.Chunk;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import java.util.List;
import java.util.concurrent.*;
import java.util.function.Consumer;
@@ -51,7 +53,7 @@ public interface EngineMantle extends IObjectPlacer {
Engine getEngine();
Integer getRadius();
int getRadius();
KList<MantleComponent> getComponents();
@@ -166,15 +168,7 @@ public interface EngineMantle extends IObjectPlacer {
}
default int getRealRadius() {
try {
return (int) Math.ceil(getRadius().get() / 2D);
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
return 0;
return (int) Math.ceil(getRadius() / 2D);
}
@@ -195,8 +189,8 @@ public interface EngineMantle extends IObjectPlacer {
BurstExecutor burst = burst().burst();
for (int i = -s; i <= s; i++) {
int xx = i + x;
for (int j = -s; j <= s; j++) {
int xx = i + x;
int zz = j + z;
burst.queue(() -> {
getComponents().forEach((f) -> generateMantleComponent(xx, zz, f, c));
@@ -229,20 +223,23 @@ public interface EngineMantle extends IObjectPlacer {
@BlockCoordinates
default void updateBlock(int x, int y, int z) {
getMantle().flag(x >> 4, z >> 4, MantleFlag.UPDATE, true);
getMantle().set(x, y, z, true);
}
@ChunkCoordinates
default KList<IrisFeaturePositional> getFeaturesInChunk(Chunk c) {
default List<IrisFeaturePositional> getFeaturesInChunk(Chunk c) {
return getFeaturesInChunk(c.getX(), c.getZ());
}
@ChunkCoordinates
default KList<IrisFeaturePositional> getFeaturesInChunk(int x, int z) {
KList<IrisFeaturePositional> pos = new KList<>();
getMantle().iterateChunk(x, z, IrisFeaturePositional.class, (a, b, c, f) -> pos.add(f), MantleFlag.FEATURE);
return pos;
default List<IrisFeaturePositional> getFeaturesInChunk(int x, int z) {
return getMantle().getChunk(x, z).getFeatures();
}
@ChunkCoordinates
default KList<IrisFeaturePositional> forEachFeature(Chunk c) {
return forEachFeature((c.getX() << 4) + 8, (c.getZ() << 4) + 8);
}
@BlockCoordinates
@@ -267,7 +264,7 @@ public interface EngineMantle extends IObjectPlacer {
for (i = -s; i <= s; i++) {
for (j = -s; j <= s; j++) {
try {
for (IrisFeaturePositional k : getFeaturesInChunk(i + cx, j + cx)) {
for (IrisFeaturePositional k : getFeaturesInChunk(i + cx, j + cz)) {
if (k.shouldFilter(x, z, getEngine().getComplex().getRng(), getData())) {
pos.add(k);
}

10
src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java
View File

@@ -18,6 +18,8 @@
package com.volmit.iris.engine.mantle.components;
import com.google.gson.Gson;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.jigsaw.PlannedStructure;
import com.volmit.iris.engine.mantle.EngineMantle;
@@ -27,24 +29,29 @@ import com.volmit.iris.engine.object.biome.IrisBiome;
import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
import com.volmit.iris.engine.object.noise.NoiseStyle;
import com.volmit.iris.engine.object.regional.IrisRegion;
import com.volmit.iris.util.documentation.BlockCoordinates;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.mantle.MantleFlag;
import com.volmit.iris.util.math.Position2;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.CNG;
import java.util.List;
import java.util.function.Consumer;
public class MantleJigsawComponent extends IrisMantleComponent {
private final CNG cng;
public MantleJigsawComponent(EngineMantle engineMantle) {
super(engineMantle, MantleFlag.JIGSAW);
cng = NoiseStyle.STATIC.create(new RNG());
}
@Override
public void generateLayer(int x, int z, Consumer<Runnable> post) {
RNG rng = new RNG(Cache.key(x, z) + seed());
RNG rng = new RNG(cng.fit(-Integer.MAX_VALUE, Integer.MAX_VALUE, x, z));
int xxx = 8 + (x << 4);
int zzz = 8 + (z << 4);
IrisRegion region = getComplex().getRegionStream().get(xxx, zzz);
@@ -109,7 +116,6 @@ public class MantleJigsawComponent extends IrisMantleComponent {
if (structure.getFeature().getBlockRadius() == 32) {
structure.getFeature().setBlockRadius((double) structure.getMaxDimension() / 3);
}
getMantle().set(position.getX(), 0, position.getZ(),
new IrisFeaturePositional(position.getX(), position.getZ(), structure.getFeature()));
}

14
src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java
View File

@@ -19,6 +19,7 @@
package com.volmit.iris.engine.object.feature;
import com.google.gson.Gson;
import com.volmit.iris.Iris;
import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.Desc;
@@ -63,7 +64,18 @@ public class IrisFeaturePositional {
private static double BLOCK = 1D / 256D; // TODO: WARNING HEIGHT
public static IrisFeaturePositional read(DataInputStream s) throws IOException {
return new Gson().fromJson(s.readUTF(), IrisFeaturePositional.class);
String sx = s.readUTF();
try
{
return new Gson().fromJson(sx, IrisFeaturePositional.class);
}
catch(Throwable e)
{
Iris.error(sx);
e.printStackTrace();
throw new IOException(e);
}
}
public void write(DataOutputStream s) throws IOException {

123
src/main/java/com/volmit/iris/util/hunk/storage/MappedSyncHunk.java Normal file
View File

@@ -0,0 +1,123 @@
/*
* Iris is a World Generator for Minecraft Bukkit Servers
* Copyright (c) 2021 Arcane Arts (Volmit Software)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.volmit.iris.util.hunk.storage;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.function.Consumer4;
import com.volmit.iris.util.function.Consumer4IO;
import com.volmit.iris.util.hunk.Hunk;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@SuppressWarnings({"DefaultAnnotationParam", "Lombok"})
@Data
@EqualsAndHashCode(callSuper = false)
public class MappedSyncHunk<T> extends StorageHunk<T> implements Hunk<T> {
private final Map<Integer, T> data;
public MappedSyncHunk(int w, int h, int d) {
super(w, h, d);
data = new HashMap<>();
}
public int getEntryCount() {
return data.size();
}
public boolean isMapped() {
return true;
}
public boolean isEmpty() {
synchronized(data)
{
return data.isEmpty();
}
}
@Override
public void setRaw(int x, int y, int z, T t) {
synchronized(data) {
if (t == null) {
data.remove(index(x, y, z));
return;
}
data.put(index(x, y, z), t);
}
}
private Integer index(int x, int y, int z) {
return (z * getWidth() * getHeight()) + (y * getWidth()) + x;
}
@Override
public synchronized Hunk<T> iterateSync(Consumer4<Integer, Integer, Integer, T> c) {
synchronized(data)
{
int idx, z;
for (Map.Entry<Integer, T> g : data.entrySet()) {
idx = g.getKey();
z = idx / (getWidth() * getHeight());
idx -= (z * getWidth() * getHeight());
c.accept(idx % getWidth(), idx / getWidth(), z, g.getValue());
}
return this;
}
}
@Override
public synchronized Hunk<T> iterateSyncIO(Consumer4IO<Integer, Integer, Integer, T> c) throws IOException {
synchronized(data)
{
int idx, z;
for (Map.Entry<Integer, T> g : data.entrySet()) {
idx = g.getKey();
z = idx / (getWidth() * getHeight());
idx -= (z * getWidth() * getHeight());
c.accept(idx % getWidth(), idx / getWidth(), z, g.getValue());
}
return this;
}
}
@Override
public void empty(T b) {
synchronized(data)
{
data.clear();
}
}
@Override
public T getRaw(int x, int y, int z) {
synchronized(data)
{
return data.get(index(x, y, z));
}
}
}

37
src/main/java/com/volmit/iris/util/mantle/Mantle.java
View File

@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.object.basic.IrisPosition;
import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.documentation.BlockCoordinates;
@@ -115,6 +116,12 @@ public class Mantle {
}
}
@ChunkCoordinates
public MantleChunk getChunk(int x, int z)
{
return get(x>>5, z>>5).getOrCreate(x & 31, z & 31);
}
/**
* Flag or unflag a chunk
* @param x the chunk x
@@ -146,22 +153,15 @@ public class Mantle {
* @param z the chunk z
* @param type the type of data to iterate
* @param iterator the iterator (x,y,z,data) -> do stuff
* @param requiredFlags any required flags that must be met for this chunk to be iterated
* @param <T> the type of data to iterate
*/
@ChunkCoordinates
public <T> void iterateChunk(int x, int z, Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator, MantleFlag... requiredFlags) {
public <T> void iterateChunk(int x, int z, Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator) {
if(!hasTectonicPlate(x >> 5, z >> 5))
{
return;
}
for (MantleFlag i : requiredFlags) {
if (!hasFlag(x, z, i)) {
return;
}
}
get(x >> 5, z >> 5).getOrCreate(x & 31, z & 31).iterate(type, iterator);
}
@@ -206,11 +206,20 @@ public class Mantle {
return;
}
Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5)
.getOrCreate((x >> 4) & 31, (z >> 4) & 31)
.getOrCreate(y >> 4);
matter.slice(matter.getClass(t))
.set(x & 15, y & 15, z & 15, t);
if(t instanceof IrisFeaturePositional)
{
get((x >> 4) >> 5, (z >> 4) >> 5)
.getOrCreate((x >> 4) & 31, (z >> 4) & 31).addFeature((IrisFeaturePositional) t);
}
else
{
Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5)
.getOrCreate((x >> 4) & 31, (z >> 4) & 31)
.getOrCreate(y >> 4);
matter.slice(matter.getClass(t))
.set(x & 15, y & 15, z & 15, t);
}
}
/**
@@ -235,7 +244,7 @@ public class Mantle {
throw new RuntimeException("The Mantle is closed");
}
if(!hasTectonicPlate(x >> 5, z >> 5))
if(!hasTectonicPlate((x >> 4) >> 5, (z >> 4) >> 5))
{
return null;
}

50
src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
View File

@@ -18,17 +18,22 @@
package com.volmit.iris.util.mantle;
import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
import com.volmit.iris.util.data.Varint;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.function.Consumer4;
import com.volmit.iris.util.matter.IrisMatter;
import com.volmit.iris.util.matter.Matter;
import com.volmit.iris.util.matter.MatterSlice;
import com.volmit.iris.util.matter.slices.ZoneMatter;
import com.volmit.iris.util.parallel.BurstExecutor;
import com.volmit.iris.util.parallel.MultiBurst;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicIntegerArray;
import java.util.concurrent.atomic.AtomicReferenceArray;
@@ -37,8 +42,10 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
* Mantle Chunks are fully atomic & thread safe
*/
public class MantleChunk {
private static final ZoneMatter zm = new ZoneMatter();
private final AtomicIntegerArray flags;
private final AtomicReferenceArray<Matter> sections;
private final CopyOnWriteArrayList<IrisFeaturePositional> features;
/**
* Create a mantle chunk
@@ -49,6 +56,7 @@ public class MantleChunk {
public MantleChunk(int sectionHeight) {
sections = new AtomicReferenceArray<>(sectionHeight);
flags = new AtomicIntegerArray(MantleFlag.values().length);
features = new CopyOnWriteArrayList<>();
for (int i = 0; i < flags.length(); i++) {
flags.set(i, 0);
@@ -76,6 +84,13 @@ public class MantleChunk {
sections.set(i, Matter.read(din));
}
}
short v = din.readShort();
for(int i = 0; i < v; i++)
{
features.add(zm.readNode(din));
}
}
public void flag(MantleFlag flag, boolean f) {
@@ -169,6 +184,13 @@ public class MantleChunk {
dos.writeBoolean(false);
}
}
dos.writeShort(features.size());
for(IrisFeaturePositional i : features)
{
zm.writeNode(i, dos);
}
}
private void trimSlice(int i) {
@@ -186,26 +208,6 @@ public class MantleChunk {
}
}
public <T> void iterate(Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator, BurstExecutor burst) {
for (int i = 0; i < sections.length(); i++) {
int finalI = i;
burst.queue(() -> {
int bs = (finalI << 4);
Matter matter = get(finalI);
if (matter != null) {
MatterSlice<T> t = matter.getSlice(type);
if (t != null) {
t.iterateSync((a, b, c, f) -> iterator.accept(a, b + bs, c, f));
}
}
});
}
burst.complete();
}
public <T> void iterate(Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator) {
for (int i = 0; i < sections.length(); i++) {
int bs = (i << 4);
@@ -220,4 +222,12 @@ public class MantleChunk {
}
}
}
public void addFeature(IrisFeaturePositional t) {
features.add(t);
}
public List<IrisFeaturePositional> getFeatures() {
return features;
}
}

4
src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java
View File

@@ -19,9 +19,11 @@
package com.volmit.iris.util.mantle;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.format.C;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.hunk.storage.ArrayHunk;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import java.io.*;
@@ -140,7 +142,7 @@ public class TectonicPlate {
@ChunkCoordinates
private int index(int x, int z) {
return (x & 0x1F) + (z & 0x1F) * 32;
return Cache.to1D(x, z, 0, 32, 32);
}
/**

1
src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java
View File

@@ -18,6 +18,7 @@
package com.volmit.iris.util.matter.slices;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
import com.volmit.iris.util.matter.Sliced;