Using the newest version of neu.

4 files changed, 7 insertions, 221 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index fcf749b24..3121ed4fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -62,8 +62,8 @@ dependencies {
     // If you don't want to log in with your real minecraft account, remove this line
     modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0")
 
-    implementation("com.github.notenoughupdates:notenoughupdates:e603cf2:all")
-    devenvMod("com.github.notenoughupdates:notenoughupdates:e603cf2:all")
+    implementation("com.github.notenoughupdates:notenoughupdates:df945f9:all")
+    devenvMod("com.github.notenoughupdates:notenoughupdates:df945f9:all")
 }
 
 // Minecraft configuration:
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemResolutionQuery.java b/src/main/java/at/hannibal2/skyhanni/utils/ItemResolutionQuery.java
deleted file mode 100644
index 548db2f08..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemResolutionQuery.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package at.hannibal2.skyhanni.utils;
-
-import at.hannibal2.skyhanni.config.ConfigManager;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.inventory.GuiChest;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.ContainerChest;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ItemResolutionQuery {
-
-    private static final Pattern ENCHANTED_BOOK_NAME_PATTERN = Pattern.compile("^((?:§.)+)([^§]+) ([IVXL]+)$");
-    private static final String EXTRA_ATTRIBUTES = "ExtraAttributes";
-    private static final List<String> PET_RARITIES = Arrays.asList(
-            "COMMON",
-            "UNCOMMON",
-            "RARE",
-            "EPIC",
-            "LEGENDARY",
-            "MYTHIC"
-    );
-    private ItemStack stack;
-    private Item itemType;
-    private int stackSize = -1;
-    private Gui guiContext;
-    private String knownInternalName;
-
-    public ItemResolutionQuery withItemStack(ItemStack stack) {
-        if (stack == null) return this;
-        this.itemType = stack.getItem();
-        this.stack = stack;
-        this.stackSize = stack.stackSize;
-        return this;
-    }
-
-    public ItemResolutionQuery withGuiContext(Gui gui) {
-        this.guiContext = gui;
-        return this;
-    }
-
-    public ItemResolutionQuery withCurrentGuiContext() {
-        this.guiContext = Minecraft.getMinecraft().currentScreen;
-        return this;
-    }
-
-    public ItemResolutionQuery withKnownInternalName(String knownInternalName) {
-        this.knownInternalName = knownInternalName;
-        return this;
-    }
-
-    @Nullable
-    public String resolveInternalName() {
-        if (knownInternalName != null) {
-            return knownInternalName;
-        }
-        String resolvedName = resolveFromSkyblock();
-        if (resolvedName == null) {
-            resolvedName = resolveContextualName();
-        } else {
-            switch (resolvedName.intern()) {
-                case "PET":
-                    resolvedName = resolvePetName();
-                    break;
-                case "RUNE":
-                    resolvedName = resolveRuneName();
-                    break;
-                case "ENCHANTED_BOOK":
-                    resolvedName = resolveEnchantedBookNameFromNBT();
-                    break;
-                case "PARTY_HAT_CRAB":
-                    resolvedName = resolveCrabHatName();
-                    break;
-            }
-        }
-
-        return resolvedName;
-    }
-
-    // <editor-fold desc="Resolution Helpers">
-    private boolean isBazaar(IInventory chest) {
-        if (chest.getDisplayName().getFormattedText().startsWith("Bazaar ➜ ")) {
-            return true;
-        }
-        int bazaarSlot = chest.getSizeInventory() - 5;
-        if (bazaarSlot < 0) return false;
-        ItemStack stackInSlot = chest.getStackInSlot(bazaarSlot);
-        if (stackInSlot == null || stackInSlot.stackSize == 0) return false;
-        // NBT lore, we do not care about rendered lore
-        List<String> lore = ItemUtils.INSTANCE.getLore(stackInSlot);
-        return lore.contains("§7To Bazaar");
-    }
-
-    private String resolveContextualName() {
-        if (!(guiContext instanceof GuiChest)) {
-            return null;
-        }
-        GuiChest chest = (GuiChest) guiContext;
-        ContainerChest inventorySlots = (ContainerChest) chest.inventorySlots;
-        String guiName = inventorySlots.getLowerChestInventory().getDisplayName().getUnformattedText();
-        boolean isOnBazaar = isBazaar(inventorySlots.getLowerChestInventory());
-        String displayName = ItemUtils.INSTANCE.getName(stack);
-        if (displayName == null) return null;
-        if (itemType == Items.enchanted_book && isOnBazaar) {
-            return resolveEnchantmentByName(displayName);
-        }
-        if (displayName.endsWith("Enchanted Book") && guiName.startsWith("Superpairs")) {
-            for (String loreLine : ItemUtils.INSTANCE.getLore(stack)) {
-                String enchantmentIdCandidate = resolveEnchantmentByName(loreLine);
-                if (enchantmentIdCandidate != null) return enchantmentIdCandidate;
-            }
-            return null;
-        }
-        return null;
-    }
-
-    private String getDisplayName(NBTTagCompound compound) {
-        if (compound == null) return null;
-        String string = compound.getCompoundTag("display").getString("Name");
-        if (string == null || string.isEmpty())
-            return null;
-        return string;
-    }
-
-    private String resolveEnchantmentByName(String name) {
-        Matcher matcher = ENCHANTED_BOOK_NAME_PATTERN.matcher(name);
-        if (!matcher.matches()) return null;
-        String format = matcher.group(1).toLowerCase(Locale.ROOT);
-        String enchantmentName = matcher.group(2).trim();
-        String romanLevel = matcher.group(3);
-        boolean ultimate = (format.contains("§l"));
-
-        return (ultimate ? "ULTIMATE_" : "")
-                + enchantmentName.replace(" ", "_").toUpperCase(Locale.ROOT)
-                + ";" + NumberUtil.INSTANCE.romanToDecimal(romanLevel);
-    }
-
-    private String resolveCrabHatName() {
-        String color = getExtraAttributes().getString("party_hat_color");
-        return "PARTY_HAT_CRAB_" + color.toUpperCase(Locale.ROOT);
-    }
-
-    private String resolveEnchantedBookNameFromNBT() {
-        NBTTagCompound enchantments = getExtraAttributes().getCompoundTag("enchantments");
-        String enchantName = IteratorUtils.INSTANCE.getOnlyElement(enchantments.getKeySet(), null);
-        if (enchantName == null || enchantName.isEmpty()) return null;
-        return enchantName.toUpperCase(Locale.ROOT) + ";" + enchantments.getInteger(enchantName);
-    }
-
-    private String resolveRuneName() {
-        NBTTagCompound runes = getExtraAttributes().getCompoundTag("runes");
-        String runeName = IteratorUtils.INSTANCE.getOnlyElement(runes.getKeySet(), null);
-        if (runeName == null || runeName.isEmpty()) return null;
-        return runeName.toUpperCase(Locale.ROOT) + "_RUNE;" + runes.getInteger(runeName);
-    }
-
-    private String resolvePetName() {
-        String petInfo = getExtraAttributes().getString("petInfo");
-        if (petInfo == null || petInfo.isEmpty()) return null;
-        try {
-            JsonObject petInfoObject = ConfigManager.Companion.getGson().fromJson(petInfo, JsonObject.class);
-            String petId = petInfoObject.get("type").getAsString();
-            String petTier = petInfoObject.get("tier").getAsString();
-            int rarityIndex = PET_RARITIES.indexOf(petTier);
-            return petId.toUpperCase(Locale.ROOT) + ";" + rarityIndex;
-        } catch (JsonParseException | ClassCastException ex) {
-			/* This happens if Hypixel changed the pet json format;
-				 I still log this exception, since this case *is* exceptional and cannot easily be recovered from */
-            ex.printStackTrace();
-            return null;
-        }
-    }
-
-    private NBTTagCompound getExtraAttributes() {
-        NBTTagCompound compound = stack.getTagCompound();
-        if (compound == null) return new NBTTagCompound();
-        return compound.getCompoundTag(EXTRA_ATTRIBUTES);
-    }
-
-    private String resolveFromSkyblock() {
-        String internalName = getExtraAttributes().getString("id");
-        if (internalName == null || internalName.isEmpty()) return null;
-        return internalName.toUpperCase(Locale.ROOT);
-    }
-
-    // </editor-fold>
-
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 00ffdaefd..714adcec4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -4,6 +4,8 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates
+import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
@@ -114,7 +116,7 @@ object ItemUtils {
     }
 
     fun ItemStack.getInternalName(): String {
-        return ItemResolutionQuery()
+        return ItemResolutionQuery(NotEnoughUpdates.INSTANCE.manager)
             .withCurrentGuiContext()
             .withItemStack(this)
             .resolveInternalName() ?: ""
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 8c127fac8..ecbcc9c93 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
+import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery
 import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.init.Items
@@ -10,25 +10,9 @@ import net.minecraft.item.ItemStack
 object NEUItems {
 
     private val itemCache = mutableMapOf<String, ItemStack>()
-    private val itemNameCache = mutableMapOf<String, String>() // display name -> internal name
 
     fun getInternalNameByName(rawName: String): String? {
-        val itemName = rawName.removeColor()
-        if (itemNameCache.containsKey(itemName)) {
-            return itemNameCache[itemName]
-        }
-        val manager = NotEnoughUpdates.INSTANCE.manager
-        for ((internalId, b) in manager.itemInformation) {
-            if (b.has("displayname")) {
-                val name = b.get("displayname").asString
-                if (name.contains(itemName)) {
-                    itemNameCache[itemName] = internalId
-                    return internalId
-                }
-            }
-        }
-
-        return null
+        return ItemResolutionQuery.findInternalNameByDisplayName(rawName, false)
     }
 
     fun readItemFromRepo(internalName: String): ItemStack {