diff --git a/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java b/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java index 0a8aff1..877eeea 100644 --- a/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java +++ b/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java @@ -1,7 +1,6 @@ package org.saturnclient.ui2.elements; -import org.saturnclient.saturnclient.config.Property; -import org.saturnclient.saturnclient.config.ThemeManager; +import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.ui2.Element; import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui2.RenderScope; @@ -10,9 +9,6 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class ClickableTexture extends Element { - private static ThemeManager theme = new ThemeManager("ClickableTexture", "hovering"); - private static Property fgColor = theme.property("fg-color", Property.color(0xFFFFFFFF)); - Identifier sprite; private Runnable onClick; @@ -20,17 +16,12 @@ public class ClickableTexture extends Element { this.sprite = sprite; this.onClick = onClick; } - + @Override public void render(RenderScope renderScope, ElementContext ctx) { - if (ctx.isHovering()) { - theme.setState("hovering"); - } else { - theme.setState(null); - } - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height, fgColor.value); + renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height, + ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value); } @Override