diff --git a/src/main/java/org/saturnclient/ui/Element.java b/src/main/java/org/saturnclient/ui/Element.java index 41f90e7..6677713 100644 --- a/src/main/java/org/saturnclient/ui/Element.java +++ b/src/main/java/org/saturnclient/ui/Element.java @@ -11,7 +11,6 @@ public class Element { public boolean focused; public Animation animation; public float scale = 1.0f; - public Integer duration = null; // Element duration, will fade out if not null public void render(RenderScope renderScope, ElementContext ctx) { } diff --git a/src/main/java/org/saturnclient/ui/Utils.java b/src/main/java/org/saturnclient/ui/Utils.java index b9287dc..8b85ad4 100644 --- a/src/main/java/org/saturnclient/ui/Utils.java +++ b/src/main/java/org/saturnclient/ui/Utils.java @@ -1,7 +1,5 @@ package org.saturnclient.ui; -import java.util.List; - import org.saturnclient.common.provider.GLFWProvider; public class Utils { @@ -64,18 +62,4 @@ public class Utils { } return builder.toString(); } - - public static T getOrNull(List list, int index) { - return (index >= 0 && index < list.size()) ? list.get(index) : null; - } - - // public static void notify(NotificationKind kind, String title, String toast) - // { - // if (SaturnClient.client.currentScreen instanceof SaturnScreen) { - // ((SaturnScreen) SaturnClient.client.currentScreen) - // .draw(new Notification(SaturnClient.client.currentScreen.width, - // SaturnClient.client.currentScreen.height, kind, - // title, toast)); - // } - // } } diff --git a/src/main/java/org/saturnclient/ui/anim/FadeOut.java b/src/main/java/org/saturnclient/ui/anim/FadeOut.java deleted file mode 100644 index 4172883..0000000 --- a/src/main/java/org/saturnclient/ui/anim/FadeOut.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.saturnclient.ui.anim; - -import org.saturnclient.config.AnimationConfig; -import org.saturnclient.ui.Element; - -public class FadeOut extends Animation { - float targetOpacity; - - public FadeOut(int duration) { - super(duration); - } - - public FadeOut(AnimationConfig config) { - super(config); - } - - @Override - public void tick(double progress, Element element) { - element.opacity = targetOpacity - (float) progress; - } - - @Override - public void init(Element element) { - targetOpacity = element.opacity; - // element.opacity = 1.0f; - } -} diff --git a/src/main/java/org/saturnclient/ui/anim/SlideX.java b/src/main/java/org/saturnclient/ui/anim/SlideX.java deleted file mode 100644 index 82792ba..0000000 --- a/src/main/java/org/saturnclient/ui/anim/SlideX.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.saturnclient.ui.anim; - -import org.saturnclient.config.AnimationConfig; -import org.saturnclient.ui.Element; - -public class SlideX extends Animation { - int offset = 20; - double startX; - - public SlideX(AnimationConfig config) { - super(config); - } - - public SlideX(AnimationConfig config, int offset) { - super(config); - this.offset = offset; - } - - public SlideX(int duration) { - super(duration); - } - - public SlideX(int duration, int offset) { - super(duration); - this.offset = offset; - } - - @Override - public void init(Element element) { - startX = element.x - offset; - element.x = (int) startX; - } - - @Override - public void tick(double progress, Element element) { - double currentX = startX + offset * progress; - element.x = (int) currentX; - } -} diff --git a/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java b/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java deleted file mode 100644 index 5936fcb..0000000 --- a/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.saturnclient.ui.elements; - -import org.saturnclient.common.ref.asset.IdentifierRef; -import org.saturnclient.config.Theme; -import org.saturnclient.ui.Element; -import org.saturnclient.ui.ElementContext; -import org.saturnclient.ui.RenderScope; - -public class ClickableTexture extends Element { - IdentifierRef sprite; - private Runnable onClick; - - public ClickableTexture(IdentifierRef sprite, Runnable onClick) { - this.sprite = sprite; - this.onClick = onClick; - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height, - ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value); - } - - @Override - public void click(int mouseX, int mouseY) { - if (onClick != null) { - onClick.run(); - } - } -} diff --git a/src/main/java/org/saturnclient/ui/elements/Notification.java b/src/main/java/org/saturnclient/ui/elements/Notification.java deleted file mode 100644 index 0e0b471..0000000 --- a/src/main/java/org/saturnclient/ui/elements/Notification.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.saturnclient.ui.elements; - -import org.saturnclient.config.Theme; -import org.saturnclient.config.property.ColorProperty; -import org.saturnclient.config.property.Property; -import org.saturnclient.ui.Element; -import org.saturnclient.ui.ElementContext; -import org.saturnclient.ui.RenderScope; -import org.saturnclient.ui.anim.SlideX; -import org.saturnclient.ui.resources.Fonts; -import org.saturnclient.ui.resources.Textures; - -public class Notification extends Element { - private static ColorProperty error = Property.color(0xFFbf212f); - private static ColorProperty info = Property.color(0xFF264b96); - private static ColorProperty success = Property.color(0xFF27b376); - - public static enum NotificationKind { - Error, - Info, - Success, - } - - NotificationKind kind; - String text; - String title; - - public Notification(int width, int height, NotificationKind kind, String title, String text) { - this.kind = kind; - this.text = text; - this.title = title; - this.width = (int) Math.max(Fonts.getWidth(text, 1) * 0.6f, Fonts.getWidth(title, 1)) + 20; - this.height = 50; - this.x = width - this.width - 15; - this.y = height - this.height - 15; - this.animation = new SlideX(700, -width); - this.duration = 3000; - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.drawRoundedRectangle(0, 0, width, height, 10, Theme.PRIMARY.value); - switch (kind) { - case Error: - renderScope.drawTexture(Textures.CIRCLE_X, 9, 9, 0, 0, 15, 15, error.value); - break; - - case Info: - renderScope.drawTexture(Textures.INFO, 9, 9, 0, 0, 15, 15, info.value); - break; - - case Success: - renderScope.drawTexture(Textures.CHECK, 9, 9, 0, 0, 15, 15, success.value); - break; - } - renderScope.drawText(0.7f, title, 32, 10, 1, -1); - renderScope.drawText(0.5f, text, 32, 28, 1, -1); - } -} diff --git a/src/main/java/org/saturnclient/ui/elements/Text.java b/src/main/java/org/saturnclient/ui/elements/Text.java deleted file mode 100644 index 7de1737..0000000 --- a/src/main/java/org/saturnclient/ui/elements/Text.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.saturnclient.ui.elements; - -import org.saturnclient.config.Theme; -import org.saturnclient.ui.Element; -import org.saturnclient.ui.ElementContext; -import org.saturnclient.ui.RenderScope; -import org.saturnclient.ui.resources.Fonts; - -public class Text extends Element { - private String text; - - public Text(String text) { - this.text = text; - width = Fonts.getWidth(text, Theme.FONT.value); - height = Fonts.getHeight(); - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.drawText(this.text, 0, 0, Theme.FONT.value, Theme.FOREGROUND.value); - } -} diff --git a/src/main/java/org/saturnclient/ui/elements/TextureButton.java b/src/main/java/org/saturnclient/ui/elements/TextureButton.java deleted file mode 100644 index 25c63b5..0000000 --- a/src/main/java/org/saturnclient/ui/elements/TextureButton.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.saturnclient.ui.elements; - -import org.saturnclient.common.ref.asset.IdentifierRef; -import org.saturnclient.config.Theme; -import org.saturnclient.ui.Element; -import org.saturnclient.ui.ElementContext; -import org.saturnclient.ui.RenderScope; - -public class TextureButton extends Element { - IdentifierRef sprite; - private Runnable onClick; - static int padding = 14; - - public TextureButton(IdentifierRef sprite, Runnable onClick) { - this.sprite = sprite; - this.onClick = onClick; - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value, - ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value); - - int texWidth = width - padding; - int texHeight = height - padding; - - renderScope.drawTexture(sprite, padding / 2, padding / 2, 0, 0, texWidth, texHeight, - ctx.isHovering() ? Theme.ACCENT_FG.value : Theme.PRIMARY_FG.value); - } - - @Override - public void click(int mouseX, int mouseY) { - if (onClick != null) { - onClick.run(); - } - } -} diff --git a/src/main/java/org/saturnclient/ui/resources/Textures.java b/src/main/java/org/saturnclient/ui/resources/Textures.java index 8ecd804..01398ca 100644 --- a/src/main/java/org/saturnclient/ui/resources/Textures.java +++ b/src/main/java/org/saturnclient/ui/resources/Textures.java @@ -9,25 +9,6 @@ import org.saturnclient.common.ref.asset.IdentifierRef; public class Textures { public static final IdentifierRef CROSSHAIR_RANGE = IdentifierRef .ofSaturn("textures/gui/hud/crosshair_range.png"); - public static final IdentifierRef COSMETICS = IdentifierRef.ofSaturn("textures/gui/components/cosmetics.png"); - public static final IdentifierRef HUD_ICON = IdentifierRef.ofSaturn("textures/gui/components/hud.png"); - public static final IdentifierRef SEARCH = IdentifierRef.ofSaturn("textures/gui/components/search.png"); - public static final IdentifierRef CLOSE = IdentifierRef.ofSaturn("textures/gui/components/close.png"); - public static final IdentifierRef MODS_TAB = IdentifierRef.ofSaturn("textures/gui/components/mods_tab.png"); - public static final IdentifierRef SETTINGS = IdentifierRef.ofSaturn("textures/gui/components/settings.png"); - public static final IdentifierRef CLOAK = IdentifierRef.ofSaturn("textures/gui/components/cloak.png"); - public static final IdentifierRef HAT = IdentifierRef.ofSaturn("textures/gui/components/hat.png"); - public static final IdentifierRef RESET = IdentifierRef.ofSaturn("textures/gui/components/reset.png"); - public static final IdentifierRef TOGGLE_INDICATOR = IdentifierRef - .ofSaturn("textures/gui/components/toggle_indicator.png"); - public static final IdentifierRef LEFT = IdentifierRef.ofSaturn("textures/gui/components/left.png"); - public static final IdentifierRef RIGHT = IdentifierRef.ofSaturn("textures/gui/components/right.png"); - public static final IdentifierRef STORE = IdentifierRef.ofSaturn("textures/gui/components/store.png"); - public static final IdentifierRef COINS = IdentifierRef.ofSaturn("textures/gui/components/coins.png"); - public static final IdentifierRef SHIRT = IdentifierRef.ofSaturn("textures/gui/components/shirt.png"); - public static final IdentifierRef CIRCLE_X = IdentifierRef.ofSaturn("textures/gui/components/circle_x.png"); - public static final IdentifierRef INFO = IdentifierRef.ofSaturn("textures/gui/components/info.png"); - public static final IdentifierRef CHECK = IdentifierRef.ofSaturn("textures/gui/components/check.png"); // Lucide icons (SVG, drawn in white so they can be tinted) public static final IdentifierRef ICON_MODS = IdentifierRef.ofSaturn("textures/gui/components/mods.svg"); @@ -56,16 +37,6 @@ public class Textures { public static final IdentifierRef LOGO_TEXT_BIG = IdentifierRef.ofSaturn("textures/logo/text_big.png"); public static final IdentifierRef SPLASH = IdentifierRef.ofSaturn("textures/gui/splash.png"); - // Widgets - public static final IdentifierRef BUTTON_BORDER = IdentifierRef.ofSaturn("button_border"); - public static final IdentifierRef BUTTON = IdentifierRef.ofSaturn("button"); - public static final IdentifierRef BUTTON_OP = IdentifierRef.ofSaturn("button_op"); - public static final IdentifierRef SETTINGS_BG = IdentifierRef.ofSaturn("settings_bg"); - public static final IdentifierRef RECT = IdentifierRef.ofSaturn("rect"); - public static final IdentifierRef RECT_BORDER = IdentifierRef.ofSaturn("rect_border"); - public static final IdentifierRef MOD = IdentifierRef.ofSaturn("textures/gui/components/mod.png"); - public static final IdentifierRef MOD_BG = IdentifierRef.ofSaturn("textures/gui/components/mod_bg.png"); - /** * Whether a texture file is in the resources, for falling back when an * optional one (like an emote's preview) is missing. diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/check.png b/src/main/resources/assets/saturnclient/textures/gui/components/check.png deleted file mode 100644 index 039befb..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/check.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png b/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png deleted file mode 100644 index 11401de..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png b/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png deleted file mode 100644 index ab853dd..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/close.png b/src/main/resources/assets/saturnclient/textures/gui/components/close.png deleted file mode 100644 index cf7f967..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/close.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/coins.png b/src/main/resources/assets/saturnclient/textures/gui/components/coins.png deleted file mode 100644 index 0946546..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/coins.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png b/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png deleted file mode 100644 index 725110f..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/hat.png b/src/main/resources/assets/saturnclient/textures/gui/components/hat.png deleted file mode 100644 index b84414f..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/hat.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/hud.png b/src/main/resources/assets/saturnclient/textures/gui/components/hud.png deleted file mode 100644 index a71c971..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/hud.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/info.png b/src/main/resources/assets/saturnclient/textures/gui/components/info.png deleted file mode 100644 index 81686b1..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/info.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/left.png b/src/main/resources/assets/saturnclient/textures/gui/components/left.png deleted file mode 100644 index 073a748..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/left.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png b/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png deleted file mode 100644 index 3c46cd0..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/reset.png b/src/main/resources/assets/saturnclient/textures/gui/components/reset.png deleted file mode 100644 index fa62098..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/reset.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/right.png b/src/main/resources/assets/saturnclient/textures/gui/components/right.png deleted file mode 100644 index fa6ee7c..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/right.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/search.png b/src/main/resources/assets/saturnclient/textures/gui/components/search.png deleted file mode 100644 index ac03290..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/search.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/settings.png b/src/main/resources/assets/saturnclient/textures/gui/components/settings.png deleted file mode 100644 index 93074e0..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/settings.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png b/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png deleted file mode 100644 index 96a85f1..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/store.png b/src/main/resources/assets/saturnclient/textures/gui/components/store.png deleted file mode 100644 index b067b97..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/store.png and /dev/null differ