From 9a03a45cd700238816f3af562659a7e0c9050963 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 26 Nov 2021 21:14:06 -0600 Subject: [PATCH] Clean up Fog, remove Fast fog, close issue #77 (near-far incorrect center) --- core | 2 +- src/main/java/com/seibel/lod/forge/ForgeConfig.java | 10 +++++----- .../wrappers/config/LodConfigWrapperSingleton.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core b/core index 58d4bc7f0..fbf5dfaa9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 58d4bc7f0f1d776f9aa4456848a00b17acec8614 +Subproject commit fbf5dfaa9df96bab076b651156f563a1e6a42b2a diff --git a/src/main/java/com/seibel/lod/forge/ForgeConfig.java b/src/main/java/com/seibel/lod/forge/ForgeConfig.java index 4bf59c8f9..0c843514b 100644 --- a/src/main/java/com/seibel/lod/forge/ForgeConfig.java +++ b/src/main/java/com/seibel/lod/forge/ForgeConfig.java @@ -41,7 +41,7 @@ import com.seibel.lod.core.enums.config.VanillaOverdraw; import com.seibel.lod.core.enums.config.VerticalQuality; import com.seibel.lod.core.enums.rendering.DebugMode; import com.seibel.lod.core.enums.rendering.FogDistance; -import com.seibel.lod.core.enums.rendering.FogDrawOverride; +import com.seibel.lod.core.enums.rendering.FogDrawMode; import com.seibel.lod.core.objects.MinDefaultMax; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics; @@ -173,7 +173,7 @@ public class ForgeConfig public static class FogQualityOption { public final ForgeConfigSpec.EnumValue fogDistance; - public final ForgeConfigSpec.EnumValue fogDrawOverride; + public final ForgeConfigSpec.EnumValue fogDrawMode; public final ForgeConfigSpec.BooleanValue disableVanillaFog; FogQualityOption(ForgeConfigSpec.Builder builder) @@ -185,10 +185,10 @@ public class ForgeConfig + IFogQuality.FOG_DISTANCE_DESC) .defineEnum("Fog Distance", IFogQuality.FOG_DISTANCE_DEFAULT); - fogDrawOverride = builder + fogDrawMode = builder .comment("\n\n" - + IFogQuality.FOG_DRAW_OVERRIDE_DESC) - .defineEnum("Fog Draw Override", IFogQuality.FOG_DRAW_OVERRIDE_DEFAULT); + + IFogQuality.FOG_DRAW_MODE_DESC) + .defineEnum("Fog Draw Override", IFogQuality.FOG_DRAW_MODE_DEFAULT); disableVanillaFog = builder .comment("\n\n" diff --git a/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java b/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java index ebbe7c444..43f491c19 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java @@ -32,7 +32,7 @@ import com.seibel.lod.core.enums.config.VanillaOverdraw; import com.seibel.lod.core.enums.config.VerticalQuality; import com.seibel.lod.core.enums.rendering.DebugMode; import com.seibel.lod.core.enums.rendering.FogDistance; -import com.seibel.lod.core.enums.rendering.FogDrawOverride; +import com.seibel.lod.core.enums.rendering.FogDrawMode; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.forge.ForgeConfig; @@ -206,14 +206,14 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override - public FogDrawOverride getFogDrawOverride() + public FogDrawMode getFogDrawMode() { - return ForgeConfig.CLIENT.graphics.fogQuality.fogDrawOverride.get(); + return ForgeConfig.CLIENT.graphics.fogQuality.fogDrawMode.get(); } @Override - public void setFogDrawOverride(FogDrawOverride newFogDrawOverride) + public void setFogDrawMode(FogDrawMode newFogDrawOverride) { - ForgeConfig.CLIENT.graphics.fogQuality.fogDrawOverride.set(newFogDrawOverride); + ForgeConfig.CLIENT.graphics.fogQuality.fogDrawMode.set(newFogDrawOverride); }