From 0efd1b797bbca2eb144b3ec795217ee2e9077c23 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 9 Aug 2023 14:55:06 +0200
Subject: Using NEUInternalName in even more classes

---
 src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt  | 4 ++--
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt       | 2 +-
 src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt | 3 +++
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt        | 5 ++---
 4 files changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index dc36a5b0e..1cd9abdc8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -7,8 +7,8 @@ import net.minecraft.inventory.Slot
 import net.minecraft.item.ItemStack
 
 object InventoryUtils {
-    var itemInHandId = ""
-    var recentItemsInHand = mutableMapOf<Long, String>()
+    var itemInHandId = NEUInternalName.NONE
+    var recentItemsInHand = mutableMapOf<Long, NEUInternalName>()
     var latestItemInHand: ItemStack? = null
 
     fun getItemsInOpenChest() = buildList<Slot> {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 8fe41bfb2..c055ff42b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -120,7 +120,7 @@ object ItemUtils {
     // TODO remove
     fun ItemStack.getInternalName_old() = getInternalName().asString()
 
-    fun ItemStack.getInternalName() = getInternalNameOrNull() ?: "".asInternalName()
+    fun ItemStack.getInternalName() = getInternalNameOrNull() ?: NEUInternalName.NONE
 
     fun ItemStack.getInternalNameOrNull() = getRawInternalName()?.asInternalName()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index 5ccb74664..acf2aa092 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -5,6 +5,9 @@ class NEUInternalName private constructor(private val internalName: String) {
     companion object {
         private val map = mutableMapOf<String, NEUInternalName>()
 
+        val NONE = "NONE".asInternalName()
+        val MISSING_ITEM = "MISSING_ITEM".asInternalName()
+
         fun String.asInternalName(): NEUInternalName {
             val internalName = uppercase()
             return map.getOrPut(internalName) { NEUInternalName(internalName) }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index f55277e0a..d530e79df 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -93,9 +93,8 @@ object NEUItems {
         }
 
         if (itemName == "§cmissing repo item") {
-            val name = "MISSING_ITEM".asInternalName()
-            itemNameCache[lowercase] = name
-            return name
+            itemNameCache[lowercase] = NEUInternalName.MISSING_ITEM
+            return NEUInternalName.MISSING_ITEM
         }
 
         resolveEnchantmentByName(itemName)?.let {
-- 
cgit