From 71f779c8ee29006abd3a53d3e2556241a9dab91c Mon Sep 17 00:00:00 2001
From: loki5512344 <mauhhhh7@gmail.com>
Date: Wed, 30 Sep 2026 11:32:17 +0200
Subject: [PATCH] refactor(hud): split BetterButtons to 197 lines

Settings values and visibility predicates move to ButtonStyleSettings,
icon drawing to ButtonIconRenderer; facade keeps the public static API
and getters. Drops three dead one-liners (getLastContext,
renderCenteredText, renderLeftAlignedText) and the unused
renderButtonInternal wrapper.
---
 .../impl/buttons/BetterButtons.java           | 244 +++---------------
 .../impl/buttons/ButtonIconRenderer.java      |  89 +++++++
 .../impl/buttons/ButtonStyleSettings.java     | 100 +++++++
 3 files changed, 219 insertions(+), 214 deletions(-)
 create mode 100644 mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonIconRenderer.java
 create mode 100644 mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonStyleSettings.java

diff --git a/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/BetterButtons.java b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/BetterButtons.java
index cbc385e..cf91ba2 100644
--- a/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/BetterButtons.java
+++ b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/BetterButtons.java
@@ -8,14 +8,9 @@ import dev.loki.lovisual.config.values.primitive.NumberValue;
 import dev.loki.lovisual.features.gui.hud.base.AbstractHudElement;
 import dev.loki.lovisual.features.gui.hud.registry.HudElementRegister;
 import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonSliderRenderer;
-import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonSprites;
 import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonStyleRenderer;
-import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonTextRenderer;
 import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.state.ButtonHoverState;
-import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.state.ButtonParallax;
 import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.state.ButtonQueue;
-import dev.loki.lovisual.mixins.accessors.hud.TextIconButtonWidgetAccessor;
-import dev.loki.lovisual.render.engine.renderer.warp.RenderWarpStack;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.CycleButton;
@@ -25,55 +20,16 @@ import net.minecraft.resources.Identifier;
 
 import java.util.List;
 
