Slayer System rework

src/main/java/de/hysky/skyblocker/config/categories/OtherLocationsCategory.java

@@ -140,6 +140,13 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                     TheEnd.eyes = 0;
                                 })
                                 .build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.config.otherLocations.end.muteEndermanSounds"))
+								.binding(defaults.otherLocations.end.muteEndermanSounds,
+										() -> config.otherLocations.end.muteEndermanSounds,
+										newValue -> config.otherLocations.end.muteEndermanSounds = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
                         .build())
 
                 //Spider's Den

src/main/java/de/hysky/skyblocker/config/configs/OtherLocationsConfig.java

@@ -57,6 +57,9 @@ public static class TheEnd {
         @SerialEntry
         public boolean waypoint = true;
 
+		@SerialEntry
+		public boolean muteEndermanSounds = false;
+
         @SerialEntry
         public int x = 10;
 

src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java

@@ -4,98 +4,113 @@
 import net.minecraft.client.resource.language.I18n;
 
 public class SlayersConfig {
-    @SerialEntry
-    public HighlightSlayerEntities highlightMinis = HighlightSlayerEntities.OFF;
+	@SerialEntry
+	public HighlightSlayerEntities highlightMinis = HighlightSlayerEntities.GLOW;
 
-    @SerialEntry
-    public HighlightSlayerEntities highlightBosses = HighlightSlayerEntities.OFF;
+	@SerialEntry
+	public HighlightSlayerEntities highlightBosses = HighlightSlayerEntities.GLOW;
 
 	@SerialEntry
 	public boolean displayBossbar = true;
 
-    public enum HighlightSlayerEntities {
-        OFF, GLOW, HITBOX;
+	public enum HighlightSlayerEntities {
+		OFF, GLOW, HITBOX;
+
+		@Override
+		public String toString() {
+			return I18n.translate("skyblocker.config.slayer.highlightBosses." + name());
+		}
+	}
+
+	@SerialEntry
+	public boolean bossSpawnAlert = true;
+
+	@SerialEntry
+	public boolean miniBossSpawnAlert = true;
+
+	@SerialEntry
+	public boolean slainTime = true;
 
-        @Override
-        public String toString() {
-            return I18n.translate("skyblocker.config.slayer.highlightBosses." + name());
-        }
-    }
+	@SerialEntry
+	public boolean enableHud = true;
 
-    @SerialEntry
-    public EndermanSlayer endermanSlayer = new EndermanSlayer();
+	@SerialEntry
+	public EndermanSlayer endermanSlayer = new EndermanSlayer();
 
-    @SerialEntry
-    public VampireSlayer vampireSlayer = new VampireSlayer();
+	@SerialEntry
+	public VampireSlayer vampireSlayer = new VampireSlayer();
+
+	@SerialEntry
+	public BlazeSlayer blazeSlayer = new BlazeSlayer();
 
-    @SerialEntry
-    public BlazeSlayer blazeSlayer = new BlazeSlayer();
+	public static class EndermanSlayer {
+		@SerialEntry
+		public boolean enableYangGlyphsNotification = true;
 
-    public static class EndermanSlayer {
-        @SerialEntry
-        public boolean enableYangGlyphsNotification = true;
+		@SerialEntry
+		public boolean highlightBeacons = true;
 
-        @SerialEntry
-        public boolean highlightBeacons = true;
+		@SerialEntry
+		public boolean highlightNukekubiHeads = true;
 
-        @SerialEntry
-        public boolean highlightNukekubiHeads = true;
-    }
+		@SerialEntry
+		public boolean lazerTimer = true;
+	}
 
-    public static class VampireSlayer {
-        @SerialEntry
-        public boolean enableEffigyWaypoints = true;
+	public static class VampireSlayer {
+		@SerialEntry
+		public boolean enableEffigyWaypoints = true;
 
-        @SerialEntry
-        public boolean compactEffigyWaypoints;
+		@SerialEntry
+		public boolean compactEffigyWaypoints;
 
-        @SerialEntry
-        public int effigyUpdateFrequency = 5;
+		@SerialEntry
+		public int effigyUpdateFrequency = 5;
 
-        @SerialEntry
-        public boolean enableHolyIceIndicator = true;
+		@SerialEntry
+		public boolean enableHolyIceIndicator = true;
 
-        @SerialEntry
-        public int holyIceIndicatorTickDelay = 10;
+		@SerialEntry
+		public int holyIceIndicatorTickDelay = 10;
 
-        @SerialEntry
-        public int holyIceUpdateFrequency = 5;
+		@SerialEntry
+		public int holyIceUpdateFrequency = 5;
 
-        @SerialEntry
-        public boolean enableHealingMelonIndicator = true;
+		@SerialEntry
+		public boolean enableHealingMelonIndicator = true;
 
-        @SerialEntry
-        public float healingMelonHealthThreshold = 4f;
+		@SerialEntry
+		public float healingMelonHealthThreshold = 4f;
 
-        @SerialEntry
-        public boolean enableSteakStakeIndicator = true;
+		@SerialEntry
+		public boolean enableSteakStakeIndicator = true;
 
-        @SerialEntry
-        public int steakStakeUpdateFrequency = 5;
+		@SerialEntry
+		public int steakStakeUpdateFrequency = 5;
 
-        @SerialEntry
-        public boolean enableManiaIndicator = true;
+		@SerialEntry
+		public boolean enableManiaIndicator = true;
 
-        @SerialEntry
-        public int maniaUpdateFrequency = 5;
-    }
+		@SerialEntry
+		public int maniaUpdateFrequency = 5;
+	}
 
-    public static class BlazeSlayer {
-        @SerialEntry
-        public FirePillar firePillarCountdown = FirePillar.SOUND_AND_VISUAL;
+	public static class BlazeSlayer {
+		@SerialEntry
+		public FirePillar firePillarCountdown = FirePillar.SOUND_AND_VISUAL;
 
-        @SerialEntry
-        public Boolean attunementHighlights = true;
+		@SerialEntry
+		public Boolean attunementHighlights = true;
 
-        public enum FirePillar {
-            OFF,
-            VISUAL,
-            SOUND_AND_VISUAL;
+		public enum FirePillar {
+			OFF,
+			VISUAL,
+			SOUND_AND_VISUAL;
 
-            @Override
-            public String toString() {
-                return I18n.translate("skyblocker.config.slayer.blazeSlayer.enableFirePillarAnnouncer.mode." + name());
-            }
-        }
-    }
+			@Override
+			public String toString() {
+				return I18n.translate("skyblocker.config.slayer.blazeSlayer.enableFirePillarAnnouncer.mode." + name());
+			}
+		}
+	}
 }

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

@@ -9,14 +9,14 @@
 import de.hysky.skyblocker.skyblock.FishingHelper;
 import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder;
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
-import de.hysky.skyblocker.skyblock.crimson.slayer.FirePillarAnnouncer;
 import de.hysky.skyblocker.skyblock.dungeon.DungeonScore;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
-import de.hysky.skyblocker.skyblock.dwarven.WishingCompassSolver;
 import de.hysky.skyblocker.skyblock.dwarven.CrystalsChestHighlighter;
+import de.hysky.skyblocker.skyblock.dwarven.WishingCompassSolver;
 import de.hysky.skyblocker.skyblock.end.EnderNodes;
 import de.hysky.skyblocker.skyblock.end.TheEnd;
-import de.hysky.skyblocker.skyblock.slayers.SlayerEntitiesGlow;
+import de.hysky.skyblocker.skyblock.slayers.SlayerManager;
+import de.hysky.skyblocker.skyblock.slayers.boss.demonlord.FirePillarAnnouncer;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
 import de.hysky.skyblocker.utils.Utils;
@@ -27,6 +27,8 @@
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.network.packet.s2c.play.*;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Final;
@@ -42,22 +44,15 @@ public abstract class ClientPlayNetworkHandlerMixin {
 	@Shadow
 	private ClientWorld world;
 
-    @Shadow
-    @Final
-    private static Logger LOGGER;
+	@Shadow
+	@Final
+	private static Logger LOGGER;
 
 	@Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
 	private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
 		if (!(entity instanceof ArmorStandEntity armorStandEntity)) return;
 
-		if (SkyblockerConfigManager.get().slayers.highlightMinis == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayerMiniMob(armorStandEntity)
-				|| SkyblockerConfigManager.get().slayers.highlightBosses == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayer(armorStandEntity)) {
-			if (armorStandEntity.isDead()) {
-				SlayerEntitiesGlow.cleanupArmorstand(armorStandEntity);
-			} else {
-				SlayerEntitiesGlow.setSlayerMobGlow(armorStandEntity);
-			}
-		}
+		SlayerManager.checkSlayerBoss(armorStandEntity);
 
 		if (SkyblockerConfigManager.get().slayers.blazeSlayer.firePillarCountdown != SlayersConfig.BlazeSlayer.FirePillar.OFF) FirePillarAnnouncer.checkFirePillar(entity);
 
@@ -70,29 +65,28 @@ public abstract class ClientPlayNetworkHandlerMixin {
 	}
 
 	@Inject(method = "method_64896", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V"))
-    private void skyblocker$onItemDestroy(int entityId, CallbackInfo ci) {
-        if (world.getEntityById(entityId) instanceof ItemEntity itemEntity) {
-            DungeonManager.onItemPickup(itemEntity);
-        }
-    }
-
-    @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
-    private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
-        DungeonManager.onItemPickup(itemEntity);
-        return itemEntity;
-    }
-
-    @WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
-    private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
-        return !Utils.isOnHypixel();
-    }
+	private void skyblocker$onItemDestroy(int entityId, CallbackInfo ci) {
+		if (world.getEntityById(entityId) instanceof ItemEntity itemEntity) {
+			DungeonManager.onItemPickup(itemEntity);
+		}
+	}
+
+	@ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
+	private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
+		DungeonManager.onItemPickup(itemEntity);
+		return itemEntity;
+	}
+
+	@WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
+	private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
+		return !Utils.isOnHypixel();
+	}
 
 	@ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
 	private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
 		if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) {
 			DungeonScore.handleEntityDeath(entity);
 			TheEnd.onEntityDeath(entity);
-			SlayerEntitiesGlow.onEntityDeath(entity);
 		}
 		return entity;
 	}
