From 5dd4c58fea97d5df8f18c099701b7034ae8939f5 Mon Sep 17 00:00:00 2001 From: inglettronald Date: Wed, 21 Jun 2023 22:10:31 -0500 Subject: more work on Chat parsing and Sound handling --- src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/com/dulkirfabric') diff --git a/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java b/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java index 867f91b..ce84582 100644 --- a/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java +++ b/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java @@ -1,20 +1,19 @@ package com.dulkirfabric.mixin; import com.dulkirfabric.events.PlaySoundEvent; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.sound.SoundInstance; import net.minecraft.client.sound.SoundSystem; import org.spongepowered.asm.mixin.Mixin; 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.CallbackInfoReturnable; @Mixin(SoundSystem.class) public class SoundSystemMixin { - @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", - at = @At("HEAD"), cancellable = true) - public void onSound(SoundInstance sound, CallbackInfo ci) { - if (new PlaySoundEvent(sound).post()) - ci.cancel(); + @ModifyExpressionValue(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/sound/SoundInstance;canPlay()Z")) + public boolean onSound(boolean original, SoundInstance sound) { + return !(new PlaySoundEvent(sound).post()); } } -- cgit