Used new neu method.

2 files changed, 24 insertions, 20 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 714adcec4..62546ee81 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -4,8 +4,6 @@ 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
@@ -115,12 +113,7 @@ object ItemUtils {
         return false
     }
 
-    fun ItemStack.getInternalName(): String {
-        return ItemResolutionQuery(NotEnoughUpdates.INSTANCE.manager)
-            .withCurrentGuiContext()
-            .withItemStack(this)
-            .resolveInternalName() ?: ""
-    }
+    fun ItemStack.getInternalName() = NEUItems.getInternalName(this)
 
     fun ItemStack.getSkullTexture(): String? {
         if (item != Items.skull) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index ecbcc9c93..c826ac1f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
+import io.github.moulberry.notenoughupdates.NEUManager
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery
 import io.github.moulberry.notenoughupdates.util.Utils
@@ -8,24 +9,34 @@ import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
 
 object NEUItems {
-
+    val manager: NEUManager get() = NotEnoughUpdates.INSTANCE.manager
     private val itemCache = mutableMapOf<String, ItemStack>()
 
-    fun getInternalNameByName(rawName: String): String? {
-        return ItemResolutionQuery.findInternalNameByDisplayName(rawName, false)
+    fun getInternalName(itemName: String): String {
+        return ItemResolutionQuery.findInternalNameByDisplayName(itemName, false)
+    }
+
+    fun getInternalName(itemStack: ItemStack): String {
+        return ItemResolutionQuery(manager)
+            .withCurrentGuiContext()
+            .withItemStack(itemStack)
+            .resolveInternalName() ?: ""
     }
 
-    fun readItemFromRepo(internalName: String): ItemStack {
+    fun getPrice(internalName: String, useSellingPrice: Boolean = false): Double {
+        return manager.auctionManager.getBazaarOrBin(internalName, useSellingPrice)
+    }
+
+    fun getItemStack(internalName: String): ItemStack {
         if (itemCache.contains(internalName)) {
-            return itemCache[internalName]!!
-        }
-        val itemStack = NotEnoughUpdates.INSTANCE.manager.jsonToStack(
-            NotEnoughUpdates.INSTANCE.manager.itemInformation[internalName]
-        )
-        if (itemStack != null) {
-            itemCache[internalName] = itemStack
+            return itemCache[internalName]!!.copy()
         }
-        return itemStack
+
+        val itemStack = ItemResolutionQuery(manager)
+            .withKnownInternalName(internalName)
+            .resolveToItemStack()!!
+        itemCache[internalName] = itemStack
+        return itemStack.copy()
     }
 
     fun ItemStack.renderOnScreen(x: Float, y: Float) {