Moving minion craft helper fully over to neu internal names.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
index 043089861..f7366235c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
@@ -14,7 +14,7 @@ object FirstMinionTier {
         otherItems: Map<NEUInternalName, Int>,
         minions: MutableMap<String, NEUInternalName>,
         tierOneMinions: MutableList<NEUInternalName>,
-        tierOneMinionsDone: MutableList<String>,
+        tierOneMinionsDone: MutableList<NEUInternalName>,
     ) {
         val help = helpMap(otherItems)
         val tierOneMinionsFiltered = getTierOneMinionsFiltered(tierOneMinions, tierOneMinionsDone)
@@ -51,20 +51,20 @@ object FirstMinionTier {
     private fun addMinion(
         tierOneMinionsFiltered: List<NEUInternalName>,
         minions: MutableMap<String, NEUInternalName>,
-        tierOneMinionsDone: MutableList<String>
+        tierOneMinionsDone: MutableList<NEUInternalName>
     ) {
         for (minionId in tierOneMinionsFiltered) {
             val prefix = minionId.asString().dropLast(1)
             if (minions.any { it.value.startsWith(prefix) }) {
-                tierOneMinionsDone.add(minionId.asString())
+                tierOneMinionsDone.add(minionId)
             }
         }
     }
 
     private fun getTierOneMinionsFiltered(
         tierOneMinions: MutableList<NEUInternalName>,
-        tierOneMinionsDone: MutableList<String>
-    ) = tierOneMinions.filter { it.asString() !in tierOneMinionsDone }
+        tierOneMinionsDone: MutableList<NEUInternalName>
+    ) = tierOneMinions.filter { it !in tierOneMinionsDone }
 
     private fun helpMap(otherItems: Map<NEUInternalName, Int>) =
         otherItems.filter { !it.key.startsWith("WOOD_") }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index 227c4fd58..bfcb24501 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -258,7 +258,7 @@ class MinionCraftHelper {
         for ((_, b) in event.inventoryItems) {
             val name = b.name ?: continue
             if (!name.startsWith("§e")) continue
-            val internalName = NEUItems.getRawInternalName("$name I")
+            val internalName = NEUItems.getInternalNameFromItemName("$name I")
                 .replace("MINION", "GENERATOR").replace(";", "_").replace("CAVE_SPIDER", "CAVESPIDER")
             if (!tierOneMinionsDone.contains(internalName)) {
                 tierOneMinionsDone.add(internalName)