Partially cleanup entity hunks

Author: kappa-maintainer

patches/minecraft/net/minecraft/entity/ai/EntityAIAttackMelee.java.patch

@@ -9,15 +9,7 @@
 
      public EntityAIAttackMelee(EntityCreature creature, double speedIn, boolean useLongMemory)
      {
-@@ -31,7 +33,6 @@
-         this.setMutexBits(3);
-     }
- 
--    @Override
-     public boolean shouldExecute()
-     {
-         EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
-@@ -46,16 +47,32 @@
+@@ -46,6 +48,19 @@
          }
          else
          {
@@ -35,92 +27,13 @@
 +                }
 +            }
              this.path = this.attacker.getNavigator().getPathToEntityLiving(entitylivingbase);
--            return this.path != null
--                   ? true
--                   : this.getAttackReachSqr(entitylivingbase)
--                   >= this.attacker
--                   .getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
-+
-+            if (this.path != null)
-+            {
-+                return true;
-+            }
-+            else
-+            {
-+                return this.getAttackReachSqr(entitylivingbase) >= this.attacker.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
-+            }
-         }
-     }
- 
--    @Override
-     public boolean shouldContinueExecuting()
-     {
-         EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
-@@ -72,62 +89,70 @@
-         {
-             return !this.attacker.getNavigator().noPath();
-         }
-+        else if (!this.attacker.isWithinHomeDistanceFromPosition(new BlockPos(entitylivingbase)))
-+        {
-+            return false;
-+        }
-         else
-         {
--            return !this.attacker.isWithinHomeDistanceFromPosition(new BlockPos(entitylivingbase))
--                   ? false
--                   : !(entitylivingbase instanceof EntityPlayer)
--                   || !((EntityPlayer)entitylivingbase).isSpectator() && !((EntityPlayer)entitylivingbase).isCreative();
-+            return !(entitylivingbase instanceof EntityPlayer) || !((EntityPlayer)entitylivingbase).isSpectator() && !((EntityPlayer)entitylivingbase).isCreative();
-         }
-     }
- 
--    @Override
-     public void startExecuting()
-     {
-         this.attacker.getNavigator().setPath(this.path, this.speedTowardsTarget);
-         this.delayCounter = 0;
-     }
- 
--    @Override
-     public void resetTask()
-     {
-         EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
- 
-         if (entitylivingbase instanceof EntityPlayer && (((EntityPlayer)entitylivingbase).isSpectator() || ((EntityPlayer)entitylivingbase).isCreative()))
-         {
--            this.attacker.setAttackTarget(null);
-+            this.attacker.setAttackTarget((EntityLivingBase)null);
-         }
- 
-         this.attacker.getNavigator().clearPath();
-     }
- 
--    @Override
-     public void updateTask()
-     {
-         EntityLivingBase entitylivingbase = this.attacker.getAttackTarget();
-         this.attacker.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F);
--        double d0 = this.attacker
--                    .getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
--        this.delayCounter--;
-+        double d0 = this.attacker.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
-+        --this.delayCounter;
- 
--        if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase))
--                && this.delayCounter <= 0
--                && (
--                    this.targetX == 0.0 && this.targetY == 0.0 && this.targetZ == 0.0
--                    || entitylivingbase.getDistanceSq(this.targetX, this.targetY, this.targetZ) >= 1.0
--                    || this.attacker.getRNG().nextFloat() < 0.05F
--                ))
-+        if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase)) && this.delayCounter <= 0 && (this.targetX == 0.0D && this.targetY == 0.0D && this.targetZ == 0.0D || entitylivingbase.getDistanceSq(this.targetX, this.targetY, this.targetZ) >= 1.0D || this.attacker.getRNG().nextFloat() < 0.05F))
-         {
-             this.targetX = entitylivingbase.posX;
+             return this.path != null
+                    ? true
+@@ -122,6 +137,23 @@
              this.targetY = entitylivingbase.getEntityBoundingBox().minY;
              this.targetZ = entitylivingbase.posZ;
              this.delayCounter = 4 + this.attacker.getRNG().nextInt(7);
- 
--            if (d0 > 1024.0)
++
 +            if (this.canPenalize)
 +            {
 +                this.delayCounter += failedPathFindingPenalty;
@@ -137,13 +50,6 @@
 +                    failedPathFindingPenalty += 10;
 +                }
 +            }
-+
-+            if (d0 > 1024.0D)
-             {
-                 this.delayCounter += 10;
-             }
--            else if (d0 > 256.0)
-+            else if (d0 > 256.0D)
+ 
+             if (d0 > 1024.0)
              {
-                 this.delayCounter += 5;
-             }

patches/minecraft/net/minecraft/entity/ai/EntityAIAttackRangedBow.java.patch

@@ -1,102 +1,11 @@
 --- before/net/minecraft/entity/ai/EntityAIAttackRangedBow.java
 +++ after/net/minecraft/entity/ai/EntityAIAttackRangedBow.java
