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

feat: Hover Text to Inventory Buttons

Browse Source
This commit is contained in:
jani270
2025-06-04 15:48:31 +02:00
committed by Linnea Gräf
parent 3695589a47
commit 6b697b8936
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@ 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 net.minecraft.client.MinecraftClient
import net.minecraft.text.Text
import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.annotations.Subscribe
import moe.nea.firmament.events.HandledScreenClickEvent import moe.nea.firmament.events.HandledScreenClickEvent
import moe.nea.firmament.events.HandledScreenForegroundEvent import moe.nea.firmament.events.HandledScreenForegroundEvent
@@ -15,6 +17,7 @@ import moe.nea.firmament.util.MC
import moe.nea.firmament.util.ScreenUtil import moe.nea.firmament.util.ScreenUtil
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
object InventoryButtons : FirmamentFeature { object InventoryButtons : FirmamentFeature {
override val identifier: String override val identifier: String
@@ -24,6 +27,7 @@ object InventoryButtons : FirmamentFeature {
val _openEditor by button("open-editor") { val _openEditor by button("open-editor") {
openEditor() openEditor()
} }
val hoverText by toggle("hover-text") { true }
} }
object DConfig : DataHolder<Data>(serializer(), identifier, ::Data) object DConfig : DataHolder<Data>(serializer(), identifier, ::Data)
@@ -63,12 +67,24 @@ object InventoryButtons : FirmamentFeature {
@Subscribe @Subscribe
fun onRenderForeground(it: HandledScreenForegroundEvent) { fun onRenderForeground(it: HandledScreenForegroundEvent) {
val bounds = it.screen.getRectangle() val bounds = it.screen.getRectangle()
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()
it.context.matrices.translate(buttonBounds.minX.toFloat(), buttonBounds.minY.toFloat(), 0F) it.context.matrices.translate(buttonBounds.minX.toFloat(), buttonBounds.minY.toFloat(), 0F)
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) {
it.context.drawText(
MinecraftClient.getInstance().textRenderer,
Text.literal(button.command).gold(),
buttonBounds.minX - 15,
buttonBounds.minY + 20,
0xFFFF00,
false
)
}
} }
lastRectangle = bounds lastRectangle = bounds
} }

2
translations/en_us.json
View File

@@ -129,6 +129,8 @@
"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.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.",
"firmament.config.item-hotkeys": "Item Hotkeys", "firmament.config.item-hotkeys": "Item Hotkeys",