From ab471dbbfd660831e7998a1da596d562a2090677 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 29 Mar 2023 12:57:19 +0200 Subject: + Money Per Hour now shows NPC Price instead of Sell Offer price when on ironman, stranded or bingo + Added Money per Hour Advanced stats = Money per hour compact price mode now colors current crop different --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (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 8633dcadd..1ce7c9e22 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.utils +import at.hannibal2.skyhanni.features.bazaar.BazaarApi import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import io.github.moulberry.notenoughupdates.NEUManager import io.github.moulberry.notenoughupdates.NotEnoughUpdates @@ -41,6 +42,17 @@ object NEUItems { } fun getPrice(internalName: String, useSellingPrice: Boolean = false): Double { + val bazaarData = BazaarApi.getBazaarDataForInternalName(internalName) + bazaarData?.let { + val buyPrice = it.buyPrice + if (buyPrice > 0) return buyPrice + + val sellPrice = it.sellPrice + if (sellPrice > 0) return sellPrice + + return it.npcPrice + } + val result = manager.auctionManager.getBazaarOrBin(internalName, useSellingPrice) // TODO remove workaround if (result == -1.0) { -- cgit