From d579f8bff828333b37a69a8f7f88b1e911e2d3ae Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+chomens@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:29:17 +0700 Subject: [PATCH] fix: more SongPlayer fixes --- .../land/chipmunk/chipmunkmod/modules/SongPlayer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java b/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java index 5b81ec5..946d932 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java @@ -14,6 +14,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; import java.io.File; @@ -50,6 +51,7 @@ public class SongPlayer { } // TODO: Less duplicate code + // TODO: Reduce the mess public void loadSong (final Path location) { final ClientPlayerEntity player = client.player; @@ -108,10 +110,12 @@ public class SongPlayer { if (loaderThread != null && !loaderThread.isAlive() && client.player != null) { if (loaderThread.exception != null) { - client.execute(() -> client.player.sendMessage(Component.translatable("Failed to load song: %s", Component.text(loaderThread.exception.message.getString())).color(NamedTextColor.RED))); + final Text exceptionMessage = loaderThread.exception.message; + client.execute(() -> client.player.sendMessage(Component.translatable("Failed to load song: %s", Component.text(exceptionMessage.getString())).color(NamedTextColor.RED))); } else { songQueue.add(loaderThread.song); - client.execute(() -> client.player.sendMessage(Component.translatable("Added %s to the song queue", Component.empty().append(loaderThread.song.name).color(NamedTextColor.DARK_GREEN)).color(NamedTextColor.GREEN))); + final Component name = loaderThread.song.name; + client.execute(() -> client.player.sendMessage(Component.translatable("Added %s to the song queue", Component.empty().append(name).color(NamedTextColor.DARK_GREEN)).color(NamedTextColor.GREEN))); } loaderThread = null; }