Remove _INVALID_ methods

9 files changed, 0 insertions, 229 deletions

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 75b0a9a4..34363f69 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -110,21 +110,6 @@ public final class Bukkit {
     }
 
     /**
-     * Gets an array copy of all currently logged in players.
-     * <p>
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @deprecated superseded by {@link #getOnlinePlayers()}
-     * @return an array of Players that are currently online
-     */
-    @Deprecated
-    public static Player[] _INVALID_getOnlinePlayers() {
-        return server._INVALID_getOnlinePlayers();
-    }
-
-    /**
      * Gets a view of all currently logged in players. This {@linkplain
      * Collections#unmodifiableCollection(Collection) view} is a reused
      * object, making some operations like {@link Collection#size()}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9468c4a6..a327527e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -90,19 +90,6 @@ public interface Server extends PluginMessageRecipient {
     public String getBukkitVersion();
 
     /**
-     * Gets an array copy of all currently logged in players.
-     * <p>
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @deprecated superseded by {@link #getOnlinePlayers()}
-     * @return an array of Players that are currently online
-     */
-    @Deprecated
-    public Player[] _INVALID_getOnlinePlayers();
-
-    /**
      * Gets a view of all currently logged in players. This {@linkplain
      * Collections#unmodifiableCollection(Collection) view} is a reused
      * object, making some operations like {@link Collection#size()}
diff --git a/src/main/java/org/bukkit/entity/Damageable.java b/src/main/java/org/bukkit/entity/Damageable.java
index bd601bb6..e173cf01 100644
--- a/src/main/java/org/bukkit/entity/Damageable.java
+++ b/src/main/java/org/bukkit/entity/Damageable.java
@@ -14,16 +14,6 @@ public interface Damageable extends Entity {
     void damage(double amount);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @param amount Amount of damage to deal
-     */
-    @Deprecated
-    void _INVALID_damage(int amount);
-
-    /**
      * Deals the given amount of damage to this entity, from a specified
      * entity.
      *
@@ -33,17 +23,6 @@ public interface Damageable extends Entity {
     void damage(double amount, Entity source);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @param amount Amount of damage to deal
-     * @param source Entity which to attribute this damage from
-     */
-    @Deprecated
-    void _INVALID_damage(int amount, Entity source);
-
-    /**
      * Gets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is dead.
      *
      * @return Health represented from 0 to max
@@ -51,16 +30,6 @@ public interface Damageable extends Entity {
     double getHealth();
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return Health represented from 0 to max
-     */
-    @Deprecated
-    int _INVALID_getHealth();
-
-    /**
      * Sets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is
      * dead.
      *
@@ -71,18 +40,6 @@ public interface Damageable extends Entity {
     void setHealth(double health);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @param health New health represented from 0 to max
-     * @throws IllegalArgumentException Thrown if the health is {@literal < 0 or >}
-     *     {@link #getMaxHealth()}
-     */
-    @Deprecated
-    void _INVALID_setHealth(int health);
-
-    /**
      * Gets the maximum health this entity has.
      *
      * @return Maximum health
@@ -92,16 +49,6 @@ public interface Damageable extends Entity {
     double getMaxHealth();
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return Maximum health
-     */
-    @Deprecated
-    int _INVALID_getMaxHealth();
-
-    /**
      * Sets the maximum health this entity can have.
      * <p>
      * If the health of the entity is above the value provided it will be set
@@ -117,16 +64,6 @@ public interface Damageable extends Entity {
     void setMaxHealth(double health);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @param health amount of health to set the maximum to
-     */
-    @Deprecated
-    void _INVALID_setMaxHealth(int health);
-
-    /**
      * Resets the max health to the original amount.
      * @deprecated use {@link Attribute#GENERIC_MAX_HEALTH}.
      */
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 12a55934..5423af84 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -169,16 +169,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
     public double getLastDamage();
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return damage taken since the last no damage ticks time period
-     */
-    @Deprecated
-    public int _INVALID_getLastDamage();
-
-    /**
      * Sets the damage dealt within the current no damage ticks time period.
      *
      * @param damage amount of damage
@@ -186,16 +176,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
     public void setLastDamage(double damage);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @param damage amount of damage
-     */
-    @Deprecated
-    public void _INVALID_setLastDamage(int damage);
-
-    /**
      * Returns the living entity's current no damage ticks.
      *
      * @return amount of no damage ticks
diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
index ea641142..904d84cb 100644
--- a/src/main/java/org/bukkit/entity/Minecart.java
+++ b/src/main/java/org/bukkit/entity/Minecart.java
@@ -10,16 +10,6 @@ import org.bukkit.util.Vector;
 public interface Minecart extends Vehicle {
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @param damage over 40 to "kill" a minecart
-     */
-    @Deprecated
-    public void _INVALID_setDamage(int damage);
-
-    /**
      * Sets a minecart's damage.
      *
      * @param damage over 40 to "kill" a minecart
@@ -27,16 +17,6 @@ public interface Minecart extends Vehicle {
     public void setDamage(double damage);
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @return The damage
-     */
-    @Deprecated
-    public int _INVALID_getDamage();
-
-    /**
      * Gets a minecart's damage.
      *
      * @return The damage
diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java
index a5599fa3..4ab2332f 100644
--- a/src/main/java/org/bukkit/entity/Projectile.java
+++ b/src/main/java/org/bukkit/entity/Projectile.java
@@ -8,16 +8,6 @@ import org.bukkit.projectiles.ProjectileSource;
 public interface Projectile extends Entity {
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @return the {@link LivingEntity} that shot this projectile
-     */
-    @Deprecated
-    public LivingEntity _INVALID_getShooter();
-
-    /**
      * Retrieve the shooter of this projectile.
      *
      * @return the {@link ProjectileSource} that shot this projectile
@@ -25,16 +15,6 @@ public interface Projectile extends Entity {
     public ProjectileSource getShooter();
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     *
-     * @param shooter the {@link LivingEntity} that shot this projectile
-     */
-    @Deprecated
-    public void _INVALID_setShooter(LivingEntity shooter);
-
-    /**
      * Set the shooter of this projectile.
      *
      * @param source the {@link ProjectileSource} that shot this projectile
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index ed9387c1..bd1cc6fc 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -146,18 +146,6 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
     }
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return the (rounded) damage
-     */
-    @Deprecated
-    public int _INVALID_getDamage() {
-        return NumberConversions.ceil(getDamage());
-    }
-
-    /**
      * Sets the raw amount of damage caused by the event.
      * <p>
      * For compatibility this also recalculates the modifiers and scales
@@ -195,18 +183,6 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
     }
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @param damage the new damage value
-     */
-    @Deprecated
-    public void _INVALID_setDamage(int damage) {
-        setDamage(damage);
-    }
-
-    /**
      * Gets the cause of the damage.
      *
      * @return A DamageCause value detailing the cause of the damage.
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
index c7e9ba6f..1dd50c56 100644
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
@@ -30,18 +30,6 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
     }
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return the (rounded) amount regained
-     */
-    @Deprecated
-    public int _INVALID_getAmount() {
-        return NumberConversions.ceil(getAmount());
-    }
-
-    /**
      * Sets the amount of regained health
      *
      * @param amount the amount of health the entity will regain
@@ -50,18 +38,6 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
         this.amount = amount;
     }
 
-    /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @param amount the amount that will be regained
-     */
-    @Deprecated
-    public void _INVALID_setAmount(int amount) {
-        setAmount(amount);
-    }
-
     @Override
     public boolean isCancelled() {
         return cancelled;
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
index c7b9c1a6..dec18b83 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
@@ -4,7 +4,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
-import org.bukkit.util.NumberConversions;
 
 /**
  * Raised when a vehicle receives damage.
@@ -15,11 +14,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
     private double damage;
     private boolean cancelled;
 
-    @Deprecated
-    public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final int damage) {
-        this(vehicle, attacker, (double) damage);
-    }
-
     public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final double damage) {
         super(vehicle);
         this.attacker = attacker;
@@ -45,18 +39,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
     }
 
     /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @return the damage
-     */
-    @Deprecated
-    public int _INVALID_getDamage() {
-        return NumberConversions.ceil(getDamage());
-    }
-
-    /**
      * Sets the damage done to the vehicle
      *
      * @param damage The damage
@@ -65,18 +47,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
         this.damage = damage;
     }
 
-    /**
-     * This method exists for legacy reasons to provide backwards
-     * compatibility. It will not exist at runtime and should not be used
-     * under any circumstances.
-     * 
-     * @param damage the damage
-     */
-    @Deprecated
-    public void _INVALID_setDamage(int damage) {
-        setDamage(damage);
-    }
-
     public boolean isCancelled() {
         return cancelled;
     }