Changing internalName to getInternalName_old, and getInternalName_new to internalName

4 files changed, 29 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 53e810483..314275fa8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -117,13 +117,14 @@ object ItemUtils {
         return false
     }
 
-    fun ItemStack.getInternalNameOrNull() = getInternalName().takeIf { it != "" }
+    // TODO remove
+    fun ItemStack.getInternalName_old() = getInternalName().asString()
 
-    fun ItemStack.getInternalNameOrNull_new() = getInternalName_new().takeIf { it.asString() != "" }
+    fun ItemStack.getInternalName() = getInternalNameOrNull() ?: "".asInternalName()
 
-    fun ItemStack.getInternalName_new() = getInternalName().asInternalName()
+    fun ItemStack.getInternalNameOrNull() = getRawInternalName()?.asInternalName()
 
-    fun ItemStack.getInternalName(): String {
+    private fun ItemStack.getRawInternalName(): String? {
         if (name == "§fWisp's Ice-Flavored Water I Splash Potion") {
             return "WISP_POTION"
         }
@@ -186,7 +187,7 @@ object ItemUtils {
             return name
         }
 
-    fun isSkyBlockMenuItem(stack: ItemStack?): Boolean = stack?.getInternalName() == "SKYBLOCK_MENU"
+    fun isSkyBlockMenuItem(stack: ItemStack?): Boolean = stack?.getInternalName_old() == "SKYBLOCK_MENU"
 
     private val patternInFront = "(?: *§8(?<amount>[\\d,]+)x )?(?<name>.*)".toPattern()
     private val patternBehind = "(?<name>(?:['\\w-]+ ?)+)(?:§8x(?<amount>[\\d,]+))?".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index 89741cbef..5ccb74664 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -24,5 +24,14 @@ class NEUInternalName private constructor(private val internalName: String) {
 
     override fun hashCode(): Int = internalName.hashCode()
 
-//    fun equals(other: String) = internalName == other
+    fun equals(other: String) = internalName == other
+
+    fun contains(other: String) = internalName.contains(other)
+
+    fun startsWith(other: String) = internalName.startsWith(other)
+
+    fun endsWith(other: String) = internalName.endsWith(other)
+
+    fun replace(oldValue: String, newValue: String) =
+        internalName.replace(oldValue.uppercase(), newValue.uppercase()).asInternalName()
 }
\ 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 ad424d5d2..0e831e486 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.test.command.CopyErrorCommand
 import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -45,12 +45,13 @@ object NEUItems {
         )
     }
 
-    fun getInternalName(itemName: String): String {
-        return getInternalNameOrNull_new(itemName)?.asString() ?: throw Error("getInternalName is null for '$itemName'")
+    // TODO remove
+    fun getRawInternalName(itemName: String): String {
+        return getInternalNameOrNull(itemName)?.asString() ?: throw Error("internal name is null for '$itemName'")
     }
 
-    fun getInternalName_new(itemName: String): NEUInternalName {
-        return getInternalNameOrNull_new(itemName) ?: throw Error("getInternalName is null for '$itemName'")
+    fun getInternalName(itemName: String): NEUInternalName {
+        return getInternalNameOrNull(itemName) ?: throw Error("getInternalName is null for '$itemName'")
     }
 
     fun getInternalNameOrNullIgnoreCase(itemName: String): NEUInternalName? {
@@ -82,9 +83,10 @@ object NEUItems {
         return map
     }
 
-    fun getInternalNameOrNull(itemName: String) = getInternalNameOrNull_new(itemName)?.asString()
+    // TODO remove
+    fun getRawInternalNameOrNull(itemName: String) = getInternalNameOrNull(itemName)?.asString()
 
-    fun getInternalNameOrNull_new(itemName: String): NEUInternalName? {
+    fun getInternalNameOrNull(itemName: String): NEUInternalName? {
         val lowercase = itemName.lowercase()
         if (itemNameCache.containsKey(lowercase)) {
             return itemNameCache[lowercase]!!
@@ -132,7 +134,7 @@ object NEUItems {
     fun getInternalName(itemStack: ItemStack) = ItemResolutionQuery(manager)
         .withCurrentGuiContext()
         .withItemStack(itemStack)
-        .resolveInternalName() ?: ""
+        .resolveInternalName()
 
     fun getInternalNameOrNull(nbt: NBTTagCompound) =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()
@@ -145,9 +147,6 @@ object NEUItems {
         return price
     }
 
-    fun getPriceOrNull(internalName: String, useSellingPrice: Boolean = false) =
-        internalName.asInternalName().getPriceOrNull(useSellingPrice)
-
     fun transHypixelNameToInternalName(hypixelId: String) =
         manager.auctionManager.transformHypixelBazaarToNEUItemId(hypixelId).asInternalName()
 
@@ -197,7 +196,7 @@ object NEUItems {
             fallbackItem
         }
 
-    fun isVanillaItem(item: ItemStack) = manager.auctionManager.isVanillaItem(item.getInternalName())
+    fun isVanillaItem(item: ItemStack) = manager.auctionManager.isVanillaItem(item.getInternalName_old())
 
     fun ItemStack.renderOnScreen(x: Float, y: Float, scaleMultiplier: Double = 1.0) {
         val item = checkBlinkItem()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index b63bdcef3..77d291d84 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.mixins.hooks.ItemStackCachedData
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -28,7 +28,7 @@ object SkyBlockItemModifierUtils {
         it - 5 - getBaseSilexCount()
     }?.takeIf { it > 0 }
 
-    private fun ItemStack.getBaseSilexCount() = when (getInternalName()) {
+    private fun ItemStack.getBaseSilexCount() = when (getInternalName_old()) {
         "STONK_PICKAXE" -> 1
         "PROMISING_SPADE" -> 5