diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 5a704435d..af9f0aa87 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -96,7 +96,7 @@ public class IrisDecorantActuator extends EngineAssignedActuator { if(height < getDimension().getFluidHeight()) { getSeaSurfaceDecorator().decorate(finalI, j, - realX, Math.round(+finalI + 1), Math.round(x + finalI - 1), + realX, Math.round(finalI + 1), Math.round(x + finalI - 1), realZ, Math.round(z + j + 1), Math.round(z + j - 1), output, biome, getDimension().getFluidHeight(), getEngine().getHeight()); getSeaFloorDecorator().decorate(finalI, j, diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index 4089e4664..e630acd7d 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -74,8 +74,10 @@ public class IrisDecorator { @Desc("The maximum repeat stack height") private int stackMax = 1; @DependsOn({"stackMin", "stackMax"}) - @Desc("Changes stackMin and stackMin from being absolute block heights and instead uses them as a percentage to scale the stack based on the cave height" + - "\n\nWithin a cave, setting them stackMin/max to 50 would make the stack 50% of the cave height") + @Desc(""" + Changes stackMin and stackMin from being absolute block heights and instead uses them as a percentage to scale the stack based on the cave height + + Within a cave, setting them stackMin/max to 50 would make the stack 50% of the cave height""") private boolean scaleStack = false; @Required @MinNumber(0) diff --git a/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java index a137ef724..714fd2761 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java +++ b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java @@ -96,7 +96,7 @@ public class BitStorage { this.mask = (1L << bits) - 1L; this.valuesPerLong = (char) (64 / bits); int var3 = 3 * (this.valuesPerLong - 1); - this.divideMul = MAGIC[var3 + 0]; + this.divideMul = MAGIC[var3]; this.divideAdd = MAGIC[var3 + 1]; this.divideShift = MAGIC[var3 + 2]; int var4 = (length + this.valuesPerLong - 1) / this.valuesPerLong; diff --git a/src/main/java/com/volmit/iris/util/math/MathHelper.java b/src/main/java/com/volmit/iris/util/math/MathHelper.java index 5fd6e3c4c..d7a78b46b 100644 --- a/src/main/java/com/volmit/iris/util/math/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/math/MathHelper.java @@ -383,7 +383,7 @@ public class MathHelper { public static double d(double var0, double var2) { double var4 = var2 * var2 + var0 * var0; if(Double.isNaN(var4)) { - return 0.0D / 0.0; + return 0.0D; } else { boolean var6 = var0 < 0.0D; if(var6) { diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCABitStorage.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCABitStorage.java index 6929dd727..cc9d20bf9 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCABitStorage.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCABitStorage.java @@ -72,7 +72,7 @@ public class MCABitStorage { this.mask = (1L << bits) - 1L; this.valuesPerLong = (char) (64 / bits); int var3 = 3 * (this.valuesPerLong - 1); - this.divideMul = MAGIC[var3 + 0]; + this.divideMul = MAGIC[var3]; this.divideAdd = MAGIC[var3 + 1]; this.divideShift = MAGIC[var3 + 2]; int var4 = (length + this.valuesPerLong - 1) / this.valuesPerLong;