From 5bba3cb3eb1ef1180b9b1ab567bb7f06b51cacc1 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sun, 24 Oct 2021 11:35:45 +0200 Subject: [PATCH] minor cleanup --- .../lod/objects/VerticalLevelContainer.java | 3 --- .../seibel/lod/util/DetailDistanceUtil.java | 13 ------------- .../java/com/seibel/lod/util/LodUtil.java | 19 +++---------------- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java index 8233e5aef..fa0a3f433 100644 --- a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java @@ -56,7 +56,6 @@ public class VerticalLevelContainer implements LevelContainer @Override public void clear(int posX, int posZ) { - posX = LevelPosUtil.getRegionModule(detailLevel, posX); posZ = LevelPosUtil.getRegionModule(detailLevel, posZ); for (int verticalIndex = 0; verticalIndex < maxVerticalData; verticalIndex++) @@ -68,7 +67,6 @@ public class VerticalLevelContainer implements LevelContainer @Override public boolean addData(long data, int posX, int posZ, int verticalIndex) { - posX = LevelPosUtil.getRegionModule(detailLevel, posX); posZ = LevelPosUtil.getRegionModule(detailLevel, posZ); dataContainer[posX * size * maxVerticalData + posZ * maxVerticalData + verticalIndex] = data; @@ -78,7 +76,6 @@ public class VerticalLevelContainer implements LevelContainer @Override public boolean addVerticalData(long[] data, int posX, int posZ) { - posX = LevelPosUtil.getRegionModule(detailLevel, posX); posZ = LevelPosUtil.getRegionModule(detailLevel, posZ); for (int verticalIndex = 0; verticalIndex < maxVerticalData; verticalIndex++) diff --git a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java index e8ebdc716..f99e2b00c 100644 --- a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java +++ b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java @@ -120,14 +120,11 @@ public class DetailDistanceUtil public static byte getTreeCutDetailFromDistance(int distance) { - return baseInverseFunction((int) (distance * treeCutMultiplier), minGenDetail, true); } - public static byte getTreeGenDetailFromDistance(int distance) { - return baseInverseFunction((int) (distance * treeGenMultiplier), minGenDetail, true); } @@ -157,30 +154,20 @@ public class DetailDistanceUtil public static HorizontalResolution getLodGenDetail(int detail) { if (detail < minGenDetail) - { return lodGenDetails[minGenDetail]; - } else - { return lodGenDetails[detail]; - } } public static byte getCutLodDetail(int detail) { if (detail < minGenDetail) - { return lodGenDetails[minGenDetail].detailLevel; - } else if (detail == maxDetail) - { return LodUtil.REGION_DETAIL_LEVEL; - } else - { return lodGenDetails[detail].detailLevel; - } } public static int getMaxVerticalData(int detail) diff --git a/src/main/java/com/seibel/lod/util/LodUtil.java b/src/main/java/com/seibel/lod/util/LodUtil.java index a81b11b45..30e132379 100644 --- a/src/main/java/com/seibel/lod/util/LodUtil.java +++ b/src/main/java/com/seibel/lod/util/LodUtil.java @@ -224,9 +224,7 @@ public class LodUtil for (ChunkSection section : blockStorage) { if (section != null && !section.isEmpty()) - { return true; - } } return false; @@ -492,20 +490,9 @@ public class LodUtil { tempX = x + Box.DIRECTION_NORMAL_MAP.get(direction).getX(); tempZ = z + Box.DIRECTION_NORMAL_MAP.get(direction).getZ(); - if (!(tempX < 0 || tempZ < 0 || tempX >= vanillaRenderedChunks.length || tempZ >= vanillaRenderedChunks[0].length)) - { - if (!vanillaRenderedChunks[tempX][tempZ]) - { - return true; - } - } - else - { - if (vanillaRenderedChunks[x][z]) - { - return true; - } - } + if (vanillaRenderedChunks[x][z] || (!(tempX < 0 || tempZ < 0 || tempX >= vanillaRenderedChunks.length || tempZ >= vanillaRenderedChunks[0].length) + && !vanillaRenderedChunks[tempX][tempZ])) + return true; } return false; }