@@ -107,38 +101,50 @@ public abstract class ClientPlayNetworkHandlerMixin {
 		PlayerListMgr.updateFooter(packet.footer());
 	}
 
-    @WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
-        return !Utils.isOnHypixel();
-    }
-
-    @Inject(method = "onPlaySound", at = @At("RETURN"))
-    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
-        FishingHelper.onSound(packet);
-        CrystalsChestHighlighter.onSound(packet);
-    }
-
-    @WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
-        return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
-    }
-
-    @WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
-        return !Utils.isOnHypixel();
-    }
-
-    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
-        return !Utils.isOnHypixel();
-    }
-
-    @Inject(method = "onParticle", at = @At("RETURN"))
-    private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
-        MythologicalRitual.onParticle(packet);
-        DojoManager.onParticle(packet);
-        CrystalsChestHighlighter.onParticle(packet);
-        EnderNodes.onParticle(packet);
-        WishingCompassSolver.onParticle(packet);
-    }
+	@WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
+		return !Utils.isOnHypixel();
+	}
+
+	@Inject(method = "onPlaySound", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/util/thread/ThreadExecutor;)V", shift = At.Shift.AFTER), cancellable = true)
+	private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
+		FishingHelper.onSound(packet);
+		CrystalsChestHighlighter.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))
+	private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
+		return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
+	}
+
+	@WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
+		return !Utils.isOnHypixel();
+	}
+
+	@WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+		return !Utils.isOnHypixel();
+	}
+
+	@Inject(method = "onParticle", at = @At("RETURN"))
+	private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
+		MythologicalRitual.onParticle(packet);
+		DojoManager.onParticle(packet);
+		CrystalsChestHighlighter.onParticle(packet);
+		EnderNodes.onParticle(packet);
+		WishingCompassSolver.onParticle(packet);
+	}
 }