1 files changed, 68 insertions, 21 deletions

diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index a724d63..54802db 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -1,38 +1,59 @@
 package moe.nea.firmament.features.inventory
 
-import net.minecraft.text.Text
+import org.lwjgl.glfw.GLFW
+import net.minecraft.network.chat.Component
+import net.minecraft.util.StringRepresentable
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ItemTooltipEvent
-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.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
+import moe.nea.firmament.util.getLogicalStackSize
 import moe.nea.firmament.util.gold
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.tr
 import moe.nea.firmament.util.yellow
 
-object PriceData : FirmamentFeature {
-	override val identifier: String
+object PriceData {
+	val identifier: String
 		get() = "price-data"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val tooltipEnabled by toggle("enable-always") { true }
 		val enableKeybinding by keyBindingWithDefaultUnbound("enable-keybind")
+		val stackSizeKey by keyBinding("stack-size-keybind") { GLFW.GLFW_KEY_LEFT_SHIFT }
+		val avgLowestBin by choice(
+			"avg-lowest-bin-days",
+		) {
+			AvgLowestBin.THREEDAYAVGLOWESTBIN
+		}
 	}
 
-	override val config get() = TConfig
+	enum class AvgLowestBin : StringRepresentable {
+		OFF,
+		ONEDAYAVGLOWESTBIN,
+		THREEDAYAVGLOWESTBIN,
+		SEVENDAYAVGLOWESTBIN;
+
+		override fun getSerializedName(): String {
+			return name
+		}
+	}
 
-	fun formatPrice(label: Text, price: Double): Text {
-		return Text.literal("")
+	fun formatPrice(label: Component, price: Double): Component {
+		return Component.literal("")
 			.yellow()
 			.bold()
 			.append(label)
 			.append(": ")
 			.append(
-				Text.literal(formatCommas(price, fractionalDigits = 1))
-					.append(if(price != 1.0) " coins" else " coin")
+				Component.literal(formatCommas(price, fractionalDigits = 1))
+					.append(if (price != 1.0) " coins" else " coin")
 					.gold()
 					.bold()
 			)
@@ -40,34 +61,60 @@ object PriceData : FirmamentFeature {
 
 	@Subscribe
 	fun onItemTooltip(it: ItemTooltipEvent) {
-		if (!TConfig.tooltipEnabled && !TConfig.enableKeybinding.isPressed()) {
-			return
-		}
+		if (!TConfig.tooltipEnabled) return
+		if (TConfig.enableKeybinding.isBound && !TConfig.enableKeybinding.isPressed()) return
 		val sbId = it.stack.skyBlockId
-		val bazaarData = HypixelStaticData.bazaarData[sbId]
+		val stackSize = it.stack.getLogicalStackSize()
+		val isShowingStack = TConfig.stackSizeKey.isPressed()
+		val multiplier = if (isShowingStack) stackSize else 1
+		val multiplierText =
+			if (isShowingStack)
+				tr("firmament.tooltip.multiply", "Showing prices for x${stackSize}").darkGrey()
+			else
+				tr(
+					"firmament.tooltip.multiply.hint",
+					"[${TConfig.stackSizeKey.format()}] to show x${stackSize}"
+				).darkGrey()
+		val bazaarData = HypixelStaticData.bazaarData[sbId?.asBazaarStock]
 		val lowestBin = HypixelStaticData.lowestBin[sbId]
+		val avgBinValue: Double? = when (TConfig.avgLowestBin) {
+			AvgLowestBin.ONEDAYAVGLOWESTBIN -> HypixelStaticData.avg1dlowestBin[sbId]
+			AvgLowestBin.THREEDAYAVGLOWESTBIN -> HypixelStaticData.avg3dlowestBin[sbId]
+			AvgLowestBin.SEVENDAYAVGLOWESTBIN -> HypixelStaticData.avg7dlowestBin[sbId]
+			AvgLowestBin.OFF -> null
+		}
 		if (bazaarData != null) {
-			it.lines.add(Text.literal(""))
+			it.lines.add(Component.literal(""))
+			it.lines.add(multiplierText)
 			it.lines.add(
 				formatPrice(
-					tr("firmament.tooltip.bazaar.sell-order", "Bazaar Sell Order"),
-					bazaarData.quickStatus.sellPrice
+					tr("firmament.tooltip.bazaar.buy-order", "Bazaar Buy Order"),
+					bazaarData.quickStatus.sellPrice * multiplier
 				)
 			)
 			it.lines.add(
 				formatPrice(
-					tr("firmament.tooltip.bazaar.buy-order", "Bazaar Buy Order"),
-					bazaarData.quickStatus.buyPrice
+					tr("firmament.tooltip.bazaar.sell-order", "Bazaar Sell Order"),
+					bazaarData.quickStatus.buyPrice * multiplier
 				)
 			)
 		} else if (lowestBin != null) {
-			it.lines.add(Text.literal(""))
+			it.lines.add(Component.literal(""))
+			it.lines.add(multiplierText)
 			it.lines.add(
 				formatPrice(
 					tr("firmament.tooltip.ah.lowestbin", "Lowest BIN"),
-					lowestBin
+					lowestBin * multiplier
 				)
 			)
+			if (avgBinValue != null) {
+				it.lines.add(
+					formatPrice(
+						tr("firmament.tooltip.ah.avg-lowestbin", "AVG Lowest BIN"),
+						avgBinValue * multiplier
+					)
+				)
+			}
 		}
 	}
 }