Refactor NEU Repo (#364)

Add RepoParser
Fix Golden Dragon stats leveling
Add wiki option
Fix recipe output count

2 files changed, 18 insertions, 16 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CompactorDeletorPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CompactorDeletorPreview.java
index 7f5b96b9..1e3dd7d2 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CompactorDeletorPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CompactorDeletorPreview.java
@@ -1,7 +1,7 @@
 package de.hysky.skyblocker.skyblock.item;
 
 import de.hysky.skyblocker.mixin.accessor.DrawContextInvoker;
-import de.hysky.skyblocker.skyblock.itemlist.ItemRegistry;
+import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.utils.ItemUtils;
 import it.unimi.dsi.fastutil.ints.IntIntPair;
 import it.unimi.dsi.fastutil.ints.IntObjectPair;
@@ -43,7 +43,7 @@ public class CompactorDeletorPreview {
         NbtCompound extraAttributes = ItemUtils.getExtraAttributes(stack);
         if (extraAttributes == null) return false;
         // Get the slots and their items from the nbt, which is in the format personal_compact_<slot_number> or personal_deletor_<slot_number>
-        List<IntObjectPair<ItemStack>> slots = extraAttributes.getKeys().stream().filter(slot -> slot.contains(type.toLowerCase().substring(0, 7))).map(slot -> IntObjectPair.of(Integer.parseInt(slot.substring(17)), ItemRegistry.getItemStack(extraAttributes.getString(slot)))).toList();
+        List<IntObjectPair<ItemStack>> slots = extraAttributes.getKeys().stream().filter(slot -> slot.contains(type.toLowerCase().substring(0, 7))).map(slot -> IntObjectPair.of(Integer.parseInt(slot.substring(17)), ItemRepository.getItemStack(extraAttributes.getString(slot)))).toList();
 
         List<TooltipComponent> components = tooltips.stream().map(Text::asOrderedText).map(TooltipComponent::of).collect(Collectors.toList());
         IntIntPair dimensions = DIMENSIONS.getOrDefault(size, DEFAULT_DIMENSION);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
index d4e6a0df..38121ea3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
@@ -1,23 +1,25 @@
 package de.hysky.skyblocker.skyblock.item;
 
-import de.hysky.skyblocker.skyblock.itemlist.ItemRegistry;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.utils.ItemUtils;
-import de.hysky.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
 import org.lwjgl.glfw.GLFW;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.CompletableFuture;
 
 public class WikiLookup {
+    private static final Logger LOGGER = LoggerFactory.getLogger(WikiLookup.class);
     public static KeyBinding wikiLookup;
-    static final MinecraftClient client = MinecraftClient.getInstance();
-    static String id;
+    private static String id;
 
     public static void init() {
         wikiLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding(
@@ -28,22 +30,22 @@ public class WikiLookup {
         ));
     }
 
-    public static String getSkyblockId(Slot slot) {
+    public static void getSkyblockId(Slot slot) {
         //Grabbing the skyblock NBT data
         ItemUtils.getItemIdOptional(slot.getStack()).ifPresent(newId -> id = newId);
-        return id;
     }
 
-    public static void openWiki(Slot slot) {
-        if (Utils.isOnSkyblock()) {
-            id = getSkyblockId(slot);
+    public static void openWiki(Slot slot, PlayerEntity player) {
+        if (SkyblockerConfigManager.get().general.wikiLookup.enableWikiLookup) {
+            getSkyblockId(slot);
             try {
-                String wikiLink = ItemRegistry.getWikiLink(id);
+                String wikiLink = ItemRepository.getWikiLink(id, player);
                 CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
             } catch (IndexOutOfBoundsException | IllegalStateException e) {
-                e.printStackTrace();
-                if (client.player != null)
-                    client.player.sendMessage(Text.of("Error while retrieving wiki article..."), false);
+                LOGGER.error("[Skyblocker] Error while retrieving wiki article...", e);
+                if (player != null) {
+                    player.sendMessage(Text.of("[Skyblocker] Error while retrieving wiki article, see logs..."), false);
+                }
             }
         }
     }