new modules, module improvements, G U N THE POWER WOLOLO, clickgui improvements

3 files changed, 77 insertions, 14 deletions

diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java
index e6e3ef7..ed97028 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java
@@ -20,10 +20,27 @@ public class CheckBox extends Component {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
-        int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
-        context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(30, 30, 47, alpha).getRGB());
+        String displayText = booleanSetting.getName() + ": " + booleanSetting.isEnabled();
+        int textWidth = mc.textRenderer.getWidth(displayText);
+        int padding = 5;
+        int boxWidth = Math.max(parent.parent.width, textWidth + (padding * 2));
 
-        context.drawTextWithShadow(mc.textRenderer, Text.literal(booleanSetting.getName() + ": " + booleanSetting.isEnabled()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2, Color.white.getRGB());
+        int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
+        context.fill(
+                parent.parent.x,
+                parent.parent.y + parent.offset + offset,
+                parent.parent.x + boxWidth,
+                parent.parent.y + parent.offset + offset + parent.parent.height,
+                new Color(30, 30, 47, alpha).getRGB()
+        );
+
+        context.drawTextWithShadow(
+                mc.textRenderer,
+                Text.literal(displayText),
+                parent.parent.x + padding,
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                Color.white.getRGB()
+        );
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java
index 651cab1..40272bc 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java
@@ -19,10 +19,28 @@ public class ModeBox extends Component {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
-        int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
-        context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(30, 30, 47, alpha).getRGB());
+        String displayText = modeSetting.getName() + ": " + modeSetting.getMode();
+        int textWidth = mc.textRenderer.getWidth(displayText);
+
+        int padding = 5;
+        int boxWidth = Math.max(parent.parent.width, textWidth + padding * 2);
 
-        context.drawTextWithShadow(mc.textRenderer, Text.literal(modeSetting.getName() + ": " + modeSetting.getMode()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2, Color.white.getRGB());
+        int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
+        context.fill(
+                parent.parent.x,
+                parent.parent.y + parent.offset + offset,
+                parent.parent.x + boxWidth,
+                parent.parent.y + parent.offset + offset + parent.parent.height,
+                new Color(30, 30, 47, alpha).getRGB()
+        );
+
+        context.drawTextWithShadow(
+                mc.textRenderer,
+                Text.literal(displayText),
+                parent.parent.x + padding, // left padding
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                Color.white.getRGB()
+        );
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java
index ea39ac6..968a2d1 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java
@@ -23,24 +23,52 @@ public class Slider extends Component {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+        String displayText = numberSetting.getName() + ": " + numberSetting.getValue();
+        int defaultPadding = 5;
+        int boxWidth = parent.parent.width;
+
         int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
-        context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(30, 30, 47, alpha).getRGB());
 
-        double diff = Math.min(parent.parent.width, Math.max(0, mouseX - parent.parent.x));
-        int renderWidth = (int) (parent.parent.width * (numberSetting.getValue() - numberSetting.getMin()) / (numberSetting.getMax() - numberSetting.getMin()));
+        context.fill(
+                parent.parent.x,
+                parent.parent.y + parent.offset + offset,
+                parent.parent.x + boxWidth,
+                parent.parent.y + parent.offset + offset + parent.parent.height,
+                new Color(30, 30, 47, alpha).getRGB()
+        );
+
+        double diff = Math.min(boxWidth, Math.max(0, mouseX - parent.parent.x));
+        int renderWidth = (int) (boxWidth * (numberSetting.getValue() - numberSetting.getMin()) / (numberSetting.getMax() - numberSetting.getMin()));
 
-        context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + renderWidth, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(252, 210, 77, 255).getRGB());
+        context.fill(
+                parent.parent.x,
+                parent.parent.y + parent.offset + offset,
+                parent.parent.x + renderWidth,
+                parent.parent.y + parent.offset + offset + parent.parent.height,
+                new Color(252, 210, 77, 255).getRGB()
+        );
 
         if (sliding) {
             if (diff == 0) {
                 numberSetting.setValue(numberSetting.getMin());
+            } else {
+                numberSetting.setValue(roundToPlace((diff / boxWidth) * (numberSetting.getMax() - numberSetting.getMin()) + numberSetting.getMin(), 1));
             }
-            else {
-                numberSetting.setValue(roundToPlace((diff / parent.parent.width) * (numberSetting.getMax() - numberSetting.getMin()) + numberSetting.getMin(), 1));
-            }
         }
 
-        context.drawTextWithShadow(mc.textRenderer, Text.literal(numberSetting.getName() + ": " + numberSetting.getValue()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2, Color.white.getRGB());
+        int textWidth = mc.textRenderer.getWidth(displayText);
+        int leftPadding = defaultPadding;
+        if (textWidth + 2 * defaultPadding > boxWidth) {
+            leftPadding = Math.max(2, boxWidth - textWidth - 2);
+        }
+
+        context.drawTextWithShadow(
+                mc.textRenderer,
+                Text.literal(displayText),
+                parent.parent.x + leftPadding,
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                Color.white.getRGB()
+        );
     }
 
     @Override