Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Only show hover tooltip after duration

Browse Source
This commit is contained in:
Linnea Gräf
2025-06-04 19:03:35 +02:00
parent 6b697b8936
commit cd35e18c9c
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
View File

@@ -5,6 +5,7 @@ package moe.nea.firmament.features.inventory.buttons
import me.shedaniel.math.Rectangle import me.shedaniel.math.Rectangle
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.serializer import kotlinx.serialization.serializer
import kotlin.time.Duration.Companion.seconds
import net.minecraft.client.MinecraftClient import net.minecraft.client.MinecraftClient
import net.minecraft.text.Text import net.minecraft.text.Text
import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.annotations.Subscribe
@@ -12,9 +13,11 @@ import moe.nea.firmament.events.HandledScreenClickEvent
import moe.nea.firmament.events.HandledScreenForegroundEvent import moe.nea.firmament.events.HandledScreenForegroundEvent
import moe.nea.firmament.events.HandledScreenPushREIEvent import moe.nea.firmament.events.HandledScreenPushREIEvent
import moe.nea.firmament.features.FirmamentFeature import moe.nea.firmament.features.FirmamentFeature
import moe.nea.firmament.gui.FirmHoverComponent
import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.gui.config.ManagedConfig
import moe.nea.firmament.util.MC import moe.nea.firmament.util.MC
import moe.nea.firmament.util.ScreenUtil import moe.nea.firmament.util.ScreenUtil
import moe.nea.firmament.util.TimeMark
import moe.nea.firmament.util.data.DataHolder import moe.nea.firmament.util.data.DataHolder
import moe.nea.firmament.util.accessors.getRectangle import moe.nea.firmament.util.accessors.getRectangle
import moe.nea.firmament.util.gold import moe.nea.firmament.util.gold
@@ -64,10 +67,14 @@ object InventoryButtons : FirmamentFeature {
} }
} }
var lastHoveredComponent: InventoryButton? = null
var lastMouseMove = TimeMark.farPast()
@Subscribe @Subscribe
fun onRenderForeground(it: HandledScreenForegroundEvent) { fun onRenderForeground(it: HandledScreenForegroundEvent) {
val bounds = it.screen.getRectangle() val bounds = it.screen.getRectangle()
var hoveredComponent: InventoryButton? = null
for (button in getValidButtons()) { for (button in getValidButtons()) {
val buttonBounds = button.getBounds(bounds) val buttonBounds = button.getBounds(bounds)
it.context.matrices.push() it.context.matrices.push()
@@ -75,17 +82,21 @@ object InventoryButtons : FirmamentFeature {
button.render(it.context) button.render(it.context)
it.context.matrices.pop() it.context.matrices.pop()
if (buttonBounds.contains(it.mouseX, it.mouseY) && TConfig.hoverText) { if (buttonBounds.contains(it.mouseX, it.mouseY) && TConfig.hoverText && hoveredComponent == null) {
it.context.drawText( hoveredComponent = button
MinecraftClient.getInstance().textRenderer, if (lastMouseMove.passedTime() > 0.6.seconds && lastHoveredComponent === button) {
Text.literal(button.command).gold(), it.context.drawTooltip(
MC.font,
listOf(Text.literal(button.command).gold()),
buttonBounds.minX - 15, buttonBounds.minX - 15,
buttonBounds.minY + 20, buttonBounds.maxY + 20,
0xFFFF00,
false
) )
} }
} }
}
if (hoveredComponent !== lastHoveredComponent)
lastMouseMove = TimeMark.now()
lastHoveredComponent = hoveredComponent
lastRectangle = bounds lastRectangle = bounds
} }

2
translations/en_us.json
View File

@@ -129,7 +129,7 @@
"firmament.config.fixes.player-skins": "Fix unsigned Player Skins", "firmament.config.fixes.player-skins": "Fix unsigned Player Skins",
"firmament.config.fixes.player-skins.description": "Mark all player skins as signed, preventing console spam, and some rendering issues.", "firmament.config.fixes.player-skins.description": "Mark all player skins as signed, preventing console spam, and some rendering issues.",
"firmament.config.inventory-buttons": "Inventory buttons", "firmament.config.inventory-buttons": "Inventory buttons",
"firmament.config.inventory-buttons.hover-text": "Hover Text", "firmament.config.inventory-buttons.hover-text": "Hover Tooltip",
"firmament.config.inventory-buttons.hover-text.description": "Hovering over inventory buttons will show the command they run.", "firmament.config.inventory-buttons.hover-text.description": "Hovering over inventory buttons will show the command they run.",
"firmament.config.inventory-buttons.open-editor": "Open Editor", "firmament.config.inventory-buttons.open-editor": "Open Editor",
"firmament.config.inventory-buttons.open-editor.description": "Click anywhere to create a new inventory button or to edit one. Hold SHIFT to grid align.", "firmament.config.inventory-buttons.open-editor.description": "Click anywhere to create a new inventory button or to edit one. Hold SHIFT to grid align.",