diff --git a/src/main/java/com/backsun/lod/builders/LodBufferBuilder.java b/src/main/java/com/backsun/lod/builders/LodBufferBuilder.java index 330e49940..a45cf80ea 100644 --- a/src/main/java/com/backsun/lod/builders/LodBufferBuilder.java +++ b/src/main/java/com/backsun/lod/builders/LodBufferBuilder.java @@ -3,9 +3,9 @@ import java.awt.Color; import org.lwjgl.opengl.GL11; +import com.backsun.lod.enums.FogDistance; import com.backsun.lod.objects.NearFarBuffer; import com.backsun.lod.renderer.LodRenderer; -import com.backsun.lod.util.enums.FogDistance; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/backsun/lod/util/enums/ColorDirection.java b/src/main/java/com/backsun/lod/enums/ColorDirection.java similarity index 90% rename from src/main/java/com/backsun/lod/util/enums/ColorDirection.java rename to src/main/java/com/backsun/lod/enums/ColorDirection.java index 9d4aa782f..2e5d2db34 100644 --- a/src/main/java/com/backsun/lod/util/enums/ColorDirection.java +++ b/src/main/java/com/backsun/lod/enums/ColorDirection.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * TOP, N, S, E, W, BOTTOM diff --git a/src/main/java/com/backsun/lod/util/enums/DrawMode.java b/src/main/java/com/backsun/lod/enums/DrawMode.java similarity index 93% rename from src/main/java/com/backsun/lod/util/enums/DrawMode.java rename to src/main/java/com/backsun/lod/enums/DrawMode.java index aee54e7d2..b31e39376 100644 --- a/src/main/java/com/backsun/lod/util/enums/DrawMode.java +++ b/src/main/java/com/backsun/lod/enums/DrawMode.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * @author James Seibel diff --git a/src/main/java/com/backsun/lod/util/enums/FogDistance.java b/src/main/java/com/backsun/lod/enums/FogDistance.java similarity index 89% rename from src/main/java/com/backsun/lod/util/enums/FogDistance.java rename to src/main/java/com/backsun/lod/enums/FogDistance.java index 87dd8c3f0..9680f8405 100644 --- a/src/main/java/com/backsun/lod/util/enums/FogDistance.java +++ b/src/main/java/com/backsun/lod/enums/FogDistance.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * Near, far, or NEAR_AND_FAR. diff --git a/src/main/java/com/backsun/lod/util/enums/FogQuality.java b/src/main/java/com/backsun/lod/enums/FogQuality.java similarity index 78% rename from src/main/java/com/backsun/lod/util/enums/FogQuality.java rename to src/main/java/com/backsun/lod/enums/FogQuality.java index f45a2146b..15ddac1cd 100644 --- a/src/main/java/com/backsun/lod/util/enums/FogQuality.java +++ b/src/main/java/com/backsun/lod/enums/FogQuality.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * fast, fancy, or off diff --git a/src/main/java/com/backsun/lod/util/enums/LodCorner.java b/src/main/java/com/backsun/lod/enums/LodCorner.java similarity index 89% rename from src/main/java/com/backsun/lod/util/enums/LodCorner.java rename to src/main/java/com/backsun/lod/enums/LodCorner.java index ac686f31f..41551ea24 100644 --- a/src/main/java/com/backsun/lod/util/enums/LodCorner.java +++ b/src/main/java/com/backsun/lod/enums/LodCorner.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * NE, SE, SW, NW diff --git a/src/main/java/com/backsun/lod/util/enums/LodLocation.java b/src/main/java/com/backsun/lod/enums/LodLocation.java similarity index 89% rename from src/main/java/com/backsun/lod/util/enums/LodLocation.java rename to src/main/java/com/backsun/lod/enums/LodLocation.java index 47b03fc98..3b17abdca 100644 --- a/src/main/java/com/backsun/lod/util/enums/LodLocation.java +++ b/src/main/java/com/backsun/lod/enums/LodLocation.java @@ -1,4 +1,4 @@ -package com.backsun.lod.util.enums; +package com.backsun.lod.enums; /** * diff --git a/src/main/java/com/backsun/lod/handlers/ReflectionHandler.java b/src/main/java/com/backsun/lod/handlers/ReflectionHandler.java index a13c254f4..70b458e79 100644 --- a/src/main/java/com/backsun/lod/handlers/ReflectionHandler.java +++ b/src/main/java/com/backsun/lod/handlers/ReflectionHandler.java @@ -2,7 +2,7 @@ package com.backsun.lod.handlers; import java.lang.reflect.Field; -import com.backsun.lod.util.enums.FogQuality; +import com.backsun.lod.enums.FogQuality; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/backsun/lod/objects/NearFarFogSetting.java b/src/main/java/com/backsun/lod/objects/NearFarFogSetting.java index 9a69e8f61..56e87d3e6 100644 --- a/src/main/java/com/backsun/lod/objects/NearFarFogSetting.java +++ b/src/main/java/com/backsun/lod/objects/NearFarFogSetting.java @@ -1,6 +1,6 @@ package com.backsun.lod.objects; -import com.backsun.lod.util.enums.FogDistance; +import com.backsun.lod.enums.FogDistance; /** * This object is just a replacement for an array diff --git a/src/main/java/com/backsun/lod/renderer/LodRenderer.java b/src/main/java/com/backsun/lod/renderer/LodRenderer.java index 7ff0d0887..21a111db2 100644 --- a/src/main/java/com/backsun/lod/renderer/LodRenderer.java +++ b/src/main/java/com/backsun/lod/renderer/LodRenderer.java @@ -11,6 +11,10 @@ import org.lwjgl.opengl.GL11; import com.backsun.lod.builders.LodBufferBuilder; import com.backsun.lod.builders.LodBuilder; +import com.backsun.lod.enums.ColorDirection; +import com.backsun.lod.enums.FogDistance; +import com.backsun.lod.enums.FogQuality; +import com.backsun.lod.enums.LodCorner; import com.backsun.lod.handlers.ReflectionHandler; import com.backsun.lod.objects.LodChunk; import com.backsun.lod.objects.LodDimension; @@ -18,10 +22,6 @@ import com.backsun.lod.objects.NearFarBuffer; import com.backsun.lod.objects.NearFarFogSetting; import com.backsun.lod.proxy.SingleLodChunkGenWorker; import com.backsun.lod.util.LodConfig; -import com.backsun.lod.util.enums.ColorDirection; -import com.backsun.lod.util.enums.FogDistance; -import com.backsun.lod.util.enums.FogQuality; -import com.backsun.lod.util.enums.LodCorner; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -596,7 +596,7 @@ public class LodRenderer Color error = new Color(255, 0, 225, alpha); // bright pink // this seemingly useless math is required, - // just using (int) camera doesn't work + // just using (int) playerX/Z doesn't work int playerXChunkOffset = ((int) playerX / LodChunk.WIDTH) * LodChunk.WIDTH; int playerZChunkOffset = ((int) playerZ / LodChunk.WIDTH) * LodChunk.WIDTH; // this is where we will start drawing squares diff --git a/src/main/java/com/backsun/lod/util/LodConfig.java b/src/main/java/com/backsun/lod/util/LodConfig.java index 7c4bc5fff..b0172182d 100644 --- a/src/main/java/com/backsun/lod/util/LodConfig.java +++ b/src/main/java/com/backsun/lod/util/LodConfig.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import com.backsun.lod.ModInfo; -import com.backsun.lod.util.enums.FogDistance; +import com.backsun.lod.enums.FogDistance; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.core.io.WritingMode; diff --git a/src/main/java/com/backsun/lod/util/ReflectionHandler.java b/src/main/java/com/backsun/lod/util/ReflectionHandler.java index 76026d845..c63154ccc 100644 --- a/src/main/java/com/backsun/lod/util/ReflectionHandler.java +++ b/src/main/java/com/backsun/lod/util/ReflectionHandler.java @@ -2,7 +2,7 @@ package com.backsun.lod.util; import java.lang.reflect.Field; -import com.backsun.lod.util.enums.FogQuality; +import com.backsun.lod.enums.FogQuality; import net.minecraft.client.Minecraft;