Several fixes

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

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
index d97b546182b179b2e5bef69da6983292f38b17ed..447b9cb12c219eb28430f163c2158e79cb584f91 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/ListScreen.java
@@ -2,11 +2,13 @@ package com.irtimaled.bbor.client.gui;
 
 import com.irtimaled.bbor.Versions;
 import com.irtimaled.bbor.client.interop.ClientInterop;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
+import net.minecraft.text.TranslatableText;
 
 import java.util.List;
 
@@ -14,7 +16,7 @@ public abstract class ListScreen extends Screen {
     private final Screen lastScreen;
     private static final String version = Versions.build;
 
-    private AbstractButton doneButton;
+    private ButtonWidget doneButton;
     private ControlList controlList;
     private SearchField searchField;
 
@@ -35,15 +37,10 @@ public abstract class ListScreen extends Screen {
     protected void init() {
         this.controlList = this.buildList(48, this.height - 28);
         this.searchField = new SearchField(this.textRenderer, this.width / 2 - 100, 22, 200, 20, this.controlList);
-        this.doneButton = new AbstractButton(this.width / 2 - 100, this.height - 24, 200, I18n.translate("gui.done")) {
-            @Override
-            public void onPressed() {
-                onDoneClicked();
-            }
-        };
+        this.doneButton = new ButtonWidget(this.width / 2 - 100, this.height - 24, 200, 20, new TranslatableText("gui.done"), buttonWidget -> onDoneClicked());
 
         this.addDrawableChild(this.searchField);
-        ((List<Element>)this.children()).add(controlList);
+        ((List<Element>) this.children()).add(this.controlList);
         this.addDrawableChild(this.doneButton);
     }
 
@@ -55,11 +52,13 @@ public abstract class ListScreen extends Screen {
     }
 
     protected void render(MatrixStack matrixStack, int mouseX, int mouseY) {
+        RenderSystem.assertOnRenderThread();
+        this.renderBackground(matrixStack);
         this.controlList.render(matrixStack, mouseX, mouseY);
 
         this.drawCenteredText(matrixStack, this.textRenderer, this.title.asString(), this.width / 2, 8, 16777215);
         this.searchField.render(matrixStack, mouseX, mouseY);
-        this.doneButton.render(matrixStack, mouseX, mouseY);
+        this.doneButton.render(matrixStack, mouseX, mouseY, 0f);
 
         int left = this.width - this.textRenderer.getWidth(version) - 2;
         int top = this.height - 10;