added attackMove, added navdistance constant for movement

Author: DevCybran

builder/version.properties

@@ -1,5 +1,5 @@
-#Thu, 14 Nov 2013 18:19:16 +0100
+#Fri, 15 Nov 2013 15:02:57 +0100
 
 version.number=6
-version.build=20
-version.timestamp=201311141819
+version.build=24
+version.timestamp=201311151502

src/java/de/ntcomputer/minecraft/controllablemobs/api/ControllableMobActions.java

@@ -13,7 +13,7 @@
  * You can retrieve an instance by using {@link ControllableMob#getActions()}
  * 
  * @author Cybran
- * @version v5
+ * @version v6
  */
 public interface ControllableMobActions {
 	/**
@@ -28,7 +28,7 @@ public interface ControllableMobActions {
 	/**
 	 * Orders the entity to move to the given location, optionally adding the action to the queue.
 	 * This action is block accurate, meaning, that the entity will stop once it reached the block the given location is pointing at.
-	 * When the actions execution is started, all other movements or attacks caused by the AI are stopped and overridden.
+	 * When the action's execution is started, all other movements or attacks caused by the AI are stopped and overridden.
 	 * If a target is assigned to the entity, it will not be lost and dealing with it will be resumed when this movement is finished. 
 	 * 
 	 * @param loc the location the entity will move to.
@@ -37,6 +37,61 @@ public interface ControllableMobActions {
 	 */
 	public ControllableMobAction moveTo(Location loc, boolean queue);
 
+	/**
+	 * Orders the entity to move to the given location. Uses the {@link ControllableMobActions#getDefaultQueuingFlag() default queuing flag}.
+	 * This action is block accurate, meaning, that the entity will stop once it reached the block the given location is pointing at.
+	 * When the action's execution is started, all other movements caused by the AI are stopped and overridden.
+	 * If the entity has a target locked on, it will interrupt the movement, deal with this target, and then continue moving to the destination.
+	 * 
+	 * @see #attackMoveTo(Location, boolean, double, double)
+	 * @param loc the location the entity will move to.
+	 * @return {@link ControllableMobAction}
+	 */
+	public ControllableMobAction attackMoveTo(Location loc);
+	
+	/**
+	 * Orders the entity to move to the given location, optionally adding the action to the queue.
+	 * This action is block accurate, meaning, that the entity will stop once it reached the block the given location is pointing at.
+	 * When the action's execution is started, all other movements caused by the AI are stopped and overridden.
+	 * If the entity has a target locked on, it will interrupt the movement, deal with this target, and then continue moving to the destination.
+	 * 
+	 * @see #attackMoveTo(Location, boolean, double, double)
+	 * @param loc the location the entity will move to.
+	 * @param queue whether this action should be added to the queue (true) or executed directly (false).
+	 * @return {@link ControllableMobAction}
+	 */
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue);
+	
+	/**
+	 * Orders the entity to move to the given location, optionally adding the action to the queue.
+	 * This action is block accurate, meaning, that the entity will stop once it reached the block the given location is pointing at.
+	 * When the action's execution is started, all other movements caused by the AI are stopped and overridden.
+	 * If the entity has a target locked on, it will interrupt the movement, deal with this target, and then continue moving to the destination.
+	 * 
+	 * @see #attackMoveTo(Location, boolean, double, double)
+	 * @param loc the location the entity will move to.
+	 * @param queue whether this action should be added to the queue (true) or executed directly (false).
+	 * @param maximumDistractionDistance the maximum distance this entity will try to follow targets in order to attack them. If reached, the entity will turn back and continue moving to the destination. Default is 16.0 blocks.
+	 * @return {@link ControllableMobAction}
+	 * @throws IllegalArgumentException when maximumDistractionDistance is zero or negative
+	 */
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance) throws IllegalArgumentException;
+	
+	/**
+	 * Orders the entity to move to the given location, optionally adding the action to the queue.
+	 * This action is block accurate, meaning, that the entity will stop once it reached the block the given location is pointing at.
+	 * When the action's execution is started, all other movements caused by the AI are stopped and overridden.
+	 * If the entity has a target locked on, it will interrupt the movement, deal with this target, and then continue moving to the destination.
+	 * 
+	 * @param loc the location the entity will move to.
+	 * @param queue whether this action should be added to the queue (true) or executed directly (false).
+	 * @param maximumDistractionDistance the maximum distance this entity will try to follow targets in order to attack them. If reached, the entity will turn back and continue moving to the destination. Default is 16.0 blocks.
+	 * @param movementSpeedMultiplicator 1.0 for default speed, 2.0 for doubling the movement speed, and so on. Default is 1.0
+	 * @return {@link ControllableMobAction}
+	 * @throws IllegalArgumentException when maximumDistractionDistance or movementSpeedMultiplicator is zero or negative
+	 */
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance, double movementSpeedMultiplicator) throws IllegalArgumentException;
+	
 	/**
 	 * Orders the entity to look at the given location.
 	 * Uses the {@link ControllableMobActions#getDefaultQueuingFlag() default queuing flag}.

src/java/de/ntcomputer/minecraft/controllablemobs/api/actions/ActionType.java

@@ -5,7 +5,7 @@
  * Can be obtained by calling {@link ControllableMobAction#getType()} 
  *  
  * @author Cybran
- * @version v2
+ * @version v6
  *
  */
 public enum ActionType {
@@ -21,6 +21,11 @@ public enum ActionType {
 	 */
 	MOVE(false, false),
 
+	/**
+	 * @see de.ntcomputer.minecraft.controllablemobs.api.ControllableMobActions#attackMoveTo(org.bukkit.Location, boolean, double, double)
+	 */
+	ATTACKMOVE(false, false),
+	
 	/**
 	 * @see de.ntcomputer.minecraft.controllablemobs.api.ControllableMobActions#target(org.bukkit.entity.LivingEntity, boolean)
 	 */

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/CraftControllableMobActions.java

@@ -7,6 +7,7 @@
 import de.ntcomputer.minecraft.controllablemobs.api.ControllableMobActions;
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ControllableMobAction;
+import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionAttackMove;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionBase;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionCallback;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionDie;
@@ -49,7 +50,7 @@ public ControllableMobAction moveTo(Location loc) {
 
 	@Override
 	public ControllableMobAction moveTo(Location loc, boolean queue) {
-		return this.addAction(new ControllableMobActionMove(this.actionManager, loc), queue);
+		return this.addAction(new ControllableMobActionMove(this.actionManager, loc, 1.0D), queue);
 	}
 
 	@Override
@@ -178,4 +179,26 @@ public void setDefaultQueuingFlag(boolean defaultQueue) {
 		this.defaultQueue = defaultQueue;
 	}
 
+	@Override
+	public ControllableMobAction attackMoveTo(Location loc) {
+		return this.attackMoveTo(loc, defaultQueue);
+	}
+
+	@Override
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue) {
+		return this.attackMoveTo(loc, queue, 16.0D);
+	}
+
+	@Override
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance) throws IllegalArgumentException {
+		return this.attackMoveTo(loc, queue, maximumDistractionDistance, 1.0D);
+	}
+
+	@Override
+	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance, double movementSpeedMultiplicator) throws IllegalArgumentException {
+		if(maximumDistractionDistance <= 0) throw new IllegalArgumentException("maximumDistractionDistance must be greater than 0.0");
+		if(movementSpeedMultiplicator <= 0) throw new IllegalArgumentException("movementSpeedMultiplicator must be greater than 0.0");
+		return this.addAction(new ControllableMobActionAttackMove(this.actionManager, loc, movementSpeedMultiplicator, maximumDistractionDistance), queue);
+	}
+
 }

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAbstractMove.java

