Removing 14 deprecated methods per http://bit.ly/mO2f4d

Bukkit · Jun 16, 2011 · a329cf1 · a329cf1
1 parent d920779
commit a329cf1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 90 deletions.
diff --git a/src/main/java/org/bukkit/event/player/PlayerListener.java b/src/main/java/org/bukkit/event/player/PlayerListener.java
@@ -1,7 +1,6 @@
 package org.bukkit.event.player;
 
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.AuthorNagException;
 
 /**
  * Handles all events thrown in relation to a Player
@@ -14,20 +13,14 @@ public PlayerListener() {}
      *
      * @param event Relevant event details
      */
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        onPlayerJoin((PlayerEvent) event);
-        throw new AuthorNagException("onPlayerJoin has been replaced with a new signature, (PlayerJoinEvent)");
-    }
+    public void onPlayerJoin(PlayerJoinEvent event) {}
 
     /**
      * Called when a player leaves a server
      *
      * @param event Relevant event details
      */
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        onPlayerQuit((PlayerEvent) event);
-        throw new AuthorNagException("onPlayerQuit has been replaced with a new signature, (PlayerQuitEvent)");
-    }
+    public void onPlayerQuit(PlayerQuitEvent event) {}
 
     /**
      * Called when a player gets kicked from the server
@@ -49,10 +42,7 @@ public void onPlayerChat(PlayerChatEvent event) {}
      *
      * @param event Relevant event details
      */
-    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        onPlayerCommandPreprocess((PlayerChatEvent) event);
-        throw new AuthorNagException("onPlayerCommandPreprocess has been replaced with a new signature, (PlayerCommandPreprocessEvent)");
-    }
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {}
 
     /**
      * Called when a player attempts to move location in a world
@@ -66,10 +56,7 @@ public void onPlayerMove(PlayerMoveEvent event) {}
      *
      * @param event Relevant event details
      */
-    public void onPlayerTeleport(PlayerTeleportEvent event) {
-        onPlayerTeleport((PlayerMoveEvent) event);
-        throw new AuthorNagException("onPlayerTeleport has been replaced with a new signature, (PlayerTeleportEvent)");
-    }
+    public void onPlayerTeleport(PlayerTeleportEvent event) {}
 
     /**
      * Called when a player respawns
@@ -189,10 +176,4 @@ public void onPlayerBedLeave(PlayerBedLeaveEvent event) {}
      * @param event Relevant event details
      */
     public void onPlayerPortal(PlayerPortalEvent event) {}
-
-    // TODO: Remove after RB
-    @Deprecated public void onPlayerQuit(PlayerEvent event) {}
-    @Deprecated public void onPlayerCommandPreprocess(PlayerChatEvent event) {}
-    @Deprecated public void onPlayerTeleport(PlayerMoveEvent event) {}
-    @Deprecated public void onPlayerJoin(PlayerEvent event) {}
 }
diff --git a/src/main/java/org/bukkit/event/server/ServerListener.java b/src/main/java/org/bukkit/event/server/ServerListener.java
@@ -1,7 +1,6 @@
 package org.bukkit.event.server;
 
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.AuthorNagException;
 
 /**
  * Handles all miscellaneous server events
@@ -13,29 +12,19 @@ public class ServerListener implements Listener {
      *
      * @param event Relevant event details
      */
-    public void onPluginEnable(PluginEnableEvent event) {
-        onPluginEnable((PluginEvent) event);
-        throw new AuthorNagException("onPluginEnable has been replaced with a new signature, (PluginEnableEvent)");
-    }
+    public void onPluginEnable(PluginEnableEvent event) {}
 
     /**
      * Called when a plugin is disabled
      *
      * @param event Relevant event details
      */
-    public void onPluginDisable(PluginDisableEvent event) {
-        onPluginDisable((PluginEvent) event);
-        throw new AuthorNagException("onPluginDisable has been replaced with a new signature, (PluginDisableEvent)");
-    }
+    public void onPluginDisable(PluginDisableEvent event) {}
 
     /**
      * Called when a server command is used
      *
      * @param event Relevant event details
      */
     public void onServerCommand(ServerCommandEvent event) {}
