Fixed capuchin trying to hit you on creative mode, and slowed them down on throwing stuff. Aswell that added a little cooldown on Yacare attack

Author: Zanckor

src/main/java/cybercat5555/faunus/Faunus.java

@@ -30,7 +30,8 @@ public void onInitialize() {
     }
 
     public void eventHandler() {
-        EventManager.onAttack();
+        EventManager.onAttackBlock();
+        EventManager.onAttackEntity();
     }
 
     public void configHandler() {

src/main/java/cybercat5555/faunus/common/EventManager.java

@@ -2,6 +2,7 @@
 
 import cybercat5555.faunus.core.entity.livingEntity.YacareManEaterEntity;
 import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
+import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -11,7 +12,7 @@
 
 public class EventManager {
 
-    public static void onAttack() {
+    public static void onAttackBlock() {
         AttackBlockCallback.EVENT.register((PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) -> {
             if (player.getVehicle() != null && player.getVehicle() instanceof YacareManEaterEntity && player.isAlive()) {
                 player.attack(player.getVehicle());
@@ -20,4 +21,14 @@ public static void onAttack() {
             return ActionResult.PASS;
         });
     }
+
+    public static void onAttackEntity() {
+        AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> {
+            if (player.getVehicle() != null && player.getVehicle() instanceof YacareManEaterEntity && player.isAlive()) {
+                player.attack(player.getVehicle());
+            }
+
+            return ActionResult.PASS;
+        });
+    }
 }

src/main/java/cybercat5555/faunus/core/entity/ai/goals/MeleeHungryGoal.java

@@ -25,10 +25,12 @@ public void tick() {
 
     @Override
     protected void attack(LivingEntity target, double squaredDistance) {
-        super.attack(target, squaredDistance);
+        if (isCooledDown()) {
+            super.attack(target, squaredDistance);
 
-        if (!target.isAlive()) {
-            increaseHunger(-(MAX_HUNGER / 10));
+            if (!target.isAlive()) {
+                increaseHunger(-(MAX_HUNGER / 3));
+            }
         }
     }
 
@@ -42,9 +44,15 @@ public boolean canStart() {
             return false;
         }
 
+
         return super.canStart();
     }
 
+    @Override
+    public void stop() {
+        super.stop();
+    }
+
     @Override
     public boolean shouldContinue() {
         return doesHaveHunger() && super.shouldContinue();

src/main/java/cybercat5555/faunus/core/entity/livingEntity/CapuchinEntity.java

@@ -80,7 +80,7 @@ protected void initGoals() {
         this.goalSelector.add(0, new AnimalMateGoal(this, 1.0D));
         this.goalSelector.add(1, new RunAwayCapuchinGoal(this, 1.5));
         this.goalSelector.add(2, new LookAtEntityGoal(this, PlayerEntity.class, 8.0f));
-        this.goalSelector.add(2, new MeleeCapuchinGoal(this, 1.5, false));
+        this.goalSelector.add(2, new AttackCapuchinGoal(this, 1.5, false));
         this.goalSelector.add(3, new HangTreeGoal(this, 1.0));
         this.goalSelector.add(4, new FollowOwnerGoal(this, 1.0, 5.0f, 1.0f, true));
 
@@ -138,16 +138,17 @@ protected <E extends CapuchinEntity> PlayState movementAnimController(final Anim
 
     protected <E extends CapuchinEntity> PlayState attackAnimController(final AnimationState<E> event) {
         boolean isAlreadyPlayingAttackAnim = event.getController().getCurrentRawAnimation() == ATTACK_LEFT_ANIM || event.getController().getCurrentRawAnimation() == ATTACK_RIGHT_ANIM;
+        boolean isAttacking = event.getLimbSwingAmount() > 0.001f;
 
-        if (isAttacking()) {
+        if (isAttacking) {
             if (isAlreadyPlayingAttackAnim) {
                 return PlayState.CONTINUE;
             }
 
             event.setAnimation(Math.random() < 0.5 ? ATTACK_LEFT_ANIM : ATTACK_RIGHT_ANIM);
         }
 
-        return PlayState.CONTINUE;
+        return PlayState.STOP;
     }
 
     @Nullable
@@ -307,18 +308,19 @@ public PassiveEntity createChild(ServerWorld world, PassiveEntity entity) {
         return EntityRegistry.CAPUCHIN.create(world);
     }
 
-    static class MeleeCapuchinGoal extends MeleeAttackGoal {
+    static class AttackCapuchinGoal extends MeleeAttackGoal {
 
-        public MeleeCapuchinGoal(CapuchinEntity mob, double speed, boolean pauseWhenMobIdle) {
+        public AttackCapuchinGoal(CapuchinEntity mob, double speed, boolean pauseWhenMobIdle) {
             super(mob, speed, pauseWhenMobIdle);
         }
 
         @Override
         protected void attack(LivingEntity target, double squaredDistance) {
             if (this.mob.isInAttackRange(target)) {
                 this.mob.tryAttack(target);
-            } else {
+            } else if(isCooledDown()) {
                 throwCocoaBean(target);
+                resetCooldown();
             }
         }
 
@@ -347,6 +349,8 @@ public boolean canStart() {
             if (shouldAttack && this.mob.getTarget() != null) {
                 attack(this.mob.getTarget(), 4);
                 this.mob.setAttacking(true);
+
+                return !(this.mob.getTarget() instanceof PlayerEntity player) || !player.isCreative();
             } else {
                 this.mob.setAttacking(false);
             }
@@ -355,6 +359,12 @@ public boolean canStart() {
             return false;
         }
 
+        @Override
+        public void stop() {
+            this.mob.setAttacking(false);
+            super.stop();
+        }
+
         @Override
         public boolean shouldContinue() {
             if(this.mob.getTarget() instanceof PlayerEntity player && !player.isCreative()) return false;