Fix Mute Enderman Sounds not muted client-generated sounds

Fixes #1531

2 files changed, 12 insertions, 14 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
index 0679920b..8c7f7dca 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
@@ -42,8 +42,6 @@ import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.s2c.play.*;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import org.slf4j.Logger;
@@ -154,18 +152,6 @@ public abstract class ClientPlayNetworkHandlerMixin extends ClientCommonNetworkH
 	private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
 		CrystalsChestHighlighter.onSound(packet);
 		TunerSolver.INSTANCE.onSound(packet);
-		SoundEvent sound = packet.getSound().value();
-
-		// Mute Enderman sounds in the End
-		if (Utils.isInTheEnd() && SkyblockerConfigManager.get().otherLocations.end.muteEndermanSounds) {
-			if (sound.id().equals(SoundEvents.ENTITY_ENDERMAN_AMBIENT.id()) ||
-					sound.id().equals(SoundEvents.ENTITY_ENDERMAN_DEATH.id()) ||
-					sound.id().equals(SoundEvents.ENTITY_ENDERMAN_HURT.id()) ||
-					sound.id().equals(SoundEvents.ENTITY_ENDERMAN_SCREAM.id()) ||
-					sound.id().equals(SoundEvents.ENTITY_ENDERMAN_STARE.id())) {
-				ci.cancel();
-			}
-		}
 	}
 
 	@WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
index a9f210c4..dcb3de88 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
@@ -13,6 +13,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 
@@ -62,5 +63,16 @@ public abstract class ClientWorldMixin implements BlockView {
 		if (SkyblockerConfigManager.get().hunting.huntingMobs.silencePhantoms && soundEvent.id().getPath().startsWith("entity.phantom")) {
 			ci.cancel();
 		}
+
+		// Mute Enderman sounds in the End
+		if (Utils.isInTheEnd() && SkyblockerConfigManager.get().otherLocations.end.muteEndermanSounds) {
+			if (soundEvent.id().equals(SoundEvents.ENTITY_ENDERMAN_AMBIENT.id()) ||
+					soundEvent.id().equals(SoundEvents.ENTITY_ENDERMAN_DEATH.id()) ||
+					soundEvent.id().equals(SoundEvents.ENTITY_ENDERMAN_HURT.id()) ||
+					soundEvent.id().equals(SoundEvents.ENTITY_ENDERMAN_SCREAM.id()) ||
+					soundEvent.id().equals(SoundEvents.ENTITY_ENDERMAN_STARE.id())) {
+				ci.cancel();
+			}
+		}
 	}
 }