Setup for 1.16.3 Fabric

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / gui / AbstractControl.java

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/AbstractControl.java b/src/main/java/com/irtimaled/bbor/client/gui/AbstractControl.java
index da9de112d30d2275d1b43bcf02c92386898b22f8..01db585e620dea0f11533aaa0a9ec7510188cd46 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/AbstractControl.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/AbstractControl.java
@@ -2,6 +2,8 @@ package com.irtimaled.bbor.client.gui;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
 
 import java.awt.*;
 
@@ -10,13 +12,13 @@ abstract class AbstractControl extends AbstractButtonWidget implements IControl
     protected final MinecraftClient minecraft;
 
     AbstractControl(int x, int y, int width, String name) {
-        super(x, y, width, 20, name);
+        super(x, y, width, 20, new LiteralText(name));
         this.minecraft = MinecraftClient.getInstance();
     }
 
     @Override
-    public void render(int mouseX, int mouseY) {
-        super.render(mouseX, mouseY, 0f);
+    public void render(MatrixStack matrixStack, int mouseX, int mouseY) {
+        super.render(matrixStack, mouseX, mouseY, 0f);
     }
 
     public void setX(int x) {
@@ -36,11 +38,11 @@ abstract class AbstractControl extends AbstractButtonWidget implements IControl
     }
 
     @Override
-    protected void renderBg(MinecraftClient minecraft, int mouseX, int mouseY) {
-        if (active) renderBackground(mouseX, mouseY);
+    protected void renderBg(MatrixStack matrixStack, MinecraftClient minecraft, int mouseX, int mouseY) {
+        if (active) renderBackground(matrixStack, mouseX, mouseY);
     }
 
-    protected void renderBackground(int mouseX, int mouseY) {
+    protected void renderBackground(MatrixStack matrixStack, int mouseX, int mouseY) {
     }
 
     @Override
@@ -49,14 +51,14 @@ abstract class AbstractControl extends AbstractButtonWidget implements IControl
     }
 
     public void filter(String lowerValue) {
-        String lowerString = this.getMessage().toLowerCase();
+        String lowerString = this.getMessage().asString().toLowerCase();
         this.visible = lowerValue.equals("") ||
                 lowerString.startsWith(lowerValue) ||
                 lowerString.contains(" " + lowerValue);
     }
 
-    void drawRectangle(int left, int top, int right, int bottom, Color color) {
-        fill(left, top, right, bottom, color.getRGB());
+    void drawRectangle(MatrixStack matrixStack, int left, int top, int right, int bottom, Color color) {
+        fill(matrixStack, left, top, right, bottom, color.getRGB());
     }
 
     @Override