Use URL of audio source as cache key

Adventurecraft-Awakening · Mar 11, 2024 · 1b0d817 · 1b0d817
1 parent 7f5596c
commit 1b0d817
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/dev/adventurecraft/awakening/mixin/client/sound/MixinSoundHelper.java b/src/main/java/dev/adventurecraft/awakening/mixin/client/sound/MixinSoundHelper.java
@@ -15,7 +15,9 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 import paulscode.sound.SoundSystem;
 
 import java.net.URL;
@@ -121,4 +123,14 @@ public void addStreaming(String id, URL url) {
     public void addMusic(String id, URL url) {
         ((ExSoundMap) this.music).addSound(id, url);
     }
+
+    @ModifyArgs(
+        method = "playSound*",
+        at = @At(
+            value = "INVOKE",
+            target = "Lpaulscode/sound/SoundSystem;newSource(ZLjava/lang/String;Ljava/net/URL;Ljava/lang/String;ZFFFIF)V"))
+    private void useUrlForSourceName(Args args) {
+        URL url = args.get(2);
+        args.set(3, url.toString());
+    }
 }
diff --git a/src/main/java/dev/adventurecraft/awakening/mixin/world/MixinWorld.java b/src/main/java/dev/adventurecraft/awakening/mixin/world/MixinWorld.java
@@ -1476,6 +1476,8 @@ public void loadMapSounds() {
     }
 
     public void loadSoundOverrides() {
+        // TODO: unload sounds?
+
         Minecraft.instance.resourceDownloadThread.method_107();
         File var1 = new File(this.levelDir, "soundOverrides");
         if (var1.exists()) {