Fix tooltips not working for buttons that override renderButton

MineLittlePony · Aug 28, 2023 · 5253209 · 5253209
1 parent 69d22a9
commit 5253209
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/src/main/java/com/minelittlepony/common/client/gui/element/Button.java b/src/main/java/com/minelittlepony/common/client/gui/element/Button.java
@@ -185,9 +185,22 @@ public boolean isMouseOver(double mouseX, double mouseY) {
     }
 
     @Override
-    public void renderButton(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        MinecraftClient mc = MinecraftClient.getInstance();
+    public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
+        if (!visible) {
+            return;
+        }
+        getStyle().getTooltip().ifPresentOrElse(tooltip -> {
+            if (tooltip != prevTooltip) {
+                prevTooltip = tooltip;
+                setTooltip(tooltip.toTooltip());
+            }
+        }, () -> setTooltip(null));
+        super.render(context, mouseX, mouseY, tickDelta);
+    }
 
+    @Override
+    public void renderButton(DrawContext context, int mouseX, int mouseY, float tickDelta) {
+        MinecraftClient mc = MinecraftClient.getInstance();
         RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         RenderSystem.setShaderColor(1, 1, 1, alpha);
         RenderSystem.enableBlend();
@@ -196,29 +209,18 @@ public void renderButton(DrawContext context, int mouseX, int mouseY, float part
                 GlStateManager.SrcFactor.SRC_ALPHA,
                 GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA);
 
-        int state = getTextureY();
-
-        renderButtonBlit(context, getX(), getY(), state, getWidth(), height);
+        renderButtonBlit(context, getX(), getY(), getTextureY(), getWidth(), height);
         renderBackground(context, mc, mouseX, mouseY);
+        setMessage(getStyle().getText());
+        drawIcon(context, mouseX, mouseY, tickDelta);
 
         int foreColor = getStyle().getColor();
         if (!active) {
             foreColor = 10526880;
         } else if (isHovered()) {
             foreColor = 16777120;
         }
-
-        setMessage(getStyle().getText());
-        drawIcon(context, mouseX, mouseY, partialTicks);
         renderForground(context, mc, mouseX, mouseY, foreColor | MathHelper.ceil(alpha * 255F) << 24);
-
-        getStyle().getTooltip().ifPresentOrElse(tooltip -> {
-            if (tooltip != prevTooltip) {
-                prevTooltip = tooltip;
-                setTooltip(tooltip.toTooltip());
-                this.getTooltipPositioner();
-            }
-        }, () -> setTooltip(null));
     }
 
     @Override