From 277def2accdc0555ddb6d6ff113ba83a543a0524 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 19 Jun 2021 20:47:04 -0500 Subject: [PATCH] Rename LodConfigHandler to LodConfig --- src/main/java/com/seibel/lod/LodMain.java | 4 +-- .../seibel/lod/builders/LodBufferBuilder.java | 4 +-- .../com/seibel/lod/builders/LodBuilder.java | 4 +-- .../lod/builders/LodChunkGenWorker.java | 6 ++-- .../lodTemplates/CubicLodTemplate.java | 4 +-- .../{LodConfigHandler.java => LodConfig.java} | 2 +- .../lod/handlers/LodDimensionFileHandler.java | 6 ++-- .../seibel/lod/mixin/MixinWorldRenderer.java | 4 +-- .../com/seibel/lod/proxy/ClientProxy.java | 4 +-- .../com/seibel/lod/render/LodRenderer.java | 34 +++++++++---------- .../com/seibel/lod/render/RenderUtil.java | 6 ++-- 11 files changed, 39 insertions(+), 39 deletions(-) rename src/main/java/com/seibel/lod/handlers/{LodConfigHandler.java => LodConfig.java} (99%) diff --git a/src/main/java/com/seibel/lod/LodMain.java b/src/main/java/com/seibel/lod/LodMain.java index 711340f3d..7c598d7d6 100644 --- a/src/main/java/com/seibel/lod/LodMain.java +++ b/src/main/java/com/seibel/lod/LodMain.java @@ -1,6 +1,6 @@ package com.seibel.lod; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.proxy.ClientProxy; import net.minecraft.client.Minecraft; @@ -34,7 +34,7 @@ public class LodMain private void init(final FMLCommonSetupEvent event) { Minecraft.getInstance().getFramebuffer().enableStencil(); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, LodConfigHandler.clientSpec); + ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, LodConfig.clientSpec); } diff --git a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java index dbc975630..863130c5e 100644 --- a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java @@ -4,7 +4,7 @@ import java.util.concurrent.Executors; import org.lwjgl.opengl.GL11; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.NearFarBuffer; @@ -204,7 +204,7 @@ public class LodBufferBuilder // get the desired LodTemplate and // add this LOD to the buffer - LodConfigHandler.CLIENT.lodTemplate.get(). + LodConfig.CLIENT.lodTemplate.get(). template.addLodToBuffer(currentBuffer, lodDim, lod, xOffset, yOffset, zOffset, renderer.debugging); } diff --git a/src/main/java/com/seibel/lod/builders/LodBuilder.java b/src/main/java/com/seibel/lod/builders/LodBuilder.java index a23755f54..eaa86ad64 100644 --- a/src/main/java/com/seibel/lod/builders/LodBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBuilder.java @@ -6,7 +6,7 @@ import java.util.concurrent.Executors; import com.seibel.lod.enums.ColorDirection; import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDataPoint; import com.seibel.lod.objects.LodDimension; @@ -123,7 +123,7 @@ public class LodBuilder throw new IllegalArgumentException("generateLodFromChunk given a null chunk"); - LodDetail detail = LodConfigHandler.CLIENT.lodDetail.get(); + LodDetail detail = LodConfig.CLIENT.lodDetail.get(); LodDataPoint[][] dataPoints = new LodDataPoint[detail.lengthCount][detail.lengthCount]; for(int i = 0; i < detail.lengthCount * detail.lengthCount; i++) diff --git a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java index 976fb434f..57b5af1da 100644 --- a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java @@ -7,7 +7,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDataPoint; import com.seibel.lod.objects.LodDimension; @@ -65,7 +65,7 @@ public class LodChunkGenWorker implements IWorker thread.lodBufferBuilder.numberOfChunksWaitingToGenerate--; - if (LodConfigHandler.CLIENT.distanceBiomeOnlyGeneration.get()) + if (LodConfig.CLIENT.distanceBiomeOnlyGeneration.get()) { // if we are using biome only generation // that can be done asynchronously @@ -133,7 +133,7 @@ public class LodChunkGenWorker implements IWorker { long startTime = System.currentTimeMillis(); - if (LodConfigHandler.CLIENT.distanceBiomeOnlyGeneration.get()) + if (LodConfig.CLIENT.distanceBiomeOnlyGeneration.get()) { Chunk chunk = new Chunk(serverWorld, pos, biomeContainer); List chunkList = new LinkedList<>(); diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java index 9a2ebb32f..88e80eb9e 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java @@ -4,7 +4,7 @@ import java.awt.Color; import com.seibel.lod.enums.ColorDirection; import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; @@ -36,7 +36,7 @@ public class CubicLodTemplate extends AbstractLodTemplate // Add this LOD to the BufferBuilder // using the quality setting set by the config - LodDetail detail = LodConfigHandler.CLIENT.lodDetail.get(); + LodDetail detail = LodConfig.CLIENT.lodDetail.get(); int halfWidth = detail.width / 2; diff --git a/src/main/java/com/seibel/lod/handlers/LodConfigHandler.java b/src/main/java/com/seibel/lod/handlers/LodConfig.java similarity index 99% rename from src/main/java/com/seibel/lod/handlers/LodConfigHandler.java rename to src/main/java/com/seibel/lod/handlers/LodConfig.java index c202f212b..e5e4ce8b2 100644 --- a/src/main/java/com/seibel/lod/handlers/LodConfigHandler.java +++ b/src/main/java/com/seibel/lod/handlers/LodConfig.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.config.ModConfig; * @version 6-19-2021 */ @Mod.EventBusSubscriber -public class LodConfigHandler +public class LodConfig { public static class Client { diff --git a/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java b/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java index e5dde6e39..e87042b71 100644 --- a/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java +++ b/src/main/java/com/seibel/lod/handlers/LodDimensionFileHandler.java @@ -83,7 +83,7 @@ public class LodDimensionFileHandler public LodRegion loadRegionFromFile(int regionX, int regionZ) { - String fileName = getFileNameAndPathForRegion(regionX, regionZ, LodConfigHandler.CLIENT.lodDetail.get()); + String fileName = getFileNameAndPathForRegion(regionX, regionZ, LodConfig.CLIENT.lodDetail.get()); File f = new File(fileName); @@ -158,7 +158,7 @@ public class LodDimensionFileHandler try { // convert each line into an LOD object and add it to the region - LodChunk lod = new LodChunk(s, LodConfigHandler.CLIENT.lodDetail.get()); + LodChunk lod = new LodChunk(s, LodConfig.CLIENT.lodDetail.get()); region.addLod(lod); } @@ -234,7 +234,7 @@ public class LodDimensionFileHandler int x = region.x; int z = region.z; - File f = new File(getFileNameAndPathForRegion(x, z, LodConfigHandler.CLIENT.lodDetail.get())); + File f = new File(getFileNameAndPathForRegion(x, z, LodConfig.CLIENT.lodDetail.get())); try { diff --git a/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java b/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java index 6aeba3cd7..af07c1a4d 100644 --- a/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java +++ b/src/main/java/com/seibel/lod/mixin/MixinWorldRenderer.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.matrix.MatrixStack; import com.seibel.lod.LodMain; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.WorldRenderer; @@ -39,7 +39,7 @@ public class MixinWorldRenderer { // only render if LODs are enabled and // only render before solid blocks - if (LodConfigHandler.CLIENT.drawLODs.get() && renderType.equals(RenderType.getSolid())) + if (LodConfig.CLIENT.drawLODs.get() && renderType.equals(RenderType.getSolid())) LodMain.client_proxy.renderLods(previousPartialTicks); } } diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index 3b3678c52..413b056cf 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; import com.seibel.lod.builders.LodBufferBuilder; import com.seibel.lod.builders.LodBuilder; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; @@ -63,7 +63,7 @@ public class ClientProxy // update each regions' width to match the new render distance int newWidth = Math.max(4, // TODO is this logic good? - (mc.gameSettings.renderDistanceChunks * LodChunk.WIDTH * 2 * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()) / LodRegion.SIZE + (mc.gameSettings.renderDistanceChunks * LodChunk.WIDTH * 2 * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()) / LodRegion.SIZE ); if (lodBuilder.regionWidth != newWidth) { diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java index 8505fc49c..91a6aa0a2 100644 --- a/src/main/java/com/seibel/lod/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -13,7 +13,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.seibel.lod.builders.LodBufferBuilder; import com.seibel.lod.enums.FogDistance; import com.seibel.lod.enums.FogQuality; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.handlers.ReflectionHandler; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; @@ -156,14 +156,14 @@ public class LodRenderer if ((int)player.getPosX() / LodChunk.WIDTH != prevChunkX || (int)player.getPosZ() / LodChunk.WIDTH != prevChunkZ || previousChunkRenderDistance != mc.gameSettings.renderDistanceChunks || - prevFogDistance != LodConfigHandler.CLIENT.fogDistance.get()) + prevFogDistance != LodConfig.CLIENT.fogDistance.get()) { // yes regen = true; prevChunkX = (int)player.getPosX() / LodChunk.WIDTH; prevChunkZ = (int)player.getPosZ() / LodChunk.WIDTH; - prevFogDistance = LodConfigHandler.CLIENT.fogDistance.get(); + prevFogDistance = LodConfig.CLIENT.fogDistance.get(); } else { @@ -173,9 +173,9 @@ public class LodRenderer } // did the user change the debug setting? - if (LodConfigHandler.CLIENT.debugMode.get() != debugging) + if (LodConfig.CLIENT.debugMode.get() != debugging) { - debugging = LodConfigHandler.CLIENT.debugMode.get(); + debugging = LodConfig.CLIENT.debugMode.get(); regen = true; } @@ -185,7 +185,7 @@ public class LodRenderer farPlaneDistance = renderDistWidth * LodChunk.WIDTH; // set how big the LODs will be and how far they will go - int totalLength = (int) farPlaneDistance * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get() * 2; + int totalLength = (int) farPlaneDistance * LodConfig.CLIENT.lodChunkRadiusMultiplier.get() * 2; int numbChunksWide = (totalLength / LodChunk.WIDTH); // see if the chunks Minecraft is going to render are the @@ -409,13 +409,13 @@ public class LodRenderer { if (fogQuality == FogQuality.FANCY) { - RenderSystem.fogStart(farPlaneDistance * 0.85f * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()); - RenderSystem.fogEnd(farPlaneDistance * 1.0f * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()); + RenderSystem.fogStart(farPlaneDistance * 0.85f * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()); + RenderSystem.fogEnd(farPlaneDistance * 1.0f * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()); } else if(fogQuality == FogQuality.FAST) { - RenderSystem.fogStart(farPlaneDistance * 0.5f * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()); - RenderSystem.fogEnd(farPlaneDistance * 0.75f * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()); + RenderSystem.fogStart(farPlaneDistance * 0.5f * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()); + RenderSystem.fogEnd(farPlaneDistance * 0.75f * LodConfig.CLIENT.lodChunkRadiusMultiplier.get()); } } @@ -495,7 +495,7 @@ public class LodRenderer getFov(partialTicks, true), (float)this.mc.getMainWindow().getFramebufferWidth() / (float)this.mc.getMainWindow().getFramebufferHeight(), 0.5F, - this.farPlaneDistance * LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get() * 2); + this.farPlaneDistance * LodConfig.CLIENT.lodChunkRadiusMultiplier.get() * 2); // add the screen space distortions projectionMatrix.mul(matrixStack.getLast().getMatrix()); @@ -533,21 +533,21 @@ public class LodRenderer private void setupBuffers(int numbChunksWide) { // calculate the max amount of memory needed (in bytes) - int bufferMemory = RenderUtil.getBufferMemoryForRadiusMultiplier(LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get()); + int bufferMemory = RenderUtil.getBufferMemoryForRadiusMultiplier(LodConfig.CLIENT.lodChunkRadiusMultiplier.get()); // if the required memory is greater than the // MAX_ALOCATEABLE_DIRECT_MEMORY lower the lodChunkRadiusMultiplier // to fit. if (bufferMemory > MAX_ALOCATEABLE_DIRECT_MEMORY) { - int maxRadiusMultiplier = RenderUtil.getMaxRadiusMultiplierWithAvaliableMemory(LodConfigHandler.CLIENT.lodTemplate.get(), LodConfigHandler.CLIENT.lodDetail.get()); + int maxRadiusMultiplier = RenderUtil.getMaxRadiusMultiplierWithAvaliableMemory(LodConfig.CLIENT.lodTemplate.get(), LodConfig.CLIENT.lodDetail.get()); ClientProxy.LOGGER.warn("The lodChunkRadiusMultiplier was set too high " + "and had to be lowered to fit memory constraints " - + "from " + LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.get() + " " + + "from " + LodConfig.CLIENT.lodChunkRadiusMultiplier.get() + " " + "to " + maxRadiusMultiplier); - LodConfigHandler.CLIENT.lodChunkRadiusMultiplier.set( + LodConfig.CLIENT.lodChunkRadiusMultiplier.set( maxRadiusMultiplier); bufferMemory = RenderUtil.getBufferMemoryForRadiusMultiplier(maxRadiusMultiplier); @@ -625,7 +625,7 @@ public class LodRenderer { case FANCY: - switch(LodConfigHandler.CLIENT.fogDistance.get()) + switch(LodConfig.CLIENT.fogDistance.get()) { case NEAR_AND_FAR: fogSetting.nearFogSetting = FogDistance.NEAR; @@ -650,7 +650,7 @@ public class LodRenderer // and far portion; and fast fog is rendered from the // frustrum's perspective instead of the camera - switch(LodConfigHandler.CLIENT.fogDistance.get()) + switch(LodConfig.CLIENT.fogDistance.get()) { case NEAR_AND_FAR: fogSetting.nearFogSetting = FogDistance.NEAR; diff --git a/src/main/java/com/seibel/lod/render/RenderUtil.java b/src/main/java/com/seibel/lod/render/RenderUtil.java index 41d48a53b..fcfaf3a64 100644 --- a/src/main/java/com/seibel/lod/render/RenderUtil.java +++ b/src/main/java/com/seibel/lod/render/RenderUtil.java @@ -2,7 +2,7 @@ package com.seibel.lod.render; import com.seibel.lod.enums.LodDetail; import com.seibel.lod.enums.LodTemplate; -import com.seibel.lod.handlers.LodConfigHandler; +import com.seibel.lod.handlers.LodConfig; import net.minecraft.client.Minecraft; @@ -59,8 +59,8 @@ public class RenderUtil // calculate the max amount of buffer memory needed (in bytes) return numbChunksWide * numbChunksWide * - LodConfigHandler.CLIENT.lodTemplate.get(). - getBufferMemoryForSingleLod(LodConfigHandler.CLIENT.lodDetail.get()); + LodConfig.CLIENT.lodTemplate.get(). + getBufferMemoryForSingleLod(LodConfig.CLIENT.lodDetail.get()); } /**