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

Engine fixes

Browse Source
This commit is contained in:
cyberpwn
2021-08-21 06:21:15 -04:00
parent d3998dd03b
commit 203a42c043
5 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ package com.volmit.iris.engine;
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
import com.volmit.iris.Iris;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.mantle.EngineMantle;
import com.volmit.iris.engine.mantle.MantleComponent;
@@ -53,8 +54,6 @@ import org.bukkit.util.BlockVector;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
@Data
@@ -62,14 +61,15 @@ public class IrisEngineMantle implements EngineMantle {
private final Engine engine;
private final Mantle mantle;
private final KList<MantleComponent> components;
private final Future<Integer> radius;
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;
this.mantle = new Mantle(new File(engine.getWorld().worldFolder(), "mantle"), engine.getTarget().getHeight());
radius = burst().completeValue(this::computeParallaxSize);
radius = radCache.aquire(this::computeParallaxSize);
components = new KList<>();
registerComponent(new MantleFeatureComponent(this));
registerComponent(new MantleJigsawComponent(this));

1
src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java
View File

@@ -32,7 +32,6 @@ public abstract class EngineAssignedActuator<T> extends EngineAssignedComponent
@BlockCoordinates
@Override
public void actuate(int x, int z, Hunk<T> output, boolean multicore) {
Iris.debug("Engine Actuator[" + getName() + "] " + x + " " + z);
onActuate(x, z, output, multicore);
}
}

1
src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java
View File

@@ -33,7 +33,6 @@ public abstract class EngineAssignedModifier<T> extends EngineAssignedComponent
@BlockCoordinates
@Override
public void modify(int x, int z, Hunk<T> output, boolean multicore) {
Iris.debug("Engine Modifier[" + getName() + "] " + x + " " + z);
onModify(x, z, output, multicore);
}
}

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

@@ -51,7 +51,7 @@ public interface EngineMantle extends IObjectPlacer {
Engine getEngine();
Future<Integer> getRadius();
Integer getRadius();
KList<MantleComponent> getComponents();
@@ -224,7 +224,6 @@ public interface EngineMantle extends IObjectPlacer {
return;
}
Iris.debug("Engine Matter Insert " + x + " " + z);
getMantle().iterateChunk(x, z, t, blocks::set);
}

4
src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
View File

@@ -177,7 +177,6 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
@Override
public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random ignored, int x, int z, @NotNull BiomeGrid biome) {
Iris.debug("Generate Request " + world.getName() + " at: " + x + ", " + z);
try {
if(lastSeed != world.getSeed())
{
@@ -188,14 +187,11 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
Iris.success("Updated Engine seed to " + lastSeed);
}
Iris.debug("Generate Request [LOCKING] at: " + x + ", " + z);
loadLock.acquire();
Iris.debug("Generate Request [LOCKED] at: " + x + ", " + z);
TerrainChunk tc = TerrainChunk.create(world, biome);
Hunk<BlockData> blocks = Hunk.view((ChunkData) tc);
Hunk<Biome> biomes = Hunk.view((BiomeGrid) tc);
this.world.bind(world);
Iris.debug("Generate Request [ENGINE] at: " + x + ", " + z);
getEngine().generate(x * 16, z * 16, blocks, biomes, true);
ChunkData c = tc.getRaw();
Iris.debug("Generated " + x + " " + z);