1 files changed, 26 insertions, 35 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
index 7db78590..f9ca0940 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -1,7 +1,6 @@
 package de.hysky.skyblocker.skyblock.quicknav;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-
 import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
 import net.fabricmc.api.EnvType;
@@ -16,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-@Environment(value=EnvType.CLIENT)
+@Environment(value = EnvType.CLIENT)
 public class QuickNavButton extends ClickableWidget {
     private final int index;
     private boolean toggled;
@@ -25,18 +24,24 @@ public class QuickNavButton extends ClickableWidget {
 
     /**
      * Checks if the current tab is a top tab based on its index.
-     * @return true if the index is less than 6, false otherwise.
+     *
+     * @return true if the index is less than 7, false otherwise.
      */
     private boolean isTopTab() {
-        return index < 6;
+        return index < 7;
+    }
+
+    public boolean toggled() {
+        return toggled;
     }
 
     /**
      * Constructs a new QuickNavButton with the given parameters.
-     * @param index the index of the button.
+     *
+     * @param index   the index of the button.
      * @param toggled the toggled state of the button.
      * @param command the command to execute when the button is clicked.
-     * @param icon the icon to display on the button.
+     * @param icon    the icon to display on the button.
      */
     public QuickNavButton(int index, boolean toggled, String command, ItemStack icon) {
         super(0, 0, 26, 32, Text.empty());
@@ -49,18 +54,18 @@ public class QuickNavButton extends ClickableWidget {
     private void updateCoordinates() {
         Screen screen = MinecraftClient.getInstance().currentScreen;
         if (screen instanceof HandledScreen<?> handledScreen) {
-            int x = ((HandledScreenAccessor)handledScreen).getX();
-            int y = ((HandledScreenAccessor)handledScreen).getY();
-            int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight();
-            if (h > 166) --h; // why is this even a thing
-            this.setX(x + this.index % 6 * 26 + 4);
-            this.setY(this.index < 6 ? y - 26 : y + h - 4);
+            int x = ((HandledScreenAccessor) handledScreen).getX();
+            int y = ((HandledScreenAccessor) handledScreen).getY();
+            int h = ((HandledScreenAccessor) handledScreen).getBackgroundHeight();
+            this.setX(x + this.index % 7 * 25);
+            this.setY(this.index < 7 ? y - 28 : y + h - 4);
         }
     }
 
     /**
      * Handles click events. If the button is not currently toggled,
      * it sets the toggled state to true and sends a message with the command after cooldown.
+     *
      * @param mouseX the x-coordinate of the mouse click
      * @param mouseY the y-coordinate of the mouse click
      */
@@ -78,9 +83,10 @@ public class QuickNavButton extends ClickableWidget {
      * The method first updates the coordinates of the button,
      * then calculates appropriate values for rendering based on its current state,
      * and finally draws both the background and icon of the button on screen.
+     *
      * @param context the context in which to render the button
-     * @param mouseX the x-coordinate of the mouse cursor
-     * @param mouseY the y-coordinate of the mouse cursor
+     * @param mouseX  the x-coordinate of the mouse cursor
+     * @param mouseY  the y-coordinate of the mouse cursor
      */
     @Override
     public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
@@ -88,31 +94,16 @@ public class QuickNavButton extends ClickableWidget {
         RenderSystem.disableDepthTest();
 
         // Construct the texture identifier based on the index and toggled state
-        String tabType = isTopTab() ? "top" : "bottom";
-        Identifier BUTTON_TEXTURES = new Identifier("container/creative_inventory/tab_" + tabType +
-                (toggled ? "_selected_" : "_unselected_") + 2);
+        Identifier tabTexture = new Identifier("container/creative_inventory/tab_" + (isTopTab() ? "top" : "bottom") + "_" + (toggled ? "selected" : "unselected") + "_" + (index % 7 + 1));
 
         // Render the button texture
-        int y = this.getY();
-        if (this.toggled) {
-            if (this.index < 6) y -= 2;
-        } else {
-            y += (this.index >= 6) ? 4 : -2;
-        }
-        int height = this.height - ((this.toggled ) ? 0 : 4);
-
-        context.drawGuiTexture(BUTTON_TEXTURES, this.getX(), y, this.width, height);
-
+        context.drawGuiTexture(tabTexture, this.getX(), this.getY(), this.width, this.height);
         // Render the button icon
-        int yOffset = !this.toggled && this.index < 6 ? 1 : 0;
-        context.drawItem(this.icon, this.getX() + 5, this.getY() + 6 + yOffset);
-
+        int yOffset = this.index < 7 ? 1 : -1;
+        context.drawItem(this.icon, this.getX() + 5, this.getY() + 8 + yOffset);
         RenderSystem.enableDepthTest();
     }
 
-	@Override
-	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
-		// TODO Auto-generated method stub
-
-	}
+    @Override
+    protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
 }