From 6929a1830e75ae54ce9108c0fc7670030651e985 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Wed, 30 Mar 2011 00:25:59 +0200 Subject: [PATCH] Force compile-time failures for the subtle changes done in the API --- src/main/java/org/bukkit/event/block/BlockListener.java | 7 +++++++ src/main/java/org/bukkit/event/player/PlayerListener.java | 6 ++++++ src/main/java/org/bukkit/event/server/ServerListener.java | 4 ++++ .../java/org/bukkit/event/vehicle/VehicleListener.java | 3 +++ src/main/java/org/bukkit/event/world/WorldListener.java | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/src/main/java/org/bukkit/event/block/BlockListener.java b/src/main/java/org/bukkit/event/block/BlockListener.java index 6cb36b46..c6404a86 100644 --- a/src/main/java/org/bukkit/event/block/BlockListener.java +++ b/src/main/java/org/bukkit/event/block/BlockListener.java @@ -1,6 +1,7 @@ package org.bukkit.event.block; import org.bukkit.event.Listener; +import org.bukkit.plugin.AuthorNagException; /** * Handles all events thrown in relation to Blocks @@ -32,10 +33,16 @@ public class BlockListener implements Listener { * Called when a block flows (water/lava) * * @param event Relevant event details + * @throws BukkitAuthorNagException */ public void onBlockFromTo(BlockFromToEvent event) { + onBlockFlow(event); + throw new AuthorNagException("onBlockFlow has been deprecated, use onBlockFromTo"); } + // Prevent compilation of old signatures TODO: Remove after 1.4 + @Deprecated public final void onBlockFlow(BlockFromToEvent event) {} + /** * Called when a block gets ignited * diff --git a/src/main/java/org/bukkit/event/player/PlayerListener.java b/src/main/java/org/bukkit/event/player/PlayerListener.java index e9abb2dc..a4829bc2 100644 --- a/src/main/java/org/bukkit/event/player/PlayerListener.java +++ b/src/main/java/org/bukkit/event/player/PlayerListener.java @@ -162,4 +162,10 @@ public class PlayerListener implements Listener { */ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) { } + + // Prevent compilation of old signatures TODO: Remove after 1.4 + @Deprecated public final void onPlayerQuit(PlayerEvent event) {} + @Deprecated public final void onPlayerCommandPreprocess(PlayerChatEvent event) {} + @Deprecated public final void onPlayerTeleport(PlayerMoveEvent event) {} + @Deprecated public final 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 index f14e90c0..c2f01de0 100644 --- a/src/main/java/org/bukkit/event/server/ServerListener.java +++ b/src/main/java/org/bukkit/event/server/ServerListener.java @@ -30,4 +30,8 @@ public class ServerListener implements Listener { */ public void onServerCommand(ServerCommandEvent event) { } + + // Prevent compilation of old signatures TODO: Remove after 1.4 + @Deprecated public final void onPluginDisable(PluginEvent event) {} + @Deprecated public final 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 index e1cc7759..84625961 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleListener.java @@ -75,4 +75,7 @@ public class VehicleListener implements Listener { */ public void onVehicleUpdate(VehicleUpdateEvent event) { } + + // Prevent compilation of old signatures TODO: Remove after 1.4 + @Deprecated public final void onVehicleUpdate(VehicleEvent event) {} } diff --git a/src/main/java/org/bukkit/event/world/WorldListener.java b/src/main/java/org/bukkit/event/world/WorldListener.java index ff19ef3a..1e727600 100644 --- a/src/main/java/org/bukkit/event/world/WorldListener.java +++ b/src/main/java/org/bukkit/event/world/WorldListener.java @@ -38,4 +38,8 @@ public class WorldListener implements Listener { */ public void onWorldLoad(WorldLoadEvent event) { } + + // Prevent compilation of old signatures TODO: Remove after 1.4 + @Deprecated public final void onWorldLoad(WorldEvent event) {} + @Deprecated public final void onWorldSave(WorldEvent event) {} }