diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java index 460d71cb4..9b53199a4 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java @@ -148,7 +148,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { int buf = v.get(0) - 1; for(Integer i : v) { - if(i < 0 || i > 255) { + if(i < 0 || i > getEngine().getHeight()) { continue; } @@ -275,7 +275,7 @@ public class IrisCarveModifier extends EngineAssignedModifier { } public boolean isValid() { - return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= 255 && airThickness() > 0; + return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= engine.getHeight() && airThickness() > 0; } public String toString() { diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 9e5eafd65..d7a77c146 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -118,7 +118,7 @@ public class IrisDepositModifier extends EngineAssignedModifier { int ny = j.getBlockY() + h; int nz = j.getBlockZ() + z; - if(ny > height || nx > 15 || nx < 0 || ny > 255 || ny < 0 || nz < 0 || nz > 15) { + if(ny > height || nx > 15 || nx < 0 || ny > engine.getHeight() || ny < 0 || nz < 0 || nz > 15) { continue; } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index ad3a55ea1..933cb543f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -293,7 +293,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { height += i.getHeight(xg, x, z, seed); } - return Math.max(0, Math.min(height, 255)); + return Math.max(0, Math.min(height, xg.getHeight())); } public CNG getBiomeGenerator(RNG random) { @@ -448,7 +448,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { } for(int i = 0; i < maxDepth; i++) { - int offset = (255 - height) - i; + int offset = (512 - height) - i; int index = offset % data.size(); real.add(data.get(Math.max(index, 0))); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 55124473a..3a02b5114 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -157,7 +157,7 @@ public class IrisDimension extends IrisRegistrant { private KList jigsawStructures = new KList<>(); @Required @MinNumber(0) - @MaxNumber(255) + @MaxNumber(1024) @Desc("The fluid height for this dimension") private int fluidHeight = 63; @Desc("Define the min and max Y bounds of this dimension. Please keep in mind that Iris internally generates from 0 to (max - min). \n\nFor example at -64 to 320, Iris is internally generating to 0 to 384, then on outputting chunks, it shifts it down by the min height (64 blocks). The default is -64 to 320. \n\nThe fluid height is placed at (fluid height + min height). So a fluid height of 63 would actually show up in the world at 1.") diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java index 5a1c969fe..7b547de95 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java @@ -35,14 +35,14 @@ import lombok.experimental.Accessors; @Data public class IrisObjectLimit { @MinNumber(0) - @MaxNumber(255) + @MaxNumber(1024) @Desc("The minimum height for placement (bottom of object)") private int minimumHeight = 0; @MinNumber(0) - @MaxNumber(255) + @MaxNumber(1024) @Desc("The maximum height for placement (top of object)") - private int maximumHeight = 255; + private int maximumHeight = 512; public boolean canPlace(int h, int l) { return h <= maximumHeight && l >= minimumHeight; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java b/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java index ad3915a97..521d493d1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java @@ -35,12 +35,12 @@ import lombok.experimental.Accessors; @Data public class IrisSlopeClip { @MinNumber(0) - @MaxNumber(255) + @MaxNumber(1024) @Desc("The minimum slope for placement") private double minimumSlope = 0; @MinNumber(0) - @MaxNumber(255) + @MaxNumber(1024) @Desc("The maximum slope for placement") private double maximumSlope = 10;