From ee55832961bfbb3127fb2b6013a5796c43f8ddd6 Mon Sep 17 00:00:00 2001 From: C10udburst <18114966+C10udburst@users.noreply.github.com> Date: Wed, 16 Feb 2022 19:29:12 +0100 Subject: [PATCH] update theme to the newest devbuild --- .../themes/rounded/MeteorRoundedGuiTheme.java | 10 ++++++++-- .../themes/rounded/widgets/WMeteorModule.java | 1 + .../themes/rounded/widgets/WMeteorWindow.java | 13 +++++++++---- .../widgets/pressable/WMeteorFavorite.java | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorFavorite.java diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java b/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java index afea49d..3a45ef6 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java @@ -95,6 +95,7 @@ public class MeteorRoundedGuiTheme extends GuiTheme { public final Setting checkboxColor = color("checkbox", "Color of checkbox.", new SettingColor(135, 0, 255)); public final Setting plusColor = color("plus", "Color of plus button.", new SettingColor(255, 255, 255)); public final Setting minusColor = color("minus", "Color of minus button.", new SettingColor(255, 255, 255)); + public final Setting favoriteColor = color("favorite", "Color of checked favorite button.", new SettingColor(255, 255, 0)); // Text @@ -175,8 +176,8 @@ public class MeteorRoundedGuiTheme extends GuiTheme { // Widgets @Override - public WWindow window(String title) { - return w(new WMeteorWindow(title)); + public WWindow window(WWidget icon, String title) { + return w(new WMeteorWindow(icon, title)); } @Override @@ -270,6 +271,11 @@ public class MeteorRoundedGuiTheme extends GuiTheme { return w(new WMeteorTopBar()); } + @Override + public WFavorite favorite(boolean checked) { + return w(new WMeteorFavorite(checked)); + } + // Colors @Override diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java index 979da1a..4927714 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java @@ -28,6 +28,7 @@ public class WMeteorModule extends WPressable implements MeteorWidget { public WMeteorModule(Module module) { this.module = module; + this.tooltip = module.description; if (module.isActive()) { animationProgress1 = 1; diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorWindow.java b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorWindow.java index 328c609..cfcfa79 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorWindow.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorWindow.java @@ -9,16 +9,17 @@ import anticope.rejects.utils.gui.GuiUtils; import anticope.rejects.gui.themes.rounded.MeteorRoundedGuiTheme; import meteordevelopment.meteorclient.gui.renderer.GuiRenderer; import anticope.rejects.gui.themes.rounded.MeteorWidget; +import meteordevelopment.meteorclient.gui.widgets.WWidget; import meteordevelopment.meteorclient.gui.widgets.containers.WWindow; public class WMeteorWindow extends WWindow implements MeteorWidget { - public WMeteorWindow(String title) { - super(title); + public WMeteorWindow(WWidget icon, String title) { + super(icon, title); } @Override - protected WHeader header() { - return new WMeteorHeader(); + protected WHeader header(WWidget icon) { + return new WMeteorHeader(icon); } @Override @@ -29,6 +30,10 @@ public class WMeteorWindow extends WWindow implements MeteorWidget { } private class WMeteorHeader extends WHeader { + public WMeteorHeader(WWidget icon) { + super(icon); + } + @Override protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, double delta) { GuiUtils.quadRounded(renderer, this, theme().accentColor.get(), ((MeteorRoundedGuiTheme)theme).roundAmount()); diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorFavorite.java b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorFavorite.java new file mode 100644 index 0000000..8fa81b7 --- /dev/null +++ b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorFavorite.java @@ -0,0 +1,16 @@ +package anticope.rejects.gui.themes.rounded.widgets.pressable; + +import anticope.rejects.gui.themes.rounded.MeteorWidget; +import meteordevelopment.meteorclient.gui.widgets.pressable.WFavorite; +import meteordevelopment.meteorclient.utils.render.color.Color; + +public class WMeteorFavorite extends WFavorite implements MeteorWidget { + public WMeteorFavorite(boolean checked) { + super(checked); + } + + @Override + protected Color getColor() { + return theme().favoriteColor.get(); + } +}