-
-    // TODO: Remove after RB
-    @Deprecated public void onPluginDisable(PluginEvent event) {}
-    @Deprecated public void onPluginEnable(PluginEvent event) {}
 }
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java b/src/main/java/org/bukkit/event/vehicle/VehicleListener.java
@@ -1,7 +1,6 @@
 package org.bukkit.event.vehicle;
 
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.AuthorNagException;
 
 /**
  * Listener for vehicle events.
@@ -73,11 +72,5 @@ public void onVehicleDestroy(VehicleDestroyEvent event) {}
      *
      * @param event
      */
-    public void onVehicleUpdate(VehicleUpdateEvent event) {
-        onVehicleUpdate((VehicleEvent) event);
-        throw new AuthorNagException("onVehicleUpdate has been replaced with a new signature, (VehicleUpdateEvent)");
-    }
-
-    // TODO: Remove after RB
-    @Deprecated public void onVehicleUpdate(VehicleEvent event) {}
+    public void onVehicleUpdate(VehicleUpdateEvent event) {}
 }
diff --git a/src/main/java/org/bukkit/event/world/WorldListener.java b/src/main/java/org/bukkit/event/world/WorldListener.java
@@ -1,7 +1,6 @@
 package org.bukkit.event.world;
 
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.AuthorNagException;
 
 /**
  * Handles all World related events
@@ -50,10 +49,7 @@ public void onPortalCreate(PortalCreateEvent event) {}
      *
      * @param event Relevant event details
      */
-    public void onWorldSave(WorldSaveEvent event) {
-        onWorldSave((WorldEvent) event);
-        throw new AuthorNagException("onWorldSave has been replaced with a new signature, (WorldSaveEvent)");
-    }
+    public void onWorldSave(WorldSaveEvent event) {}
 
     /**
      * Called when a World is initializing
@@ -68,19 +64,12 @@ public void onWorldInit(WorldInitEvent event) {
      *
      * @param event Relevant event details
      */
-    public void onWorldLoad(WorldLoadEvent event) {
-        onWorldLoad((WorldEvent) event);
-        throw new AuthorNagException("onWorldLoad has been replaced with a new signature, (WorldLoadEvent)");
-    }
+    public void onWorldLoad(WorldLoadEvent event) {}
 
     /**
      * Called when a World is unloaded
      *
      * @param event Relevant event details
      */
     public void onWorldUnload(WorldUnloadEvent event) { }
-
-    // TODO: Remove after RB
-    @Deprecated public void onWorldLoad(WorldEvent event) {}
-    @Deprecated public void onWorldSave(WorldEvent event) {}
 }
diff --git a/src/main/java/org/bukkit/material/Coal.java b/src/main/java/org/bukkit/material/Coal.java
@@ -42,17 +42,6 @@ public CoalType getType() {
         return CoalType.getByData(getData());
     }
 
-    /**
-     * Sets the type of this coal
-     *
-     * @param type New type of this coal
-     * @deprecated use {@link #setType(CoalType)} instead
-     */
-    @Deprecated
-    public void setSpecies(CoalType type) {
-        setType(type);
-    }
-
     /**
      * Sets the type of this coal
      *

diff --git a/src/main/java/org/bukkit/material/Crops.java b/src/main/java/org/bukkit/material/Crops.java
@@ -33,17 +33,6 @@ public Crops(final Material type, final byte data) {
         super(type, data);
     }
 
-    /**
-     * Gets the current growth state of this crop
-     *
-     * @return CropState of this leave
-     * @deprecated use {@link #getState()} instead
-     */
-    @Deprecated
-    public CropState getSpecies() {
-        return getState();
-    }
-
     /**
      * Gets the current growth state of this crop
      *
@@ -53,17 +42,6 @@ public CropState getState() {
         return CropState.getByData(getData());
     }
 
-    /**
-     * Sets the growth state of this crop
-     *
-     * @param state New growth state of this crop
-     * @deprecated use {@link #setState(CropState)} instead
-     */
-    @Deprecated
-    public void setSpecies(CropState state) {
-        setState(state);
-    }
-
     /**
      * Sets the growth state of this crop
      *