Add Quick Nav data fixer and refactor tabs

2 files changed, 9 insertions, 15 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
index cfa7b41b..8a66996f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
@@ -26,16 +26,6 @@ import java.util.regex.PatternSyntaxException;
 public class QuickNav {
     private static final Logger LOGGER = LoggerFactory.getLogger(QuickNav.class);
 
-    public static void init() {
-        ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
-            if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().quickNav.enableQuickNav && screen instanceof HandledScreen<?> && client.player != null && !client.player.isCreative()) {
-                String screenTitle = screen.getTitle().getString().trim();
-                List<QuickNavButton> buttons = QuickNav.init(screenTitle);
-                for (QuickNavButton button : buttons) Screens.getButtons(screen).add(button);
-            }
-        });
-    }
-
     public static List<QuickNavButton> init(String screenTitle) {
         List<QuickNavButton> buttons = new ArrayList<>();
         QuickNavigationConfig data = SkyblockerConfigManager.get().quickNav;
@@ -61,8 +51,8 @@ public class QuickNav {
     }
 
     private static QuickNavButton parseButton(QuickNavigationConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException {
-        QuickNavigationConfig.ItemData itemData = buttonInfo.item;
-        ItemStack stack = ItemStackComponentizationFixer.fromComponentsString(itemData.id, Math.clamp(itemData.count, 1, 99), itemData.components);
+        QuickNavigationConfig.ItemData itemData = buttonInfo.itemData;
+        ItemStack stack = ItemStackComponentizationFixer.fromComponentsString(itemData.item.toString(), Math.clamp(itemData.count, 1, 99), itemData.components);
         boolean uiTitleMatches = false;
 
         try {
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 e2c5cb00..f9ca0940 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -31,6 +31,10 @@ public class QuickNavButton extends ClickableWidget {
         return index < 7;
     }
 
+    public boolean toggled() {
+        return toggled;
+    }
+
     /**
      * Constructs a new QuickNavButton with the given parameters.
      *
@@ -53,8 +57,8 @@ public class QuickNavButton extends ClickableWidget {
             int x = ((HandledScreenAccessor) handledScreen).getX();
             int y = ((HandledScreenAccessor) handledScreen).getY();
             int h = ((HandledScreenAccessor) handledScreen).getBackgroundHeight();
-            this.setX(x + 27 * this.index % 7);
-            this.setY(y + this.index < 7 ? -28 : h - 4);
+            this.setX(x + this.index % 7 * 25);
+            this.setY(this.index < 7 ? y - 28 : y + h - 4);
         }
     }
 
@@ -90,7 +94,7 @@ public class QuickNavButton extends ClickableWidget {
         RenderSystem.disableDepthTest();
 
         // Construct the texture identifier based on the index and toggled state
-        Identifier tabTexture = new Identifier("container/creative_inventory/tab_" + (isTopTab() ? "top" : "bottom") + "_" + (toggled ? "selected" : "unselected") + "_" + index % 7);
+        Identifier tabTexture = new Identifier("container/creative_inventory/tab_" + (isTopTab() ? "top" : "bottom") + "_" + (toggled ? "selected" : "unselected") + "_" + (index % 7 + 1));
 
         // Render the button texture
         context.drawGuiTexture(tabTexture, this.getX(), this.getY(), this.width, this.height);