From 41b6711b38efef5686ff3df4d6f9597ddfab7164 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 27 Jul 2023 19:10:21 +0100 Subject: [PATCH] Change button text in render rather than an override This made more sense on 1.19.2 and before, but now that we have to do this for tooltips, we might as well do it for messages as well. Closes #1538, though hopefully will be resolved on the VO side too. --- .../client/gui/widgets/DynamicImageButton.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java b/projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java index 6c7324688..5f67a86ac 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java +++ b/projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java @@ -68,14 +68,11 @@ public void renderWidget(PoseStack stack, int mouseX, int mouseY, float partialT RenderSystem.enableDepthTest(); } - @Override - public Component getMessage() { - return message.get().message; - } - @Override public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) { - setTooltip(message.get().tooltip()); + var message = this.message.get(); + setMessage(message.message()); + setTooltip(message.tooltip()); super.render(stack, mouseX, mouseY, partialTicks); }