fix: neoforge port

Author: ishland

src/main/java/com/ishland/fabric/rsls/mixin/MixinMusicTracker.java

@@ -31,7 +31,7 @@ public class MixinMusicTracker {
     @Unique
     private CompletableFuture<Void> rsls$playFuture;
 
-    @WrapMethod(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"})
+    @WrapMethod(method = {"startPlaying(Lnet/minecraft/client/sounds/MusicInfo;)V", "play"})
     private void wrapPlay(@Coerce Object instance, Operation<Void> original) {
         CompletableFuture<Void> rsls$playFuture1 = this.rsls$playFuture;
         if (rsls$playFuture1 != null && !rsls$playFuture1.isDone()) {
@@ -43,7 +43,7 @@ private void wrapPlay(@Coerce Object instance, Operation<Void> original) {
         this.rsls$playFuture = CompletableFuture.runAsync(() -> original.call(instance), taskQueue).orTimeout(15, TimeUnit.SECONDS);
     }
 
-    @WrapOperation(method = {"method_4858(Lnet/minecraft/class_10383;)V", "play"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
+    @WrapOperation(method = {"startPlaying(Lnet/minecraft/client/sounds/MusicInfo;)V", "play"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;onMusicTrackStart()V"))
     private void wrapPlayListener(ToastManager instance, Operation<Void> original) {
         this.client.execute(() -> original.call(instance));
     }

src/main/java/com/ishland/fabric/rsls/mixin/MixinSoundManager.java

@@ -3,6 +3,9 @@
 import com.ishland.fabric.rsls.common.SoundManagerDuck;
 import com.ishland.fabric.rsls.mixin.access.ISoundExecutor;
 import com.ishland.fabric.rsls.mixin.access.ISoundSystem;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.sound.SoundExecutor;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.client.sound.SoundInstanceListener;
@@ -11,14 +14,14 @@
 import net.minecraft.client.sound.TickableSoundInstance;
 import net.minecraft.client.sound.WeightedSoundSet;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -31,7 +34,7 @@ public abstract class MixinSoundManager implements SoundManagerDuck {
     @Shadow @Final private SoundSystem soundSystem;
 
     @Mutable
-    @Shadow @Final private Map<Identifier, WeightedSoundSet> sounds;
+    @Shadow @Final private Map<?, WeightedSoundSet> sounds;
 
     @Shadow public abstract void playNextTick(TickableSoundInstance sound);
 
@@ -47,8 +50,6 @@ public abstract class MixinSoundManager implements SoundManagerDuck {
 
     @Shadow public abstract void unregisterListener(SoundInstanceListener listener);
 
-    @Shadow public abstract void stopSounds(@Nullable Identifier id, @Nullable SoundCategory soundCategory);
-
     @Shadow public abstract void reloadSounds();
 
     @Inject(method = "<init>", at = @At("RETURN"), remap = false)
@@ -118,11 +119,12 @@ private void onUnregisterListener(SoundInstanceListener listener, CallbackInfo c
         }
     }
 
-    @Inject(method = "stopSounds", at = @At("HEAD"), cancellable = true)
-    private void onStopSounds(Identifier id, SoundCategory soundCategory, CallbackInfo ci) {
+    @WrapMethod(method = {"stop(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/sounds/SoundSource;)V", "stopSounds"})
+    private void onStopSounds(@Coerce Object id, SoundCategory soundCategory, Operation<Void> original) {
         if (rsls$shouldRunOffthread()) {
-            ci.cancel();
-            ((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> this.stopSounds(id, soundCategory));
+            ((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> original.call(id, soundCategory));
+        } else {
+            original.call(id, soundCategory);
         }
     }
 

src/main/java/com/ishland/fabric/rsls/mixin/versions/sndmgr/patch_0/MixinSoundManager1_21_6.java

@@ -10,7 +10,6 @@
 import net.minecraft.client.sound.SoundSystem;
 import net.minecraft.client.sound.WeightedSoundSet;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,7 +24,7 @@
 @Mixin(SoundManager.class)
 public abstract class MixinSoundManager1_21_6 {
 
-    private static final Set<Identifier> rsls$unknownSounds = Sets.newConcurrentHashSet();
+//    private static final Set<Identifier> rsls$unknownSounds = Sets.newConcurrentHashSet();
 
     @Shadow @Final
     private SoundSystem soundSystem;
@@ -49,14 +48,15 @@ private void onPlay(SoundInstance sound, CallbackInfoReturnable<SoundSystem.Play
             }
 
             WeightedSoundSet soundSet = sound.getSoundSet((SoundManager) (Object) this);
-            Identifier identifier = sound.getId();
-            if (soundSet == null) {
-                if (rsls$unknownSounds.add(identifier)) {
-                    LOGGER.warn("Unable to play unknown soundEvent:  {}", identifier);
-                }
-                cir.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);
-                return;
-            }
+            // Identifier is renamed in 1.21.11, so skip checks, but keep side effect
+//            Identifier identifier = sound.getId();
+//            if (soundSet == null) {
+//                if (rsls$unknownSounds.add(identifier)) {
+//                    LOGGER.warn("Unable to play unknown soundEvent:  {}", identifier);
+//                }
+//                cir.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);
+//                return;
+//            }
 
             Sound sound2 = sound.getSound();
             if (sound2 == SoundManager.INTENTIONALLY_EMPTY_SOUND || sound2 == SoundManager.MISSING_SOUND) {

src/main/java/com/ishland/fabric/rsls/mixin/versions/sndmgr/patch_1/MixinSoundManager1_21_9.java

@@ -23,7 +23,7 @@ public abstract class MixinSoundManager1_21_9 {
     private SoundSystem soundSystem;
 
     @Dynamic
-    @WrapMethod(method = {"method_4865(Lnet/minecraft/class_3419;)V", "refreshSoundVolumes"})
+    @WrapMethod(method = {"updateSourceVolume(Lnet/minecraft/sounds/SoundSource;)V", "refreshSoundVolumes"})
     private void onUpdateSoundVolume(SoundCategory category, Operation<Void> original) {
         if (((SoundManagerDuck) this).rsls$shouldRunOffthread()) {
             ((ISoundSystem) this.soundSystem).getTaskQueue().execute(() -> original.call(category));