Fix quicknav buttons not updating positions when opening recipe book

1 files changed, 26 insertions, 21 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
index 8e79b08e..77181332 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -1,9 +1,12 @@
 package me.xmrvizzy.skyblocker.skyblock.quicknav;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import me.xmrvizzy.skyblocker.mixin.HandledScreenAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.util.math.MatrixStack;
@@ -21,62 +24,64 @@ public class QuickNavButton extends ClickableWidget {
 
     }
 
-    public enum Type {
-        TOP,
-        BOTTOM,
-    }
-
-    private final Type type;
+    private int index;
     private boolean toggled;
     private int u;
     private int v;
     private final String command;
     private final ItemStack icon;
 
-    public QuickNavButton(int x, int y, Type type, boolean toggled, String command, ItemStack icon) {
-        super(x, y, 28, 32, LiteralText.EMPTY);
-        this.type = type;
-        if (type == Type.BOTTOM) {
-            this.u = 28;
-            this.v = 64;
-        } else {
-            this.u = 28;
-            this.v = 0;
-        }
+    public QuickNavButton(int index, boolean toggled, String command, ItemStack icon) {
+        super(0, 0, 28, 32, LiteralText.EMPTY);
+        this.index = index;
         this.toggled = toggled;
-        if (toggled) this.v += 32;
         this.command = command;
         this.icon = icon;
     }
 
+    private void updateCoordinates() {
+        Screen screen = MinecraftClient.getInstance().currentScreen;
+        if (screen instanceof HandledScreen<?>) {
+            HandledScreen<?> handledScreen = (HandledScreen<?>) screen;
+            int x = ((HandledScreenAccessor)handledScreen).getX();
+            int y = ((HandledScreenAccessor)handledScreen).getY();
+            int w = ((HandledScreenAccessor)handledScreen).getBackgroundWidth();
+            int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight();
+            this.x = x + this.index % 6 * 28 + 4;
+            this.y = this.index < 6 ? y - 28 : y + h - 4;
+            this.u = 28;
+            this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0);
+        }
+    }
+
     @Override
     public void onClick(double mouseX, double mouseY) {
         if (!this.toggled) {
             this.toggled = true;
-            this.v += 32;
             CLIENT.player.sendChatMessage(command);
         }
     }
 
     @Override
     public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.updateCoordinates();
         RenderSystem.setShaderTexture(0, BUTTON_TEXTURE);
         RenderSystem.disableDepthTest();
         // render button background
         if (!this.toggled) {
-            if (this.type == Type.BOTTOM)
+            if (this.index >= 6)
                 this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4);
             else
                 this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4);
         } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height);
         // render button icon
         if (!this.toggled) {
-            if (this.type == Type.BOTTOM)
+            if (this.index >= 6)
                 CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);
             else
                 CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
         } else {
-            if (this.type == Type.BOTTOM)
+            if (this.index >= 6)
                 CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9);
             else
                 CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6);