renamed attackMove to moveToAttacking

Author: DevCybran

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

@@ -43,39 +43,39 @@ public interface ControllableMobActions {
 	 * 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)
+	 * @see #moveToAttacking(Location, boolean, double, double)
 	 * @param loc the location the entity will move to.
 	 * @return {@link ControllableMobAction}
 	 */
-	public ControllableMobAction attackMoveTo(Location loc);
+	public ControllableMobAction moveToAttacking(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)
+	 * @see #moveToAttacking(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);
+	public ControllableMobAction moveToAttacking(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)
+	 * @see #moveToAttacking(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;
+	public ControllableMobAction moveToAttacking(Location loc, boolean queue, double maximumDistractionDistance) throws IllegalArgumentException;
 
 	/**
 	 * Orders the entity to move to the given location, optionally adding the action to the queue.
@@ -90,7 +90,7 @@ public interface ControllableMobActions {
 	 * @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;
+	public ControllableMobAction moveToAttacking(Location loc, boolean queue, double maximumDistractionDistance, double movementSpeedMultiplicator) throws IllegalArgumentException;
 
 	/**
 	 * Orders the entity to look at the given location.

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

@@ -24,7 +24,7 @@ public enum ActionType {
 	/**
 	 * @see de.ntcomputer.minecraft.controllablemobs.api.ControllableMobActions#attackMoveTo(org.bukkit.Location, boolean, double, double)
 	 */
