renamed nmsEntity

DevCybran · DevCybran · commit 5a4b36cbf0cc · 2013-11-14T10:24:26.000+01:00
diff --git a/builder/version.properties b/builder/version.properties
@@ -1,5 +1,5 @@
-#Thu, 07 Nov 2013 18:40:49 +0100
+#Thu, 14 Nov 2013 10:09:40 +0100
 
 version.number=6
-version.build=15
-version.timestamp=201311071840
+version.build=16
+version.timestamp=201311141009
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIAttackMelee.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIAttackMelee.java
@@ -47,7 +47,7 @@ public AIAttackMelee(int priority, double movementSpeedMultiplicator) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalMeleeAttack((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator, false);
+		return new PathfinderGoalMeleeAttack((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator, false);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIAttackRanged.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIAttackRanged.java
@@ -80,7 +80,7 @@ public AIAttackRanged(int priority, double movementSpeedMultiplicator, float max
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalArrowAttack((IRangedEntity) mob.notchEntity, this.movementSpeedMultiplicator, this.attackTicks, this.maximumRange);
+		return new PathfinderGoalArrowAttack((IRangedEntity) mob.nmsEntity, this.movementSpeedMultiplicator, this.attackTicks, this.maximumRange);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIFleeSun.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIFleeSun.java
@@ -45,7 +45,7 @@ public AIFleeSun(final int priority, double movementSpeedMultiplicator) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalFleeSun((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator);
+		return new PathfinderGoalFleeSun((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIFloat.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIFloat.java
@@ -36,7 +36,7 @@ public AIFloat(final int priority) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(CraftControllableMob<?> mob) {
-		return new PathfinderGoalFloat(mob.notchEntity);
+		return new PathfinderGoalFloat(mob.nmsEntity);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AILookAtEntity.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AILookAtEntity.java
@@ -119,7 +119,7 @@ private AILookAtEntity(final int priority, final Class<? extends Entity> entityC
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(final CraftControllableMob<?> mob) {
-		return new PathfinderGoalLookAtPlayer(mob.notchEntity, this.entityClass, this.maxDistance);
+		return new PathfinderGoalLookAtPlayer(mob.nmsEntity, this.entityClass, this.maxDistance);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRandomLookaround.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRandomLookaround.java
@@ -35,7 +35,7 @@ public AIRandomLookaround(final int priority) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(final CraftControllableMob<?> mob) {
-		return new PathfinderGoalRandomLookaround(mob.notchEntity);
+		return new PathfinderGoalRandomLookaround(mob.nmsEntity);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRandomStroll.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRandomStroll.java
@@ -46,7 +46,7 @@ public AIRandomStroll(final int priority, double movementSpeedMultiplicator) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(final CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalRandomStroll((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator);
+		return new PathfinderGoalRandomStroll((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRestrictSun.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AIRestrictSun.java
@@ -35,7 +35,7 @@ public AIRestrictSun(final int priority) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(final CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalRestrictSun((EntityCreature) mob.notchEntity);
+		return new PathfinderGoalRestrictSun((EntityCreature) mob.nmsEntity);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AITargetHurtBy.java b/src/java/de/ntcomputer/minecraft/controllablemobs/api/ai/behaviors/AITargetHurtBy.java
@@ -58,7 +58,7 @@ public AITargetHurtBy(final int priority, final boolean crowdAttack) {
 
 	@Override
 	public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {
-		return new PathfinderGoalHurtByTarget((EntityCreature) mob.notchEntity, this.crowdAttack);
+		return new PathfinderGoalHurtByTarget((EntityCreature) mob.nmsEntity, this.crowdAttack);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/CraftControllableMob.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/CraftControllableMob.java
@@ -15,11 +15,11 @@ public class CraftControllableMob<E extends LivingEntity> implements Controllabl
 	private CraftControllableMobAttributes attributes;
 	private CraftControllableMobAI<E> ai;
 	private CraftControllableMobActions actions;
-	public EntityInsentient notchEntity;
+	public EntityInsentient nmsEntity;
 
 	public CraftControllableMob(E entity, EntityInsentient notchEntity) {
 		this.entity = entity;
-		this.notchEntity = notchEntity;
+		this.nmsEntity = notchEntity;
 		this.attributes = new CraftControllableMobAttributes(this);
 		this.actions = new CraftControllableMobActions(this);
 		this.ai = new CraftControllableMobAI<E>(this);
@@ -43,7 +43,7 @@ public void unassign(boolean resetAttributes) {
 		this.attributes = null;
 		
 		// entity unassign
-		this.notchEntity = null;
+		this.nmsEntity = null;
 		this.entity = null;
 	}
 	
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/CraftControllableMobAttributes.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/CraftControllableMobAttributes.java
@@ -19,7 +19,7 @@ public final class CraftControllableMobAttributes implements ControllableMobAttr
 	private double maximumNavigationDistance = 200.0D;
 
 	public CraftControllableMobAttributes(CraftControllableMob<?> mob) {
-		this.nmsEntity = mob.notchEntity;
+		this.nmsEntity = mob.nmsEntity;
 		this.movementSpeed = this.getAttributeInstance(NativeInterfaces.GENERICATTRIBUTES.STATIC_FIELD_MOVEMENTSPEED.get());
 		this.attackDamage = this.getAttributeInstance(NativeInterfaces.GENERICATTRIBUTES.STATIC_FIELD_ATTACKDAMAGE.get());
 		this.maxHealth = this.getAttributeInstance(NativeInterfaces.GENERICATTRIBUTES.STATIC_FIELD_MAXHEALTH.get());
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionDie.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionDie.java
@@ -10,7 +10,7 @@ public class ControllableMobActionDie extends ControllableMobActionBase {
 
 	public ControllableMobActionDie(final CraftControllableMob<?> mob) {
 		super(mob.getActionManager(), ActionType.DIE);
-		this.entity = mob.notchEntity;
+		this.entity = mob.nmsEntity;
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/AIController.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/AIController.java
@@ -38,7 +38,7 @@ public abstract class AIController<E extends LivingEntity> implements Comparator
 	
 	public AIController(CraftControllableMob<E> mob, NativeFieldObject<EntityInsentient,PathfinderGoalSelector> selectorField) {
 		this.mob = mob;
-		this.selector = selectorField.get(mob.notchEntity);
+		this.selector = selectorField.get(mob.nmsEntity);
 		
 		// create custom parts list
 		this.attachedParts = new ArrayList<CraftAIPart<E,?>>();
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionFollow.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionFollow.java
@@ -16,36 +16,36 @@ public PathfinderGoalActionFollow(CraftControllableMob<?> mob) {
 	
 	@Override
 	protected boolean isActionRequired() {
-		return NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.notchEntity, action.target) > action.maximumDistanceSquared;
+		return NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.nmsEntity, action.target) > action.maximumDistanceSquared;
 	}
 	
 	@Override
 	protected boolean isActionBlocked() {
-		return mob.notchEntity.world!=action.target.world;
+		return mob.nmsEntity.world!=action.target.world;
 	}
 	
 	@Override
 	protected boolean canStartAction() {
-		this.mob.adjustMaximumNavigationDistance((float) Math.sqrt(NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.notchEntity, action.target)));
-		final PathEntity path = NativeInterfaces.NAVIGATION.METHOD_CREATEPATHTOENTITY.invoke(this.mob.notchEntity.getNavigation(), this.action.target);
+		this.mob.adjustMaximumNavigationDistance((float) Math.sqrt(NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.nmsEntity, action.target)));
+		final PathEntity path = NativeInterfaces.NAVIGATION.METHOD_CREATEPATHTOENTITY.invoke(this.mob.nmsEntity.getNavigation(), this.action.target);
 		if(path==null) return false;
 		this.path = path;
 		return true;
 	}
 
 	@Override
 	protected void onStartAction() {
-		NativeInterfaces.NAVIGATION.METHOD_MOVEALONGPATH.invoke(this.mob.notchEntity.getNavigation(), this.path, 1.0);
+		NativeInterfaces.NAVIGATION.METHOD_MOVEALONGPATH.invoke(this.mob.nmsEntity.getNavigation(), this.path, 1.0);
 	}
 
 	@Override
 	protected boolean canContinueAction() {
-		return !NativeInterfaces.NAVIGATION.METHOD_ISNOTMOVING.invoke(this.mob.notchEntity.getNavigation()) && (NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.notchEntity, this.action.target)>this.action.minimumDistanceSquared);
+		return !NativeInterfaces.NAVIGATION.METHOD_ISNOTMOVING.invoke(this.mob.nmsEntity.getNavigation()) && (NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.nmsEntity, this.action.target)>this.action.minimumDistanceSquared);
 	}
 
 	@Override
 	protected void onEndAction() {
-		NativeInterfaces.NAVIGATION.METHOD_STOP.invoke(this.mob.notchEntity.getNavigation());
+		NativeInterfaces.NAVIGATION.METHOD_STOP.invoke(this.mob.nmsEntity.getNavigation());
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionJump.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionJump.java
@@ -13,12 +13,12 @@ public PathfinderGoalActionJump(final CraftControllableMob<?> mob) {
 
 	@Override
 	protected void onStartAction() {
-		NativeInterfaces.CONTROLLERJUMP.METHOD_JUMP.invoke(this.mob.notchEntity.getControllerJump());
+		NativeInterfaces.CONTROLLERJUMP.METHOD_JUMP.invoke(this.mob.nmsEntity.getControllerJump());
 	}
 
 	@Override
 	protected boolean canContinueAction() {
-		return !this.mob.notchEntity.onGround;
+		return !this.mob.nmsEntity.onGround;
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionLook.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionLook.java
@@ -14,7 +14,7 @@ public PathfinderGoalActionLook(CraftControllableMob<?> mob) {
 	
 	@Override
 	protected boolean isActionBlocked() {
-		return action.getWorld()!=this.mob.notchEntity.world;
+		return action.getWorld()!=this.mob.nmsEntity.world;
 	}
 
 	@Override
@@ -24,7 +24,7 @@ protected boolean canContinueAction() {
 
 	@Override
 	protected void onTickAction() {
-		NativeInterfaces.CONTROLLERLOOK.METHOD_LOOKATCOORDINATES.invoke(this.mob.notchEntity.getControllerLook(), this.action.getX(), this.action.getY(), this.action.getZ(), 10.0F, NativeInterfaces.ENTITYINSENTIENT.METHOD_GETVERTICALHEADSPEED.invoke(this.mob.notchEntity));
+		NativeInterfaces.CONTROLLERLOOK.METHOD_LOOKATCOORDINATES.invoke(this.mob.nmsEntity.getControllerLook(), this.action.getX(), this.action.getY(), this.action.getZ(), 10.0F, NativeInterfaces.ENTITYINSENTIENT.METHOD_GETVERTICALHEADSPEED.invoke(this.mob.nmsEntity));
 	}
 
 	
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMove.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMove.java
@@ -16,9 +16,9 @@ public PathfinderGoalActionMove(CraftControllableMob<?> mob) {
 	
 	@Override
 	protected boolean canStartAction() {
-		if(action.world!=this.mob.notchEntity.world) return false;
-		this.mob.adjustMaximumNavigationDistance((float) NativeInterfaces.ENTITY.METHOD_GETDISTANCETOLOCATION.invoke(this.mob.notchEntity, action.x, action.y, action.z));
-		final PathEntity path = NativeInterfaces.NAVIGATION.METHOD_CREATEPATHTOLOCATION.invoke(this.mob.notchEntity.getNavigation(), action.x, action.y, action.z);
+		if(action.world!=this.mob.nmsEntity.world) return false;
+		this.mob.adjustMaximumNavigationDistance((float) NativeInterfaces.ENTITY.METHOD_GETDISTANCETOLOCATION.invoke(this.mob.nmsEntity, action.x, action.y, action.z));
+		final PathEntity path = NativeInterfaces.NAVIGATION.METHOD_CREATEPATHTOLOCATION.invoke(this.mob.nmsEntity.getNavigation(), action.x, action.y, action.z);
 		//final PathEntity path = NativeInterfaces.WORLD.METHOD_GENERATEPATHTOCOORDS.invoke(this.mob.notchEntity.world, this.mob.notchEntity, action.x, action.y, action.z, 100F, true, false, false, true);
 		if(path==null) return false;
 		this.path = path;
@@ -27,17 +27,17 @@ protected boolean canStartAction() {
 
 	@Override
 	protected void onStartAction() {
-		NativeInterfaces.NAVIGATION.METHOD_MOVEALONGPATH.invoke(this.mob.notchEntity.getNavigation(), this.path, 1.0);
+		NativeInterfaces.NAVIGATION.METHOD_MOVEALONGPATH.invoke(this.mob.nmsEntity.getNavigation(), this.path, 1.0);
 	}
 
 	@Override
 	protected boolean canContinueAction() {
-		return !NativeInterfaces.NAVIGATION.METHOD_ISNOTMOVING.invoke(this.mob.notchEntity.getNavigation());
+		return !NativeInterfaces.NAVIGATION.METHOD_ISNOTMOVING.invoke(this.mob.nmsEntity.getNavigation());
 	}
 
 	@Override
 	protected void onEndAction() {
-		NativeInterfaces.NAVIGATION.METHOD_STOP.invoke(this.mob.notchEntity.getNavigation());
+		NativeInterfaces.NAVIGATION.METHOD_STOP.invoke(this.mob.nmsEntity.getNavigation());
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionTarget.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionTarget.java
@@ -15,16 +15,16 @@ public PathfinderGoalActionTarget(CraftControllableMob<?> mob) {
 	
 	@Override
 	protected boolean isActionBlocked() {
-		return action.target.world!=this.mob.notchEntity.world;
+		return action.target.world!=this.mob.nmsEntity.world;
 	}
 
 	@Override
 	protected void onStartAction() {
-		if(this.action.target!=null) this.mob.adjustMaximumNavigationDistance((float) Math.sqrt(NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.notchEntity, this.action.target) * 2));
+		if(this.action.target!=null) this.mob.adjustMaximumNavigationDistance((float) Math.sqrt(NativeInterfaces.ENTITY.METHOD_GETDISTANCETOENTITYSQUARED.invoke(this.mob.nmsEntity, this.action.target) * 2));
 		// set target for AI goals
-		this.mob.notchEntity.setGoalTarget(this.action.target);
+		this.mob.nmsEntity.setGoalTarget(this.action.target);
 		// set target for old AI & bukkit interface (so "getTarget" on Creature will return the correct entity)
-		if(this.mob.notchEntity instanceof EntityCreature) ((EntityCreature) this.mob.notchEntity).target = this.action.target;
+		if(this.mob.nmsEntity instanceof EntityCreature) ((EntityCreature) this.mob.nmsEntity).target = this.action.target;
 	}
 
 	@Override
@@ -34,7 +34,7 @@ protected boolean canContinueAction() {
 
 	@Override
 	protected void onEndAction() {
-		this.mob.notchEntity.setGoalTarget(null);
+		this.mob.nmsEntity.setGoalTarget(null);
 	}
 
 	@Override
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalTargetEx.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalTargetEx.java
@@ -26,7 +26,7 @@ public abstract class PathfinderGoalTargetEx extends PathfinderGoalWrapper {
 
 	public PathfinderGoalTargetEx(CraftControllableMob<?> mob, int maximumNoEyeContactTicks, boolean ignoreInvulnerability, double maximumDistance, Class<? extends EntityLiving>[] targetClasses) {
 		this.mob = mob;
-		this.entity = mob.notchEntity;
+		this.entity = mob.nmsEntity;
 		this.maximumNoEyeContactTicks = maximumNoEyeContactTicks;
 		this.ignoreInvulnerability = ignoreInvulnerability;
 		this.maximumDistanceSquared = maximumDistance<=0 ? 0 : maximumDistance*maximumDistance;

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public AIAttackMelee(int priority, double movementSpeedMultiplicator) {`
`47`	`47`
`48`	`48`	`@Override`
`49`	`49`	`public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {`
`50`		`- return new PathfinderGoalMeleeAttack((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator, false);`
	`50`	`+ return new PathfinderGoalMeleeAttack((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator, false);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public AIAttackRanged(int priority, double movementSpeedMultiplicator, float max`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {`
`83`		`- return new PathfinderGoalArrowAttack((IRangedEntity) mob.notchEntity, this.movementSpeedMultiplicator, this.attackTicks, this.maximumRange);`
	`83`	`+ return new PathfinderGoalArrowAttack((IRangedEntity) mob.nmsEntity, this.movementSpeedMultiplicator, this.attackTicks, this.maximumRange);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public AIFleeSun(final int priority, double movementSpeedMultiplicator) {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {`
`48`		`- return new PathfinderGoalFleeSun((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator);`
	`48`	`+ return new PathfinderGoalFleeSun((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public AIFloat(final int priority) {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public PathfinderGoal createPathfinderGoal(CraftControllableMob<?> mob) {`
`39`		`- return new PathfinderGoalFloat(mob.notchEntity);`
	`39`	`+ return new PathfinderGoalFloat(mob.nmsEntity);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private AILookAtEntity(final int priority, final Class<? extends Entity> entityC`
`119`	`119`
`120`	`120`	`@Override`
`121`	`121`	`public PathfinderGoal createPathfinderGoal(final CraftControllableMob<?> mob) {`
`122`		`- return new PathfinderGoalLookAtPlayer(mob.notchEntity, this.entityClass, this.maxDistance);`
	`122`	`+ return new PathfinderGoalLookAtPlayer(mob.nmsEntity, this.entityClass, this.maxDistance);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public AIRandomLookaround(final int priority) {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public PathfinderGoal createPathfinderGoal(final CraftControllableMob<?> mob) {`
`38`		`- return new PathfinderGoalRandomLookaround(mob.notchEntity);`
	`38`	`+ return new PathfinderGoalRandomLookaround(mob.nmsEntity);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public AIRandomStroll(final int priority, double movementSpeedMultiplicator) {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public PathfinderGoal createPathfinderGoal(final CraftControllableMob<? extends Creature> mob) {`
`49`		`- return new PathfinderGoalRandomStroll((EntityCreature) mob.notchEntity, this.movementSpeedMultiplicator);`
	`49`	`+ return new PathfinderGoalRandomStroll((EntityCreature) mob.nmsEntity, this.movementSpeedMultiplicator);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public AIRestrictSun(final int priority) {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public PathfinderGoal createPathfinderGoal(final CraftControllableMob<? extends Creature> mob) {`
`38`		`- return new PathfinderGoalRestrictSun((EntityCreature) mob.notchEntity);`
	`38`	`+ return new PathfinderGoalRestrictSun((EntityCreature) mob.nmsEntity);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public AITargetHurtBy(final int priority, final boolean crowdAttack) {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public PathfinderGoal createPathfinderGoal(CraftControllableMob<? extends Creature> mob) {`
`61`		`- return new PathfinderGoalHurtByTarget((EntityCreature) mob.notchEntity, this.crowdAttack);`
	`61`	`+ return new PathfinderGoalHurtByTarget((EntityCreature) mob.nmsEntity, this.crowdAttack);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`