fix world save load screen render issues

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java b/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java
index 0b8fe01387559c2f3c8bd9df9c6c5ed88e83b1dc..ad3fc827e48af195c24f654927b2efdeab029da2 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java
@@ -83,19 +83,20 @@ public class SelectableControlList extends ControlList {
     protected void drawEntry(MatrixStack matrixStack, int mouseX, int mouseY, int top, ControlListEntry entry, int height) {
         if (this.selectedElement == entry.index) {
             RenderHelper.disableTexture();
+            RenderHelper.resetShader();
             int color = this.isFocused ? 255 : 128;
-            Renderer.startTextured()
+            Renderer.startQuads()
                     .setAlpha(255)
                     .setColor(color, color, color)
-                    .addPoint((double) this.listLeft - 2, (double) (top + height) - 2, 0.0D, 0.0D, 1.0D)
-                    .addPoint((double) this.listRight + 2, (double) (top + height) - 2, 0.0D, 1.0D, 1.0D)
-                    .addPoint((double) this.listRight + 2, top - 2, 0.0D, 1.0D, 0.0D)
-                    .addPoint((double) this.listLeft - 2, top - 2, 0.0D, 0.0D, 0.0D)
+                    .addPoint((double) this.listLeft - 2, (double) (top + height) - 2, 0.0D)
+                    .addPoint((double) this.listRight + 2, (double) (top + height) - 2, 0.0D)
+                    .addPoint((double) this.listRight + 2, top - 2, 0.0D)
+                    .addPoint((double) this.listLeft - 2, top - 2, 0.0D)
                     .setColor(0, 0, 0)
-                    .addPoint(this.listLeft - 1, (double) (top + height) - 3, 0.0D, 0.0D, 1.0D)
-                    .addPoint(this.listRight + 1, (double) (top + height) - 3, 0.0D, 1.0D, 1.0D)
-                    .addPoint(this.listRight + 1, top - 1, 0.0D, 1.0D, 0.0D)
-                    .addPoint(this.listLeft - 1, top - 1, 0.0D, 0.0D, 0.0D)
+                    .addPoint(this.listLeft - 1, (double) (top + height) - 3, 0.0D)
+                    .addPoint(this.listRight + 1, (double) (top + height) - 3, 0.0D)
+                    .addPoint(this.listRight + 1, top - 1, 0.0D)
+                    .addPoint(this.listLeft - 1, top - 1, 0.0D)
                     .render();
             RenderHelper.enableTexture();
         }

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java b/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java
index 3c8aca227e191840dd12cfa5ab7f0bb5c851e2c1..9db539c0c1c3d3f3ccd8e2f5e24e514e21796c37 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java
@@ -121,7 +121,7 @@ public class WorldSaveRow extends ControlListEntry implements Comparable<WorldSa
         int y = this.getY();
         this.client.textRenderer.draw(matrixStack, displayName, (float) (x + ICON_SIZE + 3), (float) (y + 1), 16777215);
         this.client.textRenderer.draw(matrixStack, details, (float) (x + ICON_SIZE + 3), (float) (y + 1 + this.client.textRenderer.fontHeight + 1), 8421504);
-        this.client.getTextureManager().bindTexture(this.icon != null ? this.iconLocation : ICON_MISSING);
+        RenderHelper.setTexture(this.icon != null ? this.iconLocation : ICON_MISSING);
         RenderHelper.enableBlend();
         DrawableHelper.drawTexture(matrixStack, x, y, 0.0F, 0.0F, ICON_SIZE, ICON_SIZE, 32, 32);
         RenderHelper.disableBlend();

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java b/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java
index ecad189913e901b1d043131fe11f93221e9f1ec7..5747fd680673bbaea75aa7f57aef15e48f663d8a 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java
@@ -32,6 +32,10 @@ public class RenderHelper {
         RenderSystem.setShaderTexture(0, texture);
     }
 
+    public static void resetShader() {
+        RenderSystem.setShader(GameRenderer::getPositionColorShader);
+    }
+
     public static void afterRender() {
         polygonModeFill();
         RenderSystem.enableCull();

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
index b5540004791c418ef36a4453053e15a50f1bfaf7..92479973ed4c4bd7ac0dbdef9831544119c5ded5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
@@ -19,7 +19,7 @@ public class Renderer {
         return new Renderer(VertexFormat.DrawMode.LINES, VertexFormats.POSITION_COLOR);
     }
 
-    static Renderer startQuads() {
+    public static Renderer startQuads() {
         return new Renderer(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
     }
 
@@ -73,7 +73,7 @@ public class Renderer {
         return renderer;
     }
 
-    Renderer addPoint(double x, double y, double z) {
+    public Renderer addPoint(double x, double y, double z) {
         pos(x, y, z);
         color();
         end();