Changing internalName to getInternalName_old, and getInternalName_new to internalName

4 files changed, 18 insertions, 19 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
index d76bc538f..e8d453066 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
@@ -154,7 +154,7 @@ class CityProjectFeatures {
 
             val (name, amount) = ItemUtils.readItemAmount(line)
             if (name != null) {
-                val internalName = NEUItems.getInternalName(name)
+                val internalName = NEUItems.getRawInternalName(name)
                 val old = materials.getOrPut(internalName) { 0 }
                 materials[internalName] = old + amount
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
index 741a1a089..786c2bc1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.api.CollectionAPI
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_new
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -138,7 +138,7 @@ class CollectionTracker {
         }
 
         private fun countCurrentlyInInventory() =
-            InventoryUtils.countItemsInLowerInventory { it.getInternalName_new() == internalName }
+            InventoryUtils.countItemsInLowerInventory { it.getInternalName() == internalName }
 
         fun handleTabComplete(command: String): List<String>? {
             if (command != "shtrackcollection") return null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
index 67883f422..b32f19015 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getRecipientName
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -14,7 +14,7 @@ class RestorePieceOfWizardPortalLore {
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!config.restorePieceOfWizardPortalLore) return
         val stack = event.itemStack
-        if (stack.getInternalName() != "WIZARD_PORTAL_MEMENTO") return
+        if (stack.getInternalName_old() != "WIZARD_PORTAL_MEMENTO") return
         val recipient = stack.getRecipientName() ?: return
         if (!event.toolTip[5].contains(recipient)) {
             event.toolTip.add(5, "§7Earned by: $recipient")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index a7730e257..2027e68ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -5,8 +5,8 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.RenderItemTooltipEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull_new
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_new
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -101,20 +101,19 @@ object EstimatedItemValue {
     }
 
     private fun draw(stack: ItemStack): List<List<Any>> {
-        val internalName = stack.getInternalNameOrNull_new() ?: return listOf()
+        val internalName = stack.getInternalNameOrNull() ?: return listOf()
 
-        val rawInternalName = internalName.asString()
         // FIX neu item list
-        if (rawInternalName.startsWith("ULTIMATE_ULTIMATE_")) return listOf()
+        if (internalName.startsWith("ULTIMATE_ULTIMATE_")) return listOf()
         // We don't need this feature to work on books at all
         if (stack.item == Items.enchanted_book) return listOf()
         // Block catacombs items in mort inventory
-        if (rawInternalName.startsWith("CATACOMBS_PASS_") || rawInternalName.startsWith("MASTER_CATACOMBS_PASS_")) return listOf()
+        if (internalName.startsWith("CATACOMBS_PASS_") || internalName.startsWith("MASTER_CATACOMBS_PASS_")) return listOf()
         // Blocks the dungeon map
-        if (rawInternalName.startsWith("MAP-")) return listOf()
+        if (internalName.startsWith("MAP-")) return listOf()
         // Hides the rune item
-        if (rawInternalName.contains("_RUNE;")) return listOf()
-        if (rawInternalName.contains("UNIQUE_RUNE")) return listOf()
+        if (internalName.contains("_RUNE;")) return listOf()
+        if (internalName.contains("UNIQUE_RUNE")) return listOf()
 
 
         if (internalName.getItemStackOrNull() == null) {
@@ -186,7 +185,7 @@ object EstimatedItemValue {
 
     private fun addAttributeCost(stack: ItemStack, list: MutableList<String>): Double {
         val attributes = stack.getAttributes() ?: return 0.0
-        var internalName = stack.getInternalName().removePrefix("VANQUISHED_")
+        var internalName = stack.getInternalName_old().removePrefix("VANQUISHED_")
         val kuudraSets = listOf("AURORA", "CRIMSON", "TERROR", "HOLLOW")
         var genericName = internalName
         if (kuudraSets.any { internalName.contains(it) }
@@ -374,7 +373,7 @@ object EstimatedItemValue {
     private fun addSilex(stack: ItemStack, list: MutableList<String>): Double {
         val tier = stack.getSilexCount() ?: return 0.0
 
-        val internalName = stack.getInternalName()
+        val internalName = stack.getInternalName_old()
         val maxTier = if (internalName == "STONK_PICKAXE") 4 else 5
 
         val wtfHardcodedSilex = "SIL_EX".asInternalName()
@@ -504,14 +503,14 @@ object EstimatedItemValue {
     }
 
     private fun addBaseItem(stack: ItemStack, list: MutableList<String>): Double {
-        val internalName = stack.getInternalName_new()
+        val internalName = stack.getInternalName()
         var price = internalName.getPrice()
         if (price == -1.0) {
             price = 0.0
         }
 
         val name = internalName.getItemName()
-        if (internalName.asString().startsWith("ENCHANTED_BOOK_BUNDLE_")) {
+        if (internalName.startsWith("ENCHANTED_BOOK_BUNDLE_")) {
             list.add("§7Base item: $name")
             return 0.0
         }
@@ -537,7 +536,7 @@ object EstimatedItemValue {
             "ZOMBIE_COMMANDER_WHIP",
         )
 
-        val internalName = stack.getInternalName()
+        val internalName = stack.getInternalName_old()
         for ((rawName, rawLevel) in enchantments) {
             // efficiency 1-5 is cheap, 6-10 is handled by silex
             if (rawName == "efficiency") continue