-@@ -33,7 +33,6 @@
-         this.attackCooldown = p_189428_1_;
-     }
- 
--    @Override
-     public boolean shouldExecute()
-     {
-         return this.entity.getAttackTarget() == null ? false : this.isBowInMainhand();
-@@ -41,41 +40,36 @@
+@@ -41,7 +41,7 @@
 
      protected boolean isBowInMainhand()
      {
 -        return !this.entity.getHeldItemMainhand().isEmpty() && this.entity.getHeldItemMainhand().getItem() == Items.BOW;
 +        return !this.entity.getHeldItemMainhand().isEmpty() && this.entity.getHeldItemMainhand().getItem() instanceof ItemBow;
      }
 
--    @Override
-     public boolean shouldContinueExecuting()
-     {
-         return (this.shouldExecute() || !this.entity.getNavigator().noPath()) && this.isBowInMainhand();
-     }
- 
--    @Override
-     public void startExecuting()
-     {
-         super.startExecuting();
--        this.entity.setSwingingArms(true);
-+        ((IRangedAttackMob)this.entity).setSwingingArms(true);
-     }
- 
--    @Override
-     public void resetTask()
-     {
-         super.resetTask();
--        this.entity.setSwingingArms(false);
-+        ((IRangedAttackMob)this.entity).setSwingingArms(false);
-         this.seeTime = 0;
-         this.attackTime = -1;
-         this.entity.resetActiveHand();
-     }
- 
--    @Override
-     public void updateTask()
-     {
-         EntityLivingBase entitylivingbase = this.entity.getAttackTarget();
- 
-         if (entitylivingbase != null)
-         {
--            double d0 = this.entity
--                        .getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
-+            double d0 = this.entity.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
-             boolean flag = this.entity.getEntitySenses().canSee(entitylivingbase);
-             boolean flag1 = this.seeTime > 0;
- 
-@@ -86,17 +80,17 @@
- 
-             if (flag)
-             {
--                this.seeTime++;
-+                ++this.seeTime;
-             }
-             else
-             {
--                this.seeTime--;
-+                --this.seeTime;
-             }
- 
--            if (!(d0 > (double)this.maxAttackDistance) && this.seeTime >= 20)
-+            if (d0 <= (double)this.maxAttackDistance && this.seeTime >= 20)
-             {
-                 this.entity.getNavigator().clearPath();
--                this.strafingTime++;
-+                ++this.strafingTime;
-             }
-             else
-             {
-@@ -106,12 +100,12 @@
- 
-             if (this.strafingTime >= 20)
-             {
--                if ((double)this.entity.getRNG().nextFloat() < 0.3)
-+                if ((double)this.entity.getRNG().nextFloat() < 0.3D)
-                 {
-                     this.strafingClockwise = !this.strafingClockwise;
-                 }
- 
--                if ((double)this.entity.getRNG().nextFloat() < 0.3)
-+                if ((double)this.entity.getRNG().nextFloat() < 0.3D)
-                 {
-                     this.strafingBackwards = !this.strafingBackwards;
-                 }
-@@ -151,7 +145,7 @@
-                     if (i >= 20)
-                     {
-                         this.entity.resetActiveHand();
--                        this.entity.attackEntityWithRangedAttack(entitylivingbase, ItemBow.getArrowVelocity(i));
-+                        ((IRangedAttackMob)this.entity).attackEntityWithRangedAttack(entitylivingbase, ItemBow.getArrowVelocity(i));
-                         this.attackTime = this.attackCooldown;
-                     }
-                 }
+     @Override

patches/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java.patch

@@ -1,76 +1,25 @@
 --- before/net/minecraft/entity/ai/EntityAIBreakDoor.java
 +++ after/net/minecraft/entity/ai/EntityAIBreakDoor.java
-@@ -15,43 +15,55 @@
-         super(entityIn);
-     }
- 
--    @Override
-     public boolean shouldExecute()
-     {
-         if (!super.shouldExecute())
-         {
-             return false;
+@@ -24,7 +24,21 @@
          }
-+        else if (!net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.entity.world, this.entity) || !this.entity.world.getBlockState(this.doorPosition).getBlock().canEntityDestroy(this.entity.world.getBlockState(this.doorPosition), this.entity.world, this.doorPosition, this.entity) || !net.minecraftforge.event.ForgeEventFactory.onEntityDestroyBlock(this.entity, this.doorPosition, this.entity.world.getBlockState(this.doorPosition)))
-+        {
-+            return false;
-+        }
          else
          {
 -            return !this.entity.world.getGameRules().getBoolean("mobGriefing")
--                   ? false
--                   : !BlockDoor.isOpen(this.entity.world, this.doorPosition);
-+            BlockDoor blockdoor = this.doorBlock;
-+            return !BlockDoor.isOpen(this.entity.world, this.doorPosition);
-         }
-     }
- 
--    @Override
-     public void startExecuting()
-     {
-         super.startExecuting();
-         this.breakingTime = 0;
-     }
- 
--    @Override
-     public boolean shouldContinueExecuting()
-     {
-         double d0 = this.entity.getDistanceSq(this.doorPosition);
--        return this.breakingTime <= 240 && !BlockDoor.isOpen(this.entity.world, this.doorPosition) && d0 < 4.0;
-+        boolean flag;
-+
-+        if (this.breakingTime <= 240)
-+        {
-+            BlockDoor blockdoor = this.doorBlock;
-+
-+            if (!BlockDoor.isOpen(this.entity.world, this.doorPosition) && d0 < 4.0D)
-+            {
-+                flag = true;
-+                return flag;
-+            }
-+        }
-+
-+        flag = false;
-+        return flag;
-     }
- 
--    @Override
-     public void resetTask()
-     {
-         super.resetTask();
-         this.entity.world.sendBlockBreakProgress(this.entity.getEntityId(), this.doorPosition, -1);
-     }
- 
--    @Override
-     public void updateTask()
-     {
-         super.updateTask();
-@@ -61,7 +73,7 @@
-             this.entity.world.playEvent(1019, this.doorPosition, 0);
++            return !net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.entity.world, this.entity)
++                   || !this.entity.world
++                       .getBlockState(this.doorPosition)
++                       .getBlock()
++                       .canEntityDestroy(
++                           this.entity.world.getBlockState(this.doorPosition),
++                           this.entity.world,
++                           this.doorPosition,
++                           this.entity
++                       )
++                   || !net.minecraftforge.event.ForgeEventFactory.onEntityDestroyBlock(
++                       this.entity,
++                       this.doorPosition,
++                       this.entity.world.getBlockState(this.doorPosition)
++                   )
+                    ? false
+                    : !BlockDoor.isOpen(this.entity.world, this.doorPosition);
          }
- 
--        this.breakingTime++;
-+        ++this.breakingTime;
-         int i = (int)((float)this.breakingTime / 240.0F * 10.0F);
- 
-         if (i != this.previousBreakProgress)

patches/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.java.patch

@@ -1,68 +1,5 @@
 --- before/net/minecraft/entity/ai/EntityAIEatGrass.java
 +++ after/net/minecraft/entity/ai/EntityAIEatGrass.java
-@@ -13,8 +13,7 @@
- 
- public class EntityAIEatGrass extends EntityAIBase
- {
--    private static final Predicate<IBlockState> IS_TALL_GRASS = BlockStateMatcher.forBlock(Blocks.TALLGRASS)
--                .where(BlockTallGrass.TYPE, Predicates.equalTo(BlockTallGrass.EnumType.GRASS));
-+    private static final Predicate<IBlockState> IS_TALL_GRASS = BlockStateMatcher.forBlock(Blocks.TALLGRASS).where(BlockTallGrass.TYPE, Predicates.equalTo(BlockTallGrass.EnumType.GRASS));
-     private final EntityLiving grassEaterEntity;
-     private final World entityWorld;
-     int eatingGrassTimer;
-@@ -26,7 +25,6 @@
-         this.setMutexBits(7);
-     }
- 
--    @Override
-     public boolean shouldExecute()
-     {
-         if (this.grassEaterEntity.getRNG().nextInt(this.grassEaterEntity.isChild() ? 50 : 1000) != 0)
-@@ -36,13 +34,18 @@
-         else
-         {
-             BlockPos blockpos = new BlockPos(this.grassEaterEntity.posX, this.grassEaterEntity.posY, this.grassEaterEntity.posZ);
--            return IS_TALL_GRASS.apply(this.entityWorld.getBlockState(blockpos))
--                   ? true
--                   : this.entityWorld.getBlockState(blockpos.down()).getBlock() == Blocks.GRASS;
-+
-+            if (IS_TALL_GRASS.apply(this.entityWorld.getBlockState(blockpos)))
-+            {
-+                return true;
-+            }
-+            else
-+            {
-+                return this.entityWorld.getBlockState(blockpos.down()).getBlock() == Blocks.GRASS;
-+            }
-         }
-     }
- 
--    @Override
-     public void startExecuting()
-     {
-         this.eatingGrassTimer = 40;
-@@ -50,13 +53,11 @@
-         this.grassEaterEntity.getNavigator().clearPath();
-     }
- 
--    @Override
-     public void resetTask()
-     {
-         this.eatingGrassTimer = 0;
-     }
- 
--    @Override
-     public boolean shouldContinueExecuting()
-     {
-         return this.eatingGrassTimer > 0;
-@@ -67,7 +68,6 @@
-         return this.eatingGrassTimer;
-     }
- 
--    @Override
-     public void updateTask()
-     {
-         this.eatingGrassTimer = Math.max(0, this.eatingGrassTimer - 1);
 @@ -78,7 +78,7 @@
 
              if (IS_TALL_GRASS.apply(this.entityWorld.getBlockState(blockpos)))