summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/bazaar
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-09 13:50:53 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-09 13:50:53 +0200
commitd19350d4b0b99f6b04680aba9686ddbe1e7df780 (patch)
treeabb8859f13f2f03ebf9457624f8f2cbae6496b00 /src/main/java/at/hannibal2/skyhanni/features/bazaar
parente04efa84f7d42ddcbe11eb65f25adc0e524a3aaa (diff)
downloadskyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.tar.gz
skyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.tar.bz2
skyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.zip
Changing internalName to getInternalName_old, and getInternalName_new to internalName
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/bazaar')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index a989d60d1..783f79f49 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.bazaar
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.*
import at.hannibal2.skyhanni.utils.*
-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
@@ -23,7 +23,7 @@ class BazaarApi {
private var currentSearchedItem = ""
fun getBazaarDataByName(name: String): BazaarData? =
- NEUItems.getInternalNameOrNull(name)?.let { getBazaarDataByInternalName(it) }
+ NEUItems.getRawInternalNameOrNull(name)?.let { getBazaarDataByInternalName(it) }
fun getBazaarDataByInternalName(internalName: String) = internalName.asInternalName().getBazaarData()
@@ -31,7 +31,7 @@ class BazaarApi {
holder.getData(this)
} else null
- fun isBazaarItem(stack: ItemStack) = isBazaarItem(stack.getInternalName())
+ fun isBazaarItem(stack: ItemStack) = isBazaarItem(stack.getInternalName_old())
fun NEUInternalName.isBazaarItem() = NEUItems.manager.auctionManager.getBazaarInfo(asString()) != null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index a2106bf15..e37d14df8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.bazaar
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.InventoryCloseEvent
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.NEUItems
@@ -39,14 +39,14 @@ class BazaarBestSellMethod {
if (buyInstantly == null || buyInstantly.displayName != "§aBuy Instantly") return ""
val bazaarItem = inv.getStackInSlot(13) ?: return ""
- val internalName = NEUItems.getInternalNameOrNull(bazaarItem.displayName) ?: return ""
+ val internalName = NEUItems.getRawInternalNameOrNull(bazaarItem.displayName) ?: return ""
var having = 0
for (slot in chest.inventorySlots) {
if (slot == null) continue
if (slot.slotNumber == slot.slotIndex) continue
val stack = slot.stack ?: continue
- if (internalName == stack.getInternalName()) {
+ if (internalName == stack.getInternalName_old()) {
having += stack.stackSize
}
}