fixed EVENT_VOLUME and EVENT_PITCH client values

i might have trauma after dealing with mixins bruh

Author: XTerPL

src/main/java/io/github/techstreet/dfscript/event/RecieveSoundEvent.java

@@ -11,21 +11,24 @@
 public class RecieveSoundEvent implements CancellableEvent {
     private boolean cancelled = false;
 
-    private final SoundInstance sound;
+    private final Identifier soundId;
+    private final float volume, pitch;
 
-    public RecieveSoundEvent(SoundInstance sound) {
-        this.sound = sound;
+    public RecieveSoundEvent(Identifier soundId, float volume, float pitch) {
+        this.soundId = soundId;
+        this.volume = volume;
+        this.pitch = pitch;
     }
 
     public Identifier getSoundId() {
-        return sound.getId();
+        return soundId;
     }
     public float getVolume() {
-        return sound.getVolume();
+        return volume;
     }
 
     public float getPitch() {
-        return sound.getPitch();
+        return pitch;
     }
 
     @Override

src/main/java/io/github/techstreet/dfscript/mixin/sound/MSoundSystem.java

@@ -3,19 +3,34 @@
 import io.github.techstreet.dfscript.event.RecieveSoundEvent;
 import io.github.techstreet.dfscript.event.system.EventManager;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
+import net.minecraft.client.sound.Sound;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.client.sound.SoundSystem;
+import net.minecraft.client.sound.WeightedSoundSet;
 import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(SoundSystem.class)
-public class MSoundSystem {
-    @Inject(method = "play", at = @At("HEAD"), cancellable = true)
-    public void play(SoundInstance sound, CallbackInfo ci) {
-        RecieveSoundEvent event = new RecieveSoundEvent(sound);
+public abstract class MSoundSystem {
+
+    @Shadow
+    public abstract float getAdjustedVolume(SoundInstance sound);
+    @Shadow
+    public abstract float getAdjustedPitch(SoundInstance sound);
+    @Shadow
+    public abstract float getSoundVolume(SoundCategory category);
+    @Inject(method = "play", at = @At(value="INVOKE_ASSIGN", target="Lnet/minecraft/client/sound/SoundSystem;getAdjustedPitch(Lnet/minecraft/client/sound/SoundInstance;)F"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
+    public void play(SoundInstance sound, CallbackInfo ci, WeightedSoundSet weightedSoundSet, Identifier identifier, Sound sound2, float f, float g, SoundCategory soundCategory, float h, float i) {
+        RecieveSoundEvent event = new RecieveSoundEvent(sound.getId(), h, i);
         EventManager.getInstance().dispatch(event);
 
         if (event.isCancelled()) {