diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index d2f1359e2..6b23b8a57 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -125,6 +125,7 @@ public class IrisGenerator extends IrisRegistrant { for(T i : b) { for(int j = 0; j < max - i.getRarity(); j++) { + //noinspection AssignmentUsedAsCondition if(o = !o) { rarityMapped.add(i); } else { diff --git a/src/main/java/com/volmit/iris/engine/object/IrisImage.java b/src/main/java/com/volmit/iris/engine/object/IrisImage.java index c19c1cb3a..973360f2f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisImage.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisImage.java @@ -59,36 +59,36 @@ public class IrisImage extends IrisRegistrant { return ((color >> 8) & 0xFF) / 255D; } case BLUE -> { - return ((color >> 0) & 0xFF) / 255D; + return ((color) & 0xFF) / 255D; } case SATURATION -> { - return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[1]; + return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[1]; } case HUE -> { - return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[0]; + return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[0]; } case BRIGHTNESS -> { - return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[2]; + return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[2]; } case COMPOSITE_ADD_RGB -> { - return ((((color >> 16) & 0xFF) / 255D) + (((color >> 8) & 0xFF) / 255D) + (((color >> 0) & 0xFF) / 255D)) / 3D; + return ((((color >> 16) & 0xFF) / 255D) + (((color >> 8) & 0xFF) / 255D) + (((color) & 0xFF) / 255D)) / 3D; } case COMPOSITE_MUL_RGB -> { - return (((color >> 16) & 0xFF) / 255D) * (((color >> 8) & 0xFF) / 255D) * (((color >> 0) & 0xFF) / 255D); + return (((color >> 16) & 0xFF) / 255D) * (((color >> 8) & 0xFF) / 255D) * (((color) & 0xFF) / 255D); } case COMPOSITE_MAX_RGB -> { - return Math.max(Math.max((((color >> 16) & 0xFF) / 255D), (((color >> 8) & 0xFF) / 255D)), (((color >> 0) & 0xFF) / 255D)); + return Math.max(Math.max((((color >> 16) & 0xFF) / 255D), (((color >> 8) & 0xFF) / 255D)), (((color) & 0xFF) / 255D)); } case COMPOSITE_ADD_HSB -> { - float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null); + float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null); return (hsb[0] + hsb[1] + hsb[2]) / 3D; } case COMPOSITE_MUL_HSB -> { - float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null); + float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null); return hsb[0] * hsb[1] * hsb[2]; } case COMPOSITE_MAX_HSB -> { - float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null); + float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null); return Math.max(hsb[0], Math.max(hsb[1], hsb[2])); } case RAW -> { diff --git a/src/main/java/com/volmit/iris/util/data/palette/Mth.java b/src/main/java/com/volmit/iris/util/data/palette/Mth.java index 54b7024df..a4aa6f132 100644 --- a/src/main/java/com/volmit/iris/util/data/palette/Mth.java +++ b/src/main/java/com/volmit/iris/util/data/palette/Mth.java @@ -356,8 +356,8 @@ public class Mth { int var3 = (var1 & 0xFF0000) >> 16; int var4 = (var0 & 0xFF00) >> 8; int var5 = (var1 & 0xFF00) >> 8; - int var6 = (var0 & 0xFF) >> 0; - int var7 = (var1 & 0xFF) >> 0; + int var6 = (var0 & 0xFF); + int var7 = (var1 & 0xFF); int var8 = (int) (var2 * var3 / 255.0F); int var9 = (int) (var4 * var5 / 255.0F); int var10 = (int) (var6 * var7 / 255.0F); @@ -367,7 +367,7 @@ public class Mth { public static int colorMultiply(int var0, float var1, float var2, float var3) { int var4 = (var0 & 0xFF0000) >> 16; int var5 = (var0 & 0xFF00) >> 8; - int var6 = (var0 & 0xFF) >> 0; + int var6 = (var0 & 0xFF); int var7 = (int) (var4 * var1); int var8 = (int) (var5 * var2); int var9 = (int) (var6 * var3); 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 46ed45848..8089dd35e 100644 --- a/src/main/java/com/volmit/iris/util/math/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/math/MathHelper.java @@ -334,8 +334,8 @@ public class MathHelper { int var3 = (var1 & 16711680) >> 16; int var4 = (var0 & '\uff00') >> 8; int var5 = (var1 & '\uff00') >> 8; - int var6 = (var0 & 255) >> 0; - int var7 = (var1 & 255) >> 0; + int var6 = (var0 & 255); + int var7 = (var1 & 255); int var8 = (int) ((float) var2 * (float) var3 / 255.0F); int var9 = (int) ((float) var4 * (float) var5 / 255.0F); int var10 = (int) ((float) var6 * (float) var7 / 255.0F); @@ -345,7 +345,7 @@ public class MathHelper { public static int a(int var0, float var1, float var2, float var3) { int var4 = (var0 & 16711680) >> 16; int var5 = (var0 & '\uff00') >> 8; - int var6 = (var0 & 255) >> 0; + int var6 = (var0 & 255); int var7 = (int) ((float) var4 * var1); int var8 = (int) ((float) var5 * var2); int var9 = (int) ((float) var6 * var3); diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCAMth.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCAMth.java index fd43abf9e..f11853070 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCAMth.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/MCAMth.java @@ -356,8 +356,8 @@ public class MCAMth { int var3 = (var1 & 0xFF0000) >> 16; int var4 = (var0 & 0xFF00) >> 8; int var5 = (var1 & 0xFF00) >> 8; - int var6 = (var0 & 0xFF) >> 0; - int var7 = (var1 & 0xFF) >> 0; + int var6 = (var0 & 0xFF); + int var7 = (var1 & 0xFF); int var8 = (int) (var2 * var3 / 255.0F); int var9 = (int) (var4 * var5 / 255.0F); int var10 = (int) (var6 * var7 / 255.0F); @@ -367,7 +367,7 @@ public class MCAMth { public static int colorMultiply(int var0, float var1, float var2, float var3) { int var4 = (var0 & 0xFF0000) >> 16; int var5 = (var0 & 0xFF00) >> 8; - int var6 = (var0 & 0xFF) >> 0; + int var6 = (var0 & 0xFF); int var7 = (int) (var4 * var1); int var8 = (int) (var5 * var2); int var9 = (int) (var6 * var3); diff --git a/src/main/java/com/volmit/iris/util/noise/CNG.java b/src/main/java/com/volmit/iris/util/noise/CNG.java index b61dda97d..a106db829 100644 --- a/src/main/java/com/volmit/iris/util/noise/CNG.java +++ b/src/main/java/com/volmit/iris/util/noise/CNG.java @@ -299,6 +299,7 @@ public class CNG { for(T i : b) { for(int j = 0; j < max - i.getRarity(); j++) { + //noinspection AssignmentUsedAsCondition if(o = !o) { rarityMapped.add(i); } else { diff --git a/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java index 064433d28..42f631e69 100644 --- a/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java @@ -49,6 +49,7 @@ public class RarityCellGenerator extends CellGenerator { for(T i : b) { for(int j = 0; j < max - i.getRarity(); j++) { + //noinspection AssignmentUsedAsCondition if(o = !o) { rarityMapped.add(i); } else {