From 19f78f769ba1b25bc6834fff5010c654c8a86c28 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 2 Nov 2020 13:28:23 -0500 Subject: [PATCH] Fixes --- src/main/java/com/volmit/iris/IrisSettings.java | 4 ++++ src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java | 5 +++++ src/main/java/com/volmit/iris/v2/generator/IrisEngine.java | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index cf1352bd5..16ab14995 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -38,6 +38,10 @@ public class IrisSettings @Desc("More cpu for pregen gui but looks nice.") public boolean maxPregenGuiFPS = false; + @DontObfuscate + @Desc("Renders what the terrain looks like in the pregen map for iris worlds only.") + public boolean pregenRenderTerrain = true; + @DontObfuscate @Desc("Adds sound to commands.") public boolean commandSounds = true; diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java index 4608177a8..62b984aeb 100644 --- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java @@ -280,6 +280,11 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri public Color render(double x, double z) { + if(!IrisSettings.get().pregenRenderTerrain) + { + return Color.blue; + } + int ix = (int) x; int iz = (int) z; double height = getTerrainHeight(ix, iz); diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java b/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java index 9962ed12f..a6068a749 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java +++ b/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java @@ -55,7 +55,7 @@ public class IrisEngine extends BlockPopulator implements Engine @Override public void generate(int x, int z, Hunk vblocks, Hunk biomes) { - Hunk blocks = vblocks.listen(this::catchBlockUpdates); + Hunk blocks = vblocks.listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t)); getFramework().getEngineParallax().generateParallaxArea(x, z); getFramework().getBiomeActuator().actuate(x, z, biomes); getFramework().getTerrainActuator().actuate(x, z, blocks);