2 files changed, 85 insertions, 36 deletions

diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index 4477203..a724d63 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -1,5 +1,3 @@
-
-
 package moe.nea.firmament.features.inventory
 
 import net.minecraft.text.Text
@@ -8,44 +6,68 @@ 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
+import moe.nea.firmament.util.FirmFormatters.formatCommas
+import moe.nea.firmament.util.bold
+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
-        get() = "price-data"
+	override val identifier: String
+		get() = "price-data"
+
+	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
+		val tooltipEnabled by toggle("enable-always") { true }
+		val enableKeybinding by keyBindingWithDefaultUnbound("enable-keybind")
+	}
 
-    object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
-        val tooltipEnabled by toggle("enable-always") { true }
-        val enableKeybinding by keyBindingWithDefaultUnbound("enable-keybind")
-    }
+	override val config get() = TConfig
 
-    override val config get() = TConfig
+	fun formatPrice(label: Text, price: Double): Text {
+		return Text.literal("")
+			.yellow()
+			.bold()
+			.append(label)
+			.append(": ")
+			.append(
+				Text.literal(formatCommas(price, fractionalDigits = 1))
+					.append(if(price != 1.0) " coins" else " coin")
+					.gold()
+					.bold()
+			)
+	}
 
-    @Subscribe
-    fun onItemTooltip(it: ItemTooltipEvent) {
-        if (!TConfig.tooltipEnabled && !TConfig.enableKeybinding.isPressed()) {
-            return
-        }
-        val sbId = it.stack.skyBlockId
-        val bazaarData = HypixelStaticData.bazaarData[sbId]
-        val lowestBin = HypixelStaticData.lowestBin[sbId]
-        if (bazaarData != null) {
-            it.lines.add(Text.literal(""))
-            it.lines.add(
-                Text.stringifiedTranslatable("firmament.tooltip.bazaar.sell-order",
-                                             FirmFormatters.formatCommas(bazaarData.quickStatus.sellPrice, 1))
-            )
-            it.lines.add(
-                Text.stringifiedTranslatable("firmament.tooltip.bazaar.buy-order",
-                                             FirmFormatters.formatCommas(bazaarData.quickStatus.buyPrice, 1))
-            )
-        } else if (lowestBin != null) {
-            it.lines.add(Text.literal(""))
-            it.lines.add(
-                Text.stringifiedTranslatable("firmament.tooltip.ah.lowestbin",
-                                             FirmFormatters.formatCommas(lowestBin, 1))
-            )
-        }
-    }
+	@Subscribe
+	fun onItemTooltip(it: ItemTooltipEvent) {
+		if (!TConfig.tooltipEnabled && !TConfig.enableKeybinding.isPressed()) {
+			return
+		}
+		val sbId = it.stack.skyBlockId
+		val bazaarData = HypixelStaticData.bazaarData[sbId]
+		val lowestBin = HypixelStaticData.lowestBin[sbId]
+		if (bazaarData != null) {
+			it.lines.add(Text.literal(""))
+			it.lines.add(
+				formatPrice(
+					tr("firmament.tooltip.bazaar.sell-order", "Bazaar Sell Order"),
+					bazaarData.quickStatus.sellPrice
+				)
+			)
+			it.lines.add(
+				formatPrice(
+					tr("firmament.tooltip.bazaar.buy-order", "Bazaar Buy Order"),
+					bazaarData.quickStatus.buyPrice
+				)
+			)
+		} else if (lowestBin != null) {
+			it.lines.add(Text.literal(""))
+			it.lines.add(
+				formatPrice(
+					tr("firmament.tooltip.ah.lowestbin", "Lowest BIN"),
+					lowestBin
+				)
+			)
+		}
+	}
 }
diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
index 92640c8..361e8d0 100644
--- a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
+++ b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
@@ -5,16 +5,22 @@ package moe.nea.firmament.features.inventory.buttons
 import me.shedaniel.math.Rectangle
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
+import kotlin.time.Duration.Companion.seconds
+import net.minecraft.client.MinecraftClient
+import net.minecraft.text.Text
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenClickEvent
 import moe.nea.firmament.events.HandledScreenForegroundEvent
 import moe.nea.firmament.events.HandledScreenPushREIEvent
 import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.gui.FirmHoverComponent
 import moe.nea.firmament.gui.config.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.ScreenUtil
+import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.data.DataHolder
 import moe.nea.firmament.util.accessors.getRectangle
+import moe.nea.firmament.util.gold
 
 object InventoryButtons : FirmamentFeature {
     override val identifier: String
@@ -24,6 +30,7 @@ object InventoryButtons : FirmamentFeature {
         val _openEditor by button("open-editor") {
             openEditor()
         }
+		val hoverText by toggle("hover-text") { true }
     }
 
     object DConfig : DataHolder<Data>(serializer(), identifier, ::Data)
@@ -60,16 +67,36 @@ object InventoryButtons : FirmamentFeature {
         }
     }
 
+	var lastHoveredComponent: InventoryButton? = null
+	var lastMouseMove = TimeMark.farPast()
+
     @Subscribe
     fun onRenderForeground(it: HandledScreenForegroundEvent) {
         val bounds = it.screen.getRectangle()
+
+		var hoveredComponent: InventoryButton? = null
         for (button in getValidButtons()) {
             val buttonBounds = button.getBounds(bounds)
             it.context.matrices.push()
             it.context.matrices.translate(buttonBounds.minX.toFloat(), buttonBounds.minY.toFloat(), 0F)
             button.render(it.context)
             it.context.matrices.pop()
+
+			if (buttonBounds.contains(it.mouseX, it.mouseY) && TConfig.hoverText && hoveredComponent == null) {
+				hoveredComponent = button
+				if (lastMouseMove.passedTime() > 0.6.seconds && lastHoveredComponent === button) {
+					it.context.drawTooltip(
+						MC.font,
+						listOf(Text.literal(button.command).gold()),
+						buttonBounds.minX - 15,
+						buttonBounds.maxY + 20,
+					)
+				}
+			}
         }
+		if (hoveredComponent !== lastHoveredComponent)
+			lastMouseMove = TimeMark.now()
+		lastHoveredComponent = hoveredComponent
         lastRectangle = bounds
     }