From 835beb607ddb8ae673f91cb693c3dc1d394490bb Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 9 Mar 2022 23:06:34 -0600 Subject: [PATCH] Close #207 (re-add brightness/contrast configs) --- .../java/com/seibel/lod/common/Config.java | 12 +++++++++- .../config/LodConfigWrapperSingleton.java | 24 +++++++++++++++++++ core | 2 +- 3 files changed, 36 insertions(+), 2 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 f3a3804d8..03b862f27 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/Config.java @@ -160,11 +160,21 @@ public class Config public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC; @ConfigAnnotations.Entry public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT; - + @ConfigAnnotations.FileComment public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC; @ConfigAnnotations.Entry public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT; + + @ConfigAnnotations.FileComment + public static String _brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DESC; + @ConfigAnnotations.Entry + public static double brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DEFAULT; + + @ConfigAnnotations.FileComment + public static String _saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DESC; + @ConfigAnnotations.Entry + public static double saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DEFAULT; /* @ConfigAnnotations.FileComment 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 789c7e686..e14915705 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 @@ -305,6 +305,30 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.useExtendedNearClipPlane").value = newUseExtendedNearClipPlane; ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.useExtendedNearClipPlane"); } + + @Override + public double getBrightnessMultiplier() + { + return Config.Client.Graphics.AdvancedGraphics.brightnessMultiplier; + } + @Override + public void setBrightnessMultiplier(double newBrightnessMultiplier) + { + ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier; + ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier"); + } + + @Override + public double getSaturationMultiplier() + { + return Config.Client.Graphics.AdvancedGraphics.saturationMultiplier; + } + @Override + public void setSaturationMultiplier(double newSaturationMultiplier) + { + ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.saturationMultiplier").value = newSaturationMultiplier; + ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.saturationMultiplier"); + } } } diff --git a/core b/core index c9cabd8a3..bca2b6180 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c9cabd8a321a63cbd971bfae41b54d224feb43c2 +Subproject commit bca2b61800b613b630def131e9c9f85f9736493d