From 92e651c7795c10aa87b90db72937570ea3964377 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 19 Jun 2021 20:42:48 -0500 Subject: [PATCH] Rename LodUtils to LodUtil --- .../java/com/seibel/lod/builders/LodBufferBuilder.java | 6 +++--- src/main/java/com/seibel/lod/builders/LodBuilder.java | 8 ++++---- .../com/seibel/lod/builders/LodChunkGenWorker.java | 6 +++--- src/main/java/com/seibel/lod/objects/LodDimension.java | 10 +++++----- src/main/java/com/seibel/lod/proxy/ClientProxy.java | 4 ++-- .../seibel/lod/util/{LodUtils.java => LodUtil.java} | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) rename src/main/java/com/seibel/lod/util/{LodUtils.java => LodUtil.java} (96%) diff --git a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java index 81c41189a..af546a691 100644 --- a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java @@ -9,7 +9,7 @@ import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.NearFarBuffer; import com.seibel.lod.render.LodRender; -import com.seibel.lod.util.LodUtils; +import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; @@ -90,7 +90,7 @@ public class LodBufferBuilder if (previousDimension != lodDim) { - biomeContainer = LodUtils.getServerWorldFromDimension(lodDim.dimension).getChunk(0, 0, ChunkStatus.EMPTY).getBiomes(); + biomeContainer = LodUtil.getServerWorldFromDimension(lodDim.dimension).getChunk(0, 0, ChunkStatus.EMPTY).getBiomes(); previousDimension = lodDim; } @@ -213,7 +213,7 @@ public class LodBufferBuilder // TODO add a way for a server side mod to generate chunks requested here if(mc.isIntegratedServerRunning()) { - ServerWorld serverWorld = LodUtils.getServerWorldFromDimension(lodDim.dimension); + ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(lodDim.dimension); // make sure we have as many chunks to generate as we are allowed if (chunkGenIndex < maxChunkGenRequests) diff --git a/src/main/java/com/seibel/lod/builders/LodBuilder.java b/src/main/java/com/seibel/lod/builders/LodBuilder.java index 1f8b3d4b2..a23755f54 100644 --- a/src/main/java/com/seibel/lod/builders/LodBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBuilder.java @@ -11,7 +11,7 @@ import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDataPoint; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodWorld; -import com.seibel.lod.util.LodUtils; +import com.seibel.lod.util.LodUtil; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -59,7 +59,7 @@ public class LodBuilder return; // is this chunk from the same world as the lodWorld? - if (!lodWorld.getWorldName().equals(LodUtils.getWorldID(world))) + if (!lodWorld.getWorldName().equals(LodUtil.getWorldID(world))) // we are not in the same world anymore // don't add this LOD return; @@ -404,7 +404,7 @@ public class LodBuilder continue; } - Color c = LodUtils.intToColor(ci); + Color c = LodUtil.intToColor(ci); red += c.getRed(); green += c.getGreen(); @@ -579,7 +579,7 @@ public class LodBuilder continue; } - Color c = LodUtils.intToColor(ci); + Color c = LodUtil.intToColor(ci); red += c.getRed(); green += c.getGreen(); diff --git a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java index c72c34867..f3fb29ad1 100644 --- a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java @@ -14,7 +14,7 @@ import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; import com.seibel.lod.proxy.ClientProxy; import com.seibel.lod.render.LodRender; -import com.seibel.lod.util.LodUtils; +import com.seibel.lod.util.LodUtil; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; @@ -155,7 +155,7 @@ public class LodChunkGenWorker implements IWorker Color color; if (biome.getCategory() == Biome.Category.OCEAN) { - color = LodUtils.intToColor(biome.getWaterColor()); + color = LodUtil.intToColor(biome.getWaterColor()); } else if (biome.getCategory() == Biome.Category.ICY) { @@ -163,7 +163,7 @@ public class LodChunkGenWorker implements IWorker } else { - color = LodUtils.intToColor(biome.getFoliageColor()); + color = LodUtil.intToColor(biome.getFoliageColor()); } diff --git a/src/main/java/com/seibel/lod/objects/LodDimension.java b/src/main/java/com/seibel/lod/objects/LodDimension.java index 9441ea0b3..17ffe5c4b 100644 --- a/src/main/java/com/seibel/lod/objects/LodDimension.java +++ b/src/main/java/com/seibel/lod/objects/LodDimension.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.IOException; import com.seibel.lod.handlers.LodDimensionFileHandler; -import com.seibel.lod.util.LodUtils; +import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; import net.minecraft.util.math.ChunkPos; @@ -49,7 +49,7 @@ public class LodDimension { // local world - ServerWorld serverWorld = LodUtils.getServerWorldFromDimension(newDimension); + ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(newDimension); // provider needs a separate variable to prevent // the compiler from complaining ServerChunkProvider provider = serverWorld.getChunkProvider(); @@ -60,7 +60,7 @@ public class LodDimension // connected to server saveDir = new File(mc.gameDir.getCanonicalFile() + - "\\lod server data\\" + LodUtils.getDimensionIDFromWorld(mc.world)); + "\\lod server data\\" + LodUtil.getDimensionIDFromWorld(mc.world)); } fileHandler = new LodDimensionFileHandler(saveDir, this); @@ -242,7 +242,7 @@ public class LodDimension */ public void addLod(LodChunk lod) { - RegionPos pos = LodUtils.convertChunkPosToRegionPos(new ChunkPos(lod.x, lod.z)); + RegionPos pos = LodUtil.convertChunkPosToRegionPos(new ChunkPos(lod.x, lod.z)); // don't continue if the region can't be saved if (!regionIsInRange(pos.x, pos.z)) @@ -281,7 +281,7 @@ public class LodDimension */ public LodChunk getLodFromCoordinates(int chunkX, int chunkZ) { - RegionPos pos = LodUtils.convertChunkPosToRegionPos(new ChunkPos(chunkX, chunkZ)); + RegionPos pos = LodUtil.convertChunkPosToRegionPos(new ChunkPos(chunkX, chunkZ)); LodRegion region = getRegion(pos.x, pos.z); diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index 03281386e..06e4b96bf 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -11,7 +11,7 @@ import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; import com.seibel.lod.objects.LodWorld; import com.seibel.lod.render.LodRender; -import com.seibel.lod.util.LodUtils; +import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; import net.minecraft.profiler.IProfiler; @@ -131,7 +131,7 @@ public class ClientProxy public void worldLoadEvent(WorldEvent.Load event) { // the player just loaded a new world/dimension - lodWorld.selectWorld(LodUtils.getWorldID(event.getWorld())); + lodWorld.selectWorld(LodUtil.getWorldID(event.getWorld())); // make sure the correct LODs are being rendered // (if this isn't done the previous world's LODs may be drawn) renderer.regenerateLODsNextFrame(); diff --git a/src/main/java/com/seibel/lod/util/LodUtils.java b/src/main/java/com/seibel/lod/util/LodUtil.java similarity index 96% rename from src/main/java/com/seibel/lod/util/LodUtils.java rename to src/main/java/com/seibel/lod/util/LodUtil.java index f0497add3..747682555 100644 --- a/src/main/java/com/seibel/lod/util/LodUtils.java +++ b/src/main/java/com/seibel/lod/util/LodUtil.java @@ -22,7 +22,7 @@ import net.minecraft.world.server.ServerWorld; * @author James Seibel * @version 06-19-2021 */ -public class LodUtils +public class LodUtil { private static Minecraft mc = Minecraft.getInstance(); @@ -128,7 +128,7 @@ public class LodUtils if(mc.world == null) return ""; - ServerWorld serverWorld = LodUtils.getServerWorldFromDimension(mc.world.getDimensionType()); + ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(mc.world.getDimensionType()); if(serverWorld == null) return ""; @@ -166,7 +166,7 @@ public class LodUtils // this will return the world save location // and the dimension folder - ServerWorld serverWorld = LodUtils.getServerWorldFromDimension(world.getDimensionType()); + ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(world.getDimensionType()); if(serverWorld == null) throw new NullPointerException("getDimensionIDFromWorld wasn't able to get the ServerWorld for the dimension " + world.getDimensionType().getEffects().getPath());