diff --git a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java index fe6777612..450306c01 100644 --- a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java @@ -240,6 +240,7 @@ public class VerticalLevelContainer implements LevelContainer } @Override + @SuppressWarnings("unused") public String toString() { /* diff --git a/src/main/java/com/seibel/lod/util/ColorUtil.java b/src/main/java/com/seibel/lod/util/ColorUtil.java index ecb6c5990..2ddfdbaf9 100644 --- a/src/main/java/com/seibel/lod/util/ColorUtil.java +++ b/src/main/java/com/seibel/lod/util/ColorUtil.java @@ -37,30 +37,20 @@ public class ColorUtil public static int applyShade(int color, int shade) { if (shade < 0) - { return (getAlpha(color) << 24) | (Math.max(getRed(color) + shade, 0) << 16) | (Math.max(getGreen(color) + shade, 0) << 8) | Math.max(getBlue(color) + shade, 0); - } else - { return (getAlpha(color) << 24) | (Math.min(getRed(color) + shade, 255) << 16) | (Math.min(getGreen(color) + shade, 255) << 8) | Math.min(getBlue(color) + shade, 255); - } } public static int applyShade(int color, float shade) { if (shade < 1) - { return (getAlpha(color) << 24) | ((int) Math.max(getRed(color) * shade, 0) << 16) | ((int) Math.max(getGreen(color) * shade, 0) << 8) | (int) Math.max(getBlue(color) * shade, 0); - } else - { return (getAlpha(color) << 24) | ((int) Math.min(getRed(color) * shade, 255) << 16) | ((int) Math.min(getGreen(color) * shade, 255) << 8) | (int) Math.min(getBlue(color) * shade, 255); - } } - /** - * Edit the given color as an HSV (Hue Saturation Value) color. - */ + /** Edit the given color as an HSV (Hue Saturation Value) color */ public static int applySaturationAndBrightnessMultipliers(int color, float saturationMultiplier, float brightnessMultiplier) { float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null); @@ -70,45 +60,18 @@ public class ColorUtil LodUtil.clamp(0.0f, hsv[2] * brightnessMultiplier, 1.0f)).getRGB(); } - /** - * Edit the given color as an HSV (Hue Saturation Value) color. - */ - public static int changeBrightness(int color, float brightness) - { - float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null); - return Color.getHSBColor( - hsv[0], // hue - hsv[1], - brightness).getRGB(); - } - - /** - * Edit the given color as an HSV (Hue Saturation Value) color. - */ - public static int changeBrightnessValue(int color, int brightnessColor) - { - float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null); - float brightness = Color.RGBtoHSB(getRed(brightnessColor), getGreen(brightnessColor), getBlue(brightnessColor), null)[2]; - return Color.getHSBColor( - hsv[0], // hue - hsv[1], - brightness).getRGB(); - } - + /** Multiply 2 RGB colors */ public static int multiplyRGBcolors(int color1, int color2) { return ((getAlpha(color1) * getAlpha(color2) / 255) << 24) | ((getRed(color1) * getRed(color2) / 255) << 16) | ((getGreen(color1) * getGreen(color2) / 255) << 8) | (getBlue(color1) * getBlue(color2) / 255); } - + @SuppressWarnings("unused") public static String toString(int color) { - return Integer.toHexString(getAlpha(color)) + - " " + - Integer.toHexString(getRed(color)) + - " " + - Integer.toHexString(getGreen(color)) + - " " + + return Integer.toHexString(getAlpha(color)) + " " + + Integer.toHexString(getRed(color)) + " " + + Integer.toHexString(getGreen(color)) + " " + Integer.toHexString(getBlue(color)); } } diff --git a/src/main/java/com/seibel/lod/util/DataPointUtil.java b/src/main/java/com/seibel/lod/util/DataPointUtil.java index 67e12b2de..8f91b693b 100644 --- a/src/main/java/com/seibel/lod/util/DataPointUtil.java +++ b/src/main/java/com/seibel/lod/util/DataPointUtil.java @@ -188,6 +188,7 @@ public class DataPointUtil } /** This is used to convert a dataPoint to string (useful for the print function) */ + @SuppressWarnings("unused") public static String toString(long dataPoint) { return getHeight(dataPoint) + " " + @@ -233,7 +234,7 @@ public class DataPointUtil * @param dataToMerge one or more columns of data * @param inputVerticalData vertical size of an input data * @param maxVerticalData max vertical size of the merged data - * @return 1 column of correctly parsed data + * @return one column of correctly parsed data */ public static long[] mergeMultiData(long[] dataToMerge, int inputVerticalData, int maxVerticalData) { diff --git a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java index f1dd9a255..28dee6a21 100644 --- a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java +++ b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java @@ -17,20 +17,6 @@ public class DetailDistanceUtil private static int maxDistance = LodConfig.CLIENT.graphics.lodChunkRenderDistance.get() * 16 * 2; - private static final int[] maxVerticalData = { - 4, - 4, - 4, - 2, - 2, - 1, - 1, - 1, - 1, - 1, - 1 }; - - private static final HorizontalResolution[] lodGenDetails = { HorizontalResolution.BLOCK, HorizontalResolution.TWO_BLOCKS, diff --git a/src/main/java/com/seibel/lod/util/LevelPosUtil.java b/src/main/java/com/seibel/lod/util/LevelPosUtil.java index b7f5b7958..4f67c36d1 100644 --- a/src/main/java/com/seibel/lod/util/LevelPosUtil.java +++ b/src/main/java/com/seibel/lod/util/LevelPosUtil.java @@ -221,9 +221,12 @@ public class LevelPosUtil return compareResult; } + @SuppressWarnings("unused") public static String toString(int[] levelPos) { - return (getDetailLevel(levelPos) + " " + getPosX(levelPos) + " " + getPosZ(levelPos)); + return (getDetailLevel(levelPos) + " " + + getPosX(levelPos) + " " + + getPosZ(levelPos)); } public static String toString(byte detailLevel, int posX, int posZ)