Adjust positioning of Text && Use Text in SimpleButton

Author: lowercasebtw

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

@@ -3,10 +3,10 @@
 import net.minecraft.client.gui.GuiGraphics;
 
 public abstract class Gidget {
-    protected final int x;
-    protected final int y;
-    protected final int width;
-    protected final int height;
+    private final int x;
+    private final int y;
+    private final int width;
+    private final int height;
 
     public Gidget(int x, int y, int width, int height) {
         this.x = x;

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

@@ -28,13 +28,15 @@ public SimpleButton(Component text, int x, int y, Consumer<? super SimpleButton>
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
         boolean hovered = this.isInside(mouseX, mouseY);
 
-        int backgroundColor = hovered ? ARGB.color(0.7F, 0xFFFFFF) : ARGB.color(0.58F, 0xFFFFFF);
-        guiGraphics.fill(this.x, this.y, this.x + this.width, this.y + this.height, backgroundColor);
+        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;
-        int textWidth = font.width(this.text.getString());
-        int textColor = hovered ? ARGB.color(1.0F, 0xFFFFA0) : ARGB.color(1.0F, 0xE0E0E0);
-        guiGraphics.drawString(font, this.text, this.x + ((this.width / 2) - (textWidth / 2)), this.y + ((this.height / 2) - (font.lineHeight / 2)), textColor);
+        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);
+        text.render(guiGraphics, mouseX, mouseY);
     }
 
     @Override

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

@@ -9,26 +9,31 @@ public class Text extends Gidget implements TextHolder {
     private final Font font;
     private final Component text;
     private final int color;
-    private final boolean centered;
+    private final Positioned positioned;
     private final boolean shadow;
 
-    public Text(Font font, Component text, int x, int y, int color, boolean centered, boolean shadow) {
+    public Text(Font font, Component text, int x, int y, int color, Positioned positioned, boolean shadow) {
         super(x, y, font.width(text.getString()), font.lineHeight);
         this.font = font;
         this.text = text;
         this.color = color;
-        this.centered = centered;
+        this.positioned = positioned;
         this.shadow = shadow;
     }
 
     @Override
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        int finalX = this.x;
-        if (this.centered) {
-            finalX -= this.width / 2;
+        int finalX = this.x();
+        if (this.positioned == Positioned.BOTH || this.positioned == Positioned.CENTER_HORIZONTAL) {
+            finalX -= this.width() / 2;
         }
 
-        guiGraphics.drawString(this.font, this.text, finalX, this.y, this.color, this.shadow);
+        int finalY = this.y();
+        if (this.positioned == Positioned.BOTH || this.positioned == Positioned.CENTER_VERTICAL) {
+            finalY -= this.height() / 2;
+        }
+
+        guiGraphics.drawString(this.font, this.text, finalX, finalY, this.color, this.shadow);
     }
 
     @Override
@@ -40,8 +45,8 @@ public int getColor() {
         return this.color;
     }
 
-    public boolean isCentered() {
-        return this.centered;
+    public Positioned getPositioned() {
+        return this.positioned;
     }
 
     public boolean hasShadow() {
@@ -54,7 +59,7 @@ public static class Builder {
         private final int y;
 
         private int color = ARGB.white(1.0F);
-        private boolean centered = false;
+        private Positioned positioned = Positioned.NONE;
         private boolean shadow = true;
 
         public Builder(Component text, int x, int y) {
@@ -77,13 +82,25 @@ public Builder withShadow(boolean shadow) {
             return this;
         }
 
+        public Builder positioned(Positioned positioned) {
+            this.positioned = positioned;
+            return this;
+        }
+
         public Builder centered() {
-            this.centered = true;
+            this.positioned = Positioned.CENTER_HORIZONTAL;
             return this;
         }
 
         public Text build(Font font) {
-            return new Text(font, this.text, this.x, this.y, this.color, this.centered, this.shadow);
+            return new Text(font, this.text, this.x, this.y, this.color, this.positioned, this.shadow);
         }
     }
+
+    public enum Positioned {
+        CENTER_VERTICAL,
+        CENTER_HORIZONTAL,
+        BOTH,
+        NONE
+    }
 }