summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-01 01:59:30 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-01 01:59:30 +0200
commit07a16dae17b80b0e489c812d80f6e92745db80ac (patch)
tree5e744e938013a59d719bbe0ade0f5565e8abf483 /src/main/java/at/hannibal2/skyhanni/utils
parent1bad17906dc6f5f1f65b48300404dec4c3b67043 (diff)
downloadskyhanni-07a16dae17b80b0e489c812d80f6e92745db80ac.tar.gz
skyhanni-07a16dae17b80b0e489c812d80f6e92745db80ac.tar.bz2
skyhanni-07a16dae17b80b0e489c812d80f6e92745db80ac.zip
Fixed Anita shop delicate enchant
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 563e8976e..85dc8816c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -21,18 +21,21 @@ object NEUItems {
private val recipesCache = mutableMapOf<String, Set<NeuRecipe>>()
fun getInternalName(itemName: String): String {
+ return getInternalNameOrNull(itemName) ?: throw Error("getInternalName is null for '$itemName'")
+ }
+
+ fun getInternalNameOrNull(itemName: String): String? {
if (itemNameCache.containsKey(itemName)) {
return itemNameCache[itemName]!!
}
- var internalName = ItemResolutionQuery.findInternalNameByDisplayName(itemName, false)
+ var internalName = ItemResolutionQuery.findInternalNameByDisplayName(itemName, false) ?: return null
+
// This fixes a NEU bug with ยง9Hay Bale (cosmetic item)
// TODO remove workaround when this is fixed in neu
if (internalName == "HAY_BALE") {
internalName = "HAY_BLOCK"
}
- if (internalName == null) {
- throw Error("getInternalName is null for '$itemName'")
- }
+
itemNameCache[itemName] = internalName
return internalName
}