From 05fcd3032bd6aae795b7f8eb4d6233b93a7d982c Mon Sep 17 00:00:00 2001 From: Leo dev Date: Tue, 13 May 2025 00:03:09 +0200 Subject: [PATCH] default colors changed --- .../saturnclient/ui2/components/SaturnModule.java | 13 +++++++------ .../java/org/saturnclient/ui2/elements/Button.java | 2 +- .../saturnclient/ui2/elements/TextureButton.java | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/saturnclient/ui2/components/SaturnModule.java b/src/main/java/org/saturnclient/ui2/components/SaturnModule.java index 5a02a44..8cb08df 100644 --- a/src/main/java/org/saturnclient/ui2/components/SaturnModule.java +++ b/src/main/java/org/saturnclient/ui2/components/SaturnModule.java @@ -15,16 +15,17 @@ import net.minecraft.client.render.RenderLayer; public class SaturnModule extends Element { private static ThemeManager theme = new ThemeManager("Module", "enabled", "hovering"); - private static Property bgColor = theme.property("bg", new Property<>(0xFF581c1c)); + private static Property bgColor = theme.property("bg", new Property<>(0xFF1d202d)); private static Property fgColor = theme.property("fg", new Property<>(0xFFA1A2B8)); - private static Property iconBg = theme.property("icon-bg", new Property<>(0xFF802222)); + private static Property iconFg = theme.property("icon-fg", new Property<>(0xFFA1A2B8)); + private static Property iconBg = theme.property("icon-bg", new Property<>(0xFF2e3248)); private static Property iconRadius = theme.property("icon-radius", new Property<>(10)); private static Property radius = theme.property("radius", new Property<>(10)); static { - theme.propertyStateDefault("enabled", "bg", 0xFF14532d); - theme.propertyStateDefault("enabled", "icon-bg", 0xFF1e6f3f); - theme.propertyStateDefault("hovering", "fg", 0xFFbfc0cf); + theme.propertyStateDefault("enabled", "bg", 0xFF1d202d); + theme.propertyStateDefault("enabled", "icon-bg", 0xFF845eee); + theme.propertyStateDefault("hovering", "fg", 0xFF845eee); } private Module mod; @@ -59,7 +60,7 @@ public class SaturnModule extends Element { renderScope.drawRoundedRectangle(p, p, h, h, iconRadius.value, iconBg.value); - renderScope.drawTexture(mod.getIconTexture(), p + (p / 2), p + (p / 2), 0, 0, h - p, h - p, fgColor.value); + renderScope.drawTexture(mod.getIconTexture(), p + (p / 2), p + (p / 2), 0, 0, h - p, h - p, iconFg.value); renderScope.drawText(0.6f, mod.getName(), p+h+4, p + 1, true, fgColor.value); diff --git a/src/main/java/org/saturnclient/ui2/elements/Button.java b/src/main/java/org/saturnclient/ui2/elements/Button.java index 4fe416a..a4ae70e 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Button.java +++ b/src/main/java/org/saturnclient/ui2/elements/Button.java @@ -15,7 +15,7 @@ public class Button extends Element { private static Property bold = theme.property("fg-bold", new Property(false)); static { - theme.propertyStateDefault("hovering", "fg-color", 0xFFFF0000); + theme.propertyStateDefault("hovering", "fg-color", 0xFF845eee); } private String text; diff --git a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java b/src/main/java/org/saturnclient/ui2/elements/TextureButton.java index 4cc039d..f1575d4 100644 --- a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java +++ b/src/main/java/org/saturnclient/ui2/elements/TextureButton.java @@ -18,7 +18,7 @@ public class TextureButton extends Element { static { - theme.propertyStateDefault("hovering", "fg-color", 0xFFFF0000); + theme.propertyStateDefault("hovering", "fg-color", 0xFF845eee); } Identifier sprite;