From 40469b22c22bec1af3517ec59d70575c91419c60 Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Sun, 1 Jun 2025 08:49:16 +0200 Subject: fix jacobs event toast being too small in certain languages (#1292) --- .../de/hysky/skyblocker/skyblock/events/EventToast.java | 4 ++-- .../skyblocker/skyblock/events/JacobEventToast.java | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/EventToast.java b/src/main/java/de/hysky/skyblocker/skyblock/events/EventToast.java index 5d986de0..851f609b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/EventToast.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/EventToast.java @@ -26,8 +26,8 @@ public class EventToast implements Toast { protected final List message; protected final List messageNow; - protected final int messageWidth; - protected final int messageNowWidth; + protected int messageWidth; + protected int messageNowWidth; protected final ItemStack icon; protected boolean started; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java index 67e761a5..b30d6238 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java @@ -2,12 +2,14 @@ package de.hysky.skyblocker.skyblock.events; import de.hysky.skyblocker.skyblock.tabhud.widget.JacobsContestWidget; import de.hysky.skyblocker.utils.render.RenderHelper; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.text.Text; import net.minecraft.util.Colors; import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; @@ -17,10 +19,18 @@ public class JacobEventToast extends EventToast { private final String[] crops; private static final ItemStack DEFAULT_ITEM = new ItemStack(Items.IRON_HOE); + private static final Text CROPS = Text.translatable("skyblocker.events.crops"); + private final int cropsWidth; - public JacobEventToast(long eventStartTime, String name, String[] crops) { + public JacobEventToast(long eventStartTime, String name, String[] crops) { super(eventStartTime, name, new ItemStack(Items.IRON_HOE)); this.crops = crops; + TextRenderer renderer = MinecraftClient.getInstance().textRenderer; + cropsWidth = renderer.getWidth(CROPS); + + int i = cropsWidth + 4 + crops.length * 24; + messageWidth = Math.max(messageWidth, i); + messageNowWidth = Math.max(messageNowWidth, i); } @Override @@ -36,9 +46,8 @@ public class JacobEventToast extends EventToast { int k = (~MathHelper.floor(Math.clamp((startTime - 3_000) / 200.0f, 0.0f, 1.0f) * 255.0f)) << 24 | 0x4000000; - String s = "Crops:"; - int x = 30 + textRenderer.getWidth(s) + 4; - context.drawText(textRenderer, s, 30, 7 + (16 - textRenderer.fontHeight) / 2, Colors.WHITE, false); + int x = 30 + cropsWidth + 4; + context.drawText(textRenderer, CROPS, 30, 7 + (16 - textRenderer.fontHeight) / 2, Colors.WHITE, false); for (int i = 0; i < crops.length; i++) { context.drawItem(JacobsContestWidget.FARM_DATA.getOrDefault(crops[i], DEFAULT_ITEM), x + i * (16 + 8), 7); } -- cgit