From ed40e076dd50b9440545ca9e187081136b09a347 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sat, 21 Sep 2024 22:03:39 -0400 Subject: Update quick nav empty command message --- .../java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java | 4 +++- .../java/de/hysky/skyblocker/utils/scheduler/MessageScheduler.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java/de') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java index 75e486a1..3f38bf74 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -5,6 +5,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.serialization.JsonOps; import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor; +import de.hysky.skyblocker.utils.Constants; import de.hysky.skyblocker.utils.scheduler.MessageScheduler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -18,6 +19,7 @@ import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.text.TextCodecs; +import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import java.time.Duration; @@ -99,7 +101,7 @@ public class QuickNavButton extends ClickableWidget { this.temporaryToggled = true; this.toggleTime = System.currentTimeMillis(); if (command == null || command.isEmpty()) { - MinecraftClient.getInstance().player.sendMessage(Text.literal("Quick Nav button index " + index + " has no command"), false); + MinecraftClient.getInstance().player.sendMessage(Constants.PREFIX.get().append(Text.literal("Quick Nav button index " + (index + 1) + " has no command!").formatted(Formatting.RED)), false); } else { MessageScheduler.INSTANCE.sendMessageAfterCooldown(command); } diff --git a/src/main/java/de/hysky/skyblocker/utils/scheduler/MessageScheduler.java b/src/main/java/de/hysky/skyblocker/utils/scheduler/MessageScheduler.java index 04596960..a1fe7f5a 100644 --- a/src/main/java/de/hysky/skyblocker/utils/scheduler/MessageScheduler.java +++ b/src/main/java/de/hysky/skyblocker/utils/scheduler/MessageScheduler.java @@ -46,10 +46,11 @@ public class MessageScheduler extends Scheduler { return; } message = StringHelper.truncateChat(StringUtils.normalizeSpace(message.trim())); + + if (!hide) client.inGameHud.getChatHud().addToMessageHistory(message); if (message.startsWith("/")) { client.player.networkHandler.sendCommand(message.substring(1)); } else { - if (!hide) client.inGameHud.getChatHud().addToMessageHistory(message); client.player.networkHandler.sendChatMessage(message); } } -- cgit