aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/bazaar
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-09-07 12:58:45 +0200
committerLorenz <lo.scherf@gmail.com>2022-09-07 12:58:45 +0200
commit48a793d2d3e9d779f5acecf5097e2c013aabf9ae (patch)
tree176539e2f9da95d3bbdb28739886b7ee06adc0b9 /src/main/java/at/hannibal2/skyhanni/features/bazaar
parent79ae2adaac593f50e1d2606b540c4fc2386d733c (diff)
parent8b89f9c4ff51c557b5a51d5b00075c2665bdbe9f (diff)
downloadSkyHanni-48a793d2d3e9d779f5acecf5097e2c013aabf9ae.tar.gz
SkyHanni-48a793d2d3e9d779f5acecf5097e2c013aabf9ae.tar.bz2
SkyHanni-48a793d2d3e9d779f5acecf5097e2c013aabf9ae.zip
Merge remote-tracking branch 'origin/dev' into dev
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/bazaar')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt9
1 files changed, 6 insertions, 3 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 5ae100ac2..c2c8bcb18 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -1,7 +1,9 @@
package at.hannibal2.skyhanni.features.bazaar
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraft.item.ItemStack
class BazaarApi {
@@ -44,9 +46,10 @@ class BazaarApi {
return null
}
- fun isBazaarItem(name: String): Boolean {
- val bazaarName = getCleanBazaarName(name)
- return bazaarMap.containsKey(bazaarName)
+ fun isBazaarItem(stack: ItemStack): Boolean {
+ val internalName = stack.getInternalName()
+ return bazaarMap.any { it.value.apiName == internalName }
+
}
}