From 443d6165fa2a23a2279af36113427014762cb3e6 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 14 Dec 2021 20:45:38 +0100 Subject: [PATCH] final fix for 1.18 y<0? --- .../seibel/lod/core/builders/lodBuilding/LodBuilder.java | 6 ++---- .../seibel/lod/core/objects/lod/VerticalLevelContainer.java | 4 ++-- src/main/java/com/seibel/lod/core/util/DataPointUtil.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java b/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java index 8d7193031..ca6fd0ab0 100644 --- a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java +++ b/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java @@ -272,14 +272,12 @@ public class LodBuilder { yAbs = depth; light = getLightValue(chunk, xAbs,yAbs,zAbs, true, hasSkyLight, true); - //TODO don't ask me why, but apparently it works - color = generateLodColor(chunk, config, xAbs, yAbs - MIN_WORLD_HEIGHT, zAbs); + color = generateLodColor(chunk, config, xAbs, yAbs, zAbs); } else { light = getLightValue(chunk, xAbs, yAbs, zAbs, hasCeiling, hasSkyLight, topBlock); - //TODO don't ask me why, but apparently it works - color = generateLodColor(chunk, config, xAbs, yAbs - MIN_WORLD_HEIGHT, zAbs); + color = generateLodColor(chunk, config, xAbs, yAbs, zAbs); } lightBlock = light & 0b1111; lightSky = (light >> 4) & 0b1111; 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 91087c4ba..69be35485 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 @@ -524,7 +524,7 @@ public class VerticalLevelContainer implements LevelContainer int j = 0; while (count > verticalSize) { - ii = DataPointUtil.WORLD_HEIGHT - DataPointUtil.VERTICAL_OFFSET; + ii = DataPointUtil.WORLD_HEIGHT; for (i = 0; i < count - 1; i++) { if (heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2] <= ii) @@ -867,7 +867,7 @@ public class VerticalLevelContainer implements LevelContainer int j = 0; while (count > verticalSize) { - ii = DataPointUtil.WORLD_HEIGHT - DataPointUtil.VERTICAL_OFFSET; + ii = DataPointUtil.WORLD_HEIGHT; for (i = 0; i < count - 1; i++) { if (heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2] <= ii) diff --git a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java index f30204dec..18ce7aadd 100644 --- a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java +++ b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java @@ -415,7 +415,7 @@ public class DataPointUtil int j = 0; while (count > maxVerticalData) { - ii = WORLD_HEIGHT - VERTICAL_OFFSET; + ii = WORLD_HEIGHT; for (i = 0; i < count - 1; i++) { if (heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2] <= ii)