@@ -0,0 +1,42 @@
+package de.ntcomputer.minecraft.controllablemobs.implementation.actions;
+
+import net.minecraft.server.v1_6_R3.World;
+
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
+
+import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
+
+public class ControllableMobActionAbstractMove extends ControllableMobActionBase {
+	public final int x;
+	public final int y;
+	public final int z;
+	public final World world;
+	public final double movementSpeedMultiplicator;
+	private final boolean isValid;
+	
+	public ControllableMobActionAbstractMove(ControllableMobActionManager manager, ActionType type, Location to, double movementSpeedMultiplicator) {
+		super(manager, type);
+		if(to==null) {
+			this.x = 0;
+			this.y = 0;
+			this.z = 0;
+			this.world = null;
+			this.movementSpeedMultiplicator = 0;
+			this.isValid = false;
+		} else {
+			this.x = to.getBlockX();
+			this.y = to.getBlockY();
+			this.z = to.getBlockZ();
+			this.world = ((CraftWorld) to.getWorld()).getHandle();
+			this.movementSpeedMultiplicator = Math.abs(movementSpeedMultiplicator);
+			this.isValid = true;
+		}
+	}
+
+	@Override
+	public boolean isValid() {
+		return super.isValid() && this.isValid;
+	}
+
+}

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAttackMove.java

