Added new lead_friend and lead_enemy particles and sounds, to make it clear when…

Added new lead_friend and lead_enemy particles and sounds, to make it clear when a "lead" behavior begins

CHANGELOG.md

@@ -9,7 +9,7 @@ All notable changes to **CreatureChat** are documented in this file. The format
 ### Added
 - New friendship particles (hearts + fire) to indicate when friendship changes
 - Added sound effects for max friendship and max enemy
-- New follow, flee, attack, and protect particles & sound effects
+- New follow, flee, attack, lead, and protect particles & sound effects (for easy confirmation of behaviors)
 - New animated lead particle (arrows pointing where they are going)
 - New animated attack particles (with random # of particles)
 - New sounds and particles when max friendship with EnderDragon (plus XP drop)

src/client/java/com/owlmaddie/ClientInit.java

@@ -31,9 +31,11 @@ public class ClientInit implements ClientModInitializer {
         ParticleFactoryRegistry.getInstance().register(FIRE_BIG_PARTICLE, CreatureParticleFactory::new);
         ParticleFactoryRegistry.getInstance().register(ATTACK_PARTICLE, CreatureParticleFactory::new);
         ParticleFactoryRegistry.getInstance().register(FLEE_PARTICLE, CreatureParticleFactory::new);
-        ParticleFactoryRegistry.getInstance().register(FOLLOW_ENEMY_PARTICLE, CreatureParticleFactory::new);
         ParticleFactoryRegistry.getInstance().register(FOLLOW_FRIEND_PARTICLE, CreatureParticleFactory::new);
+        ParticleFactoryRegistry.getInstance().register(FOLLOW_ENEMY_PARTICLE, CreatureParticleFactory::new);
         ParticleFactoryRegistry.getInstance().register(PROTECT_PARTICLE, CreatureParticleFactory::new);
+        ParticleFactoryRegistry.getInstance().register(LEAD_FRIEND_PARTICLE, CreatureParticleFactory::new);
+        ParticleFactoryRegistry.getInstance().register(LEAD_ENEMY_PARTICLE, CreatureParticleFactory::new);
         ParticleFactoryRegistry.getInstance().register(LEAD_PARTICLE, LeadParticleFactory::new);
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {

src/main/java/com/owlmaddie/chat/EntityChatData.java

@@ -415,7 +415,11 @@ public class EntityChatData {
                         EntityBehaviorManager.removeGoal(entity, FleePlayerGoal.class);
                         EntityBehaviorManager.removeGoal(entity, AttackPlayerGoal.class);
                         EntityBehaviorManager.addGoal(entity, leadGoal, GoalPriority.LEAD_PLAYER);
-
+                        if (playerData.friendship >= 0) {
+                            ParticleEmitter.emitCreatureParticle((ServerWorld) entity.getWorld(), entity, LEAD_FRIEND_PARTICLE, 0.5, 1);
+                        } else {
+                            ParticleEmitter.emitCreatureParticle((ServerWorld) entity.getWorld(), entity, LEAD_ENEMY_PARTICLE, 0.5, 1);
+                        }
                     } else if (behavior.getName().equals("UNLEAD")) {
                         EntityBehaviorManager.removeGoal(entity, LeadPlayerGoal.class);
 

src/main/java/com/owlmaddie/network/ServerPackets.java

@@ -70,6 +70,8 @@ public class ServerPackets {
     public static final DefaultParticleType FOLLOW_FRIEND_PARTICLE = FabricParticleTypes.simple();
     public static final DefaultParticleType FOLLOW_ENEMY_PARTICLE = FabricParticleTypes.simple();
     public static final DefaultParticleType PROTECT_PARTICLE = FabricParticleTypes.simple();
+    public static final DefaultParticleType LEAD_FRIEND_PARTICLE = FabricParticleTypes.simple();
+    public static final DefaultParticleType LEAD_ENEMY_PARTICLE = FabricParticleTypes.simple();
     public static final ParticleType<LeadParticleEffect> LEAD_PARTICLE = FabricParticleTypes.complex(LeadParticleEffect.DESERIALIZER);
 
     public static void register() {
@@ -83,6 +85,8 @@ public class ServerPackets {
         Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "follow_enemy"), FOLLOW_ENEMY_PARTICLE);
         Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "follow_friend"), FOLLOW_FRIEND_PARTICLE);
         Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "protect"), PROTECT_PARTICLE);
+        Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "lead_enemy"), LEAD_ENEMY_PARTICLE);
+        Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "lead_friend"), LEAD_FRIEND_PARTICLE);
         Registry.register(Registries.PARTICLE_TYPE, new Identifier("creaturechat", "lead"), LEAD_PARTICLE);
 
         // Handle packet for Greeting

src/main/java/com/owlmaddie/particle/ParticleEmitter.java

@@ -35,7 +35,8 @@ public class ParticleEmitter {
             world.playSound(entity, entity.getBlockPos(), SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.4F, 1.0F);
         } else if (particleType.equals(FIRE_BIG_PARTICLE) && count > 1) {
             world.playSound(entity, entity.getBlockPos(), SoundEvents.ITEM_AXE_STRIP, SoundCategory.PLAYERS, 0.8F, 1.0F);
-        } else if (particleType.equals(FOLLOW_FRIEND_PARTICLE) || particleType.equals(FOLLOW_ENEMY_PARTICLE)) {
+        } else if (particleType.equals(FOLLOW_FRIEND_PARTICLE) || particleType.equals(FOLLOW_ENEMY_PARTICLE) ||
+                particleType.equals(LEAD_FRIEND_PARTICLE) || particleType.equals(LEAD_ENEMY_PARTICLE)) {
             world.playSound(entity, entity.getBlockPos(), SoundEvents.BLOCK_AMETHYST_BLOCK_PLACE, SoundCategory.PLAYERS, 0.8F, 1.0F);
         } else if (particleType.equals(PROTECT_PARTICLE)) {
             world.playSound(entity, entity.getBlockPos(), SoundEvents.BLOCK_BEACON_POWER_SELECT, SoundCategory.PLAYERS, 0.8F, 1.0F);

src/main/resources/assets/creaturechat/particles/lead_enemy.json

+{
+  "textures": [
+    "creaturechat:lead_enemy"
+  ]
+}
\ No newline at end of file

src/main/resources/assets/creaturechat/particles/lead_friend.json

+{
+  "textures": [
+    "creaturechat:lead_friend"
+  ]
+}
\ No newline at end of file