diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index cf534e85f..2e6c85132 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -9,7 +9,7 @@ public class IrisSettings @DontObfuscate @Desc("Iris generator threads (must be 2 or higher).") - public int threads = 128; + public int threads = 16; @DontObfuscate @Desc("Compress parallax data in memory to reduce memory usage in exchange for more cpu usage.") diff --git a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java index 11c74dcd6..99fd4b7d9 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java @@ -180,7 +180,6 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple if(getDimension().isPlaceObjects()) { onGenerateParallax(random, x, z); - injectBiomeSky(x, z, grid); getParallaxChunk(x, z).inject(data); setSliverBuffer(getSliverCache().size()); getParallaxChunk(x, z).setWorldGenerated(true); @@ -194,39 +193,6 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple Iris.data.getObjectLoader().clean(); } - protected void injectBiomeSky(int x, int z, BiomeGrid grid) - { - if(getDimension().isInverted()) - { - return; - } - - int rx; - int rz; - - for(int i = 0; i < 16; i++) - { - rx = (x * 16) + i; - for(int j = 0; j < 16; j++) - { - rz = (z * 16) + j; - - int min = sampleSliver(rx, rz).getHighestBiome(); - int max = getParallaxSliver(rx, rz).getHighestBlock(); - - if(min < max) - { - IrisBiome biome = getCachedInternalBiome(i, j); - - for(int g = min; g <= max; g++) - { - grid.setBiome(i, g, j, biome.getSkyBiome(masterRandom, rz, g, rx)); - } - } - } - } - } - protected void onGenerateParallax(RNG random, int x, int z) { String key = "par." + x + "." + "z"; diff --git a/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java b/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java index 08c3685cd..b15d07f64 100644 --- a/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java @@ -87,17 +87,23 @@ public abstract class PostBlockChunkGenerator extends ParallaxChunkGenerator imp { int rxx = rx; int rzz = (z << 4) + j; + int hh = h; - for(IrisPostBlockFilter f : filters) + getAccelerant().queue("post", () -> { - if(f.getPhase() == h) + for(IrisPostBlockFilter f : filters) { - f.onPost(rxx, rzz); + if(f.getPhase() == hh) + { + f.onPost(rxx, rzz); + } } - } + }); } } + getAccelerant().waitFor("post"); + for(IrisPostBlockFilter f : filters) { if(f.getPhase() == h)