aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/features/inventory
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-06-26 21:22:41 +0200
committerLinnea Gräf <nea@nea.moe>2025-06-26 21:22:41 +0200
commite5ff77c47f2936c34699a56b1394c1b5c18964e8 (patch)
treed11a34b90b7bfbd544b95be9d70d8a4dfdc5b7de /src/main/kotlin/features/inventory
parent04fd3b66df7184db37df3306876bac8f95f8e71a (diff)
downloadFirmament-e5ff77c47f2936c34699a56b1394c1b5c18964e8.tar.gz
Firmament-e5ff77c47f2936c34699a56b1394c1b5c18964e8.tar.bz2
Firmament-e5ff77c47f2936c34699a56b1394c1b5c18964e8.zip
feat: Make use of bazaar stocks for better bazaar prices
Diffstat (limited to 'src/main/kotlin/features/inventory')
-rw-r--r--src/main/kotlin/features/inventory/ItemHotkeys.kt3
-rw-r--r--src/main/kotlin/features/inventory/PriceData.kt3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/kotlin/features/inventory/ItemHotkeys.kt b/src/main/kotlin/features/inventory/ItemHotkeys.kt
index 0dc8a2a..e826b31 100644
--- a/src/main/kotlin/features/inventory/ItemHotkeys.kt
+++ b/src/main/kotlin/features/inventory/ItemHotkeys.kt
@@ -10,6 +10,7 @@ import moe.nea.firmament.repo.ItemCache.asItemStack
import moe.nea.firmament.repo.ItemCache.isBroken
import moe.nea.firmament.repo.RepoManager
import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.asBazaarStock
import moe.nea.firmament.util.focusedItemStack
import moe.nea.firmament.util.skyBlockId
import moe.nea.firmament.util.skyblock.SBItemUtil.getSearchName
@@ -28,7 +29,7 @@ object ItemHotkeys {
var item = event.screen.focusedItemStack ?: return
val skyblockId = item.skyBlockId ?: return
item = RepoManager.getNEUItem(skyblockId)?.asItemStack()?.takeIf { !it.isBroken } ?: item
- if (HypixelStaticData.hasBazaarStock(skyblockId)) {
+ if (HypixelStaticData.hasBazaarStock(skyblockId.asBazaarStock)) {
MC.sendCommand("bz ${item.getSearchName()}")
} else if (HypixelStaticData.hasAuctionHouseOffers(skyblockId)) {
MC.sendCommand("ahs ${item.getSearchName()}")
diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index e247080..2e854b7 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -9,6 +9,7 @@ import moe.nea.firmament.features.FirmamentFeature
import moe.nea.firmament.gui.config.ManagedConfig
import moe.nea.firmament.repo.HypixelStaticData
import moe.nea.firmament.util.FirmFormatters.formatCommas
+import moe.nea.firmament.util.asBazaarStock
import moe.nea.firmament.util.bold
import moe.nea.firmament.util.darkGrey
import moe.nea.firmament.util.gold
@@ -75,7 +76,7 @@ object PriceData : FirmamentFeature {
"firmament.tooltip.multiply.hint",
"[${TConfig.stackSizeKey.format()}] to show x${stackSize}"
).darkGrey()
- val bazaarData = HypixelStaticData.bazaarData[sbId]
+ val bazaarData = HypixelStaticData.bazaarData[sbId?.asBazaarStock]
val lowestBin = HypixelStaticData.lowestBin[sbId]
val avgBinValue: Double? = when (TConfig.avgLowestBin) {
AvgLowestBin.ONEDAYAVGLOWESTBIN -> HypixelStaticData.avg1dlowestBin[sbId]