-	ATTACKMOVE(false, false),
+	MOVEATTACKING(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,7 +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.ControllableMobActionMoveAttacking;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionBase;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionCallback;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionDie;
@@ -180,25 +180,25 @@ public void setDefaultQueuingFlag(boolean defaultQueue) {
 	}
 
 	@Override
-	public ControllableMobAction attackMoveTo(Location loc) {
-		return this.attackMoveTo(loc, defaultQueue);
+	public ControllableMobAction moveToAttacking(Location loc) {
+		return this.moveToAttacking(loc, defaultQueue);
 	}
 
 	@Override
-	public ControllableMobAction attackMoveTo(Location loc, boolean queue) {
-		return this.attackMoveTo(loc, queue, 16.0D);
+	public ControllableMobAction moveToAttacking(Location loc, boolean queue) {
+		return this.moveToAttacking(loc, queue, 16.0D);
 	}
 
 	@Override
-	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance) throws IllegalArgumentException {
-		return this.attackMoveTo(loc, queue, maximumDistractionDistance, 1.0D);
+	public ControllableMobAction moveToAttacking(Location loc, boolean queue, double maximumDistractionDistance) throws IllegalArgumentException {
+		return this.moveToAttacking(loc, queue, maximumDistractionDistance, 1.0D);
 	}
 
 	@Override
-	public ControllableMobAction attackMoveTo(Location loc, boolean queue, double maximumDistractionDistance, double movementSpeedMultiplicator) throws IllegalArgumentException {
+	public ControllableMobAction moveToAttacking(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);
+		return this.addAction(new ControllableMobActionMoveAttacking(this.actionManager, loc, movementSpeedMultiplicator, maximumDistractionDistance), queue);
 	}
 
 }

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

@@ -4,7 +4,7 @@
 
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
 
-public class ControllableMobActionMove extends ControllableMobActionAbstractMove {
+public class ControllableMobActionMove extends ControllableMobActionMoveAbstract {
 
 	public ControllableMobActionMove(ControllableMobActionManager manager, Location to, double movementSpeedMultiplicator) {
 		super(manager, ActionType.MOVE, to, movementSpeedMultiplicator);

…s/ControllableMobActionAbstractMove.java …s/ControllableMobActionMoveAbstract.javasrc/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAbstractMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionMoveAbstract.java src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAbstractMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionMoveAbstract.java

@@ -7,15 +7,15 @@
 
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
 
-public class ControllableMobActionAbstractMove extends ControllableMobActionBase {
+public class ControllableMobActionMoveAbstract 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) {
+	public ControllableMobActionMoveAbstract(ControllableMobActionManager manager, ActionType type, Location to, double movementSpeedMultiplicator) {
 		super(manager, type);
 		if(to==null) {
 			this.x = 0;

…ons/ControllableMobActionAttackMove.java …/ControllableMobActionMoveAttacking.javasrc/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAttackMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionMoveAttacking.java src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionAttackMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/actions/ControllableMobActionMoveAttacking.java

@@ -4,12 +4,12 @@
 
 import de.ntcomputer.minecraft.controllablemobs.api.actions.ActionType;
 
-public class ControllableMobActionAttackMove extends ControllableMobActionAbstractMove {
+public class ControllableMobActionMoveAttacking extends ControllableMobActionMoveAbstract {
 	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);
+	public ControllableMobActionMoveAttacking(ControllableMobActionManager manager, Location to, double movementSpeedMultiplicator, double maxDistraction) {
+		super(manager, ActionType.MOVEATTACKING, to, movementSpeedMultiplicator);
 		if(this.isValid()) {
 			this.maxDistraction = 0;
 		} else {

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

@@ -3,7 +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.PathfinderGoalActionMoveAttacking;
 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;
@@ -20,7 +20,7 @@ public AIGoalController(CraftControllableMob<E> mob) {
 	@Override
 	protected void createActionGoals() {
 		this.addActionGoal(-3, new PathfinderGoalActionMove(mob));
-		this.addActionGoal(-2, new PathfinderGoalActionAttackMove(mob));
+		this.addActionGoal(-2, new PathfinderGoalActionMoveAttacking(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/PathfinderGoalActionMove.java

@@ -4,7 +4,7 @@
 import de.ntcomputer.minecraft.controllablemobs.implementation.CraftControllableMob;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionMove;
 
-public class PathfinderGoalActionMove extends PathfinderGoalActionAbstractMove<ControllableMobActionMove> {
+public class PathfinderGoalActionMove extends PathfinderGoalActionMoveAbstract<ControllableMobActionMove> {
 
 	public PathfinderGoalActionMove(CraftControllableMob<?> mob) {
 		super(mob, ActionType.MOVE);

…rs/PathfinderGoalActionAbstractMove.java …rs/PathfinderGoalActionMoveAbstract.javasrc/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAbstractMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMoveAbstract.java src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAbstractMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMoveAbstract.java

@@ -3,13 +3,13 @@
 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.actions.ControllableMobActionMoveAbstract;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.NativeInterfaces;
 
-public class PathfinderGoalActionAbstractMove<A extends ControllableMobActionAbstractMove> extends PathfinderGoalActionDelayed<A> {
+public class PathfinderGoalActionMoveAbstract<A extends ControllableMobActionMoveAbstract> extends PathfinderGoalActionDelayed<A> {
 	private PathEntity path;
 
-	public PathfinderGoalActionAbstractMove(CraftControllableMob<?> mob, ActionType type) {
+	public PathfinderGoalActionMoveAbstract(CraftControllableMob<?> mob, ActionType type) {
 		super(mob, type);
 		this.setMutexBits(3);
 	}

…iors/PathfinderGoalActionAttackMove.java …s/PathfinderGoalActionMoveAttacking.javasrc/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAttackMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMoveAttacking.java src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionAttackMove.java renamed to src/java/de/ntcomputer/minecraft/controllablemobs/implementation/ai/behaviors/PathfinderGoalActionMoveAttacking.java

@@ -2,13 +2,13 @@
 
 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.actions.ControllableMobActionMoveAttacking;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.NativeInterfaces;
 
-public class PathfinderGoalActionAttackMove extends PathfinderGoalActionAbstractMove<ControllableMobActionAttackMove> {
+public class PathfinderGoalActionMoveAttacking extends PathfinderGoalActionMoveAbstract<ControllableMobActionMoveAttacking> {
 
-	public PathfinderGoalActionAttackMove(CraftControllableMob<?> mob) {
-		super(mob, ActionType.ATTACKMOVE);
+	public PathfinderGoalActionMoveAttacking(CraftControllableMob<?> mob) {
+		super(mob, ActionType.MOVEATTACKING);
 	}
 
 	@Override