Adjust positioning of Text && Use Text in SimpleButton

Author: lowercasebtw

src/main/java/btw/lowercase/optiboxes/screen/DebugScreen.java

@@ -1,6 +1,5 @@
 package btw.lowercase.optiboxes.screen;
 
-import btw.lowercase.optiboxes.screen.widget.Clickable;
 import btw.lowercase.optiboxes.screen.widget.Gidget;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
@@ -37,14 +36,27 @@ public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, flo
     @Override
     public boolean mouseClicked(@NotNull MouseButtonEvent event, boolean isDoubleClick) {
         for (Gidget gidget : this.gidgets) {
-            if (gidget instanceof Clickable clickable && gidget.isInside(event.x(), event.y())) {
-                clickable.click(event.x(), event.y());
+            if (gidget.isInside(event.x(), event.y())) {
+                gidget.onMouseClicked(event.x(), event.y());
             }
         }
 
         return super.mouseClicked(event, isDoubleClick);
     }
 
+    @Override
+    public void mouseMoved(double mouseX, double mouseY) {
+        for (Gidget gidget : this.gidgets) {
+            if (gidget.isInside(mouseX, mouseY)) {
+                gidget.onMouseEnter(mouseX, mouseY);
+            } else if (gidget.hovered()) {
+                gidget.onMouseLeave(mouseX, mouseY);
+            }
+        }
+
+        super.mouseMoved(mouseX, mouseY);
+    }
+
     @Override
     public void onClose() {
         this.minecraft.setScreen(this.parent);

src/main/java/btw/lowercase/optiboxes/screen/widget/Clickable.java

@@ -1,12 +1,14 @@
 package btw.lowercase.optiboxes.screen.widget;
 
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.ARGB;
 
 public abstract class Gidget {
     private final int x;
     private final int y;
     private final int width;
     private final int height;
+    private boolean hovered = false;
 
     public Gidget(int x, int y, int width, int height) {
         this.x = x;
@@ -17,6 +19,22 @@ public Gidget(int x, int y, int width, int height) {
 
     public abstract void render(GuiGraphics guiGraphics, int mouseX, int mouseY);
 
+    public void renderBackground(GuiGraphics guiGraphics) {
+        final int backgroundColor = this.hovered ? ARGB.white(0.7F) : ARGB.white(0.58F);
+        guiGraphics.fill(this.x(), this.y(), this.x() + this.width(), this.y() + this.height(), backgroundColor);
+    }
+
+    public void onMouseEnter(double mouseX, double mouseY) {
+        this.hovered = this.isInside(mouseX, mouseY);
+    }
+
+    public void onMouseLeave(double mouseX, double mouseY) {
+        this.hovered = this.isInside(mouseX, mouseY);
+    }
+
+    public void onMouseClicked(double mouseX, double mouseY) {
+    }
+
     public boolean isInside(double x, double y) {
         return (x >= this.x && x <= this.x + this.width) && (y >= this.y && y <= this.y + this.height);
     }
@@ -36,4 +54,8 @@ public int width() {
     public int height() {
         return this.height;
     }
+
+    public boolean hovered() {
+        return this.hovered;
+    }
 }

src/main/java/btw/lowercase/optiboxes/screen/widget/Gidget.java

@@ -1,7 +1,6 @@
 package btw.lowercase.optiboxes.screen.widget;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
@@ -11,42 +10,36 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-public class SimpleButton extends Gidget implements Clickable, TextHolder {
+public class SimpleButton extends Gidget implements TextHolder {
     public static final int DEFAULT_WIDTH = 200;
     public static final int DEFAULT_HEIGHT = 20;
 
-    private final Component text;
+    private final Text text;
     private final Consumer<? super SimpleButton> onClick;
 
     public SimpleButton(Component text, int x, int y, Consumer<? super SimpleButton> onClick) {
         super(x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT);
-        this.text = text;
+        this.text = new Text.Builder(text, this.x() + (this.width() / 2), this.y() + (this.height() / 2))
+                .positioned(Text.Positioned.BOTH)
+                .build(Minecraft.getInstance().font);
         this.onClick = onClick;
     }
 
     @Override
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        boolean hovered = this.isInside(mouseX, mouseY);
-
-        int backgroundColor = hovered ? ARGB.white(0.7F) : ARGB.white(0.58F);
-        guiGraphics.fill(this.x(), this.y(), this.x() + this.width(), this.y() + this.height(), backgroundColor);
-
-        Font font = Minecraft.getInstance().font;
-        Text text = new Text.Builder(this.text, this.x() + (this.width() / 2), this.y() + (this.height() / 2))
-                .withColor(hovered ? ARGB.color(1.0F, 0xFFFFA0) : ARGB.color(1.0F, 0xE0E0E0))
-                .positioned(Text.Positioned.BOTH)
-                .build(font);
+        this.renderBackground(guiGraphics);
+        text.setColor(this.hovered() ? ARGB.color(1.0F, 0xFFFFA0) : ARGB.color(1.0F, 0xE0E0E0));
         text.render(guiGraphics, mouseX, mouseY);
     }
 
     @Override
-    public void click(double mouseX, double mouseY) {
+    public void onMouseClicked(double mouseX, double mouseY) {
         this.onClick.accept(this);
     }
 
     @Override
     public Component getText() {
-        return this.text;
+        return this.text.getText();
     }
 
     public static class Storage extends SimpleButton {

src/main/java/btw/lowercase/optiboxes/screen/widget/SimpleButton.java

@@ -8,17 +8,17 @@
 public class Text extends Gidget implements TextHolder {
     private final Font font;
     private final Component text;
-    private final int color;
-    private final Positioned positioned;
-    private final boolean shadow;
+    private Positioned positioned;
+    private boolean shadow;
+    private int color;
 
-    public Text(Font font, Component text, int x, int y, int color, Positioned positioned, boolean shadow) {
+    public Text(Font font, Component text, int x, int y, Positioned positioned, boolean shadow, int color) {
         super(x, y, font.width(text.getString()), font.lineHeight);
         this.font = font;
         this.text = text;
-        this.color = color;
         this.positioned = positioned;
         this.shadow = shadow;
+        this.color = color;
     }
 
     @Override
@@ -36,19 +36,38 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
         guiGraphics.drawString(this.font, this.text, finalX, finalY, this.color, this.shadow);
     }
 
+    public Builder builder() {
+        return new Builder(this.text, this.x(), this.y())
+                .withColor(this.color)
+                .positioned(this.positioned)
+                .withShadow(this.shadow);
+    }
+
     @Override
     public Component getText() {
         return this.text;
     }
 
+    public void setColor(int color) {
+        this.color = color;
+    }
+
     public int getColor() {
         return this.color;
     }
 
+    public void setPositioned(Positioned positioned) {
+        this.positioned = positioned;
+    }
+
     public Positioned getPositioned() {
         return this.positioned;
     }
 
+    public void setShadow(boolean shadow) {
+        this.shadow = shadow;
+    }
+
     public boolean hasShadow() {
         return this.shadow;
     }
@@ -93,7 +112,7 @@ public Builder centered() {
         }
 
         public Text build(Font font) {
-            return new Text(font, this.text, this.x, this.y, this.color, this.positioned, this.shadow);
+            return new Text(font, this.text, this.x, this.y, this.positioned, this.shadow, this.color);
         }
     }