diff options
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/internal/config')
| -rw-r--r-- | src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java | 7 | ||||
| -rw-r--r-- | src/main/java/cc/polyfrost/oneconfig/internal/config/compatibility/vigilance/VigilanceConfig.java | 11 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java b/src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java index cb93f0a..bf290b7 100644 --- a/src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java +++ b/src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java @@ -1,5 +1,6 @@ package cc.polyfrost.oneconfig.internal.config; +import cc.polyfrost.oneconfig.config.annotations.Exclude; import cc.polyfrost.oneconfig.config.annotations.KeyBind; import cc.polyfrost.oneconfig.config.annotations.Slider; import cc.polyfrost.oneconfig.config.annotations.Switch; @@ -9,7 +10,6 @@ import cc.polyfrost.oneconfig.internal.gui.BlurHandler; import cc.polyfrost.oneconfig.libs.universal.UKeyboard; import cc.polyfrost.oneconfig.platform.Platform; import cc.polyfrost.oneconfig.utils.TickDelay; -import cc.polyfrost.oneconfig.utils.gui.GuiUtils; public class Preferences extends InternalConfig { @Switch( @@ -23,10 +23,6 @@ public class Preferences extends InternalConfig { ) public static OneKeyBind oneConfigKeyBind = new OneKeyBind(UKeyboard.KEY_RSHIFT); - @Switch( - name = "Easter Egg 1" - ) - public static boolean easterEgg1 = true; @Switch( name = "Use custom GUI scale", @@ -43,6 +39,7 @@ public class Preferences extends InternalConfig { ) public static float customScale = 1f; + @Exclude private static Preferences INSTANCE; public Preferences() { diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/config/compatibility/vigilance/VigilanceConfig.java b/src/main/java/cc/polyfrost/oneconfig/internal/config/compatibility/vigilance/VigilanceConfig.java index 689bf25..87ffc47 100644 --- a/src/main/java/cc/polyfrost/oneconfig/internal/config/compatibility/vigilance/VigilanceConfig.java +++ b/src/main/java/cc/polyfrost/oneconfig/internal/config/compatibility/vigilance/VigilanceConfig.java @@ -184,13 +184,10 @@ public class VigilanceConfig extends Config { } @Override - protected void setColor(OneColor color) { - if (cachedColor != color) { - Color newColor = new Color(color.getRGB(), true); - try { - this.color.set(parent, newColor); - } catch (IllegalAccessException ignored) { - } + protected void set(Object color) throws IllegalAccessException { + if (color instanceof OneColor) { + Color newColor = ((OneColor) color).toJavaColor(); + this.color.set(parent, newColor); } } } |