@@ -0,0 +1,20 @@
+package de.ntcomputer.minecraft.controllablemobs.implementation.actions;
+
+import org.bukkit.Location;
+
+import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
+
+public class ControllableMobActionAttackMove extends ControllableMobActionAbstractMove {
+	public final double maxDistraction;
+	public double lastDistanceSquared = Double.MAX_VALUE;
+	
+	public ControllableMobActionAttackMove(ControllableMobActionManager manager, Location to, double movementSpeedMultiplicator, double maxDistraction) {
+		super(manager, ActionType.ATTACKMOVE, to, movementSpeedMultiplicator);
+		if(this.isValid()) {
+			this.maxDistraction = 0;
+		} else {
+			this.maxDistraction = Math.abs(maxDistraction);
+		}
+	}
+
+}

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionMove.java

@@ -1,39 +1,13 @@
 package de.ntcomputer.minecraft.controllablemobs.implementation.actions;
 
-import net.minecraft.server.v1_6_R3.World;
-
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
 
-public class ControllableMobActionMove extends ControllableMobActionBase {
-	public final int x;
-	public final int y;
-	public final int z;
-	public final World world;
-	private final boolean isValid;
+public class ControllableMobActionMove extends ControllableMobActionAbstractMove {
 
-	public ControllableMobActionMove(final ControllableMobActionManager manager, final Location to) {
-		super(manager, ActionType.MOVE);
-		if(to==null) {
-			this.x = 0;
-			this.y = 0;
-			this.z = 0;
-			this.world = null;
-			this.isValid = false;
-		} else {
-			this.x = to.getBlockX();
-			this.y = to.getBlockY();
-			this.z = to.getBlockZ();
-			this.world = ((CraftWorld) to.getWorld()).getHandle();
-			this.isValid = true;
-		}
-	}
-
-	@Override
-	public boolean isValid() {
-		return super.isValid() && this.isValid;
+	public ControllableMobActionMove(ControllableMobActionManager manager, Location to, double movementSpeedMultiplicator) {
+		super(manager, ActionType.MOVE, to, movementSpeedMultiplicator);
 	}
 
 }

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/AIGoalController.java

@@ -3,6 +3,7 @@
 import org.bukkit.entity.LivingEntity;
 
 import de.ntcomputer.minecraft.controllablemobs.implementation.CraftControllableMob;
+import de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors.PathfinderGoalActionAttackMove;
 import de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors.PathfinderGoalActionFollow;
 import de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors.PathfinderGoalActionJump;
 import de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors.PathfinderGoalActionLook;
@@ -18,7 +19,8 @@ public AIGoalController(CraftControllableMob<E> mob) {
 
 	@Override
 	protected void createActionGoals() {
-		this.addActionGoal(-2, new PathfinderGoalActionMove(mob));
+		this.addActionGoal(-3, new PathfinderGoalActionMove(mob));
+		this.addActionGoal(-2, new PathfinderGoalActionAttackMove(mob));
 		this.addActionGoal(-1, new PathfinderGoalActionFollow(mob));
 		this.addActionGoal(0, new PathfinderGoalActionWait(mob));
 		this.addActionGoal(Integer.MAX_VALUE, new PathfinderGoalActionJump(mob));

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAbstractMove.java

@@ -0,0 +1,47 @@
+package de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors;
+
+import net.minecraft.server.v1_6_R3.PathEntity;
+import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
+import de.ntcomputer.minecraft.controllablemobs.implementation.CraftControllableMob;
+import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionAbstractMove;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.NativeInterfaces;
+
+public class PathfinderGoalActionAbstractMove<A extends ControllableMobActionAbstractMove> extends PathfinderGoalActionDelayed<A> {
+	private PathEntity path;
+
+	public PathfinderGoalActionAbstractMove(CraftControllableMob<?> mob, ActionType type) {
+		super(mob, type);
+		this.setMutexBits(3);
+	}
+	
+	@Override
+	protected boolean canStartAction() {
+		if(action.world!=this.mob.nmsEntity.world) return false;
+		this.mob.adjustMaximumNavigationDistance(NativeInterfaces.ENTITY.METHOD_GETDISTANCETOLOCATION.invoke(this.mob.nmsEntity, action.x, action.y, action.z) + 50.0D);
+		final PathEntity path = NativeInterfaces.NAVIGATION.METHOD_CREATEPATHTOLOCATION.invoke(this.mob.nmsEntity.getNavigation(), action.x, action.y, action.z);
+		if(path==null) return false;
+		this.path = path;
+		return true;
+	}
+
+	@Override
+	protected void onStartAction() {
+		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.nmsEntity.getNavigation());
+	}
+
+	@Override
+	protected void onEndAction() {
+		NativeInterfaces.NAVIGATION.METHOD_STOP.invoke(this.mob.nmsEntity.getNavigation());
+	}
+
+	@Override
+	protected int getDelayTicks() {
+		return 1;
+	}
+
+}

src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAttackMove.java

@@ -0,0 +1,38 @@
+package de.ntcomputer.minecraft.controllablemobs.implementation.ai.behaviors;
+
+import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
+import de.ntcomputer.minecraft.controllablemobs.implementation.CraftControllableMob;
+import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionAttackMove;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.NativeInterfaces;
+
+public class PathfinderGoalActionAttackMove extends PathfinderGoalActionAbstractMove<ControllableMobActionAttackMove> {
+
+	public PathfinderGoalActionAttackMove(CraftControllableMob<?> mob) {
+		super(mob, ActionType.ATTACKMOVE);
+	}
+	
+	@Override
+	protected boolean isActionBlocked() {
+		if(this.mob.nmsEntity.getGoalTarget()==null) return false;
+		double distanceSquared = NativeInterfaces.ENTITY.METHOD_GETDISTANCETOLOCATIONSQUARED.invoke(this.mob.nmsEntity, action.x, action.y, action.z);
+		if(distanceSquared > this.action.lastDistanceSquared) return false;
+		this.action.lastDistanceSquared = distanceSquared;
+		return true;
+	}
+
+	@Override
+	protected boolean isActionRequired() {
+		double distanceSquared = NativeInterfaces.ENTITY.METHOD_GETDISTANCETOLOCATIONSQUARED.invoke(this.mob.nmsEntity, action.x, action.y, action.z);
+		if(this.mob.nmsEntity.getGoalTarget()!=null) {
+			if(distanceSquared < this.action.lastDistanceSquared) {
+				this.action.lastDistanceSquared = distanceSquared;
+				return false;
+			}
+			if(Math.sqrt(distanceSquared) < Math.sqrt(this.action.lastDistanceSquared) + this.action.maxDistraction) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+}