From 8b55f2068415bab33d0604da2a2f88119028de83 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 12 Sep 2021 08:18:46 -0400 Subject: [PATCH] Drop feature size radius computation in mantle engine --- .../volmit/iris/engine/IrisEngineMantle.java | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index a16f20ddb..f648e66ad 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -30,7 +30,6 @@ import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; import com.volmit.iris.engine.mantle.components.MantleObjectComponent; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDepositGenerator; -import com.volmit.iris.engine.object.IrisFeaturePotential; import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.engine.object.IrisObjectPlacement; @@ -85,14 +84,6 @@ public class IrisEngineMantle implements EngineMantle { return r; } - private KList getAllFeatures() { - KList r = new KList<>(); - r.addAll(getEngine().getDimension().getFeatures()); - getAllRegions().forEach((i) -> r.addAll(i.getFeatures())); - getAllBiomes().forEach((i) -> r.addAll(i.getFeatures())); - return r; - } - private KList getAllBiomes() { KList r = new KList<>(); @@ -115,16 +106,6 @@ public class IrisEngineMantle implements EngineMantle { } } - private int computeFeatureRange() { - int m = 0; - - for (IrisFeaturePotential i : getAllFeatures()) { - m = Math.max(m, i.getZone().getRealSize()); - } - - return m; - } - private int computeParallaxSize() { Iris.verbose("Calculating the Parallax Size in Parallel"); AtomicInteger xg = new AtomicInteger(0); @@ -296,17 +277,14 @@ public class IrisEngineMantle implements EngineMantle { x = Math.max(z, x); int u = x; - int v = computeFeatureRange(); int c = Math.max(computeCarvingRange(), computeBodyRange()); x = Math.max(jig, x); - x = Math.max(x, v); x = Math.max(x, c); x = (Math.max(x, 16) + 16) >> 4; x = x % 2 == 0 ? x + 1 : x; - Iris.info("Parallax Size: " + x + " Chunks"); + Iris.info("Mantle Size: " + x + " Chunks"); Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")"); Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")"); - Iris.info(" Feature Mantle Size: " + v + " (" + ((Math.max(v, 16) + 16) >> 4) + ")"); Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")"); return x;