+/**
+ * Buttons HUD facade: settings values in {@link ButtonStyleSettings}, icon
+ * drawing in {@link ButtonIconRenderer}, queue/render primitives behind it.
+ */
 @HudElementRegister(order = 10)
 public final class BetterButtons extends AbstractHudElement {
 
     public static final BetterButtons INSTANCE = new BetterButtons();
 
-    private final EnumValue<Style> style =
-            new EnumValue<>("style", Style.DEFAULT, Style.values());
-    private final RGBAColorValue gradientBaseColor =
-            new RGBAColorValue("gradient_base_color", "#FF2F2929");
-    private final RGBAColorValue gradientColor =
-            new RGBAColorValue("gradient_color", "#FF902F2F");
-    private final NumberValue<Float> gradientAngle =
-            new NumberValue<>("gradient_angle", 74.25f, 0.0f, 360.0f);
-    private final NumberValue<Float> gradientIntensity =
-            new NumberValue<>("gradient_intensity", 0.6f, 0.0f, 1.0f);
-    private final RGBAColorValue customBg =
-            new RGBAColorValue("custom_bg", "#FF1B1B1B");
-    private final RGBAColorValue customBgHover =
-            new RGBAColorValue("custom_bg_hover", "#FF2A2A2A");
-    private final RGBAColorValue customBgDisabled =
-            new RGBAColorValue("custom_bg_disabled", "#FF141414");
-    private final RGBAColorValue customStroke =
-            new RGBAColorValue("custom_stroke", "#FF9B5DB8");
-    private final RGBAColorValue customStrokeHover =
-            new RGBAColorValue("custom_stroke_hover", "#FFA710B2");
-    private final RGBAColorValue customStrokeDisabled =
-            new RGBAColorValue("custom_stroke_disabled", "#FF2A2A2A");
-    private final RGBAColorValue customText =
-            new RGBAColorValue("custom_text", "#FFECECEC");
-    private final RGBAColorValue customTextDisabled =
-            new RGBAColorValue("custom_text_disabled", "#FF7A7A7A");
-    private final NumberValue<Float> customRadius =
-            new NumberValue<>("custom_radius", 6.0f, 0.0f, 20.0f);
-    private final NumberValue<Float> customSoftness =
-            new NumberValue<>("custom_softness", 1.2f, 0.0f, 4.0f);
-    private final NumberValue<Float> customStrokeThickness =
-            new NumberValue<>("custom_stroke_thickness", 0.7f, 0.1f, 3.0f);
-    private final BooleanValue customGradient =
-            new BooleanValue("custom_gradient", true);
-    private final RGBAColorValue customGradientColor =
-            new RGBAColorValue("custom_gradient_color", "#73521BA7");
-    private final NumberValue<Float> customGradientAngle =
-            new NumberValue<>("custom_gradient_angle", 90.0f, 0.0f, 360.0f);
-    private final NumberValue<Float> customGradientIntensity =
-            new NumberValue<>("custom_gradient_intensity", 0.5f, 0.0f, 1.0f);
-    private final NumberValue<Float> customTextScale =
-            new NumberValue<>("custom_text_scale", 1.0f, 0.6f, 1.6f);
-    private final NumberValue<Float> customTextPadX =
-            new NumberValue<>("custom_text_pad_x", 6.0f, 0.0f, 16.0f);
+    private final ButtonStyleSettings settings = new ButtonStyleSettings();
 
     private BetterButtons() {
         super("vanilla_buttons", "Buttons", true);
@@ -89,9 +45,6 @@ public final class BetterButtons extends AbstractHudElement {
         ButtonQueue.beginFrame(ctx);
     }
 
-    public static GuiGraphicsExtractor getLastContext() {
-        return ButtonQueue.lastContext();
-    }
 
     public static void pushScissorContext(int x1, int y1, int x2, int y2) {
         ButtonQueue.pushScissorContext(x1, y1, x2, y2);
@@ -157,211 +110,74 @@ public final class BetterButtons extends AbstractHudElement {
         ButtonStyleRenderer.renderButtonUnscaled(ctx, widget, text, hover, enabled, focused);
     }
 
-    static void renderButtonInternal(GuiGraphicsExtractor ctx, AbstractWidget widget, Component text, float hover, boolean enabled, boolean focused, float scale, boolean manageProjection, boolean allowParallax) {
-        ButtonStyleRenderer.renderInternal(ctx, widget, text, hover, enabled, focused, scale, manageProjection, allowParallax);
-    }
-
     public static void renderSlider(GuiGraphicsExtractor ctx, AbstractWidget widget, float value, boolean dragging, float hover) {
         ButtonSliderRenderer.render(ctx, widget, value, dragging, hover);
     }
 
     public static void renderTextIconButton(GuiGraphicsExtractor ctx, SpriteIconButton widget, boolean iconOnly, float hover, boolean enabled, boolean focused) {
-        if (ctx == null || widget == null) return;
-        renderButton(ctx, widget, null, hover, enabled, focused);
-
-        TextIconButtonWidgetAccessor accessor = (TextIconButtonWidgetAccessor) widget;
-        int texW = accessor.lovisual$getTextureWidth();
-        int texH = accessor.lovisual$getTextureHeight();
-        int iconX;
-        int iconY = widget.getY() + widget.getHeight() / 2 - texH / 2;
-        if (iconOnly) {
-            iconX = widget.getX() + widget.getWidth() / 2 - texW / 2;
-        } else {
-            iconX = widget.getX() + widget.getWidth() - texW - 2;
-        }
-        boolean hoverState = widget.isActive() && (widget.isHoveredOrFocused() || focused || hover > 0.001f);
-        Identifier spriteId = accessor.lovisual$getTexture().get(widget.isActive(), hoverState);
-        float sx = ButtonParallax.shiftX(widget, hover);
-        float sy = ButtonParallax.shiftY(widget, hover);
-        ButtonSprites.drawGuiSprite(spriteId, Math.round(iconX + sx), Math.round(iconY + sy), texW, texH, widget.getAlpha());
-
-        if (!iconOnly) {
-            float left = widget.getX() + 2f;
-            float right = widget.getX() + widget.getWidth() - texW - 4f;
-            float top = widget.getY();
-            float bottom = widget.getY() + widget.getHeight();
-            Component text = widget.getMessage();
-            ButtonParallax.Data parallax = ButtonParallax.compute(widget, hover);
-            try (RenderWarpStack.Scope ignored = ButtonParallax.pushWarp(parallax, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight())) {
-                ButtonTextRenderer.renderLeftAligned(text, left, top, right, bottom, widget.getAlpha(), enabled, hover, !parallax.active());
-            }
-        }
+        ButtonIconRenderer.renderTextIconButton(ctx, widget, iconOnly, hover, enabled, focused);
     }
 
     public static void renderCyclingButton(GuiGraphicsExtractor ctx, CycleButton<?> widget, Identifier icon, boolean showLabel, float hover, boolean enabled, boolean focused) {
-        if (ctx == null || widget == null) return;
-        renderButton(ctx, widget, null, hover, enabled, focused);
-
-        if (icon != null) {
-            int size = Math.min(widget.getWidth(), widget.getHeight()) - 6;
-            float sx = ButtonParallax.shiftX(widget, hover);
-            float sy = ButtonParallax.shiftY(widget, hover);
-            int ix = Math.round(widget.getX() + (widget.getWidth() - size) / 2 + sx);
-            int iy = Math.round(widget.getY() + (widget.getHeight() - size) / 2 + sy);
-            ctx.blitSprite(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED, icon, ix, iy, size, size, widget.getAlpha());
-        }
-
-        if (showLabel) {
-            Component text = widget.getMessage();
-            ButtonParallax.Data parallax = ButtonParallax.compute(widget, hover);
-            try (RenderWarpStack.Scope ignored = ButtonParallax.pushWarp(parallax, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight())) {
-                ButtonTextRenderer.renderCentered(text, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight(),
-                        widget.getAlpha(), enabled, hover, !parallax.active());
-            }
-        }
+        ButtonIconRenderer.renderCyclingButton(ctx, widget, icon, showLabel, hover, enabled, focused);
     }
 
-    public static void renderCenteredText(Component text, float x, float y, float w, float h, float alpha, boolean enabled, float hover) {
-        ButtonTextRenderer.renderCentered(text, x, y, w, h, alpha, enabled, hover);
-    }
-
-    public static void renderLeftAlignedText(Component text, float x0, float y0, float x1, float y1, float alpha, boolean enabled, float hover) {
-        ButtonTextRenderer.renderLeftAligned(text, x0, y0, x1, y1, alpha, enabled, hover);
-    }
 
     // --- getters for render helpers ---
 
-    public EnumValue<Style> getStyle() {
-        return style;
-    }
+    public EnumValue<Style> getStyle() { return settings.style; }
 
-    public RGBAColorValue getGradientBaseColor() {
-        return gradientBaseColor;
-    }
+    public RGBAColorValue getGradientBaseColor() { return settings.gradientBaseColor; }
 
-    public RGBAColorValue getGradientColor() {
-        return gradientColor;
-    }
+    public RGBAColorValue getGradientColor() { return settings.gradientColor; }
 
-    public NumberValue<Float> getGradientAngle() {
-        return gradientAngle;
-    }
+    public NumberValue<Float> getGradientAngle() { return settings.gradientAngle; }
 
-    public NumberValue<Float> getGradientIntensity() {
-        return gradientIntensity;
-    }
+    public NumberValue<Float> getGradientIntensity() { return settings.gradientIntensity; }
 
-    public RGBAColorValue getCustomBg() {
-        return customBg;
-    }
+    public RGBAColorValue getCustomBg() { return settings.customBg; }
 
-    public RGBAColorValue getCustomBgHover() {
-        return customBgHover;
-    }
+    public RGBAColorValue getCustomBgHover() { return settings.customBgHover; }
 
-    public RGBAColorValue getCustomBgDisabled() {
-        return customBgDisabled;
-    }
+    public RGBAColorValue getCustomBgDisabled() { return settings.customBgDisabled; }
 
-    public RGBAColorValue getCustomStroke() {
-        return customStroke;
-    }
+    public RGBAColorValue getCustomStroke() { return settings.customStroke; }
 
-    public RGBAColorValue getCustomStrokeHover() {
-        return customStrokeHover;
-    }
+    public RGBAColorValue getCustomStrokeHover() { return settings.customStrokeHover; }
 
-    public RGBAColorValue getCustomStrokeDisabled() {
-        return customStrokeDisabled;
-    }
+    public RGBAColorValue getCustomStrokeDisabled() { return settings.customStrokeDisabled; }
 
-    public RGBAColorValue getCustomText() {
-        return customText;
-    }
+    public RGBAColorValue getCustomText() { return settings.customText; }
 
-    public RGBAColorValue getCustomTextDisabled() {
-        return customTextDisabled;
-    }
+    public RGBAColorValue getCustomTextDisabled() { return settings.customTextDisabled; }
 
-    public NumberValue<Float> getCustomRadius() {
-        return customRadius;
-    }
+    public NumberValue<Float> getCustomRadius() { return settings.customRadius; }
 
-    public NumberValue<Float> getCustomSoftness() {
-        return customSoftness;
-    }
+    public NumberValue<Float> getCustomSoftness() { return settings.customSoftness; }
 
-    public NumberValue<Float> getCustomStrokeThickness() {
-        return customStrokeThickness;
-    }
+    public NumberValue<Float> getCustomStrokeThickness() { return settings.customStrokeThickness; }
 
-    public BooleanValue getCustomGradient() {
-        return customGradient;
-    }
+    public BooleanValue getCustomGradient() { return settings.customGradient; }
 
-    public RGBAColorValue getCustomGradientColor() {
-        return customGradientColor;
-    }
+    public RGBAColorValue getCustomGradientColor() { return settings.customGradientColor; }
 
-    public NumberValue<Float> getCustomGradientAngle() {
-        return customGradientAngle;
-    }
+    public NumberValue<Float> getCustomGradientAngle() { return settings.customGradientAngle; }
 
-    public NumberValue<Float> getCustomGradientIntensity() {
-        return customGradientIntensity;
-    }
+    public NumberValue<Float> getCustomGradientIntensity() { return settings.customGradientIntensity; }
 
-    public NumberValue<Float> getCustomTextScale() {
-        return customTextScale;
-    }
+    public NumberValue<Float> getCustomTextScale() { return settings.customTextScale; }
 
-    public NumberValue<Float> getCustomTextPadX() {
-        return customTextPadX;
-    }
+    public NumberValue<Float> getCustomTextPadX() { return settings.customTextPadX; }
 
     @Override
     protected void defineSettings(List<SettingDef> defs) {
-        defs.add(SettingDef.mode(style));
-        defs.add(SettingDef.color(gradientBaseColor).visibleWhen(this::isGradientStyle));
-        defs.add(SettingDef.color(gradientColor).visibleWhen(this::isGradientStyle));
-        defs.add(SettingDef.number(gradientAngle).visibleWhen(this::isGradientStyle));
-        defs.add(SettingDef.number(gradientIntensity).visibleWhen(this::isGradientStyle));
-
-        defs.add(SettingDef.color(customBg).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customBgHover).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customBgDisabled).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customStroke).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customStrokeHover).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customStrokeDisabled).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customText).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customTextDisabled).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.number(customRadius).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.number(customSoftness).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.number(customStrokeThickness).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.bool(customGradient).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.color(customGradientColor).visibleWhen(this::isCustomGradientStyle));
-        defs.add(SettingDef.number(customGradientAngle).visibleWhen(this::isCustomGradientStyle));
-        defs.add(SettingDef.number(customGradientIntensity).visibleWhen(this::isCustomGradientStyle));
-        defs.add(SettingDef.number(customTextScale).visibleWhen(this::isCustomStyle));
-        defs.add(SettingDef.number(customTextPadX).visibleWhen(this::isCustomStyle));
+        settings.defineSettings(defs);
     }
 
     public boolean useUiButtons() {
         return isEnabled();
     }
 
