From 17ec026c19d1e203244217d599f72bd265d9aac8 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:12:27 +0200 Subject: Using NEUInternalName in slayer profit tracker --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 4c18c7f94..75f9d1562 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -172,25 +172,25 @@ object NEUItems { fun getPrice(internalName: String, useSellingPrice: Boolean = false) = NEUInternalName.from(internalName).getPrice(useSellingPrice) - fun getItemStackOrNull(internalName: NEUInternalName) = ItemResolutionQuery(manager) - .withKnownInternalName(internalName.asString()) + fun NEUInternalName.getItemStackOrNull() = ItemResolutionQuery(manager) + .withKnownInternalName(asString()) .resolveToItemStack()?.copy() - fun getItemStackOrNull(internalName: String) = getItemStackOrNull(NEUInternalName.from(internalName)) + fun getItemStackOrNull(internalName: String) = NEUInternalName.from(internalName).getItemStackOrNull() fun getItemStack(internalName: String, definite: Boolean = false): ItemStack = - getItemStack(NEUInternalName.from(internalName), definite) + NEUInternalName.from(internalName).getItemStack(definite) - fun getItemStack(internalName: NEUInternalName, definite: Boolean = false): ItemStack = - getItemStackOrNull(internalName) ?: run { - if (internalName.getPrice() == -1.0) return@run fallbackItem + fun NEUInternalName.getItemStack(definite: Boolean = false): ItemStack = + getItemStackOrNull() ?: run { + if (getPrice() == -1.0) return@run fallbackItem if (definite) { Utils.showOutdatedRepoNotification() } CopyErrorCommand.logError( IllegalStateException("Something went wrong!"), - "Encountered an error getting the item for §7$internalName§c. " + + "Encountered an error getting the item for §7$this§c. " + "This may be because your NEU repo is outdated. Please ask in the SkyHanni " + "Discord if this is the case" ) -- cgit