diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java index d67da5335..e9890d3ea 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java @@ -40,7 +40,6 @@ public class IrisTerrainIslandActuator extends EngineAssignedActuator @Getter private final RNG rng; private final boolean carving; - private final boolean hasUnder; @Getter private final int lastBedrock = -1; @@ -48,7 +47,6 @@ public class IrisTerrainIslandActuator extends EngineAssignedActuator super(engine, "TerrainIsland"); rng = new RNG(engine.getWorld().seed()); carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty(); - hasUnder = getDimension().getUndercarriage() != null && !getDimension().getUndercarriage().getGenerator().isFlat(); } @BlockCoordinates diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 3d4b13800..3c8c9dc21 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -38,7 +38,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator @Getter private final RNG rng; private final boolean carving; - private final boolean hasUnder; @Getter private int lastBedrock = -1; @@ -46,7 +45,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator super(engine, "Terrain"); rng = new RNG(engine.getWorld().seed()); carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty(); - hasUnder = getDimension().getUndercarriage() != null && !getDimension().getUndercarriage().getGenerator().isFlat(); } @BlockCoordinates @@ -88,23 +86,22 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator for (int zf = 0; zf < h.getDepth(); zf++) { realX = (int) modX(xf + x); realZ = (int) modZ(zf + z); - b = hasUnder ? (int) Math.round(getDimension().getUndercarriage().get(rng, getData(), realX, realZ)) : 0; he = (int) Math.round(Math.min(h.getHeight(), getComplex().getHeightStream().get(realX, realZ))); hf = Math.round(Math.max(Math.min(h.getHeight(), getDimension().getFluidHeight()), he)); biome = getComplex().getTrueBiomeStream().get(realX, realZ); blocks = null; fblocks = null; - if (hf < b) { + if (hf < 0) { continue; } - for (i = hf; i >= b; i--) { + for (i = hf; i >= 0; i--) { if (i >= h.getHeight()) { continue; } - if (i == b) { + if (i == 0) { if (getDimension().isBedrock()) { h.set(xf, i, zf, BEDROCK); lastBedrock = i; diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java index ef282669f..2863f6b26 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java @@ -106,9 +106,6 @@ public class IrisDimension extends IrisRegistrant { @Desc("Define iris cavern zones") private IrisCaverns caverns = new IrisCaverns(); - @Desc("Instead of a flat bottom, applies a clamp (using this noise style) to the bottom instead of a flat bottom. Useful for carving out center-dimensions in a dimension composite world.") - private IrisShapedGeneratorStyle undercarriage = null; - @Desc("Upon joining this world, Iris will send a resource pack request to the client. If they have previously selected yes, it will auto-switch depending on which dimension they go to.") private String resourcePack = "";