diff --git a/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java b/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java index d03879a88..cd7e44db7 100644 --- a/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java +++ b/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java @@ -17,19 +17,16 @@ */ package com.seibel.lod.mixin; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.seibel.lod.LodMain; import com.seibel.lod.proxy.ClientProxy; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.WorldRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.seibel.lod.LodMain; -import com.seibel.lod.config.LodConfig; - -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.WorldRenderer; - /** * This class is used to mix in my rendering code * before Minecraft starts rendering blocks. diff --git a/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java b/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java index 766d7a88a..19c5c091a 100644 --- a/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java @@ -119,7 +119,7 @@ public class SingleLevelContainer implements LevelContainer { childPosX = 2 * posX + x; childPosZ = 2 * posZ + z; - dataToMerge[2 * x + z] = ((SingleLevelContainer) lowerLevelContainer).getSingleData(childPosX, childPosZ); + dataToMerge[2 * x + z] = lowerLevelContainer.getSingleData(childPosX, childPosZ); } } data = DataPointUtil.mergeSingleData(dataToMerge); diff --git a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java index c69fd343c..0c1442bb4 100644 --- a/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java @@ -2,7 +2,6 @@ package com.seibel.lod.objects; import com.seibel.lod.util.*; -import java.security.InvalidParameterException; import java.util.Arrays; public class VerticalLevelContainer implements LevelContainer diff --git a/src/main/java/com/seibel/lod/util/DataPointUtil.java b/src/main/java/com/seibel/lod/util/DataPointUtil.java index d1d03a69c..03872bbc4 100644 --- a/src/main/java/com/seibel/lod/util/DataPointUtil.java +++ b/src/main/java/com/seibel/lod/util/DataPointUtil.java @@ -35,10 +35,10 @@ public class DataPointUtil public final static int ALPHA_DOWNSIZE_SHIFT = 4; - public final static int BLUE_COLOR_SHIFT = 0; - public final static int GREEN_COLOR_SHIFT = 8; - public final static int RED_COLOR_SHIFT = 16; - public final static int ALPHA_COLOR_SHIFT = 24; + //public final static int BLUE_COLOR_SHIFT = 0; + //public final static int GREEN_COLOR_SHIFT = 8; + //public final static int RED_COLOR_SHIFT = 16; + //public final static int ALPHA_COLOR_SHIFT = 24; public final static int BLUE_SHIFT = 36; public final static int GREEN_SHIFT = BLUE_SHIFT + 8; @@ -51,9 +51,9 @@ public class DataPointUtil public final static int DEPTH_SHIFT = 16; public final static int BLOCK_LIGHT_SHIFT = 12; public final static int SKY_LIGHT_SHIFT = 8; - public final static int LIGHTS_SHIFT = SKY_LIGHT_SHIFT; - public final static int VERTICAL_INDEX_SHIFT = 6; - public final static int FLAG_SHIFT = 5; + //public final static int LIGHTS_SHIFT = SKY_LIGHT_SHIFT; + //public final static int VERTICAL_INDEX_SHIFT = 6; + //public final static int FLAG_SHIFT = 5; public final static int GEN_TYPE_SHIFT = 2; public final static int VOID_SHIFT = 1; public final static int EXISTENCE_SHIFT = 0; @@ -62,14 +62,14 @@ public class DataPointUtil public final static long RED_MASK = 0b1111_1111; public final static long GREEN_MASK = 0b1111_1111; public final static long BLUE_MASK = 0b1111_1111; - public final static long COLOR_MASK = 0b11111111_11111111_11111111; + //public final static long COLOR_MASK = 0b11111111_11111111_11111111; public final static long HEIGHT_MASK = 0b11_1111_1111; public final static long DEPTH_MASK = 0b11_1111_1111; - public final static long LIGHTS_MASK = 0b1111_1111; + //public final static long LIGHTS_MASK = 0b1111_1111; public final static long BLOCK_LIGHT_MASK = 0b1111; public final static long SKY_LIGHT_MASK = 0b1111; - public final static long VERTICAL_INDEX_MASK = 0b11; - public final static long FLAG_MASK = 0b1; + //public final static long VERTICAL_INDEX_MASK = 0b11; + //public final static long FLAG_MASK = 0b1; public final static long GEN_TYPE_MASK = 0b111; public final static long VOID_MASK = 1; public final static long EXISTENCE_MASK = 1;