diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt index 43c878b1e5..4b5fc30548 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt @@ -122,16 +122,25 @@ fun drawText( y: Number, centered: Boolean = false, colour: Int, - shadow: Boolean = true + shadow: Boolean = true, + pMouseX: Int? = null, + pMouseY: Int? = null ) { val comp = if (font == null) text else text.setStyle(text.style.withFont(font)) val textRenderer = MinecraftClient.getInstance().textRenderer var x = x + val width = textRenderer.getWidth(comp) if (centered) { - val width = textRenderer.getWidth(comp) x = x.toDouble() - width / 2 } context.drawText(textRenderer, comp, x.toInt(), y.toInt(), colour, shadow) + + // Check is text is hovered + if (pMouseY != null && pMouseX != null) { + if (pMouseX >= x.toInt() && pMouseX <= x.toInt() + width && pMouseY >= y.toInt() && pMouseY <= y.toInt() + textRenderer.fontHeight) { + context.drawHoverEvent(textRenderer, text.style, pMouseX, pMouseY) + } + } } fun drawText( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt index 30ecb946a3..eb0f6220f5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt @@ -177,7 +177,9 @@ fun drawScaledText( maxCharacterWidth: Int = Int.MAX_VALUE, colour: Int = 0x00FFFFFF + ((opacity.toFloat() * 255).toInt() shl 24), centered: Boolean = false, - shadow: Boolean = false + shadow: Boolean = false, + pMouseX: Int? = null, + pMouseY: Int? = null ) { if (opacity.toFloat() < 0.05F) { return @@ -197,7 +199,9 @@ fun drawScaledText( y = y.toFloat() / (scale * extraScale) + (1 - extraScale) * fontHeight * scale, centered = centered, colour = colour, - shadow = shadow + shadow = shadow, + pMouseX = pMouseX, + pMouseY = pMouseY ) matrices.pop() }