From b3f5e4f63306ff7d4229a8c7daad9b36ced81e80 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+chomens@users.noreply.github.com>
Date: Tue, 4 Mar 2025 20:26:46 +0700
Subject: [PATCH] fix: more fixes to song stuff

---
 .../chipmunkmod/mixin/SoundSystemMixin.java         |  1 +
 .../chipmunk/chipmunkmod/modules/SongPlayer.java    | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/SoundSystemMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/SoundSystemMixin.java
index 79672f8..6d1d208 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/mixin/SoundSystemMixin.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/SoundSystemMixin.java
@@ -12,5 +12,6 @@ public class SoundSystemMixin {
     @Inject(method = "getAdjustedPitch", at = @At("HEAD"), cancellable = true)
     private void getAdjustedPitch (SoundInstance sound, CallbackInfoReturnable<Float> cir) {
         cir.setReturnValue(sound.getPitch());
+        cir.cancel();
     }
 }
diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java b/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java
index 6e5fbea..cae9dc6 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/SongPlayer.java
@@ -64,11 +64,12 @@ public class SongPlayer {
         }
 
         try {
-            loaderThread = new SongLoaderThread(location);
-            player.sendMessage(Component.translatable("Loading %s", Component.text(location.getFileName().toString(), NamedTextColor.DARK_GREEN)).color(NamedTextColor.GREEN));
-            loaderThread.start();
+            final SongLoaderThread _loaderThread = new SongLoaderThread(location);
+            player.sendMessage(Component.translatable("Loading %s", Component.text(location.toString(), NamedTextColor.DARK_GREEN)).color(NamedTextColor.GREEN));
+            _loaderThread.start();
+            loaderThread = _loaderThread;
         } catch (SongLoaderException e) {
-            player.sendMessage(Component.translatable("Failed to load song: %s", e.message.getString()).color(NamedTextColor.RED));
+            player.sendMessage(Component.translatable("Failed to load song: %s", Component.text(e.message.getString())).color(NamedTextColor.RED));
             loaderThread = null;
         }
     }
@@ -89,7 +90,7 @@ public class SongPlayer {
             _loaderThread.start();
             loaderThread = _loaderThread;
         } catch (SongLoaderException e) {
-            player.sendMessage(Component.translatable("Failed to load song: %s", e.message.getString()).color(NamedTextColor.RED));
+            player.sendMessage(Component.translatable("Failed to load song: %s", Component.text(e.message.getString())).color(NamedTextColor.RED));
             loaderThread = null;
         }
     }
@@ -109,7 +110,7 @@ public class SongPlayer {
 
                 if (loaderThread != null && !loaderThread.isAlive() && client.player != null) {
                     if (loaderThread.exception != null) {
-                        client.player.sendMessage(Component.translatable("Failed to load song: %s", loaderThread.exception.message.getString()).color(NamedTextColor.RED));
+                        client.player.sendMessage(Component.translatable("Failed to load song: %s", Component.text(loaderThread.exception.message.getString())).color(NamedTextColor.RED));
                     } else {
                         songQueue.add(loaderThread.song);
                         client.player.sendMessage(Component.translatable("Added %s to the song queue", Component.empty().append(loaderThread.song.name).color(NamedTextColor.DARK_GREEN)).color(NamedTextColor.GREEN));