From 22ffed51b9a9fe863c8491566ca8b30e774b3a5f Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Thu, 22 Sep 2016 19:30:07 -0400
Subject: [PATCH] Fixed 1.9 support
---
.../entity/ai/EntityAIAttackStealthMelee.java | 126 ++++++++++++++++--
.../entity/mob/EntityCorruptedChicken.java | 3 +-
2 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
index 1e51c890..e54d3c1e 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
@@ -1,24 +1,81 @@
package WayofTime.bloodmagic.entity.ai;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIAttackMelee;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.pathfinding.Path;
import net.minecraft.util.EnumHand;
+import net.minecraft.world.World;
import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken;
-public class EntityAIAttackStealthMelee extends EntityAIAttackMelee
+public class EntityAIAttackStealthMelee extends EntityAIBase
{
protected EntityCorruptedChicken chicken;
+ World worldObj;
+ /**
+ * An amount of decrementing ticks that allows the entity to attack once the
+ * tick reaches 0.
+ */
+ protected int attackTick;
+ /** The speed with which the mob will approach the target */
+ double speedTowardsTarget;
+ /**
+ * When true, the mob will continue chasing its target, even if it can't
+ * find a path to them right now.
+ */
+ boolean longMemory;
+ /** The PathEntity of our entity. */
+ Path entityPathEntity;
+ private int delayCounter;
+ private double targetX;
+ private double targetY;
+ private double targetZ;
+ protected final int attackInterval = 20;
+ private int failedPathFindingPenalty = 0;
+ private boolean canPenalize = false;
+
public EntityAIAttackStealthMelee(EntityCorruptedChicken creature, double speedIn, boolean useLongMemory)
{
- super(creature, speedIn, useLongMemory);
- chicken = creature;
+ this.chicken = creature;
+ this.worldObj = creature.worldObj;
+ this.speedTowardsTarget = speedIn;
+ this.longMemory = useLongMemory;
+ this.setMutexBits(3);
}
@Override
public boolean shouldExecute()
{
- return chicken.attackStateMachine == 1 && super.shouldExecute();
+ if (chicken.attackStateMachine != 1)
+ {
+ return false;
+ }
+
+ EntityLivingBase entitylivingbase = this.chicken.getAttackTarget();
+
+ if (entitylivingbase == null)
+ {
+ return false;
+ } else if (!entitylivingbase.isEntityAlive())
+ {
+ return false;
+ } else
+ {
+ if (canPenalize)
+ {
+ if (--this.delayCounter <= 0)
+ {
+ this.entityPathEntity = this.chicken.getNavigator().getPathToEntityLiving(entitylivingbase);
+ this.delayCounter = 4 + this.chicken.getRNG().nextInt(7);
+ return this.entityPathEntity != null;
+ } else
+ {
+ return true;
+ }
+ }
+ this.entityPathEntity = this.chicken.getNavigator().getPathToEntityLiving(entitylivingbase);
+ return this.entityPathEntity != null;
+ }
}
@Override
@@ -37,17 +94,70 @@ public class EntityAIAttackStealthMelee extends EntityAIAttackMelee
}
@Override
- protected void func_190102_a(EntityLivingBase attacked, double distance)
+ public void updateTask()
+ {
+ EntityLivingBase entitylivingbase = this.chicken.getAttackTarget();
+ this.chicken.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F);
+ double d0 = this.chicken.getDistanceSq(entitylivingbase.posX, entitylivingbase.getEntityBoundingBox().minY, entitylivingbase.posZ);
+ --this.delayCounter;
+
+ if ((this.longMemory || this.chicken.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.chicken.getRNG().nextFloat() < 0.05F))
+ {
+ this.targetX = entitylivingbase.posX;
+ this.targetY = entitylivingbase.getEntityBoundingBox().minY;
+ this.targetZ = entitylivingbase.posZ;
+ this.delayCounter = 4 + this.chicken.getRNG().nextInt(7);
+
+ if (this.canPenalize)
+ {
+ this.delayCounter += failedPathFindingPenalty;
+ if (this.chicken.getNavigator().getPath() != null)
+ {
+ net.minecraft.pathfinding.PathPoint finalPathPoint = this.chicken.getNavigator().getPath().getFinalPathPoint();
+ if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1)
+ failedPathFindingPenalty = 0;
+ else
+ failedPathFindingPenalty += 10;
+ } else
+ {
+ failedPathFindingPenalty += 10;
+ }
+ }
+
+ if (d0 > 1024.0D)
+ {
+ this.delayCounter += 10;
+ } else if (d0 > 256.0D)
+ {
+ this.delayCounter += 5;
+ }
+
+ if (!this.chicken.getNavigator().tryMoveToEntityLiving(entitylivingbase, this.speedTowardsTarget))
+ {
+ this.delayCounter += 15;
+ }
+ }
+
+ this.attackTick = Math.max(this.attackTick - 1, 0);
+ this.attackEntity(entitylivingbase, d0);
+ }
+
+ protected void attackEntity(EntityLivingBase attacked, double distance)
{
double d0 = this.getAttackReachSqr(attacked);
if (distance <= d0 && this.attackTick <= 0)
{
this.attackTick = 20;
- this.attacker.swingArm(EnumHand.MAIN_HAND);
- this.attacker.attackEntityAsMob(attacked);
+ this.chicken.swingArm(EnumHand.MAIN_HAND);
+ this.chicken.attackEntityAsMob(attacked);
chicken.attackStateMachine = 2;
}
}
+
+ protected double getAttackReachSqr(EntityLivingBase attackTarget)
+ {
+ return (double) (this.chicken.width * 2.0F * this.chicken.width * 2.0F + attackTarget.width);
+ }
}
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java
index 2b7208a9..474343cf 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java
@@ -3,7 +3,6 @@ package WayofTime.bloodmagic.entity.mob;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIAttackMelee;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAISwimming;
@@ -27,7 +26,7 @@ import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget;
public class EntityCorruptedChicken extends EntityAspectedDemonBase
{
- private EntityAIAttackMelee aiAttackOnCollide;
+ private EntityAIAttackStealthMelee aiAttackOnCollide;
private final int attackPriority = 3;
public float wingRotation;