From 546d60f1fc17cb175df10aee3742fa4a2d06a550 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 18 Jan 2022 11:29:01 +0100 Subject: [PATCH] resolved warnings. part 3 --- .../enums/config/DistanceGenerationMode.java | 4 +--- .../core/enums/config/VerticalQuality.java | 4 +--- .../lod/core/objects/BlockBiomeCouple.java | 2 +- .../objects/lod/VerticalLevelContainer.java | 20 +++++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/enums/config/DistanceGenerationMode.java b/src/main/java/com/seibel/lod/core/enums/config/DistanceGenerationMode.java index 6f33cdf4f..09a6549f2 100644 --- a/src/main/java/com/seibel/lod/core/enums/config/DistanceGenerationMode.java +++ b/src/main/java/com/seibel/lod/core/enums/config/DistanceGenerationMode.java @@ -107,7 +107,6 @@ public enum DistanceGenerationMode case BIOME_ONLY: return DistanceGenerationMode.NONE; case NONE: - return null; default: return null; } @@ -116,8 +115,6 @@ public enum DistanceGenerationMode // Note: return null if out of range public static DistanceGenerationMode next(DistanceGenerationMode mode) { switch (mode) { - case FULL: - return null; case FEATURES: return DistanceGenerationMode.FULL; case SURFACE: @@ -128,6 +125,7 @@ public enum DistanceGenerationMode return DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT; case NONE: return DistanceGenerationMode.BIOME_ONLY; + case FULL: default: return null; } diff --git a/src/main/java/com/seibel/lod/core/enums/config/VerticalQuality.java b/src/main/java/com/seibel/lod/core/enums/config/VerticalQuality.java index 48a1bcfe7..1ab8b20a1 100644 --- a/src/main/java/com/seibel/lod/core/enums/config/VerticalQuality.java +++ b/src/main/java/com/seibel/lod/core/enums/config/VerticalQuality.java @@ -60,7 +60,6 @@ public enum VerticalQuality case MEDIUM: return VerticalQuality.LOW; case LOW: - return null; default: return null; } @@ -69,12 +68,11 @@ public enum VerticalQuality // Note: return null if out of range public static VerticalQuality next(VerticalQuality mode) { switch (mode) { - case HIGH: - return null; case MEDIUM: return VerticalQuality.HIGH; case LOW: return VerticalQuality.MEDIUM; + case HIGH: default: return null; } diff --git a/src/main/java/com/seibel/lod/core/objects/BlockBiomeCouple.java b/src/main/java/com/seibel/lod/core/objects/BlockBiomeCouple.java index 536286f8c..7224b7ea6 100644 --- a/src/main/java/com/seibel/lod/core/objects/BlockBiomeCouple.java +++ b/src/main/java/com/seibel/lod/core/objects/BlockBiomeCouple.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentMap; public class BlockBiomeCouple { - public static ConcurrentMap noBiomeIstanceCache = new ConcurrentHashMap<>(); + public static final ConcurrentMap noBiomeIstanceCache = new ConcurrentHashMap<>(); public static ConcurrentMap> withBiomeIstanceCache = new ConcurrentHashMap<>(); String blockName; diff --git a/src/main/java/com/seibel/lod/core/objects/lod/VerticalLevelContainer.java b/src/main/java/com/seibel/lod/core/objects/lod/VerticalLevelContainer.java index 343142af7..46ba89263 100644 --- a/src/main/java/com/seibel/lod/core/objects/lod/VerticalLevelContainer.java +++ b/src/main/java/com/seibel/lod/core/objects/lod/VerticalLevelContainer.java @@ -417,12 +417,14 @@ public class VerticalLevelContainer implements LevelContainer //STEP 1// //We initially reset this position of the data container - positionDataContainer[posX * size + posZ] = PositionDataFormat.EMPTY_DATA; + final int indexA = posX * size + posZ; + positionDataContainer[indexA] = PositionDataFormat.EMPTY_DATA; for (int verticalIndex = 0; verticalIndex < verticalSize; verticalIndex++) { - verticalDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = VerticalDataFormat.EMPTY_LOD; - lightDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0; - colorDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0; + final int indexB = indexA * verticalSize + verticalIndex; + verticalDataContainer[indexB] = VerticalDataFormat.EMPTY_LOD; + lightDataContainer[indexB] = 0; + colorDataContainer[indexB] = 0; } @@ -756,12 +758,14 @@ public class VerticalLevelContainer implements LevelContainer //SPLITTED VERSION OF THE MERGE AND ADD private void resetPosition(int posX, int posZ) { - positionDataContainer[posX * size + posZ] = PositionDataFormat.EMPTY_DATA; + final int indexA = posX * size + posZ; + positionDataContainer[indexA] = PositionDataFormat.EMPTY_DATA; for (int verticalIndex = 0; verticalIndex < verticalSize; verticalIndex++) { - verticalDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = VerticalDataFormat.EMPTY_LOD; - lightDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0; - colorDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0; + final int indexB = indexA * verticalSize + verticalIndex; + verticalDataContainer[indexB] = VerticalDataFormat.EMPTY_LOD; + lightDataContainer[indexB] = 0; + colorDataContainer[indexB] = 0; } }