From 974a9b4452f1b51e987709c177c121904861edde Mon Sep 17 00:00:00 2001 From: Leonardo Date: Tue, 19 Oct 2021 22:30:23 +0200 Subject: [PATCH] Small change to configs name + comments --- .../bufferBuilding/LodBufferBuilder.java | 2 +- .../java/com/seibel/lod/config/LodConfig.java | 45 ++++++++++++++++--- .../com/seibel/lod/render/LodRenderer.java | 2 +- .../seibel/lod/util/DetailDistanceUtil.java | 4 +- .../java/com/seibel/lod/util/LodUtil.java | 2 +- 5 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java index e1e2a4ae5..edadbe65b 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilder.java @@ -393,7 +393,7 @@ public class LodBufferBuilder if (DataPointUtil.isVoid(data) || !DataPointUtil.doesItExist(data)) break; - LodConfig.CLIENT.graphics.advancedOption.lodTemplate.get().template.addLodToBuffer(currentBuffers[bufferIndex], playerBlockPosRounded, data, adjData, + LodConfig.CLIENT.graphics.advancedGraphicsOption.lodTemplate.get().template.addLodToBuffer(currentBuffers[bufferIndex], playerBlockPosRounded, data, adjData, detailLevel, posX, posZ, box, renderer.previousDebugMode, renderer.lightMap, adjShadeDisabled); } diff --git a/src/main/java/com/seibel/lod/config/LodConfig.java b/src/main/java/com/seibel/lod/config/LodConfig.java index a2cf9bccf..09089bf01 100644 --- a/src/main/java/com/seibel/lod/config/LodConfig.java +++ b/src/main/java/com/seibel/lod/config/LodConfig.java @@ -43,12 +43,32 @@ import net.minecraftforge.fml.config.ModConfig; @Mod.EventBusSubscriber public class LodConfig { + // CONFIG STRUCTURE + // -> Client + // | + // |-> Graphics + // | |-> QualityOption + // | |-> FogQualityOption + // | |-> AdvancedGraphicsOption + // | + // |-> World Generation + // | + // |-> Advanced Mod Option + // |-> Threads + // |-> Buffers + // |-> Debugging + + + public static class Client { public final Graphics graphics; public final WorldGenerator worldGenerator; public final AdvancedModOptions advancedModOptions; + //================// + // Client Configs // + //================// public Client(ForgeConfigSpec.Builder builder) { builder.push("client"); @@ -60,16 +80,16 @@ public class LodConfig builder.pop(); } - //================// - // Client Configs // - //================// + //==================// + // Graphics Configs // + //==================// public static class Graphics { public final QualityOption qualityOption; public final FogQualityOption fogQualityOption; - public final AdvancedOption advancedOption; + public final AdvancedGraphicsOption advancedGraphicsOption; Graphics(ForgeConfigSpec.Builder builder) { @@ -77,7 +97,7 @@ public class LodConfig { qualityOption = new QualityOption(builder); fogQualityOption = new FogQualityOption(builder); - advancedOption = new AdvancedOption(builder); + advancedGraphicsOption = new AdvancedGraphicsOption(builder); } builder.pop(); } @@ -176,7 +196,7 @@ public class LodConfig } } - public static class AdvancedOption + public static class AdvancedGraphicsOption { public final ForgeConfigSpec.EnumValue lodTemplate; @@ -186,7 +206,7 @@ public class LodConfig public final ForgeConfigSpec.EnumValue vanillaOverdraw; - AdvancedOption(ForgeConfigSpec.Builder builder) + AdvancedGraphicsOption(ForgeConfigSpec.Builder builder) { lodTemplate = builder @@ -239,6 +259,12 @@ public class LodConfig } } + + + + //========================// + // WorldGenerator Configs // + //========================// public static class WorldGenerator { public final ForgeConfigSpec.EnumValue generationPriority; @@ -356,6 +382,11 @@ public class LodConfig } + + + //============================// + // AdvancedModOptions Configs // + //============================// public static class AdvancedModOptions { diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java index ef2d4fb02..54124086c 100644 --- a/src/main/java/com/seibel/lod/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -273,7 +273,7 @@ public class LodRenderer ActiveRenderInfo renderInfo = mc.getGameRenderer().getMainCamera(); Vector3d cameraDir = new Vector3d(renderInfo.getLookVector()); - boolean cullingDisabled = LodConfig.CLIENT.graphics.advancedOption.disableDirectionalCulling.get(); + boolean cullingDisabled = LodConfig.CLIENT.graphics.advancedGraphicsOption.disableDirectionalCulling.get(); // used to determine what type of fog to render int halfWidth = vbos.length / 2; diff --git a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java index 0863f8e33..578e4b666 100644 --- a/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java +++ b/src/main/java/com/seibel/lod/util/DetailDistanceUtil.java @@ -115,14 +115,14 @@ public class DetailDistanceUtil { if (detail < minDrawDetail) { - if (LodConfig.CLIENT.graphics.advancedOption.alwaysDrawAtMaxQuality.get()) + if (LodConfig.CLIENT.graphics.advancedGraphicsOption.alwaysDrawAtMaxQuality.get()) return getLodGenDetail(minDrawDetail).detailLevel; else return (byte) minDrawDetail; } else { - if (LodConfig.CLIENT.graphics.advancedOption.alwaysDrawAtMaxQuality.get()) + if (LodConfig.CLIENT.graphics.advancedGraphicsOption.alwaysDrawAtMaxQuality.get()) return getLodGenDetail(detail).detailLevel; else return (byte) detail; diff --git a/src/main/java/com/seibel/lod/util/LodUtil.java b/src/main/java/com/seibel/lod/util/LodUtil.java index 045f5805d..02d413fa7 100644 --- a/src/main/java/com/seibel/lod/util/LodUtil.java +++ b/src/main/java/com/seibel/lod/util/LodUtil.java @@ -355,7 +355,7 @@ public class LodUtil ChunkPos centerChunk = new ChunkPos(playerPos); int skipRadius; - VanillaOverdraw overdraw = LodConfig.CLIENT.graphics.advancedOption.vanillaOverdraw.get(); + VanillaOverdraw overdraw = LodConfig.CLIENT.graphics.advancedGraphicsOption.vanillaOverdraw.get(); HorizontalResolution drawRes = LodConfig.CLIENT.graphics.qualityOption.drawResolution.get(); // apply distance based rules for dynamic overdraw