Add second handler for toast sound, close #51

Author: NotRyken

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.15
+
+- Fixed 'Silent Toast' option not working on 1.21.5
+
 ## 1.5.14
 
 - Fixed partial paths in sprites.json being overwritten by defaults

common/src/main/resources/META-INF/accesstransformer.cfg

@@ -1 +1,2 @@
 # https://docs.neoforged.net/docs/advanced/accesstransformers
+public net.minecraft.client.gui.components.toasts.ToastManager$ToastInstance

common/src/main/resources/now-playing.accesswidener

@@ -1,2 +1,3 @@
 accessWidener v2 named
 # https://fabricmc.net/wiki/tutorial:accesswideners
+accessible class net/minecraft/client/gui/components/toasts/ToastManager$ToastInstance

fabric/src/main/java/com/github/scotsguy/nowplaying/mixin/MixinToastInstance.java

@@ -36,6 +36,19 @@
 
 @Mixin(ToastManager.class)
 public class MixinToastInstance {
+    @WrapOperation(
+            method = "method_61991",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/gui/components/toasts/Toast$Visibility;playSound(Lnet/minecraft/client/sounds/SoundManager;)V"
+            )
+    )
+    void silenceWooshSound(Toast.Visibility instance, SoundManager handler, Operation<Void> original, @Local(argsOnly = true) ToastManager.ToastInstance<?> toastInstance) {
+        if (!(toastInstance.getToast() instanceof NowPlayingToast && Config.options().silenceWoosh)) {
+            original.call(instance, handler);
+        }
+    }
+    
     @WrapOperation(
             method = "method_61992",
             at = @At(

gradle.properties

@@ -3,7 +3,7 @@
 # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 
 # Project
-mod_version=1.5.14
+mod_version=1.5.15
 mod_group=com.github.scotsguy
 mod_id=now-playing
 mod_name=Now Playing

neoforge/src/main/java/com/github/scotsguy/nowplaying/mixin/MixinToastInstance.java

@@ -36,6 +36,19 @@
 
 @Mixin(ToastManager.class)
 public class MixinToastInstance {
+    @WrapOperation(
+            method = "lambda$update$0",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/gui/components/toasts/Toast$Visibility;playSound(Lnet/minecraft/client/sounds/SoundManager;)V"
+            )
+    )
+    void silenceWooshSound(Toast.Visibility instance, SoundManager handler, Operation<Void> original, @Local(argsOnly = true) ToastManager.ToastInstance<?> toastInstance) {
+        if (!(toastInstance.getToast() instanceof NowPlayingToast && Config.options().silenceWoosh)) {
+            original.call(instance, handler);
+        }
+    }
+
     @WrapOperation(
             method = "lambda$update$1",
             at = @At(