From 1d1b5f611551913ccb0feb0e316ba14c813bdb14 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sun, 10 Oct 2021 10:34:34 +0200 Subject: [PATCH] Resolved more warnings. Applied auto format in affected files. --- .../com/seibel/lod/objects/LodDimension.java | 40 +++++-------------- .../lod/objects/PosToRenderContainer.java | 2 +- .../com/seibel/lod/render/LodRenderer.java | 6 +-- 3 files changed, 13 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/seibel/lod/objects/LodDimension.java b/src/main/java/com/seibel/lod/objects/LodDimension.java index d7f86ab7c..cd8cf6954 100644 --- a/src/main/java/com/seibel/lod/objects/LodDimension.java +++ b/src/main/java/com/seibel/lod/objects/LodDimension.java @@ -747,10 +747,7 @@ public class LodDimension public boolean doesDataExist(byte detailLevel, int posX, int posZ) { LodRegion region = getRegion(detailLevel, posX, posZ); - if (region == null) - return false; - - return region.doesDataExist(detailLevel, posX, posZ); + return region != null && region.doesDataExist(detailLevel, posX, posZ); } /** @@ -760,10 +757,7 @@ public class LodDimension public LodRegion getRegionFromFile(RegionPos regionPos, byte detailLevel, DistanceGenerationMode generationMode, VerticalQuality verticalQuality) { - if (fileHandler != null) - return fileHandler.loadRegionFromFile(detailLevel, regionPos, generationMode, verticalQuality); - else - return null; + return fileHandler != null ? fileHandler.loadRegionFromFile(detailLevel, regionPos, generationMode, verticalQuality) : null; } /** @@ -804,17 +798,10 @@ public class LodDimension */ public int getWidth() { - if (regions != null) - { - // we want to get the length directly from the - // source to make sure it is in sync with region - // and isRegionDirty - return regions.length; - } - else - { - return width; - } + // we want to get the length directly from the + // source to make sure it is in sync with region + // and isRegionDirty + return regions != null ? regions.length : width; } /** Update the width of this dimension, in regions */ @@ -838,26 +825,17 @@ public class LodDimension @Override public String toString() { - LodRegion region; - StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("Dimension : \n"); - for (int x = 0; x < regions.length; x++) + for (LodRegion[] lodRegions : regions) { - for (int z = 0; z < regions.length; z++) + for (LodRegion region : lodRegions) { - region = regions[x][z]; if (region == null) - { stringBuilder.append("n"); - stringBuilder.append("\t"); - - } else - { stringBuilder.append(region.getMinDetailLevel()); - stringBuilder.append("\t"); - } + stringBuilder.append("\t"); } stringBuilder.append("\n"); } diff --git a/src/main/java/com/seibel/lod/objects/PosToRenderContainer.java b/src/main/java/com/seibel/lod/objects/PosToRenderContainer.java index 7e9d87b7c..34aa0ec85 100644 --- a/src/main/java/com/seibel/lod/objects/PosToRenderContainer.java +++ b/src/main/java/com/seibel/lod/objects/PosToRenderContainer.java @@ -14,7 +14,7 @@ import java.util.Arrays; public class PosToRenderContainer { public byte minDetail; - private int size; + private final int size; private int regionPosX; private int regionPosZ; private int numberOfPosToRender; diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java index ff97ec239..7bd69da4b 100644 --- a/src/main/java/com/seibel/lod/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -74,14 +74,14 @@ public class LodRenderer */ public DebugMode previousDebugMode = DebugMode.OFF; - private MinecraftWrapper mc; - private GameRenderer gameRender; + private final MinecraftWrapper mc; + private final GameRenderer gameRender; private IProfiler profiler; private int farPlaneBlockDistance; /** This is used to generate the buildable buffers */ - private LodBufferBuilder lodBufferBuilder; + private final LodBufferBuilder lodBufferBuilder; /** Each VertexBuffer represents 1 region */ private VertexBuffer[][][] vbos;