From 95a7ba078539115f9b83e3013c8adf879df832c3 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Mon, 13 Sep 2021 09:47:09 -0400 Subject: [PATCH] No modifiers --- .../com/volmit/iris/engine/IrisEngine.java | 26 ++++++++++--------- .../volmit/iris/engine/framework/Engine.java | 6 ----- .../engine/framework/EngineComponent.java | 8 ------ 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index baf3c5282..c0dee1f07 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -197,6 +197,7 @@ public class IrisEngine implements Engine { var bodies = new IrisBodyModifier(this); var perfection = new IrisPerfectionModifier(this); + registerStage((x, z, k, p, m) -> warmupChunk(x>>4, z>>4)); registerStage((x, z, k, p, m) -> getMantle().generateMatter(x >> 4, z >> 4, m)); registerStage((x, z, k, p, m) -> terrain.actuate(x, z, k, m)); registerStage((x, z, k, p, m) -> biome.actuate(x, z, p, m)); @@ -209,6 +210,19 @@ public class IrisEngine implements Engine { registerStage((x, z, k, p, m) -> perfection.modify(x, z, k, m)); } + private void warmupChunk(int x, int z) { + for(int i = 0; i < 16; i++) + { + for(int j = 0; j < 16; j++) + { + int xx = x + (i << 4); + int zz = z + (z << 4); + getComplex().getTrueBiomeStream().get(xx,zz); + getComplex().getTrueHeightStream().get(xx,zz); + } + } + } + @Override public void hotload() { hotloadSilently(); @@ -422,18 +436,6 @@ public class IrisEngine implements Engine { }); } - @BlockCoordinates - @Override - public double modifyX(double x) { - return x / getDimension().getTerrainZoom(); - } - - @BlockCoordinates - @Override - public double modifyZ(double z) { - return z / getDimension().getTerrainZoom(); - } - @BlockCoordinates @Override public void generate(int x, int z, Hunk vblocks, Hunk vbiomes, boolean multicore) throws WrongEngineBroException { diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index fc5509b61..22415e09d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -135,12 +135,6 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat void setMinHeight(int min); - @BlockCoordinates - double modifyX(double x); - - @BlockCoordinates - double modifyZ(double z); - @BlockCoordinates default void generate(int x, int z, TerrainChunk tc, boolean multicore) throws WrongEngineBroException { generate(x, z, Hunk.view((ChunkGenerator.ChunkData) tc), Hunk.view((ChunkGenerator.BiomeGrid) tc), multicore); diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java index 15ad8b86f..451327825 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java @@ -48,14 +48,6 @@ public interface EngineComponent { } } - default double modX(double x) { - return getEngine().modifyX(x); - } - - default double modZ(double z) { - return getEngine().modifyZ(z); - } - default IrisData getData() { return getEngine().getData(); }