From c0d5dd6deea54fc0b0d8b10dbf268f93fe06e67e Mon Sep 17 00:00:00 2001 From: TomTheFurry <46843632+TomTheFurry@users.noreply.github.com> Date: Wed, 16 Mar 2022 18:50:42 +0800 Subject: [PATCH] ADVANCED FOGGGGGGGGGGGGGGGG~~~~~~~~~~~~~~~~ --- .../java/com/seibel/lod/common/Config.java | 20 ++++++--- .../config/LodConfigWrapperSingleton.java | 42 +++++++++++++------ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/Config.java b/common/src/main/java/com/seibel/lod/common/Config.java index e3f0e8306..f97d45dda 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/Config.java @@ -185,7 +185,7 @@ public class Config @ConfigAnnotations.FileComment public static String _farFogType = IAdvancedFog.FAR_FOG_TYPE_DESC; @ConfigAnnotations.Entry - public static FogSetting.Type farFogType = IAdvancedFog.FAR_FOG_TYPE_DEFAULT; + public static FogSetting.FogType farFogType = IAdvancedFog.FAR_FOG_TYPE_DEFAULT; @ConfigAnnotations.FileComment public static String _farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_DESC; @@ -193,15 +193,24 @@ public class Config public static double farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue; @ConfigAnnotations.ScreenEntry - public static HeightFog HeightFog; + public static HeightFog heightFog; public static class HeightFog { @ConfigAnnotations.FileComment - public static String _heightFogTMode = IHeightFog.HEIGHT_FOG_MODE_DESC; + public static String _heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DESC; + @ConfigAnnotations.Entry + public static HeightFogMixMode heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DEFAULT; + @ConfigAnnotations.FileComment + public static String _heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DESC; @ConfigAnnotations.Entry public static HeightFogMode heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DEFAULT; + @ConfigAnnotations.FileComment + public static String _heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_DESC; + @ConfigAnnotations.Entry(minValue = -4096.0, maxValue = 4096.0) + public static double heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_MIN_DEFAULT_MAX.defaultValue; + @ConfigAnnotations.FileComment public static String _heightFogStart = IHeightFog.HEIGHT_FOG_START_DESC; @ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2) @@ -225,13 +234,14 @@ public class Config @ConfigAnnotations.FileComment public static String _heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DESC; @ConfigAnnotations.Entry - public static FogSetting.Type heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DEFAULT; + public static FogSetting.FogType heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DEFAULT; @ConfigAnnotations.FileComment public static String _heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_DESC; @ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0) public static double heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue; - } + + } } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java index 57299f134..d1ff86816 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java @@ -299,7 +299,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMax; } @Override - public FogSetting.Type getFarFogType() { + public FogSetting.FogType getFarFogType() { return Config.Client.Graphics.FogQuality.AdvancedFog.farFogType; } @Override @@ -328,7 +328,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMax"); } @Override - public void setFarFogType(FogSetting.Type newFarFogType) { + public void setFarFogType(FogSetting.FogType newFarFogType) { ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogType").value = newFarFogType; ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogType"); } @@ -345,41 +345,59 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton public static class HeightFog implements IHeightFog { + @Override + public HeightFogMixMode getHeightFogMixMode() { + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMixMode; + } @Override public HeightFogMode getHeightFogMode() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogMode; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMode; + } + @Override + public double getHeightFogHeight() { + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogHeight; } @Override public double getHeightFogStart() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogStart; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogStart; } @Override public double getHeightFogEnd() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogEnd; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogEnd; } @Override public double getHeightFogMin() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogMin; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMin; } @Override public double getHeightFogMax() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogMax; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMax; } @Override - public FogSetting.Type getHeightFogType() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogType; + public FogSetting.FogType getHeightFogType() { + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogType; } @Override public double getHeightFogDensity() { - return Config.Client.Graphics.FogQuality.AdvancedFog.HeightFog.heightFogDensity; + return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogDensity; } @Override - public void setHeightFogType(HeightFogMode newHeightFogMode) { + public void setHeightFogMixMode(HeightFogMixMode newHeightFogMixMode) { + ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode").value = newHeightFogMixMode; + ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode"); + } + @Override + public void setHeightFogMode(HeightFogMode newHeightFogMode) { ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode").value = newHeightFogMode; ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode"); } @Override + public void setHeightFogHeight(double newHeightFogHeight) { + ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight").value = newHeightFogHeight; + ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight"); + } + @Override public void setHeightFogStart(double newHeightFogStart) { ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart").value = newHeightFogStart; ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart"); @@ -400,7 +418,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax"); } @Override - public void setHeightFogType(FogSetting.Type newHeightFogType) { + public void setHeightFogType(FogSetting.FogType newHeightFogType) { ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogType").value = newHeightFogType; ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogType"); }