From 7c8a513ac98071ce34ed9e35660956d7e5b7fac5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 9 Aug 2023 13:11:45 +0200
Subject: Using NEUInternalName in GardenVisitorFeatures

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 4 +++-
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt  | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 14bb25231..53e810483 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -227,5 +227,7 @@ object ItemUtils {
         return pair
     }
 
-    fun NEUInternalName.getItemName() = getItemStack().name ?: error("No item name found for $this")
+    fun NEUInternalName.getItemNameOrNull() = getItemStack().name
+
+    fun NEUInternalName.getItemName() = getItemNameOrNull() ?: error("No item name found for $this")
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 446eeffc0..ad424d5d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -229,6 +229,11 @@ object NEUItems {
         GlStateManager.popMatrix()
     }
 
+    fun getMultiplier(internalName: NEUInternalName, tryCount: Int = 0): Pair<NEUInternalName, Int> {
+        val pair = getMultiplier(internalName.asString(), tryCount)
+        return Pair(pair.first.asInternalName(), pair.second)
+    }
+
     fun getMultiplier(internalName: String, tryCount: Int = 0): Pair<String, Int> {
         if (multiplierCache.contains(internalName)) {
             return multiplierCache[internalName]!!
-- 
cgit