mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 18:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove under feature

Browse Source
This commit is contained in:
cyberpwn 2021-08-17 12:29:19 -04:00
parent 1029b2523d
commit 0da229e8f4
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java
View File

@ -40,7 +40,6 @@ public class IrisTerrainIslandActuator extends EngineAssignedActuator<BlockData>
@Getter @Getter
private final RNG rng; private final RNG rng;
private final boolean carving; private final boolean carving;
private final boolean hasUnder;
@Getter @Getter
private final int lastBedrock = -1; private final int lastBedrock = -1;
@ -48,7 +47,6 @@ public class IrisTerrainIslandActuator extends EngineAssignedActuator<BlockData>
super(engine, "TerrainIsland"); super(engine, "TerrainIsland");
rng = new RNG(engine.getWorld().seed()); rng = new RNG(engine.getWorld().seed());
carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty(); carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty();
hasUnder = getDimension().getUndercarriage() != null && !getDimension().getUndercarriage().getGenerator().isFlat();
} }
@BlockCoordinates @BlockCoordinates

9
src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java
View File

@ -38,7 +38,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
@Getter @Getter
private final RNG rng; private final RNG rng;
private final boolean carving; private final boolean carving;
private final boolean hasUnder;
@Getter @Getter
private int lastBedrock = -1; private int lastBedrock = -1;
@ -46,7 +45,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
super(engine, "Terrain"); super(engine, "Terrain");
rng = new RNG(engine.getWorld().seed()); rng = new RNG(engine.getWorld().seed());
carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty(); carving = getDimension().isCarving() && getDimension().getCarveLayers().isNotEmpty();
hasUnder = getDimension().getUndercarriage() != null && !getDimension().getUndercarriage().getGenerator().isFlat();
} }
@BlockCoordinates @BlockCoordinates
@ -88,23 +86,22 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
for (int zf = 0; zf < h.getDepth(); zf++) { for (int zf = 0; zf < h.getDepth(); zf++) {
realX = (int) modX(xf + x); realX = (int) modX(xf + x);
realZ = (int) modZ(zf + z); 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))); 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)); hf = Math.round(Math.max(Math.min(h.getHeight(), getDimension().getFluidHeight()), he));
biome = getComplex().getTrueBiomeStream().get(realX, realZ); biome = getComplex().getTrueBiomeStream().get(realX, realZ);
blocks = null; blocks = null;
fblocks = null; fblocks = null;
if (hf < b) { if (hf < 0) {
continue; continue;
} }
for (i = hf; i >= b; i--) { for (i = hf; i >= 0; i--) {
if (i >= h.getHeight()) { if (i >= h.getHeight()) {
continue; continue;
} }
if (i == b) { if (i == 0) {
if (getDimension().isBedrock()) { if (getDimension().isBedrock()) {
h.set(xf, i, zf, BEDROCK); h.set(xf, i, zf, BEDROCK);
lastBedrock = i; lastBedrock = i;

3
src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java
View File

@ -106,9 +106,6 @@ public class IrisDimension extends IrisRegistrant {
@Desc("Define iris cavern zones") @Desc("Define iris cavern zones")
private IrisCaverns caverns = new IrisCaverns(); 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.") @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 = ""; private String resourcePack = "";