Merge branch 'update/1.19.4' into 1.19.x/dev

# Conflicts:
#	build.gradle.kts

1 files changed, 3 insertions, 13 deletions

diff --git a/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java b/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java
index 76ba14f..b955912 100644
--- a/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java
+++ b/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java
@@ -6,7 +6,6 @@ import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.network.chat.Component;
-import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.util.Mth;
 
 public class TextScaledButtonWidget extends Button {
@@ -23,22 +22,13 @@ public class TextScaledButtonWidget extends Button {
     }
 
     @Override
-    public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
-        // prevents super from rendering text
-        Component message = getMessage();
-        setMessage(Component.empty());
-
-        super.renderButton(matrices, mouseX, mouseY, delta);
-
-        setMessage(message);
-        int j = this.active ? 16777215 : 10526880;
-        FormattedCharSequence orderedText = getMessage().getVisualOrderText();
+    public void renderString(PoseStack matrices, Font textRenderer, int color) {
         Font font = Minecraft.getInstance().font;
 
         matrices.pushPose();
-        matrices.translate(((this.getX() + this.width / 2f) - font.width(orderedText) * textScale / 2), (float)this.getY() + (this.height - 8 * textScale) / 2f / textScale, 0);
+        matrices.translate(((this.getX() + this.width / 2f) - font.width(getMessage()) * textScale / 2), (float)this.getY() + (this.height - 8 * textScale) / 2f / textScale, 0);
         matrices.scale(textScale, textScale, 1);
-        font.drawShadow(matrices, orderedText, 0, 0, j | Mth.ceil(this.alpha * 255.0F) << 24);
+        font.drawShadow(matrices, getMessage(), 0, 0, color | Mth.ceil(this.alpha * 255.0F) << 24);
         matrices.popPose();
     }
 }