From 4ff181543609b8ec1b81bd6516696dab23a249da Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 16 Oct 2021 16:28:57 -0500 Subject: [PATCH] Clean up a few compiler warnings --- .../bufferBuilding/lodTemplates/CubicLodTemplate.java | 7 +++---- src/main/java/com/seibel/lod/render/LodRenderer.java | 2 -- src/main/java/com/seibel/lod/util/ThreadMapUtil.java | 9 +++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java index 6b5617c6a..9e5157800 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java @@ -18,20 +18,19 @@ package com.seibel.lod.builders.bufferBuilding.lodTemplates; +import java.util.Map; + import com.seibel.lod.enums.DebugMode; -import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.ColorUtil; import com.seibel.lod.util.DataPointUtil; import com.seibel.lod.util.LodUtil; import com.seibel.lod.wrappers.MinecraftWrapper; -import net.minecraft.client.Minecraft; + import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import java.util.Map; - /** * Builds LODs as rectangular prisms. * @author James Seibel diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java index a08d2c884..f4b4847df 100644 --- a/src/main/java/com/seibel/lod/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -156,7 +156,6 @@ public class LodRenderer * @param mcMatrixStack This matrix stack should come straight from MC's renderChunkLayer (or future equivalent) method * @param partialTicks how far into the current tick this method was called. */ - @SuppressWarnings("deprecation") public void drawLODs(LodDimension lodDim, MatrixStack mcMatrixStack, float partialTicks, IProfiler newProfiler) { if (lodDim == null) @@ -439,7 +438,6 @@ public class LodRenderer /** * Revert any changes that were made to the fog. */ - @SuppressWarnings("deprecation") private void cleanupFog(NearFarFogSettings fogSettings, float defaultFogStartDist, float defaultFogEndDist, int defaultFogMode, int defaultFogDistance) diff --git a/src/main/java/com/seibel/lod/util/ThreadMapUtil.java b/src/main/java/com/seibel/lod/util/ThreadMapUtil.java index 653caa7b8..0621d90ca 100644 --- a/src/main/java/com/seibel/lod/util/ThreadMapUtil.java +++ b/src/main/java/com/seibel/lod/util/ThreadMapUtil.java @@ -1,7 +1,6 @@ package com.seibel.lod.util; -import com.seibel.lod.builders.bufferBuilding.lodTemplates.Box; -import net.minecraft.util.Direction; +import static com.seibel.lod.util.LodUtil.DETAIL_OPTIONS; import java.util.Arrays; import java.util.HashMap; @@ -9,7 +8,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static com.seibel.lod.util.LodUtil.DETAIL_OPTIONS; +import com.seibel.lod.builders.bufferBuilding.lodTemplates.Box; + +import net.minecraft.util.Direction; /** * Holds data used by specific threads so @@ -59,7 +60,7 @@ public class ThreadMapUtil || (adjDataMap.get(Thread.currentThread().getName()).get(Direction.NORTH) == null) || (adjDataMap.get(Thread.currentThread().getName()).get(Direction.NORTH).length != verticalData)) { - adjDataMap.put(Thread.currentThread().getName(), new HashMap()); + adjDataMap.put(Thread.currentThread().getName(), new HashMap()); adjDataMap.get(Thread.currentThread().getName()).put(Direction.UP, new long[1]); adjDataMap.get(Thread.currentThread().getName()).put(Direction.DOWN, new long[1]); for (Direction direction : Box.ADJ_DIRECTIONS)