removed deprecated functions

Author: DevCybran

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

@@ -8,7 +8,7 @@
  * You can retrieve an instance of ControllableMob by using the {@link ControllableMobs} class.
  * 
  * @author Cybran
- * @version v4
+ * @version v5
  *
  * @param <E> the bukkit entity class of the entity which is being controlled.
  */
@@ -21,13 +21,6 @@ public interface ControllableMob<E extends LivingEntity> {
 	 */
 	public E getEntity();
 
-	/**
-	 * @return the property management object for this ControllableMob.
-	 * @deprecated use {@link ControllableMob#getAttributes()} instead. 
-	 */
-	@Deprecated
-	public ControllableMobProperties getProperties();
-	
 	/**
 	 * @return the attribute management object for this ControllableMob.
 	 */

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

@@ -11,26 +11,10 @@
  * You can retrieve an instance by using {@link ControllableMob#getAI()}
  * 
  * @author Cybran
- * @version v4
+ * @version v5
  */
 public interface ControllableMobAI<E extends LivingEntity> {
 
-	/**
-	 * Adds a given AI behavior - the entity will act corresponding to this behavior.
-	 * AI behaviors are persistent, if you add them one time, they will stay active until you remove them.
-	 * AI behaviors start certain actions automatically, defined by the behavior you add.
-	 * You can retrieve an AI behavior instance by creating a subclass of {@link AIBehavior}.
-	 * You must not add a behavior more than one time.
-	 * 
-	 * @param behavior the new AI behavior
-	 * @throws IllegalArgumentException when behavior is null or has already been added
-	 * 
-	 * @deprecated changed to {@link ControllableMobAI#addBehavior(AIBehavior)}. Method will be removed in v5.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Deprecated
-	public void addAIBehavior(AIBehavior behavior) throws IllegalArgumentException;
-	
 	/**
 	 * Adds a given AI behavior - the entity will act corresponding to this behavior.<br>
 	 * AI behaviors start certain actions automatically, defined by the behavior you add.<br>
@@ -43,18 +27,6 @@ public interface ControllableMobAI<E extends LivingEntity> {
 	 */
 	public <B extends AIBehavior<? super E>> AIPart<E,B> addBehavior(B behavior) throws IllegalArgumentException;
 
-	/**
-	 * Adds the given AI behaviors.
-	 * 
-	 * @see ControllableMobAI#addAIBehavior(AIBehavior)
-	 * @param behaviors an array of new AI behaviors
-	 * @throws IllegalArgumentException when behaviors is null or contains null
-	 * 
-	 * @deprecated changed to {@link ControllableMobAI#addBehaviors(AIBehavior...)}. Method will be removed in v5.
-	 */
-	@SuppressWarnings("rawtypes")
-	public void addAIBehaviors(AIBehavior[] behaviors) throws IllegalArgumentException;
-	
 	/**
 	 * Adds the given AI behaviors.
 	 * 
@@ -65,19 +37,6 @@ public interface ControllableMobAI<E extends LivingEntity> {
 	 */
 	public AIPart<E,?>[] addBehaviors(AIBehavior<? super E>... behaviors) throws IllegalArgumentException;
 
-	/**
-	 * Removes the given AI behavior.<br>
-	 * The behavior must have been added manually before.
-	 * 
-	 * @param behavior the AI behavior to remove. Be sure, that the instance was previously added by {@link ControllableMobAI#addAIBehavior(AIBehavior)}
-	 * @throws IllegalArgumentException when behavior is null
-	 * 
-	 * @deprecated removing parts of the AI by passing the behavior is deprecated. You should switch to {@link de.ntcomputer.minecraft.controllablemobs.api.ai.AIPart#unattach()}. Method will be removed in v5 or v6.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Deprecated
-	public void removeAIBehavior(AIBehavior behavior) throws IllegalArgumentException;
-	
 	/**
 	 * Unattaches all AI parts of the specified types.<br>
 	 * You are free to re-attach any of the removed AI parts later.
@@ -94,51 +53,20 @@ public interface ControllableMobAI<E extends LivingEntity> {
 	 */
 	public void removeExcept(AIType... typesToKeep);
 
-	/**
-	 * Removes all AI behaviors.<br>
-	 * Removes custom, manually added behaviors as well as default behaviors.<br>
-	 * The result: the entity will not move nor attack automatically.
-	 * 
-	 * @deprecated renamed to {@link ControllableMobAI#clear()}. Method will be removed in v5.
-	 */
-	@Deprecated
-	public void clearAIBehaviors();
-	
 	/**
 	 * Removes all AI behaviors.<br>
 	 * Removes custom, manually added behaviors as well as default behaviors.<br>
 	 * The result: the entity will not move nor attack automatically.
 	 */
 	public void clear();
 
-	/**
-	 * Restores all default AI behaviors.
-	 * Removes custom, manually added behaviors and restores the default behaviors for this entity.
-	 * The result: the entity will act normal.
-	 * 
-	 * @deprecated renamed to {@link ControllableMobAI#reset()}. Method will be removed in v5.
-	 */
-	@Deprecated
-	public void restoreAIBehaviors();
-	
 	/**
 	 * Resets to default AI behaviors.<br>
 	 * Removes custom, manually added behaviors and restores the default behaviors for this entity.<br>
 	 * The result: the entity will act normal.
 	 */
 	public void reset();
 
-	/**
-	 * Retrieves all custom AI behaviors.
-	 * 
-	 * @return an array of all custom AI behaviors (default AI behaviors are NOT included)
-	 * 
-	 * @deprecated retrieving the AI by returning the behaviors is deprecated. You should switch to {@link ControllableMobAI#getParts()}. Method will be removed in v5 or v6.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Deprecated
-	public AIBehavior[] getAIBehaviors();
-	
 	/**
 	 * Retrieves all AI parts, including custom behaviors and default behaviors.
 	 * 

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 v3
+ * @version v5
  */
 public interface ControllableMobActions {
 	/**
@@ -235,12 +235,6 @@ public interface ControllableMobActions {
 	 */
 	public ControllableMobAction callback(Runnable runnable);
 
-	/*public ControllableMobAction teleport(Entity entity);
-	public ControllableMobAction teleport(Entity entity, boolean queue);
-	public ControllableMobAction teleport(Entity entity, boolean queue, float targetDistance);
-	public ControllableMobAction teleport(Location loc);
-	public ControllableMobAction teleport(Location loc, boolean queue);*/
-	
 
 	/**
 	 * Returns whether an action of the specified type is currently running.

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

@@ -11,15 +11,14 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.PluginClassLoader;
 
-import de.ntcomputer.minecraft.controllablemobs.api.ai.behaviors.AIBehavior;
 import de.ntcomputer.minecraft.controllablemobs.implementation.CraftControllableMob;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.NativeInterfaces;
 
 /**
  * This is a static class which lets you retrieve instances of {@link ControllableMob}.
  * 
  * @author Cybran
- * @version v4
+ * @version v5
  * 
  */
 public final class ControllableMobs {
@@ -141,78 +140,6 @@ public static <E extends LivingEntity> ControllableMob<E> assign(E entity, boole
 		return controllableMob;
 	}
 
-	/**
-	 * Puts the entity under your control and sets its new movement speed, optionally clearing its AI.
-	 * If you decide to clear its AI, the entity will stop moving and attacking and stand still until you order it to execute any actions.
-	 * See {@link ControllableMobAttributes#getMovementSpeedAttribute()} for critical information.
-	 * 
-	 * @param entity entity an instance of a subclass of LivingEntity - the entity you want to control.
-	 * @param clearAI a boolean indicating whether default behaviors should be removed (true) or not (false)
-	 * @param newMovementSpeed This float value has to be in a range between 0.01 and 2.0, or it will be ignored. The default value is 0.25 for monsters
-	 * @return the {@link ControllableMob} you can use to control the entity
-	 * @throws InvalidEntityException when the entity is null or can't be controlled
-	 * @throws IllegalStateException when the entity is already being controlled
-	 * 
-	 * @deprecated contains parameters that should be set elsewhere. Will be removed in v5 or v6.
-	 */
-	@Deprecated
-	public static <E extends LivingEntity> ControllableMob<E> assign(E entity, boolean clearAI, float newMovementSpeed) throws IllegalStateException, InvalidEntityException {
-		return assign(entity, clearAI, newMovementSpeed, null);
-	}
-	
-	/**
-	 * Puts the entity under your control, optionally clearing its AI and adding custom AI behaviors.
-	 * If you decide to clear its AI, the entity will stop moving and attacking like it would normally do.
-	 * Instead, it will act corresponding to the new AI behaviors you provide.
-	 * 
-	 * @param entity entity an instance of a subclass of LivingEntity - the entity you want to control.
-	 * @param clearAI a boolean indicating whether default behaviors should be removed (true) or not (false)
-	 * @param additionalAIBehaviors an array of new AI behaviors. See {@link ControllableMobAI#addAIBehaviors(AIBehavior[])}
-	 * @return the {@link ControllableMob} you can use to control the entity
-	 * @throws InvalidEntityException when the entity is null or can't be controlled
-	 * @throws IllegalStateException when the entity is already being controlled
-	 * 
-	 * @deprecated contains parameters that should be set elsewhere. Will be removed in v5 or v6.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Deprecated
-	public static <E extends LivingEntity> ControllableMob<E> assign(E entity, boolean clearAI, AIBehavior[] additionalAIBehaviors) throws IllegalStateException, InvalidEntityException {
-		return assign(entity, clearAI, 0, additionalAIBehaviors);
-	}
-	
-	/**
-	 * Puts the entity under your control and sets its new movement speed, optionally clearing its AI and adding custom AI behaviors.
-	 * If you decide to clear its AI, the entity will stop moving and attacking like it would normally do.
-	 * Instead, it will act corresponding to the new AI behaviors you provide.
-	 * See {@link ControllableMobAttributes#getMovementSpeedAttribute()} for critical information.
-	 * 
-	 * @param entity entity an instance of a subclass of LivingEntity - the entity you want to control.
-	 * @param clearAI a boolean indicating whether default behaviors should be removed (true) or not (false)
-	 * @param newMovementSpeed This float value has to be in a range between 0.01 and 2.0, or it will be ignored. The default value is 0.25 for monsters
-	 * @param additionalAIBehaviors an array of new AI behaviors. See {@link ControllableMobAI#addAIBehaviors(AIBehavior[])}
-	 * @return the {@link ControllableMob} you can use to control the entity
-	 * @throws InvalidEntityException when the entity is null or can't be controlled
-	 * @throws IllegalStateException when the entity is already being controlled
-	 * 
-	 * @deprecated contains parameters that should be set elsewhere. Will be removed in v5 or v6.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Deprecated
-	public static <E extends LivingEntity> ControllableMob<E> assign(E entity, boolean clearAI, float newMovementSpeed, AIBehavior[] additionalAIBehaviors) throws IllegalStateException, InvalidEntityException {
-		if(entity==null) throw new InvalidEntityException("entity must not be null", entity);
-		EntityLiving notchEntity = ((CraftLivingEntity) entity).getHandle();
-		if(!(notchEntity instanceof EntityInsentient)) throw new InvalidEntityException("the entity "+entity.toString()+" can't be controlled",entity);
-		if(entities.containsKey(entity)) throw new IllegalStateException("entity "+entity.toString()+" is already a controlled entity");
-		
-		ControllableMob<E> controllableMob = new CraftControllableMob<E>(entity, (EntityInsentient) notchEntity);
-		if(clearAI) controllableMob.getAI().clearAIBehaviors();
-		controllableMob.getProperties().setMovementSpeed(newMovementSpeed);
-		if(additionalAIBehaviors!=null) controllableMob.getAI().addAIBehaviors(additionalAIBehaviors);
-		
-		entities.put(entity,controllableMob);
-		return controllableMob;
-	}
-	
 	/**
 	 * Releases the entity from control and restores default behaviors.
 	 * All actions will be stopped immediately, all custom AI behaviors will be removed and default attributes and behaviors will be restored. Frees memory.

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

@@ -8,15 +8,11 @@
 import de.ntcomputer.minecraft.controllablemobs.api.ControllableMobAI;
 import de.ntcomputer.minecraft.controllablemobs.api.ControllableMobActions;
 import de.ntcomputer.minecraft.controllablemobs.api.ControllableMobAttributes;
-import de.ntcomputer.minecraft.controllablemobs.api.ControllableMobProperties;
 import de.ntcomputer.minecraft.controllablemobs.implementation.actions.ControllableMobActionManager;
 
-@SuppressWarnings("deprecation")
 public class CraftControllableMob<E extends LivingEntity> implements ControllableMob<E> {
 	private E entity;
 	private CraftControllableMobAttributes attributes;
-	@Deprecated
-	private CraftControllableMobProperties properties;
 	private CraftControllableMobAI<E> ai;
 	private CraftControllableMobActions actions;
 	public EntityInsentient notchEntity;
@@ -25,7 +21,6 @@ public CraftControllableMob(E entity, EntityInsentient notchEntity) {
 		this.entity = entity;
 		this.notchEntity = notchEntity;
 		this.attributes = new CraftControllableMobAttributes(this);
-		this.properties = new CraftControllableMobProperties(this.attributes);
 		this.actions = new CraftControllableMobActions(this);
 		this.ai = new CraftControllableMobAI<E>(this);
 	}
@@ -40,13 +35,11 @@ public void unassign(boolean resetAttributes) {
 		// component dispose
 		this.actions.dispose();
 		this.ai.dispose();
-		this.properties.dispose();
 		this.attributes.dispose(resetAttributes);
 
 		// component disposal
 		this.actions = null;
 		this.ai = null;
-		this.properties = null;
 		this.attributes = null;
 
 		// entity unassign
@@ -68,13 +61,6 @@ public E getEntity() {
 		return entity;
 	}
 
-	@Override
-	@Deprecated
-	public ControllableMobProperties getProperties() throws IllegalStateException {
-		if(this.properties==null) this.disposedCall();
-		return this.properties;
-	}
-
 	@Override
 	public ControllableMobAI<E> getAI() {
 		if(this.ai==null) this.disposedCall();