Fix SoundBlocker not blocking preexisting tickable sounds

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/mixin/SoundSystemMixin.java

@@ -5,21 +5,34 @@
 
 package meteordevelopment.meteorclient.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.world.PlaySoundEvent;
+import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.systems.modules.misc.SoundBlocker;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.client.sound.SoundSystem;
+import net.minecraft.client.sound.TickableSoundInstance;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(SoundSystem.class)
 public abstract class SoundSystemMixin {
+    @Shadow
+    public abstract void stop(SoundInstance sound);
+
     @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At("HEAD"), cancellable = true)
     private void onPlay(SoundInstance soundInstance, CallbackInfo info) {
         PlaySoundEvent event = MeteorClient.EVENT_BUS.post(PlaySoundEvent.get(soundInstance));
 
         if (event.isCancelled()) info.cancel();
     }
+
+    @Inject(method = "tick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/sound/TickableSoundInstance;tick()V", ordinal = 0))
+    private void onTick(CallbackInfo ci, @Local TickableSoundInstance tickableSoundInstance) {
+        if (Modules.get().get(SoundBlocker.class).shouldBlock(tickableSoundInstance)) stop(tickableSoundInstance);
+    }
 }

src/main/java/meteordevelopment/meteorclient/systems/modules/misc/SoundBlocker.java

@@ -12,6 +12,8 @@
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.orbit.EventHandler;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.registry.Registries;
 import net.minecraft.sound.SoundEvent;
 
 import java.util.List;
@@ -38,4 +40,8 @@ private void onPlaySound(PlaySoundEvent event) {
             }
         }
     }
+
+    public boolean shouldBlock(SoundInstance soundInstance) {
+        return isActive() && sounds.get().contains(Setting.parseId(Registries.SOUND_EVENT, soundInstance.getId().getPath()));
+    }
 }