-    private boolean isGradientStyle() {
-        return style.get() == Style.GRADIENT;
-    }
-
-    private boolean isCustomStyle() {
-        return style.get() == Style.CUSTOM;
-    }
-
-    private boolean isCustomGradientStyle() {
-        return isCustomStyle() && customGradient.get();
-    }
-
     public enum Style implements EnumValue.IdProvider {
         DEFAULT("Default"),
         GRADIENT("Gradient"),
diff --git a/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonIconRenderer.java b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonIconRenderer.java
new file mode 100644
index 0000000..34326f3
--- /dev/null
+++ b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonIconRenderer.java
@@ -0,0 +1,89 @@
+package dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons;
+
+import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonSprites;
+import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.render.ButtonTextRenderer;
+import dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons.state.ButtonParallax;
+import dev.loki.lovisual.mixins.accessors.hud.TextIconButtonWidgetAccessor;
+import dev.loki.lovisual.render.engine.renderer.warp.RenderWarpStack;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.CycleButton;
+import net.minecraft.client.gui.components.SpriteIconButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+
+/**
+ * Icon placement for text-icon and cycling buttons: sprites plus optional
+ * label, all offset by the shared parallax shift.
+ */
+final class ButtonIconRenderer {
+
+    private ButtonIconRenderer() {
+    }
+
+    static void renderTextIconButton(GuiGraphicsExtractor ctx,
+                                     SpriteIconButton widget,
+                                     boolean iconOnly,
+                                     float hover,
+                                     boolean enabled,
+                                     boolean focused) {
+        if (ctx == null || widget == null) return;
+        BetterButtons.renderButton(ctx, widget, null, hover, enabled, focused);
+
+        TextIconButtonWidgetAccessor accessor = (TextIconButtonWidgetAccessor) widget;
+        int texW = accessor.lovisual$getTextureWidth();
+        int texH = accessor.lovisual$getTextureHeight();
+        int iconX;
+        int iconY = widget.getY() + widget.getHeight() / 2 - texH / 2;
+        if (iconOnly) {
+            iconX = widget.getX() + widget.getWidth() / 2 - texW / 2;
+        } else {
+            iconX = widget.getX() + widget.getWidth() - texW - 2;
+        }
+        boolean hoverState = widget.isActive() && (widget.isHoveredOrFocused() || focused || hover > 0.001f);
+        Identifier spriteId = accessor.lovisual$getTexture().get(widget.isActive(), hoverState);
+        float sx = ButtonParallax.shiftX(widget, hover);
+        float sy = ButtonParallax.shiftY(widget, hover);
+        ButtonSprites.drawGuiSprite(spriteId, Math.round(iconX + sx), Math.round(iconY + sy), texW, texH, widget.getAlpha());
+
+        if (!iconOnly) {
+            float left = widget.getX() + 2f;
+            float right = widget.getX() + widget.getWidth() - texW - 4f;
+            float top = widget.getY();
+            float bottom = widget.getY() + widget.getHeight();
+            Component text = widget.getMessage();
+            ButtonParallax.Data parallax = ButtonParallax.compute(widget, hover);
+            try (RenderWarpStack.Scope ignored = ButtonParallax.pushWarp(parallax, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight())) {
+                ButtonTextRenderer.renderLeftAligned(text, left, top, right, bottom, widget.getAlpha(), enabled, hover, !parallax.active());
+            }
+        }
+    }
+
+    static void renderCyclingButton(GuiGraphicsExtractor ctx,
+                                    CycleButton<?> widget,
+                                    Identifier icon,
+                                    boolean showLabel,
+                                    float hover,
+                                    boolean enabled,
+                                    boolean focused) {
+        if (ctx == null || widget == null) return;
+        BetterButtons.renderButton(ctx, widget, null, hover, enabled, focused);
+
+        if (icon != null) {
+            int size = Math.min(widget.getWidth(), widget.getHeight()) - 6;
+            float sx = ButtonParallax.shiftX(widget, hover);
+            float sy = ButtonParallax.shiftY(widget, hover);
+            int ix = Math.round(widget.getX() + (widget.getWidth() - size) / 2 + sx);
+            int iy = Math.round(widget.getY() + (widget.getHeight() - size) / 2 + sy);
+            ctx.blitSprite(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED, icon, ix, iy, size, size, widget.getAlpha());
+        }
+
+        if (showLabel) {
+            Component text = widget.getMessage();
+            ButtonParallax.Data parallax = ButtonParallax.compute(widget, hover);
+            try (RenderWarpStack.Scope ignored = ButtonParallax.pushWarp(parallax, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight())) {
+                ButtonTextRenderer.renderCentered(text, widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight(),
+                        widget.getAlpha(), enabled, hover, !parallax.active());
+            }
+        }
+    }
+}
diff --git a/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonStyleSettings.java b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonStyleSettings.java
new file mode 100644
index 0000000..23abda6
--- /dev/null
+++ b/mod/src/main/java/dev/loki/lovisual/features/gui/hud/nondraggable/impl/buttons/ButtonStyleSettings.java
@@ -0,0 +1,100 @@
+package dev.loki.lovisual.features.gui.hud.nondraggable.impl.buttons;
+
+import dev.loki.lovisual.config.definition.SettingDef;
+import dev.loki.lovisual.config.values.color.RGBAColorValue;
+import dev.loki.lovisual.config.values.mode.EnumValue;
+import dev.loki.lovisual.config.values.primitive.BooleanValue;
+import dev.loki.lovisual.config.values.primitive.NumberValue;
+
+import java.util.List;
+
+/**
+ * Settings schema and live value holders for {@link BetterButtons}.
+ * Declared package-private so the facade can read these fields directly
+ * from its getters, mirroring {@code bars/impl/BarSettings}.
+ */
+final class ButtonStyleSettings {
+
+    final EnumValue<BetterButtons.Style> style =
+            new EnumValue<>("style", BetterButtons.Style.DEFAULT, BetterButtons.Style.values());
+    final RGBAColorValue gradientBaseColor =
+            new RGBAColorValue("gradient_base_color", "#FF2F2929");
+    final RGBAColorValue gradientColor =
+            new RGBAColorValue("gradient_color", "#FF902F2F");
+    final NumberValue<Float> gradientAngle =
+            new NumberValue<>("gradient_angle", 74.25f, 0.0f, 360.0f);
+    final NumberValue<Float> gradientIntensity =
+            new NumberValue<>("gradient_intensity", 0.6f, 0.0f, 1.0f);
+    final RGBAColorValue customBg =
+            new RGBAColorValue("custom_bg", "#FF1B1B1B");
+    final RGBAColorValue customBgHover =
+            new RGBAColorValue("custom_bg_hover", "#FF2A2A2A");
+    final RGBAColorValue customBgDisabled =
+            new RGBAColorValue("custom_bg_disabled", "#FF141414");
+    final RGBAColorValue customStroke =
+            new RGBAColorValue("custom_stroke", "#FF9B5DB8");
+    final RGBAColorValue customStrokeHover =
+            new RGBAColorValue("custom_stroke_hover", "#FFA710B2");
+    final RGBAColorValue customStrokeDisabled =
+            new RGBAColorValue("custom_stroke_disabled", "#FF2A2A2A");
+    final RGBAColorValue customText =
+            new RGBAColorValue("custom_text", "#FFECECEC");
+    final RGBAColorValue customTextDisabled =
+            new RGBAColorValue("custom_text_disabled", "#FF7A7A7A");
+    final NumberValue<Float> customRadius =
+            new NumberValue<>("custom_radius", 6.0f, 0.0f, 20.0f);
+    final NumberValue<Float> customSoftness =
+            new NumberValue<>("custom_softness", 1.2f, 0.0f, 4.0f);
+    final NumberValue<Float> customStrokeThickness =
+            new NumberValue<>("custom_stroke_thickness", 0.7f, 0.1f, 3.0f);
+    final BooleanValue customGradient =
+            new BooleanValue("custom_gradient", true);
+    final RGBAColorValue customGradientColor =
+            new RGBAColorValue("custom_gradient_color", "#73521BA7");
+    final NumberValue<Float> customGradientAngle =
+            new NumberValue<>("custom_gradient_angle", 90.0f, 0.0f, 360.0f);
+    final NumberValue<Float> customGradientIntensity =
+            new NumberValue<>("custom_gradient_intensity", 0.5f, 0.0f, 1.0f);
+    final NumberValue<Float> customTextScale =
+            new NumberValue<>("custom_text_scale", 1.0f, 0.6f, 1.6f);
+    final NumberValue<Float> customTextPadX =
+            new NumberValue<>("custom_text_pad_x", 6.0f, 0.0f, 16.0f);
+
+    void defineSettings(List<SettingDef> defs) {
+        defs.add(SettingDef.mode(style));
+        defs.add(SettingDef.color(gradientBaseColor).visibleWhen(this::isGradientStyle));
+        defs.add(SettingDef.color(gradientColor).visibleWhen(this::isGradientStyle));
+        defs.add(SettingDef.number(gradientAngle).visibleWhen(this::isGradientStyle));
+        defs.add(SettingDef.number(gradientIntensity).visibleWhen(this::isGradientStyle));
+
+        defs.add(SettingDef.color(customBg).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customBgHover).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customBgDisabled).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customStroke).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customStrokeHover).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customStrokeDisabled).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customText).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customTextDisabled).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.number(customRadius).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.number(customSoftness).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.number(customStrokeThickness).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.bool(customGradient).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.color(customGradientColor).visibleWhen(this::isCustomGradientStyle));
+        defs.add(SettingDef.number(customGradientAngle).visibleWhen(this::isCustomGradientStyle));
+        defs.add(SettingDef.number(customGradientIntensity).visibleWhen(this::isCustomGradientStyle));
+        defs.add(SettingDef.number(customTextScale).visibleWhen(this::isCustomStyle));
+        defs.add(SettingDef.number(customTextPadX).visibleWhen(this::isCustomStyle));
+    }
+
+    private boolean isGradientStyle() {
+        return style.get() == BetterButtons.Style.GRADIENT;
+    }
+
+    private boolean isCustomStyle() {
+        return style.get() == BetterButtons.Style.CUSTOM;
+    }
+
+    private boolean isCustomGradientStyle() {
+        return isCustomStyle() && customGradient.get();
+    }
+}