From 07a16dae17b80b0e489c812d80f6e92745db80ac Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 1 Apr 2023 01:59:30 +0200 Subject: Fixed Anita shop delicate enchant --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') 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>() 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 } -- cgit