summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 568ccbb87..8633dcadd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -55,21 +55,26 @@ object NEUItems {
return result
}
- fun getItemStack(internalName: String): ItemStack {
+ fun getItemStackOrNull(internalName: String): ItemStack? {
if (itemCache.contains(internalName)) {
return itemCache[internalName]!!.copy()
}
val itemStack = ItemResolutionQuery(manager)
.withKnownInternalName(internalName)
- .resolveToItemStack()
- if (itemStack == null) {
+ .resolveToItemStack() ?: return null
+ itemCache[internalName] = itemStack
+ return itemStack.copy()
+ }
+
+ fun getItemStack(internalName: String): ItemStack {
+ val stack = getItemStackOrNull(internalName)
+ if (stack == null) {
val error = "ItemResolutionQuery returns null for internalName $internalName"
LorenzUtils.error(error)
throw RuntimeException(error)
}
- itemCache[internalName] = itemStack
- return itemStack.copy()
+ return stack
}
fun isVanillaItem(item: ItemStack) = manager.auctionManager.isVanillaItem(item.getInternalName())