From 4422d7d648d2968060e3ecdbd34b01b7796ab18f Mon Sep 17 00:00:00 2001 From: isXander Date: Thu, 2 Feb 2023 20:24:39 +0000 Subject: 22w05a button changes --- .../dev/isxander/yacl/gui/TextScaledButtonWidget.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java') diff --git a/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java b/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java index 76ba14f..e52174a 100644 --- a/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java +++ b/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java @@ -23,22 +23,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 x, int y, 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(); } } -- cgit From 19573b50098696028bdb9c7df941ce9ea2628523 Mon Sep 17 00:00:00 2001 From: isXander Date: Wed, 22 Feb 2023 21:43:35 +0000 Subject: 1.19.4-pre1 --- src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java') diff --git a/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java b/src/client/java/dev/isxander/yacl/gui/TextScaledButtonWidget.java index e52174a..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,7 +22,7 @@ public class TextScaledButtonWidget extends Button { } @Override - public void renderString(PoseStack matrices, Font textRenderer, int x, int y, int color) { + public void renderString(PoseStack matrices, Font textRenderer, int color) { Font font = Minecraft.getInstance().font; matrices.pushPose(); -- cgit