From d0591f292ea8add1903d2006d906f48c5ae6d592 Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 14 Jun 2023 11:15:25 +1000 Subject: [PATCH] Use primitive int over Integer --- .../terra/addons/image/colorsampler/ColorSampler.java | 2 +- .../image/colorsampler/image/SingleImageColorSampler.java | 2 +- .../image/colorsampler/image/TileImageColorSampler.java | 2 +- .../image/colorsampler/mutate/RotateColorSampler.java | 5 +++-- .../image/colorsampler/mutate/TranslateColorSampler.java | 2 +- .../image/converter/ClosestMatchColorConverter.java | 2 +- .../terra/addons/image/converter/ColorConverter.java | 8 ++++---- .../terra/addons/image/converter/ExactColorConverter.java | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java index 4856a08f9..9cf226302 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java @@ -8,5 +8,5 @@ public interface ColorSampler { * @param z World z coordinate * @return Integer representing a web color */ - Integer apply(int x, int z); + int apply(int x, int z); } diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java index 2c19f70bf..420b0f62f 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java @@ -20,7 +20,7 @@ public class SingleImageColorSampler implements ColorSampler { } @Override - public Integer apply(int x, int z) { + public int apply(int x, int z) { var nx = transformation.transformX(image, x); var nz = transformation.transformZ(image, z); if(nx < 0 || nz < 0 || nx >= image.getWidth() || nz >= image.getHeight()) return fallback.apply(x, z); diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java index aae1bf21f..ec03c4941 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java @@ -19,7 +19,7 @@ public class TileImageColorSampler implements ColorSampler { } @Override - public Integer apply(int x, int z) { + public int apply(int x, int z) { x = transformation.transformX(image, x); z = transformation.transformZ(image, z); return image.getRGB(FastMath.floorMod(x, image.getWidth()), FastMath.floorMod(z, image.getHeight())); diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java index d7fae42b2..ed425e35d 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java @@ -1,8 +1,9 @@ package com.dfsek.terra.addons.image.colorsampler.mutate; -import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import net.jafama.FastMath; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; + public class RotateColorSampler implements ColorSampler { @@ -16,7 +17,7 @@ public class RotateColorSampler implements ColorSampler { } @Override - public Integer apply(int x, int z) { + public int apply(int x, int z) { return sampler.apply( (int) (x * FastMath.cos(radians) - z * FastMath.sin(radians)), (int) (z * FastMath.cos(radians) + x * FastMath.sin(radians)) diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java index f281e5152..16d3cb71c 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java @@ -15,7 +15,7 @@ public class TranslateColorSampler implements ColorSampler { } @Override - public Integer apply(int x, int z) { + public int apply(int x, int z) { return sampler.apply(x - translateX, z - translateZ); } } diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ClosestMatchColorConverter.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ClosestMatchColorConverter.java index a95e2ee83..b2d44f94d 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ClosestMatchColorConverter.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ClosestMatchColorConverter.java @@ -16,7 +16,7 @@ public class ClosestMatchColorConverter implements ColorConverter { } @Override - public T apply(Integer color) { + public T apply(int color) { int closest = 0; int smallestDistance = Integer.MAX_VALUE; for(int compare : colors) { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ColorConverter.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ColorConverter.java index bb5a87613..5f76291d8 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ColorConverter.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ColorConverter.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.image.converter; -import java.util.function.Function; - - -public interface ColorConverter extends Function { +public interface ColorConverter { + + T apply(int color); + Iterable getEntries(); } diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ExactColorConverter.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ExactColorConverter.java index 99188f379..8f6f55d4c 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ExactColorConverter.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/converter/ExactColorConverter.java @@ -25,7 +25,7 @@ public class ExactColorConverter implements ColorConverter { } @Override - public T apply(Integer color) { + public T apply(int color) { if (ignoreAlpha) { color = ColorUtil.zeroAlpha(color); }