From 049a7cc1d09ff056929e39e26ec5c37405ed18ca Mon Sep 17 00:00:00 2001
From: Erik Broes <erikbroes@grum.nl>
Date: Mon, 30 Jan 2012 21:32:48 +0100
Subject: Deprecation cleanup.

---
 src/main/java/org/bukkit/Achievement.java          |  14 -
 src/main/java/org/bukkit/Bukkit.java               |  26 +-
 src/main/java/org/bukkit/ChatColor.java            |  21 -
 src/main/java/org/bukkit/Note.java                 |  12 -
 src/main/java/org/bukkit/Server.java               |  70 +-
 src/main/java/org/bukkit/Statistic.java            |  12 -
 src/main/java/org/bukkit/World.java                |  12 -
 src/main/java/org/bukkit/block/Block.java          |  12 -
 .../bukkit/command/defaults/TimingsCommand.java    |   8 +-
 src/main/java/org/bukkit/entity/Player.java        |  22 -
 .../java/org/bukkit/event/CustomEventListener.java |  17 -
 src/main/java/org/bukkit/event/Event.java          | 939 +--------------------
 src/main/java/org/bukkit/event/EventException.java |   1 -
 .../org/bukkit/event/TransitionalCustomEvent.java  |  18 -
 .../org/bukkit/event/block/BlockBreakEvent.java    |   6 +-
 .../org/bukkit/event/block/BlockBurnEvent.java     |   4 +-
 .../org/bukkit/event/block/BlockCanBuildEvent.java |   4 +-
 .../org/bukkit/event/block/BlockDamageEvent.java   |   8 +-
 .../org/bukkit/event/block/BlockDispenseEvent.java |   4 +-
 .../java/org/bukkit/event/block/BlockEvent.java    |   3 +-
 .../org/bukkit/event/block/BlockFadeEvent.java     |   6 +-
 .../org/bukkit/event/block/BlockFormEvent.java     |  13 +-
 .../org/bukkit/event/block/BlockFromToEvent.java   |   2 +-
 .../org/bukkit/event/block/BlockIgniteEvent.java   |   9 +-
 .../java/org/bukkit/event/block/BlockListener.java | 191 -----
 .../org/bukkit/event/block/BlockPhysicsEvent.java  |   2 +-
 .../org/bukkit/event/block/BlockPistonEvent.java   |   6 +-
 .../bukkit/event/block/BlockPistonExtendEvent.java |   6 +-
 .../event/block/BlockPistonRetractEvent.java       |   4 +-
 .../org/bukkit/event/block/BlockPlaceEvent.java    |   4 +-
 .../org/bukkit/event/block/BlockRedstoneEvent.java |   6 +-
 .../org/bukkit/event/block/BlockSpreadEvent.java   |   6 +-
 .../bukkit/event/block/EntityBlockFormEvent.java   |   4 +-
 .../org/bukkit/event/block/LeavesDecayEvent.java   |   2 +-
 .../org/bukkit/event/block/SignChangeEvent.java    |   8 +-
 .../bukkit/event/enchantment/EnchantItemEvent.java |  10 +-
 .../event/enchantment/PrepareItemEnchantEvent.java |  12 +-
 .../bukkit/event/entity/CreatureSpawnEvent.java    |  10 +-
 .../org/bukkit/event/entity/CreeperPowerEvent.java |  12 +-
 .../bukkit/event/entity/EndermanPickupEvent.java   |   6 +-
 .../bukkit/event/entity/EndermanPlaceEvent.java    |   6 +-
 .../event/entity/EntityChangeBlockEvent.java       |   8 +-
 .../event/entity/EntityCombustByBlockEvent.java    |   4 +-
 .../event/entity/EntityCombustByEntityEvent.java   |   4 +-
 .../bukkit/event/entity/EntityCombustEvent.java    |   4 +-
 .../event/entity/EntityCreatePortalEvent.java      |   6 +-
 .../event/entity/EntityDamageByBlockEvent.java     |   6 +-
 .../event/entity/EntityDamageByEntityEvent.java    |   6 +-
 .../entity/EntityDamageByProjectileEvent.java      |  42 -
 .../org/bukkit/event/entity/EntityDamageEvent.java |  11 +-
 .../org/bukkit/event/entity/EntityDeathEvent.java  |   6 +-
 .../java/org/bukkit/event/entity/EntityEvent.java  |   3 +-
 .../bukkit/event/entity/EntityExplodeEvent.java    |  13 +-
 .../bukkit/event/entity/EntityInteractEvent.java   |   4 +-
 .../org/bukkit/event/entity/EntityListener.java    | 187 ----
 .../event/entity/EntityPortalEnterEvent.java       |   6 +-
 .../event/entity/EntityRegainHealthEvent.java      |   7 +-
 .../bukkit/event/entity/EntityShootBowEvent.java   |   8 +-
 .../org/bukkit/event/entity/EntityTameEvent.java   |   6 +-
 .../org/bukkit/event/entity/EntityTargetEvent.java |   6 +-
 .../bukkit/event/entity/ExplosionPrimeEvent.java   |   6 +-
 .../bukkit/event/entity/FoodLevelChangeEvent.java  |   4 +-
 .../org/bukkit/event/entity/ItemDespawnEvent.java  |   6 +-
 .../org/bukkit/event/entity/ItemSpawnEvent.java    |   6 +-
 .../java/org/bukkit/event/entity/PigZapEvent.java  |   8 +-
 .../org/bukkit/event/entity/PlayerDeathEvent.java  |   6 +-
 .../org/bukkit/event/entity/PotionSplashEvent.java |   6 +-
 .../bukkit/event/entity/ProjectileHitEvent.java    |   8 +-
 .../org/bukkit/event/entity/SheepDyeWoolEvent.java |   4 +-
 .../bukkit/event/entity/SheepRegrowWoolEvent.java  |   4 +-
 .../org/bukkit/event/entity/SlimeSplitEvent.java   |   4 +-
 .../bukkit/event/inventory/FurnaceBurnEvent.java   |   8 +-
 .../bukkit/event/inventory/FurnaceSmeltEvent.java  |   8 +-
 .../bukkit/event/inventory/InventoryListener.java  |  25 -
 .../event/painting/PaintingBreakByEntityEvent.java |   2 +-
 .../bukkit/event/painting/PaintingBreakEvent.java  |   6 +-
 .../org/bukkit/event/painting/PaintingEvent.java   |   3 +-
 .../bukkit/event/painting/PaintingPlaceEvent.java  |  11 +-
 .../bukkit/event/player/PlayerAnimationEvent.java  |   4 +-
 .../bukkit/event/player/PlayerBedEnterEvent.java   |   6 +-
 .../bukkit/event/player/PlayerBedLeaveEvent.java   |   6 +-
 .../event/player/PlayerBucketEmptyEvent.java       |   4 +-
 .../org/bukkit/event/player/PlayerBucketEvent.java |  10 +-
 .../bukkit/event/player/PlayerBucketFillEvent.java |   5 +-
 .../event/player/PlayerChangedWorldEvent.java      |   4 +-
 .../org/bukkit/event/player/PlayerChatEvent.java   |   8 +-
 .../event/player/PlayerCommandPreprocessEvent.java |   3 +-
 .../bukkit/event/player/PlayerDropItemEvent.java   |   2 +-
 .../bukkit/event/player/PlayerEggThrowEvent.java   |   6 +-
 .../java/org/bukkit/event/player/PlayerEvent.java  |   3 +-
 .../bukkit/event/player/PlayerExpChangeEvent.java  |   6 +-
 .../org/bukkit/event/player/PlayerFishEvent.java   |   6 +-
 .../event/player/PlayerGameModeChangeEvent.java    |   6 +-
 .../event/player/PlayerInteractEntityEvent.java    |   4 +-
 .../bukkit/event/player/PlayerInteractEvent.java   |   4 +-
 .../bukkit/event/player/PlayerInventoryEvent.java  |   2 +-
 .../bukkit/event/player/PlayerItemHeldEvent.java   |   6 +-
 .../org/bukkit/event/player/PlayerJoinEvent.java   |   4 +-
 .../org/bukkit/event/player/PlayerKickEvent.java   |   4 +-
 .../event/player/PlayerLevelChangeEvent.java       |  10 +-
 .../org/bukkit/event/player/PlayerListener.java    | 230 -----
 .../org/bukkit/event/player/PlayerLoginEvent.java  |  12 +-
 .../org/bukkit/event/player/PlayerMoveEvent.java   |   9 +-
 .../bukkit/event/player/PlayerPickupItemEvent.java |   6 +-
 .../org/bukkit/event/player/PlayerPortalEvent.java |   4 +-
 .../bukkit/event/player/PlayerPreLoginEvent.java   |   7 +-
 .../org/bukkit/event/player/PlayerQuitEvent.java   |   4 +-
 .../bukkit/event/player/PlayerRespawnEvent.java    |   6 +-
 .../event/player/PlayerShearEntityEvent.java       |   6 +-
 .../bukkit/event/player/PlayerTeleportEvent.java   |  19 +-
 .../event/player/PlayerToggleSneakEvent.java       |   6 +-
 .../event/player/PlayerToggleSprintEvent.java      |   6 +-
 .../bukkit/event/player/PlayerVelocityEvent.java   |   8 +-
 .../bukkit/event/server/MapInitializeEvent.java    |   4 +-
 .../bukkit/event/server/PluginDisableEvent.java    |   5 +-
 .../org/bukkit/event/server/PluginEnableEvent.java |   5 +-
 .../java/org/bukkit/event/server/PluginEvent.java  |   4 +-
 .../bukkit/event/server/ServerCommandEvent.java    |  11 +-
 .../java/org/bukkit/event/server/ServerEvent.java  |   3 -
 .../bukkit/event/server/ServerListPingEvent.java   |   8 +-
 .../org/bukkit/event/server/ServerListener.java    |  45 -
 .../event/vehicle/VehicleBlockCollisionEvent.java  |   6 +-
 .../event/vehicle/VehicleCollisionEvent.java       |   4 +-
 .../bukkit/event/vehicle/VehicleCreateEvent.java   |   4 +-
 .../bukkit/event/vehicle/VehicleDamageEvent.java   |   6 +-
 .../bukkit/event/vehicle/VehicleDestroyEvent.java  |   6 +-
 .../bukkit/event/vehicle/VehicleEnterEvent.java    |   6 +-
 .../event/vehicle/VehicleEntityCollisionEvent.java |   6 +-
 .../org/bukkit/event/vehicle/VehicleEvent.java     |   3 +-
 .../org/bukkit/event/vehicle/VehicleExitEvent.java |   6 +-
 .../org/bukkit/event/vehicle/VehicleListener.java  |  75 --
 .../org/bukkit/event/vehicle/VehicleMoveEvent.java |   8 +-
 .../bukkit/event/vehicle/VehicleUpdateEvent.java   |   5 +-
 .../bukkit/event/weather/LightningStrikeEvent.java |   6 +-
 .../bukkit/event/weather/ThunderChangeEvent.java   |   6 +-
 .../bukkit/event/weather/WeatherChangeEvent.java   |   6 +-
 .../org/bukkit/event/weather/WeatherEvent.java     |   3 +-
 .../org/bukkit/event/weather/WeatherListener.java  |  32 -
 .../java/org/bukkit/event/world/ChunkEvent.java    |   4 +-
 .../org/bukkit/event/world/ChunkLoadEvent.java     |   2 +-
 .../org/bukkit/event/world/ChunkPopulateEvent.java |   2 +-
 .../org/bukkit/event/world/ChunkUnloadEvent.java   |   2 +-
 .../org/bukkit/event/world/PortalCreateEvent.java  |   4 +-
 .../org/bukkit/event/world/SpawnChangeEvent.java   |   6 +-
 .../org/bukkit/event/world/StructureGrowEvent.java |  10 +-
 .../java/org/bukkit/event/world/WorldEvent.java    |   4 +-
 .../org/bukkit/event/world/WorldInitEvent.java     |   4 +-
 .../java/org/bukkit/event/world/WorldListener.java |  82 --
 .../org/bukkit/event/world/WorldLoadEvent.java     |   5 +-
 .../org/bukkit/event/world/WorldSaveEvent.java     |   5 +-
 .../org/bukkit/event/world/WorldUnloadEvent.java   |   4 +-
 src/main/java/org/bukkit/plugin/Plugin.java        |  12 +-
 src/main/java/org/bukkit/plugin/PluginLoader.java  |  26 -
 src/main/java/org/bukkit/plugin/PluginManager.java |  27 +-
 .../org/bukkit/plugin/SimplePluginManager.java     |  88 +-
 .../java/org/bukkit/plugin/java/JavaPlugin.java    |  41 +-
 .../org/bukkit/plugin/java/JavaPluginLoader.java   | 766 +----------------
 .../java/org/bukkit/util/config/Configuration.java | 239 ------
 .../bukkit/util/config/ConfigurationException.java |  16 -
 .../org/bukkit/util/config/ConfigurationNode.java  | 586 -------------
 160 files changed, 409 insertions(+), 4235 deletions(-)
 delete mode 100644 src/main/java/org/bukkit/event/CustomEventListener.java
 delete mode 100644 src/main/java/org/bukkit/event/TransitionalCustomEvent.java
 delete mode 100644 src/main/java/org/bukkit/event/block/BlockListener.java
 delete mode 100644 src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
 delete mode 100644 src/main/java/org/bukkit/event/entity/EntityListener.java
 delete mode 100644 src/main/java/org/bukkit/event/inventory/InventoryListener.java
 delete mode 100644 src/main/java/org/bukkit/event/player/PlayerListener.java
 delete mode 100644 src/main/java/org/bukkit/event/server/ServerListener.java
 delete mode 100644 src/main/java/org/bukkit/event/vehicle/VehicleListener.java
 delete mode 100644 src/main/java/org/bukkit/event/weather/WeatherListener.java
 delete mode 100644 src/main/java/org/bukkit/event/world/WorldListener.java
 delete mode 100644 src/main/java/org/bukkit/util/config/Configuration.java
 delete mode 100644 src/main/java/org/bukkit/util/config/ConfigurationException.java
 delete mode 100644 src/main/java/org/bukkit/util/config/ConfigurationNode.java

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/bukkit/Achievement.java b/src/main/java/org/bukkit/Achievement.java
index 4226ca8f..8f1f6aa4 100644
--- a/src/main/java/org/bukkit/Achievement.java
+++ b/src/main/java/org/bukkit/Achievement.java
@@ -47,20 +47,6 @@ public enum Achievement {
         return id;
     }
 
-    /**
-     * Gets the achievement associated with the given ID.
-     * <p />
-     * Note that the ID must already be offset using {@link #STATISTIC_OFFSET}
-     *
-     * @param id ID of the achievement to return
-     * @return Achievement with the given ID
-     * @deprecated use {@link Achievement#getById(int)}
-     */
-    @Deprecated
-    public static Achievement getAchievement(int id) {
-        return BY_ID.get(id);
-    }
-
     /**
      * Gets the achievement associated with the given ID.
      * <p />
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d0d52eaa..2497a31a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1,18 +1,16 @@
 package org.bukkit;
 
-import com.avaje.ebean.config.ServerConfig;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Logger;
-import org.bukkit.World.Environment;
+
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
-import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.inventory.Recipe;
 import org.bukkit.map.MapView;
 import org.bukkit.plugin.PluginManager;
@@ -20,6 +18,8 @@ import org.bukkit.plugin.ServicesManager;
 import org.bukkit.plugin.messaging.Messenger;
 import org.bukkit.scheduler.BukkitScheduler;
 
+import com.avaje.ebean.config.ServerConfig;
+
 /**
  * Represents the Bukkit core, for version and Server singleton handling
  */
@@ -136,26 +136,6 @@ public final class Bukkit {
         return server.getWorlds();
     }
 
-    @Deprecated
-    public static World createWorld(String name, Environment environment) {
-        return server.createWorld(name, environment);
-    }
-
-    @Deprecated
-    public static World createWorld(String name, Environment environment, long seed) {
-        return server.createWorld(name, environment, seed);
-    }
-
-    @Deprecated
-    public static World createWorld(String name, Environment environment, ChunkGenerator generator) {
-        return server.createWorld(name, environment, generator);
-    }
-
-    @Deprecated
-    public static World createWorld(String name, Environment environment, long seed, ChunkGenerator generator) {
-        return server.createWorld(name, environment, seed, generator);
-    }
-
     public static World createWorld(WorldCreator options) {
         return server.createWorld(options);
     }
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index eff64afc..2cef2590 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -95,16 +95,6 @@ public enum ChatColor {
         this.toString = new String(new char[] {COLOR_CHAR, code});
     }
 
-    /**
-     * Gets the data value associated with this color
-     *
-     * @return An integer value of this color code
-     * @deprecated Use {@link #getChar()}
-     */
-    public int getCode() {
-        return intCode;
-    }
-
     /**
      * Gets the char value associated with this color
      *
@@ -119,17 +109,6 @@ public enum ChatColor {
         return toString;
     }
 
-    /**
-     * Gets the color represented by the specified color code
-     *
-     * @param code Code to check
-     * @return Associative {@link org.bukkit.ChatColor} with the given code, or null if it doesn't exist
-     * @deprecated Use {@link #getByChar(char)}
-     */
-    public static ChatColor getByCode(final int code) {
-        return BY_ID.get(code);
-    }
-
     /**
      * Gets the color represented by the specified color code
      *
diff --git a/src/main/java/org/bukkit/Note.java b/src/main/java/org/bukkit/Note.java
index fd84c14c..3d5f1254 100644
--- a/src/main/java/org/bukkit/Note.java
+++ b/src/main/java/org/bukkit/Note.java
@@ -85,18 +85,6 @@ public class Note {
             }
         }
 
-        /**
-         * Returns the tone to id. Also returning the semitones.
-         *
-         * @param id the id of the tone.
-         * @return the tone to id.
-         * @deprecated use {@link #getById(byte)}
-         */
-        @Deprecated
-        public static Tone getToneById(byte id) {
-            return BY_DATA.get(id);
-        }
-
         /**
          * Returns the tone to id. Also returning the semitones.
          *
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f271e00e..df83db74 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1,22 +1,18 @@
 package org.bukkit;
 
-import org.bukkit.generator.ChunkGenerator;
-import com.avaje.ebean.config.ServerConfig;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Recipe;
-
+import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Logger;
-import java.io.File;
 
 import org.bukkit.command.CommandException;
-import org.bukkit.command.PluginCommand;
-
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Recipe;
 import org.bukkit.map.MapView;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.ServicesManager;
@@ -24,6 +20,8 @@ import org.bukkit.plugin.messaging.Messenger;
 import org.bukkit.plugin.messaging.PluginMessageRecipient;
 import org.bukkit.scheduler.BukkitScheduler;
 
+import com.avaje.ebean.config.ServerConfig;
+
 /**
  * Represents a server implementation
  */
@@ -277,62 +275,6 @@ public interface Server extends PluginMessageRecipient {
      */
     public List<World> getWorlds();
 
-    /**
-     * Creates or loads a world with the given name.
-     * If the world is already loaded, it will just return the equivalent of
-     * getWorld(name)
-     *
-     * @param name Name of the world to load
-     * @param environment Environment type of the world
-     * @return Newly created or loaded World
-     * @deprecated Use {@link #createWorld(org.bukkit.WorldCreator)}
-     */
-    @Deprecated
-    public World createWorld(String name, World.Environment environment);
-
-    /**
-     * Creates or loads a world with the given name.
-     * If the world is already loaded, it will just return the equivalent of
-     * getWorld(name)
-     *
-     * @param name Name of the world to load
-     * @param environment Environment type of the world
-     * @param seed Seed value to create the world with
-     * @return Newly created or loaded World
-     * @deprecated Use {@link #createWorld(org.bukkit.WorldCreator)}
-     */
-    @Deprecated
-    public World createWorld(String name, World.Environment environment, long seed);
-
-    /**
-     * Creates or loads a world with the given name.
-     * If the world is already loaded, it will just return the equivalent of
-     * getWorld(name)
-     *
-     * @param name Name of the world to load
-     * @param environment Environment type of the world
-     * @param generator ChunkGenerator to use in the construction of the new world
-     * @return Newly created or loaded World
-     * @deprecated Use {@link #createWorld(org.bukkit.WorldCreator)}
-     */
-    @Deprecated
-    public World createWorld(String name, World.Environment environment, ChunkGenerator generator);
-
-    /**
-     * Creates or loads a world with the given name.
-     * If the world is already loaded, it will just return the equivalent of
-     * getWorld(name)
-     *
-     * @param name Name of the world to load
-     * @param environment Environment type of the world
-     * @param seed Seed value to create the world with
-     * @param generator ChunkGenerator to use in the construction of the new world
-     * @return Newly created or loaded World
-     * @deprecated Use {@link #createWorld(org.bukkit.WorldCreator)}
-     */
-    @Deprecated
-    public World createWorld(String name, World.Environment environment, long seed, ChunkGenerator generator);
-
     /**
      * Creates or loads a world with the given name using the specified options.
      * <p>
diff --git a/src/main/java/org/bukkit/Statistic.java b/src/main/java/org/bukkit/Statistic.java
index 41d1b838..11e69b69 100644
--- a/src/main/java/org/bukkit/Statistic.java
+++ b/src/main/java/org/bukkit/Statistic.java
@@ -66,18 +66,6 @@ public enum Statistic {
         return isSubstat && isBlock;
     }
 
-    /**
-     * Gets the statistic associated with the given ID.
-     *
-     * @param id ID of the statistic to return
-     * @return statistic with the given ID
-     * @deprecated See {@link #getById(int)}
-     */
-    @Deprecated
-    public static Statistic getStatistic(int id) {
-        return BY_ID.get(id);
-    }
-
     /**
      * Gets the statistic associated with the given ID.
      *
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d4acd762..22c01bd0 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -370,18 +370,6 @@ public interface World extends PluginMessageRecipient {
      */
     public UUID getUID();
 
-    /**
-     * Gets a semi-unique identifier for this world.
-     * <p />
-     * While it is highly unlikely that this may be shared with another World,
-     * it is not guaranteed to be unique
-     *
-     * @deprecated Replaced with {@link #getUID()}
-     * @return Id of this world
-     */
-    @Deprecated
-    public long getId();
-
     /**
      * Gets the default spawn {@link Location} of this world
      *
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 0ca2622c..7ca3c01b 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -23,18 +23,6 @@ public interface Block {
      */
     byte getData();
 
-    /**
-     * @deprecated use {@link #getRelative(BlockFace face)}
-     */
-    @Deprecated
-    Block getFace(BlockFace face);
-
-    /**
-     * @deprecated use {@link #getRelative(BlockFace face, int distance)}
-     */
-    @Deprecated
-    Block getFace(BlockFace face, int distance);
-
     /**
      * Gets the block at the given offsets
      *
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index e43456f7..b6c9a663 100644
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
@@ -1,5 +1,9 @@
 package org.bukkit.command.defaults;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -10,10 +14,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredListener;
 import org.bukkit.plugin.TimedRegisteredListener;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
 public class TimingsCommand extends Command {
     public TimingsCommand(String name) {
         super(name);
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c32cd0d9..dca7e432 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -364,28 +364,6 @@ public interface Player extends HumanEntity, CommandSender, OfflinePlayer, Plugi
      */
     public void setExp(float exp);
 
-    /**
-     * Gets the players current experience points towards the next level.
-     * <p>
-     * This is a percentage value. 0 is "no progress" and 1 is "next level".
-     *
-     * @return Current experience points
-     * @deprecated use {@link #getExp()} - this method is unsafe to use!
-     */
-    @Deprecated
-    public int getExperience();
-
-    /**
-     * Sets the players current experience points towards the next level
-     * <p>
-     * This is a percentage value. 0 is "no progress" and 1 is "next level".
-     *
-     * @param exp New experience points
-     * @deprecated use {@link #setExp(float)} - this method is unsafe to use!
-     */
-    @Deprecated
-    public void setExperience(int exp);
-
     /**
      * Gets the players current experience level
      *
diff --git a/src/main/java/org/bukkit/event/CustomEventListener.java b/src/main/java/org/bukkit/event/CustomEventListener.java
deleted file mode 100644
index 26d2dbda..00000000
--- a/src/main/java/org/bukkit/event/CustomEventListener.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bukkit.event;
-
-/**
- * Handles all custom events
- */
-@Deprecated
-public class CustomEventListener implements Listener {
-    private static final HandlerList handlers = new HandlerList();
-    public CustomEventListener() {}
-
-    /**
-     * Called when a custom event is fired
-     *
-     * @param event Relevant event details
-     */
-    public void onCustomEvent(Event event) {}
-}
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 448827b9..2d25bec3 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -1,64 +1,25 @@
 package org.bukkit.event;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
-import org.bukkit.event.block.*;
-import org.bukkit.event.entity.*;
-import org.bukkit.event.inventory.*;
-import org.bukkit.event.painting.*;
-import org.bukkit.event.player.*;
-import org.bukkit.event.server.*;
-import org.bukkit.event.vehicle.*;
-import org.bukkit.event.weather.*;
-import org.bukkit.event.world.*;
+import org.apache.commons.lang.Validate;
 
 /**
  * Represents an event
  */
 @SuppressWarnings("serial")
 public abstract class Event implements Serializable {
-    @Deprecated
-    private final static Map<String, HandlerList> customHandlers = new HashMap<String, HandlerList>();
-    @Deprecated
-    private final Type type;
     private final String name;
 
-    protected Event(final Type type) {
-        exAssert(type != null, "type is null");
-        exAssert(type != Type.CUSTOM_EVENT, "use Event(String) to make custom events");
-        this.type = type;
-        this.name = getClass().getName();
-    }
-
     protected Event() {
-        this.type = Type.FIXED_EVENT;
         this.name = getClass().getName();
     }
 
     protected Event(final String name) {
-        exAssert(name != null, "name is null");
-        this.type = Type.CUSTOM_EVENT;
+        Validate.notNull(name, "name is cannot be null");
         this.name = name;
     }
 
-    /**
-     * Gets the Type of this event
-     *
-     * @return Event type that this object represents
-     */
-    @Deprecated
-    public final Type getType() {
-        return type;
-    }
-
-    private void exAssert(boolean b, String s) {
-        if (!b) {
-            throw new IllegalArgumentException(s);
-        }
-    }
-
     /**
      * Gets the event's name. Should only be used if getType() == Type.CUSTOM
      *
@@ -69,901 +30,7 @@ public abstract class Event implements Serializable {
     }
 
     public HandlerList getHandlers() {
-        if (type == Type.CUSTOM_EVENT) {
-            HandlerList result = customHandlers.get(getEventName());
-
-            if (result == null) {
-                result = new HandlerList();
-                customHandlers.put(getEventName(), result);
-            }
-
-            return result;
-        } else {
-            throw new IllegalStateException("Event must implement getHandlers()");
-        }
-    }
-
-    /**
-     * Represents an events priority in execution
-     */
-    @Deprecated
-    public enum Priority {
-
-        /**
-         * Event call is of very low importance and should be ran first, to allow
-         * other plugins to further customise the outcome
-         */
-        Lowest(EventPriority.LOWEST),
-        /**
-         * Event call is of low importance
-         */
-        Low(EventPriority.LOW),
-        /**
-         * Event call is neither important or unimportant, and may be ran normally
-         */
-        Normal(EventPriority.NORMAL),
-        /**
-         * Event call is of high importance
-         */
-        High(EventPriority.HIGH),
-        /**
-         * Event call is critical and must have the final say in what happens
-         * to the event
-         */
-        Highest(EventPriority.HIGHEST),
-        /**
-         * Event is listened to purely for monitoring the outcome of an event.
-         * <p />
-         * No modifications to the event should be made under this priority
-         */
-        Monitor(EventPriority.MONITOR);
-
-        private final EventPriority priority;
-        private Priority(EventPriority priority) {
-            this.priority = priority;
-        }
-
-        public EventPriority getNewPriority() {
-            return priority;
-        }
-    }
-
-    /**
-     * Represents a category used by Type
-     */
-    @Deprecated
-    public enum Category {
-
-        /**
-         * Represents Player-based events
-         *
-         * @see #LIVING_ENTITY
-         */
-        PLAYER,
-        /**
-         * Represents Entity-based events
-         */
-        ENTITY,
-        /**
-         * Represents Block-based events
-         */
-        BLOCK,
-        /**
-         * Represents LivingEntity-based events
-         */
-        LIVING_ENTITY,
-        /**
-         * Represents Weather-based events
-         */
-        WEATHER,
-        /**
-         * Represents Vehicle-based events
-         */
-        VEHICLE,
-        /**
-         * Represents World-based events
-         */
-        WORLD,
-        /**
-         * Represents Server and Plugin based events
-         */
-        SERVER,
-        /**
-         * Represents Inventory-based events
-         */
-        INVENTORY,
-        /**
-         * Represents any miscellaneous events
-         */
-        MISCELLANEOUS;
-    }
-
-    /**
-     * Provides a lookup for all core events
-     */
-    @Deprecated
-    public enum Type {
-
-        /**
-         * PLAYER EVENTS
-         */
-
-        /**
-         * Called when a player enters the world on a server
-         *
-         * @see org.bukkit.event.player.PlayerJoinEvent
-         */
-        PLAYER_JOIN(Category.PLAYER, PlayerJoinEvent.class),
-        /**
-         * Called when a player is attempting to connect to the server
-         *
-         * @see org.bukkit.event.player.PlayerLoginEvent
-         */
-        PLAYER_LOGIN(Category.PLAYER, PlayerLoginEvent.class),
-        /**
-         * Called when a player has just been authenticated
-         *
-         * @see org.bukkit.event.player.PlayerPreLoginEvent
-         */
-        PLAYER_PRELOGIN(Category.PLAYER, PlayerPreLoginEvent.class),
-        /**
-         * Called when a player respawns
-         *
-         * @see org.bukkit.event.player.PlayerRespawnEvent
-         */
-        PLAYER_RESPAWN(Category.PLAYER, PlayerRespawnEvent.class),
-        /**
-         * Called when a player gets kicked from the server
-         *
-         * @see org.bukkit.event.player.PlayerKickEvent
-         */
-        PLAYER_KICK(Category.PLAYER, PlayerKickEvent.class),
-        /**
-         * Called when a player sends a chat message
-         *
-         * @see org.bukkit.event.player.PlayerChatEvent
-         */
-        PLAYER_CHAT(Category.PLAYER, PlayerChatEvent.class),
-        /**
-         * Called when a player uses a command (early in the command handling process)
-         *
-         * @see org.bukkit.event.player.PlayerCommandPreprocessEvent
-         */
-        PLAYER_COMMAND_PREPROCESS(Category.PLAYER, PlayerCommandPreprocessEvent.class),
-        /**
-         * Called when a player leaves the server
-         *
-         * @see org.bukkit.event.player.PlayerQuitEvent
-         */
-        PLAYER_QUIT(Category.PLAYER, PlayerQuitEvent.class),
-        /**
-         * Called when a player moves position in the world
-         *
-         * @see org.bukkit.event.player.PlayerMoveEvent
-         */
-        PLAYER_MOVE(Category.PLAYER, PlayerMoveEvent.class),
-        /**
-         * Called before a player gets a velocity vector sent, which will instruct him to
-         * get "pushed" into a specific direction, e.g. after an explosion
-         *
-         * @see org.bukkit.event.player.PlayerVelocityEvent
-         */
-        PLAYER_VELOCITY(Category.PLAYER, PlayerVelocityEvent.class),
-        /**
-         * Called when a player undergoes an animation (Arm Swing is the only animation currently supported)
-         *
-         * @see org.bukkit.event.player.PlayerAnimationEvent
-         */
-        PLAYER_ANIMATION(Category.PLAYER, PlayerAnimationEvent.class),
-        /**
-         * Called when a player toggles sneak mode
-         *
-         * @see org.bukkit.event.player.PlayerToggleSneakEvent
-         */
-        PLAYER_TOGGLE_SNEAK(Category.PLAYER, PlayerToggleSneakEvent.class),
-        /**
-         * Called when a player toggles sprint mode
-         *
-         * @see org.bukkit.event.player.PlayerToggleSprintEvent
-         */
-        PLAYER_TOGGLE_SPRINT(Category.PLAYER, PlayerToggleSprintEvent.class),
-        /**
-         * Called when a player interacts with an object or air
-         *
-         * @see org.bukkit.event.player.PlayerInteractEvent
-         */
-        PLAYER_INTERACT(Category.PLAYER, PlayerInteractEvent.class),
-        /**
-         * Called when a player right clicks an entity
-         *
-         * @see org.bukkit.event.player.PlayerInteractEntityEvent
-         */
-        PLAYER_INTERACT_ENTITY(Category.PLAYER, PlayerInteractEntityEvent.class),
-        /**
-         * Called when a player throws an egg
-         *
-         * @see org.bukkit.event.player.PlayerEggThrowEvent
-         */
-        PLAYER_EGG_THROW(Category.PLAYER, PlayerEggThrowEvent.class),
-        /**
-         * Called when a player teleports from one position to another
-         *
-         * @see org.bukkit.event.player.PlayerTeleportEvent
-         */
-        PLAYER_TELEPORT(Category.PLAYER, PlayerTeleportEvent.class),
-        /**
-         * Called when a player completes the portaling process by standing in a portal
-         *
-         * @see org.bukkit.event.player.PlayerPortalEvent
-         */
-        PLAYER_PORTAL(Category.PLAYER, PlayerPortalEvent.class),
-        /**
-         * Called when a player changes their held item
-         *
-         * @see org.bukkit.event.player.PlayerItemHeldEvent
-         */
-        PLAYER_ITEM_HELD(Category.PLAYER, PlayerItemHeldEvent.class),
-        /**
-         * Called when a player drops an item
-         *
-         * @see org.bukkit.event.player.PlayerDropItemEvent
-         */
-        PLAYER_DROP_ITEM(Category.PLAYER, PlayerDropItemEvent.class),
-        /**
-         * Called when a player picks an item up off the ground
-         *
-         * @see org.bukkit.event.player.PlayerPickupItemEvent
-         */
-        PLAYER_PICKUP_ITEM(Category.PLAYER, PlayerPickupItemEvent.class),
-        /**
-         * Called when a player empties a bucket
-         *
-         * @see org.bukkit.event.player.PlayerBucketEmptyEvent
-         */
-        PLAYER_BUCKET_EMPTY(Category.PLAYER, PlayerBucketEmptyEvent.class),
-        /**
-         * Called when a player fills a bucket
-         *
-         * @see org.bukkit.event.player.PlayerBucketFillEvent
-         */
-        PLAYER_BUCKET_FILL(Category.PLAYER, PlayerBucketFillEvent.class),
-        /**
-         * Called when a player interacts with the inventory
-         *
-         * @see org.bukkit.event.player.PlayerInventoryEvent
-         */
-        PLAYER_INVENTORY(Category.PLAYER, PlayerInventoryEvent.class),
-        /**
-         * Called when a player enter a bed
-         *
-         * @see org.bukkit.event.player.PlayerBedEnterEvent
-         */
-        PLAYER_BED_ENTER(Category.PLAYER, PlayerBedEnterEvent.class),
-        /**
-         * Called when a player leaves a bed
-         *
-         * @see org.bukkit.event.player.PlayerBedLeaveEvent
-         */
-        PLAYER_BED_LEAVE(Category.PLAYER, PlayerBedLeaveEvent.class),
-        /**
-         * Called when a player is fishing
-         *
-         * @see org.bukkit.event.player.PlayerFishEvent
-         */
-        PLAYER_FISH(Category.PLAYER, PlayerFishEvent.class),
-        /**
-         * Called when the game mode of a player is changed
-         *
-         * @see org.bukkit.event.player.PlayerGameModeChangeEvent
-         */
-        PLAYER_GAME_MODE_CHANGE(Category.PLAYER, PlayerGameModeChangeEvent.class),
-        /**
-         * Called after a player has changed to a new world
-         *
-         * @see org.bukkit.event.player.PlayerChangedWorldEvent
-         */
-        PLAYER_CHANGED_WORLD(Category.PLAYER, PlayerChangedWorldEvent.class),
-        /**
-         * Called when a players level changes
-         *
-         * @see org.bukkit.event.player.PlayerLevelChangeEvent
-         */
-        PLAYER_LEVEL_CHANGE(Category.PLAYER, PlayerLevelChangeEvent.class),
-        /**
-         * Called when a players experience changes naturally
-         *
-         * @see org.bukkit.event.player.PlayerExpChangeEvent
-         */
-        PLAYER_EXP_CHANGE(Category.PLAYER, PlayerExpChangeEvent.class),
-        /**
-         * Called when a player shears an entity
-         *
-         * @see org.bukkit.event.player.PlayerShearEntityEvent
-         */
-        PLAYER_SHEAR_ENTITY(Category.LIVING_ENTITY, PlayerShearEntityEvent.class),
-
-        /**
-         * BLOCK EVENTS
-         */
-
-        /**
-         * Called when a block is damaged (hit by a player)
-         *
-         * @see org.bukkit.event.block.BlockDamageEvent
-         */
-        BLOCK_DAMAGE(Category.BLOCK, BlockDamageEvent.class),
-        /**
-         * Called when a block is undergoing a universe physics
-         * check on whether it can be built
-         * <p />
-         * For example, cacti cannot be built on grass unless overridden here
-         *
-         * @see org.bukkit.event.block.BlockCanBuildEvent
-         */
-        BLOCK_CANBUILD(Category.BLOCK, BlockCanBuildEvent.class),
-        /**
-         * Called when a block of water or lava attempts to flow into another
-         * block
-         *
-         * @see org.bukkit.event.block.BlockFromToEvent
-         */
-        BLOCK_FROMTO(Category.BLOCK, BlockFromToEvent.class),
-        /**
-         * Called when a block is being set on fire from another block, such as
-         * an adjacent block of fire attempting to set fire to wood
-         *
-         * @see org.bukkit.event.block.BlockIgniteEvent
-         */
-        BLOCK_IGNITE(Category.BLOCK, BlockIgniteEvent.class),
-        /**
-         * Called when a block undergoes a physics check
-         * <p />
-         * A physics check is commonly called when an adjacent block changes
-         * type
-         *
-         * @see org.bukkit.event.block.BlockPhysicsEvent
-         */
-        BLOCK_PHYSICS(Category.BLOCK, BlockPhysicsEvent.class),
-        /**
-         * Called when a player is attempting to place a block
-         *
-         * @see org.bukkit.event.block.BlockPlaceEvent
-         */
-        BLOCK_PLACE(Category.BLOCK, BlockPlaceEvent.class),
-        /**
-         * Called when a block dispenses something
-         *
-         * @see org.bukkit.event.block.BlockDispenseEvent
-         */
-        BLOCK_DISPENSE(Category.BLOCK, BlockDispenseEvent.class),
-        /**
-         * Called when a block is destroyed from being burnt by fire
-         *
-         * @see org.bukkit.event.block.BlockBurnEvent
-         */
-        BLOCK_BURN(Category.BLOCK, BlockBurnEvent.class),
-        /**
-         * Called when leaves are decaying naturally
-         *
-         * @see org.bukkit.event.block.LeavesDecayEvent
-         */
-        LEAVES_DECAY(Category.BLOCK, LeavesDecayEvent.class),
-        /**
-         * Called when a sign is changed
-         *
-         * @see org.bukkit.event.block.SignChangeEvent
-         */
-        SIGN_CHANGE(Category.BLOCK, SignChangeEvent.class),
-        /**
-         * Called when a block changes redstone current. Only triggered on blocks
-         * that are actually capable of transmitting or carrying a redstone
-         * current
-         *
-         * @see org.bukkit.event.block.BlockRedstoneEvent
-         */
-        REDSTONE_CHANGE(Category.BLOCK, BlockRedstoneEvent.class),
-        /**
-         * Called when a block is broken by a player
-         *
-         * @see org.bukkit.event.block.BlockBreakEvent
-         */
-        BLOCK_BREAK(Category.BLOCK, BlockBreakEvent.class),
-        /**
-         * Called when a block is formed based on world conditions
-         *
-         * @see org.bukkit.event.block.BlockFormEvent
-         */
-        BLOCK_FORM(Category.BLOCK, BlockFormEvent.class),
-        /**
-         * Called when a block spreads based on world conditions
-         *
-         * @see org.bukkit.event.block.BlockSpreadEvent
-         */
-        BLOCK_SPREAD(Category.BLOCK, BlockSpreadEvent.class),
-        /**
-         * Called when a block fades, melts or disappears based on world conditions
-         *
-         * @see org.bukkit.event.block.BlockFadeEvent
-         */
-        BLOCK_FADE(Category.BLOCK, BlockFadeEvent.class),
-        /**
-         * Called when a piston extends
-         *
-         * @see org.bukkit.event.block.BlockPistonExtendEvent
-         */
-        BLOCK_PISTON_EXTEND(Category.BLOCK, BlockPistonExtendEvent.class),
-        /**
-         * Called when a piston retracts
-         *
-         * @see org.bukkit.event.block.BlockPistonRetractEvent
-         */
-        BLOCK_PISTON_RETRACT(Category.BLOCK, BlockPistonRetractEvent.class),
-        /**
-         * INVENTORY EVENTS
-         */
-
-        /**
-         * Called when a player opens an inventory
-         *
-         * @todo: add javadoc see comment
-         */
-        INVENTORY_OPEN(Category.INVENTORY, null),
-        /**
-         * Called when a player closes an inventory
-         *
-         * @todo: add javadoc see comment
-         */
-        INVENTORY_CLOSE(Category.INVENTORY, null),
-        /**
-         * Called when a player clicks on an inventory slot
-         *
-         * @todo: add javadoc see comment
-         */
-        INVENTORY_CLICK(Category.INVENTORY, null),
-        /**
-         * Called when an inventory slot changes values or type
-         *
-         * @todo: add javadoc see comment
-         */
-        INVENTORY_CHANGE(Category.INVENTORY, null),
-        /**
-         * Called when a player is attempting to perform an inventory transaction
-         *
-         * @todo: add javadoc see comment
-         */
-        INVENTORY_TRANSACTION(Category.INVENTORY, null),
-        /**
-         * Called when an ItemStack is successfully smelted in a furnace.
-         *
-         * @see org.bukkit.event.inventory.FurnaceSmeltEvent
-         */
-        FURNACE_SMELT(Category.INVENTORY, FurnaceSmeltEvent.class),
-        /**
-         * Called when an ItemStack is successfully burned as fuel in a furnace.
-         *
-         * @see org.bukkit.event.inventory.FurnaceBurnEvent
-         */
-        FURNACE_BURN(Category.INVENTORY, FurnaceBurnEvent.class),
-        /**
-         * SERVER EVENTS
-         */
-
-        /**
-         * Called when a plugin is enabled
-         *
-         * @see org.bukkit.event.server.PluginEnableEvent
-         */
-        PLUGIN_ENABLE(Category.SERVER, PluginEnableEvent.class),
-        /**
-         * Called when a plugin is disabled
-         *
-         * @see org.bukkit.event.server.PluginDisableEvent
-         */
-        PLUGIN_DISABLE(Category.SERVER, PluginDisableEvent.class),
-        /**
-         * Called when a server command is called
-         *
-         * @see org.bukkit.event.server.ServerCommandEvent
-         */
-        SERVER_COMMAND(Category.SERVER, ServerCommandEvent.class),
-        /**
-         * Called when a remote server command is called
-         *
-         * @see org.bukkit.event.server.ServerCommandEvent
-         */
-        REMOTE_COMMAND(Category.SERVER, ServerCommandEvent.class),
-        /**
-         * Called when a map is initialized (created or loaded into memory)
-         *
-         * @see org.bukkit.event.server.MapInitializeEvent
-         */
-        MAP_INITIALIZE(Category.SERVER, MapInitializeEvent.class),
-        /**
-         * Called when a client pings a server.
-         *
-         * @see org.bukkit.event.server.ServerListPingEvent
-         */
-        SERVER_LIST_PING(Category.SERVER, ServerListPingEvent.class),
-
-        /**
-         * WORLD EVENTS
-         */
-
-        /**
-         * Called when a chunk is loaded
-         * <p />
-         * If a new chunk is being generated for loading, it will call
-         * Type.CHUNK_GENERATION and then Type.CHUNK_LOADED upon completion
-         *
-         * @see org.bukkit.event.world.ChunkLoadEvent
-         */
-        CHUNK_LOAD(Category.WORLD, ChunkLoadEvent.class),
-        /**
-         * Called when a chunk is unloaded
-         *
-         * @see org.bukkit.event.world.ChunkUnloadEvent
-         */
-        CHUNK_UNLOAD(Category.WORLD, ChunkUnloadEvent.class),
-        /**
-         * Called when a newly created chunk has been populated.
-         * <p />
-         * If your intent is to populate the chunk using this event, please see {@link org.bukkit.generator.BlockPopulator}
-         *
-         * @see org.bukkit.event.world.ChunkPopulateEvent
-         */
-        CHUNK_POPULATED(Category.WORLD, ChunkPopulateEvent.class),
-        /**
-         * Called when an ItemEntity spawns in the world
-         *
-         * @see org.bukkit.event.entity.ItemSpawnEvent
-         */
-        ITEM_SPAWN(Category.WORLD, ItemSpawnEvent.class),
-        /**
-         * Called when a World's spawn is changed
-         *
-         * @see org.bukkit.event.world.SpawnChangeEvent
-         */
-        SPAWN_CHANGE(Category.WORLD, SpawnChangeEvent.class),
-        /**
-         * Called when a world is saved
-         *
-         * @see org.bukkit.event.world.WorldSaveEvent
-         */
-        WORLD_SAVE(Category.WORLD, WorldSaveEvent.class),
-        /**
-         * Called when a World is initializing
-         *
-         * @see org.bukkit.event.world.WorldInitEvent
-         */
-        WORLD_INIT(Category.WORLD, WorldInitEvent.class),
-        /**
-         * Called when a World is loaded
-         *
-         * @see org.bukkit.event.world.WorldLoadEvent
-         */
-        WORLD_LOAD(Category.WORLD, WorldLoadEvent.class),
-        /**
-         * Called when a World is unloaded
-         *
-         * @see org.bukkit.event.world.WorldUnloadEvent
-         */
-        WORLD_UNLOAD(Category.WORLD, WorldUnloadEvent.class),
-        /**
-         * Called when world attempts to create a matching end to a portal
-         *
-         * @see org.bukkit.event.world.PortalCreateEvent
-         */
-        PORTAL_CREATE(Category.WORLD, PortalCreateEvent.class),
-        /**
-         * Called when an organic structure attempts to grow (Sapling -> Tree), (Mushroom -> Huge Mushroom), naturally or using bonemeal.
-         *
-         * @see org.bukkit.event.world.StructureGrowEvent
-         */
-        STRUCTURE_GROW(Category.WORLD, StructureGrowEvent.class),
-        /**
-         * Called when an item despawns from a world
-         *
-         * @see org.bukkit.event.entity.ItemDespawnEvent
-         */
-        ITEM_DESPAWN(Category.WORLD, ItemDespawnEvent.class),
-
-        /**
-         * ENTITY EVENTS
-         */
-
-        /**
-         * Called when a painting is placed by player
-         *
-         * @see org.bukkit.event.painting.PaintingPlaceEvent
-         */
-        PAINTING_PLACE(Category.ENTITY, PaintingPlaceEvent.class),
-        /**
-         * Called when a painting is removed
-         *
-         * @see org.bukkit.event.painting.PaintingBreakEvent
-         */
-        PAINTING_BREAK(Category.ENTITY, PaintingBreakEvent.class),
-        /**
-         * Called when an entity touches a portal block
-         *
-         * @see org.bukkit.event.entity.EntityPortalEnterEvent
-         */
-        ENTITY_PORTAL_ENTER(Category.ENTITY, EntityPortalEnterEvent.class),
-
-        /**
-         * LIVING_ENTITY EVENTS
-         */
-
-        /**
-         * Called when a creature, either hostile or neutral, attempts to spawn
-         * in the world "naturally"
-         *
-         * @see org.bukkit.event.entity.CreatureSpawnEvent
-         */
-        CREATURE_SPAWN(Category.LIVING_ENTITY, CreatureSpawnEvent.class),
-        /**
-         * Called when a LivingEntity is damaged with no source.
-         *
-         * @see org.bukkit.event.entity.EntityDamageEvent
-         */
-        ENTITY_DAMAGE(Category.LIVING_ENTITY, EntityDamageEvent.class),
-        /**
-         * Called when a LivingEntity dies
-         *
-         * @see org.bukkit.event.entity.EntityDeathEvent
-         */
-        ENTITY_DEATH(Category.LIVING_ENTITY, EntityDeathEvent.class),
-        /**
-         * Called when a Skeleton or Zombie catch fire due to the sun
-         *
-         * @see org.bukkit.event.entity.EntityCombustEvent
-         */
-        ENTITY_COMBUST(Category.LIVING_ENTITY, EntityCombustEvent.class),
-        /**
-         * Called when an entity explodes, either TNT, Creeper, or Ghast Fireball
-         *
-         * @see org.bukkit.event.entity.EntityExplodeEvent
-         */
-        ENTITY_EXPLODE(Category.LIVING_ENTITY, EntityExplodeEvent.class),
-        /**
-         * Called when an entity has made a decision to explode.
-         * <p />
-         * Provides an opportunity to act on the entity, change the explosion radius,
-         * or to change the fire-spread flag.
-         * <p />
-         * Canceling the event negates the entity's decision to explode.
-         * For EntityCreeper, this resets the fuse but does not kill the Entity.
-         * For EntityFireball and EntityTNTPrimed....?
-         *
-         * @see org.bukkit.event.entity.ExplosionPrimeEvent
-         */
-        EXPLOSION_PRIME(Category.LIVING_ENTITY, ExplosionPrimeEvent.class),
-        /**
-         * Called when an entity targets another entity
-         *
-         * @see org.bukkit.event.entity.EntityTargetEvent
-         */
-        ENTITY_TARGET(Category.LIVING_ENTITY, EntityTargetEvent.class),
-        /**
-         * Called when a sheep regrows its wool
-         *
-         * @see org.bukkit.event.entity.SheepRegrowWoolEvent
-         */
-        SHEEP_REGROW_WOOL(Category.LIVING_ENTITY, SheepRegrowWoolEvent.class),
-        /**
-         * Called when a sheep's wool is dyed
-         *
-         * @see org.bukkit.event.entity.SheepDyeWoolEvent
-         */
-        SHEEP_DYE_WOOL(Category.LIVING_ENTITY, SheepDyeWoolEvent.class),
-        /**
-         * Called when an entity interacts with a block
-         * This event specifically excludes player entities
-         *
-         * @see org.bukkit.event.entity.EntityInteractEvent
-         */
-        ENTITY_INTERACT(Category.LIVING_ENTITY, EntityInteractEvent.class),
-        /**
-         * Called when a creeper gains or loses a power shell
-         *
-         * @see org.bukkit.event.entity.CreeperPowerEvent
-         */
-        CREEPER_POWER(Category.LIVING_ENTITY, CreeperPowerEvent.class),
-        /**
-         * Called when a pig is zapped, zombifying it
-         *
-         * @see org.bukkit.event.entity.PigZapEvent
-         */
-        PIG_ZAP(Category.LIVING_ENTITY, PigZapEvent.class),
-        /**
-         * Called when a LivingEntity is tamed
-         *
-         * @see org.bukkit.event.entity.EntityTameEvent
-         */
-        ENTITY_TAME(Category.LIVING_ENTITY, EntityTameEvent.class),
-        /**
-         * Called when a LivingEntity changes a block
-         *
-         * This event specifically excludes player entities
-         *
-         * @see org.bukkit.event.entity.EntityChangeBlockEvent
-         */
-        ENTITY_CHANGE_BLOCK(Category.LIVING_ENTITY, EntityChangeBlockEvent.class),
-        /**
-         * Called when a {@link Projectile} hits something
-         *
-         * @see org.bukkit.event.entity.ProjectileHitEvent
-         */
-        PROJECTILE_HIT(Category.ENTITY, ProjectileHitEvent.class),
-        /**
-         * Called when a splash potion hits an area
-         *
-         * @see org.bukkit.event.entity.PotionSplashEvent
-         */
-        POTION_SPLASH(Category.ENTITY, PotionSplashEvent.class),
-        /**
-         * Called when a Slime splits into smaller Slimes upon death
-         *
-         * @see org.bukkit.event.entity.SlimeSplitEvent
-         */
-        SLIME_SPLIT(Category.LIVING_ENTITY, SlimeSplitEvent.class),
-        /**
-         * Called when a LivingEntity is regains health
-         *
-         * @see org.bukkit.event.entity.EntityRegainHealthEvent
-         */
-        ENTITY_REGAIN_HEALTH(Category.LIVING_ENTITY, EntityRegainHealthEvent.class),
-        /**
-         * Called when an Enderman picks a block up
-         *
-         * @see org.bukkit.event.entity.EndermanPickupEvent
-         */
-        ENDERMAN_PICKUP(Category.LIVING_ENTITY, EndermanPickupEvent.class),
-        /**
-         * Called when an Enderman places a block
-         *
-         * @see org.bukkit.event.entity.EndermanPlaceEvent
-         */
-        ENDERMAN_PLACE(Category.LIVING_ENTITY, EndermanPlaceEvent.class),
-        /**
-         * Called when a non-player LivingEntity teleports
-         *
-         * @see org.bukkit.event.entity.EntityTeleportEvent
-         */
-        ENTITY_TELEPORT(Category.LIVING_ENTITY, EntityTeleportEvent.class),
-        /**
-         * Called when a human entity's food level changes
-         *
-         * @see org.bukkit.event.entity.FoodLevelChangeEvent
-         */
-        FOOD_LEVEL_CHANGE(Category.LIVING_ENTITY, FoodLevelChangeEvent.class),
-        /**
-         * Called when an entity creates a portal in a world
-         *
-         * @see org.bukkit.event.entity.EntityCreatePortalEvent
-         */
-        ENTITY_CREATE_PORTAL(Category.LIVING_ENTITY, EntityCreatePortalEvent.class),
-        /**
-         * Called when a LivingEntity shoots a bow firing an arrow
-         *
-         * @see org.bukkit.event.entity.EntityShootBowEvent
-         */
-        ENTITY_SHOOT_BOW(Category.LIVING_ENTITY, EntityShootBowEvent.class),
-
-        /**
-         * WEATHER EVENTS
-         */
-
-        /**
-         * Called when a lightning entity strikes somewhere
-         *
-         * @see org.bukkit.event.weather.LightningStrikeEvent
-         */
-        LIGHTNING_STRIKE(Category.WEATHER, LightningStrikeEvent.class),
-        /**
-         * Called when the weather in a world changes
-         *
-         * @see org.bukkit.event.weather.WeatherChangeEvent
-         */
-        WEATHER_CHANGE(Category.WEATHER, WeatherChangeEvent.class),
-        /**
-         * Called when the thunder state in a world changes
-         *
-         * @see org.bukkit.event.weather.ThunderChangeEvent
-         */
-        THUNDER_CHANGE(Category.WEATHER, ThunderChangeEvent.class),
-
-        /**
-         * VEHICLE EVENTS
-         */
-
-        /**
-         * Called when a vehicle is placed by a player
-         *
-         * @see org.bukkit.event.vehicle.VehicleCreateEvent
-         */
-        VEHICLE_CREATE(Category.VEHICLE, VehicleCreateEvent.class),
-        /**
-         * Called when a vehicle is destroyed
-         *
-         * @see org.bukkit.event.vehicle.VehicleDestroyEvent
-         */
-        VEHICLE_DESTROY(Category.VEHICLE, VehicleDestroyEvent.class),
-        /**
-         * Called when a vehicle is damaged by a LivingEntity
-         *
-         * @see org.bukkit.event.vehicle.VehicleDamageEvent
-         */
-        VEHICLE_DAMAGE(Category.VEHICLE, VehicleDamageEvent.class),
-        /**
-         * Called when a vehicle collides with an Entity
-         *
-         * @see org.bukkit.event.vehicle.VehicleCollisionEvent
-         */
-        VEHICLE_COLLISION_ENTITY(Category.VEHICLE, VehicleEntityCollisionEvent.class),
-        /**
-         * Called when a vehicle collides with a Block
-         *
-         * @see org.bukkit.event.vehicle.VehicleBlockCollisionEvent
-         */
-        VEHICLE_COLLISION_BLOCK(Category.VEHICLE, VehicleBlockCollisionEvent.class),
-        /**
-         * Called when a vehicle is entered by a LivingEntity
-         *
-         * @see org.bukkit.event.vehicle.VehicleEnterEvent
-         */
-        VEHICLE_ENTER(Category.VEHICLE, VehicleEnterEvent.class),
-        /**
-         * Called when a vehicle is exited by a LivingEntity
-         *
-         * @see org.bukkit.event.vehicle.VehicleExitEvent
-         */
-        VEHICLE_EXIT(Category.VEHICLE, VehicleExitEvent.class),
-        /**
-         * Called when a vehicle moves position in the world
-         *
-         * @see org.bukkit.event.vehicle.VehicleMoveEvent
-         */
-        VEHICLE_MOVE(Category.VEHICLE, VehicleMoveEvent.class),
-        /**
-         * Called when a vehicle is going through an update cycle, rechecking itself
-         *
-         * @see org.bukkit.event.vehicle.VehicleUpdateEvent
-         */
-        VEHICLE_UPDATE(Category.VEHICLE, VehicleUpdateEvent.class),
-        /**
-         * MISCELLANEOUS EVENTS
-         */
-
-        /**
-         * Represents a custom event, isn't actually used
-         */
-        CUSTOM_EVENT(Category.MISCELLANEOUS, TransitionalCustomEvent.class),
-        /**
-         * Represents an event using the new, Event.Type-less event system to avoid NPE-ing
-         */
-        FIXED_EVENT(Category.MISCELLANEOUS, Event.class);
-
-        private final Category category;
-        private final Class<? extends Event> clazz;
-
-        private Type(Category category, Class<? extends Event> clazz) {
-            this.category = category;
-            this.clazz = clazz;
-        }
-
-        /**
-         * Gets the Category assigned to this event
-         *
-         * @return Category of this Event.Type
-         */
-        public Category getCategory() {
-            return category;
-        }
-
-        public Class<? extends Event> getEventClass() {
-            return clazz;
-        }
+        throw new IllegalStateException("Event must implement getHandlers()");
     }
 
     public enum Result {
diff --git a/src/main/java/org/bukkit/event/EventException.java b/src/main/java/org/bukkit/event/EventException.java
index 47ceb1ed..84638e85 100644
--- a/src/main/java/org/bukkit/event/EventException.java
+++ b/src/main/java/org/bukkit/event/EventException.java
@@ -1,7 +1,6 @@
 package org.bukkit.event;
 
 public class EventException extends Exception {
-    private static final HandlerList handlers = new HandlerList();
     private static final long serialVersionUID = 3532808232324183999L;
     private final Throwable cause;
 
diff --git a/src/main/java/org/bukkit/event/TransitionalCustomEvent.java b/src/main/java/org/bukkit/event/TransitionalCustomEvent.java
deleted file mode 100644
index e82c5618..00000000
--- a/src/main/java/org/bukkit/event/TransitionalCustomEvent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bukkit.event;
-
-/**
- * A transitional class to avoid breaking plugins using custom events.
- */
-@Deprecated
-public class TransitionalCustomEvent extends Event {
-    private static final HandlerList handlers = new HandlerList();
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
diff --git a/src/main/java/org/bukkit/event/block/BlockBreakEvent.java b/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
index 780ed48f..b8ed1953 100644
--- a/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
@@ -18,11 +18,11 @@ import org.bukkit.event.HandlerList;
 public class BlockBreakEvent extends BlockEvent implements Cancellable {
 
     private static final HandlerList handlers = new HandlerList();
-    private Player player;
+    private final Player player;
     private boolean cancel;
 
-    public BlockBreakEvent(final Block theBlock, Player player) {
-        super(Type.BLOCK_BREAK, theBlock);
+    public BlockBreakEvent(final Block theBlock, final Player player) {
+        super(theBlock);
         this.player = player;
         this.cancel = false;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockBurnEvent.java b/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
index 665b1bd8..8cb9169a 100644
--- a/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
@@ -14,8 +14,8 @@ public class BlockBurnEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
 
-    public BlockBurnEvent(Block block) {
-        super(Type.BLOCK_BURN, block);
+    public BlockBurnEvent(final Block block) {
+        super(block);
         this.cancelled = false;
     }
 
diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
index 5efc16d4..16f09a01 100644
--- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
@@ -19,8 +19,8 @@ public class BlockCanBuildEvent extends BlockEvent {
     protected boolean buildable;
     protected int material;
 
-    public BlockCanBuildEvent(Block block, int id, boolean canBuild) {
-        super(Type.BLOCK_CANBUILD, block);
+    public BlockCanBuildEvent(final Block block, final int id, final boolean canBuild) {
+        super(block);
         buildable = canBuild;
         material = id;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
index 0353c3f1..f2a076f2 100644
--- a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
@@ -14,13 +14,13 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class BlockDamageEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Player player;
+    private final Player player;
     private boolean instaBreak;
     private boolean cancel;
-    private ItemStack itemstack;
+    private final ItemStack itemstack;
 
-    public BlockDamageEvent(Player player, Block block, ItemStack itemInHand, boolean instaBreak) {
-        super(Type.BLOCK_DAMAGE, block);
+    public BlockDamageEvent(final Player player, final Block block, final ItemStack itemInHand, final boolean instaBreak) {
+        super(block);
         this.instaBreak = instaBreak;
         this.player = player;
         this.itemstack = itemInHand;
diff --git a/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java b/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
index 7b2963ad..83e87f5e 100644
--- a/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
@@ -19,8 +19,8 @@ public class BlockDispenseEvent extends BlockEvent implements Cancellable {
     private ItemStack item;
     private Vector velocity;
 
-    public BlockDispenseEvent(Block block, ItemStack dispensed, Vector velocity) {
-        super(Type.BLOCK_DISPENSE, block);
+    public BlockDispenseEvent(final Block block, final ItemStack dispensed, final Vector velocity) {
+        super(block);
         this.item = dispensed;
         this.velocity = velocity;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockEvent.java b/src/main/java/org/bukkit/event/block/BlockEvent.java
index d3ba7a9d..85defac2 100644
--- a/src/main/java/org/bukkit/event/block/BlockEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockEvent.java
@@ -10,8 +10,7 @@ import org.bukkit.event.Event;
 public abstract class BlockEvent extends Event {
     protected Block block;
 
-    public BlockEvent(final Event.Type type, final Block theBlock) {
-        super(type);
+    public BlockEvent(final Block theBlock) {
         block = theBlock;
     }
 
diff --git a/src/main/java/org/bukkit/event/block/BlockFadeEvent.java b/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
index ac937656..e5fa5ad0 100644
--- a/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
@@ -20,10 +20,10 @@ import org.bukkit.event.HandlerList;
 public class BlockFadeEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private BlockState newState;
+    private final BlockState newState;
 
-    public BlockFadeEvent(Block block, BlockState newState) {
-        super(Type.BLOCK_FADE, block);
+    public BlockFadeEvent(final Block block, final BlockState newState) {
+        super(block);
         this.newState = newState;
         this.cancelled = false;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockFormEvent.java b/src/main/java/org/bukkit/event/block/BlockFormEvent.java
index c3b824f8..a7c305ec 100644
--- a/src/main/java/org/bukkit/event/block/BlockFormEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockFormEvent.java
@@ -23,17 +23,10 @@ import org.bukkit.event.HandlerList;
 public class BlockFormEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private BlockState newState;
+    private final BlockState newState;
 
-    public BlockFormEvent(Block block, BlockState newState) {
-        super(Type.BLOCK_FORM, block);
-        this.block = block;
-        this.newState = newState;
-        this.cancelled = false;
-    }
-
-    public BlockFormEvent(Type type, Block block, BlockState newState) {
-        super(type, block);
+    public BlockFormEvent(final Block block, final BlockState newState) {
+        super(block);
         this.block = block;
         this.newState = newState;
         this.cancelled = false;
diff --git a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
index 271b789c..ca9b9649 100644
--- a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
@@ -18,7 +18,7 @@ public class BlockFromToEvent extends BlockEvent implements Cancellable {
     protected boolean cancel;
 
     public BlockFromToEvent(final Block block, final BlockFace face) {
-        super(Type.BLOCK_FROMTO, block);
+        super(block);
         this.face = face;
         this.cancel = false;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
index 30a5b0c7..45c4dad9 100644
--- a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
@@ -3,7 +3,6 @@ package org.bukkit.event.block;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -14,12 +13,12 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class BlockIgniteEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private IgniteCause cause;
+    private final IgniteCause cause;
     private boolean cancel;
-    private Player thePlayer;
+    private final Player thePlayer;
 
-    public BlockIgniteEvent(Block theBlock, IgniteCause cause, Player thePlayer) {
-        super(Event.Type.BLOCK_IGNITE, theBlock);
+    public BlockIgniteEvent(final Block theBlock, final IgniteCause cause, final Player thePlayer) {
+        super(theBlock);
         this.cause = cause;
         this.thePlayer = thePlayer;
         this.cancel = false;
diff --git a/src/main/java/org/bukkit/event/block/BlockListener.java b/src/main/java/org/bukkit/event/block/BlockListener.java
deleted file mode 100644
index fa0bd18f..00000000
--- a/src/main/java/org/bukkit/event/block/BlockListener.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.bukkit.event.block;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all events thrown in relation to Blocks
- */
-@Deprecated
-public class BlockListener implements Listener {
-
-    /**
-     * Default Constructor
-     */
-    public BlockListener() {}
-
-    /**
-     * Called when a block is damaged by a player.
-     * <p />
-     * If a Block Damage event is cancelled, the block will not be damaged.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockDamage(BlockDamageEvent event) {}
-
-    /**
-     * Called when we try to place a block, to see if we can build it here or not.
-     * <p />
-     * Note:
-     * <ul>
-     * <li>The Block returned by getBlock() is the block we are trying to place on, not the block we are trying to place.</li>
-     * <li>If you want to figure out what is being placed, use {@link BlockCanBuildEvent#getMaterial()} or {@link BlockCanBuildEvent#getMaterialId()} instead.</li>
-     * </ul>
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockCanBuild(BlockCanBuildEvent event) {}
-
-    /**
-     * Represents events with a source block and a destination block, currently only applies to liquid (lava and water).
-     * <p />
-     * If a Block From To event is cancelled, the block will not move (the liquid will not flow).
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockFromTo(BlockFromToEvent event) {}
-
-    /**
-     * Called when a block is ignited. If you want to catch when a Player places fire, you need to use {@link BlockPlaceEvent}.
-     * <p />
-     * If a Block Ignite event is cancelled, the block will not be ignited.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockIgnite(BlockIgniteEvent event) {}
-
-    /**
-     * Called when block physics occurs.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockPhysics(BlockPhysicsEvent event) {}
-
-    /**
-     * Called when a block is placed by a player.
-     * <p />
-     * If a Block Place event is cancelled, the block will not be placed.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockPlace(BlockPlaceEvent event) {}
-
-    /**
-     * Called when redstone changes.<br />
-     * From: the source of the redstone change.<br />
-     * To: The redstone dust that changed.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockRedstoneChange(BlockRedstoneEvent event) {}
-
-    /**
-     * Called when leaves are decaying naturally.
-     * <p />
-     * If a Leaves Decay event is cancelled, the leaves will not decay.
-     *
-     * @param event Relevant event details
-     */
-    public void onLeavesDecay(LeavesDecayEvent event) {}
-
-    /**
-     * Called when a sign is changed by a player.
-     * <p />
-     * If a Sign Change event is cancelled, the sign will not be changed.
-     *
-     * @param event Relevant event details
-     */
-    public void onSignChange(SignChangeEvent event) {}
-
-    /**
-     * Called when a block is destroyed as a result of being burnt by fire.
-     * <p />
-     * If a Block Burn event is cancelled, the block will not be destroyed as a result of being burnt by fire.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockBurn(BlockBurnEvent event) {}
-
-    /**
-     * Called when a block is broken by a player.
-     * <p />
-     * Note:
-     * Plugins wanting to simulate a traditional block drop should set the block to air and utilise their own methods for determining
-     *   what the default drop for the block being broken is and what to do about it, if anything.
-     * <p />
-     * If a Block Break event is cancelled, the block will not break.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockBreak(BlockBreakEvent event) {}
-
-    /**
-     * Called when a block is formed or spreads based on world conditions.
-     * Use {@link BlockSpreadEvent} to catch blocks that actually spread and don't just "randomly" form.
-     * <p />
-     * Examples:
-     * <ul>
-     * <li>Snow forming due to a snow storm.</li>
-     * <li>Ice forming in a snowy Biome like Tiga or Tundra.</li>
-     * </ul>
-     * <p />
-     * If a Block Form event is cancelled, the block will not be formed or will not spread.
-     *
-     * @see BlockSpreadEvent
-     * @param event Relevant event details
-     */
-    public void onBlockForm(BlockFormEvent event) {}
-
-    /**
-     * Called when a block spreads based on world conditions.
-     * Use {@link BlockFormEvent} to catch blocks that "randomly" form instead of actually spread.
-     * <p />
-     * Examples:
-     * <ul>
-     * <li>Mushrooms spreading.</li>
-     * <li>Fire spreading.</li>
-     * </ul>
-     * <p />
-     * If a Block Spread event is cancelled, the block will not spread.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockSpread(BlockSpreadEvent event) {}
-
-    /**
-     * Called when a block fades, melts or disappears based on world conditions
-     * <p />
-     * Examples:
-     * <ul>
-     * <li>Snow melting due to being near a light source.</li>
-     * <li>Ice melting due to being near a light source.</li>
-     * </ul>
-     * <p />
-     * If a Block Fade event is cancelled, the block will not fade, melt or disappear.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockFade(BlockFadeEvent event) {}
-
-    /**
-     * Called when an item is dispensed from a block.
-     * <p />
-     * If a Block Dispense event is cancelled, the block will not dispense the item.
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockDispense(BlockDispenseEvent event) {}
-
-    /**
-     * Called when a piston retracts
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockPistonRetract(BlockPistonRetractEvent event) {}
-
-    /**
-     * Called when a piston extends
-     *
-     * @param event Relevant event details
-     */
-    public void onBlockPistonExtend(BlockPistonExtendEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
index 29c5d9e0..53058bfc 100644
--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
@@ -15,7 +15,7 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
     private boolean cancel = false;
 
     public BlockPhysicsEvent(final Block block, final int changed) {
-        super(Type.BLOCK_PHYSICS, block);
+        super(block);
         this.changed = changed;
     }
 
diff --git a/src/main/java/org/bukkit/event/block/BlockPistonEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
index 93f66fee..816ba596 100644
--- a/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
@@ -8,10 +8,10 @@ import org.bukkit.event.Cancellable;
 @SuppressWarnings("serial")
 public abstract class BlockPistonEvent extends BlockEvent implements Cancellable {
     private boolean cancelled;
-    private BlockFace direction;
+    private final BlockFace direction;
 
-    public BlockPistonEvent(Type type, Block block, BlockFace direction) {
-        super(type, block);
+    public BlockPistonEvent(final Block block, final BlockFace direction) {
+        super(block);
         this.direction = direction;
     }
 
diff --git a/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
index 5e94588e..fdbb76c9 100644
--- a/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
@@ -11,11 +11,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class BlockPistonExtendEvent extends BlockPistonEvent {
     private static final HandlerList handlers = new HandlerList();
-    private int length;
+    private final int length;
     private List<Block> blocks;
 
-    public BlockPistonExtendEvent(Block block, int length, BlockFace direction) {
-        super(Type.BLOCK_PISTON_EXTEND, block, direction);
+    public BlockPistonExtendEvent(final Block block, final int length, final BlockFace direction) {
+        super(block, direction);
 
         this.length = length;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
index 48c3c59a..7ce03ba9 100644
--- a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
@@ -8,8 +8,8 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class BlockPistonRetractEvent extends BlockPistonEvent {
     private static final HandlerList handlers = new HandlerList();
-    public BlockPistonRetractEvent(Block block, BlockFace direction) {
-        super(Type.BLOCK_PISTON_RETRACT, block, direction);
+    public BlockPistonRetractEvent(final Block block, final BlockFace direction) {
+        super(block, direction);
     }
 
     /**
diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index 27ee1cd9..a581c897 100644
--- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
@@ -22,8 +22,8 @@ public class BlockPlaceEvent extends BlockEvent implements Cancellable {
     protected ItemStack itemInHand;
     protected Player player;
 
-    public BlockPlaceEvent(Block placedBlock, BlockState replacedBlockState, Block placedAgainst, ItemStack itemInHand, Player thePlayer, boolean canBuild) {
-        super(Type.BLOCK_PLACE, placedBlock);
+    public BlockPlaceEvent(final Block placedBlock, final BlockState replacedBlockState, final Block placedAgainst, final ItemStack itemInHand, final Player thePlayer, final boolean canBuild) {
+        super(placedBlock);
         this.placedAgainst = placedAgainst;
         this.itemInHand = itemInHand;
         this.player = thePlayer;
diff --git a/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java b/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
index b1179d21..ab16c843 100644
--- a/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
@@ -9,11 +9,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class BlockRedstoneEvent extends BlockEvent {
     private static final HandlerList handlers = new HandlerList();
-    private int oldCurrent;
+    private final int oldCurrent;
     private int newCurrent;
 
-    public BlockRedstoneEvent(Block block, int oldCurrent, int newCurrent) {
-        super(Type.REDSTONE_CHANGE, block);
+    public BlockRedstoneEvent(final Block block, final int oldCurrent, final int newCurrent) {
+        super(block);
         this.oldCurrent = oldCurrent;
         this.newCurrent = newCurrent;
     }
diff --git a/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java b/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
index e90a2b81..d8b6315e 100644
--- a/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
@@ -21,10 +21,10 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class BlockSpreadEvent extends BlockFormEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Block source;
+    private final Block source;
 
-    public BlockSpreadEvent(Block block, Block source, BlockState newState) {
-        super(Type.BLOCK_SPREAD, block, newState);
+    public BlockSpreadEvent(final Block block, final Block source, final BlockState newState) {
+        super(block, newState);
         this.source = source;
     }
 
diff --git a/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java b/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
index d1b3cdbd..46473fe0 100644
--- a/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
+++ b/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
@@ -14,9 +14,9 @@ import org.bukkit.entity.Entity;
  */
 @SuppressWarnings("serial")
 public class EntityBlockFormEvent extends BlockFormEvent {
-    private Entity entity;
+    private final Entity entity;
 
-    public EntityBlockFormEvent(Entity entity, Block block, BlockState blockstate) {
+    public EntityBlockFormEvent(final Entity entity, final Block block, final BlockState blockstate) {
         super(block, blockstate);
 
         this.entity = entity;
diff --git a/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java b/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
index f52d677f..69582788 100644
--- a/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
+++ b/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
@@ -15,7 +15,7 @@ public class LeavesDecayEvent extends BlockEvent implements Cancellable {
     private boolean cancel = false;
 
     public LeavesDecayEvent(final Block block) {
-        super(Type.LEAVES_DECAY, block);
+        super(block);
     }
 
     public boolean isCancelled() {
diff --git a/src/main/java/org/bukkit/event/block/SignChangeEvent.java b/src/main/java/org/bukkit/event/block/SignChangeEvent.java
index 3fbe31a7..06709f35 100644
--- a/src/main/java/org/bukkit/event/block/SignChangeEvent.java
+++ b/src/main/java/org/bukkit/event/block/SignChangeEvent.java
@@ -14,11 +14,11 @@ import org.bukkit.event.HandlerList;
 public class SignChangeEvent extends BlockEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
-    private Player player;
-    private String[] lines;
+    private final Player player;
+    private final String[] lines;
 
-    public SignChangeEvent(final Block theBlock, final Player thePlayer, String[] theLines) {
-        super(Type.SIGN_CHANGE, theBlock);
+    public SignChangeEvent(final Block theBlock, final Player thePlayer, final String[] theLines) {
+        super(theBlock);
         this.player = thePlayer;
         this.lines = theLines;
     }
diff --git a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
index 42e4bedf..08930369 100644
--- a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
+++ b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
@@ -17,14 +17,14 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class EnchantItemEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Block table;
-    private ItemStack item;
+    private final Block table;
+    private final ItemStack item;
     private int level;
     private boolean cancelled;
-    private Map<Enchantment,Integer> enchants;
-    private Player enchanter;
+    private final Map<Enchantment,Integer> enchants;
+    private final Player enchanter;
 
-    public EnchantItemEvent(Player enchanter, Block table, ItemStack item, int level, Map<Enchantment, Integer> enchants) {
+    public EnchantItemEvent(final Player enchanter, final Block table, final ItemStack item, final int level, final Map<Enchantment, Integer> enchants) {
         this.enchanter = enchanter;
         this.table = table;
         this.item = item;
diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
index 26ed21a9..169b3b06 100644
--- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
+++ b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
@@ -13,14 +13,14 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class PrepareItemEnchantEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Block table;
-    private ItemStack item;
-    private int[] levelsOffered;
-    private int bonus;
+    private final Block table;
+    private final ItemStack item;
+    private final int[] levelsOffered;
+    private final int bonus;
     private boolean cancelled;
-    private Player enchanter;
+    private final Player enchanter;
 
-    public PrepareItemEnchantEvent(Player enchanter, Block table, ItemStack item, int[] levelsOffered, int bonus) {
+    public PrepareItemEnchantEvent(final Player enchanter, final Block table, final ItemStack item, final int[] levelsOffered, final int bonus) {
         this.enchanter = enchanter;
         this.table = table;
         this.item = item;
diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
index 03f719a6..87704328 100644
--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
@@ -15,13 +15,13 @@ import org.bukkit.event.HandlerList;
 public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
-    private Location location;
+    private final Location location;
     private boolean canceled;
-    private CreatureType creatureType;
-    private SpawnReason spawnReason;
+    private final CreatureType creatureType;
+    private final SpawnReason spawnReason;
 
-    public CreatureSpawnEvent(Entity spawnee, CreatureType mobtype, Location loc, SpawnReason spawnReason) {
-        super(Type.CREATURE_SPAWN, spawnee);
+    public CreatureSpawnEvent(final Entity spawnee, final CreatureType mobtype, final Location loc, final SpawnReason spawnReason) {
+        super(spawnee);
         this.creatureType = mobtype;
         this.location = loc;
         this.spawnReason = spawnReason;
diff --git a/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java b/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
index e6900a08..95cb0cb9 100644
--- a/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
+++ b/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
@@ -14,19 +14,17 @@ public class CreeperPowerEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean canceled;
-    private PowerCause cause;
+    private final PowerCause cause;
     private Entity bolt;
 
-    public CreeperPowerEvent(Entity creeper, Entity bolt, PowerCause cause) {
-        super(Type.CREEPER_POWER, creeper);
+    public CreeperPowerEvent(final Entity creeper, final Entity bolt, final PowerCause cause) {
+        this(creeper, cause);
         this.bolt = bolt;
-        this.cause = cause;
     }
 
-    public CreeperPowerEvent(Entity creeper, PowerCause cause) {
-        super(Type.CREEPER_POWER, creeper);
+    public CreeperPowerEvent(final Entity creeper, final PowerCause cause) {
+        super(creeper);
         this.cause = cause;
-        this.bolt = null;
     }
 
     public boolean isCancelled() {
diff --git a/src/main/java/org/bukkit/event/entity/EndermanPickupEvent.java b/src/main/java/org/bukkit/event/entity/EndermanPickupEvent.java
index c5372ad9..17512ea7 100644
--- a/src/main/java/org/bukkit/event/entity/EndermanPickupEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EndermanPickupEvent.java
@@ -14,10 +14,10 @@ public class EndermanPickupEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancel;
-    private Block block;
+    private final Block block;
 
-    public EndermanPickupEvent(Entity what, Block block) {
-        super(Type.ENDERMAN_PICKUP, what);
+    public EndermanPickupEvent(final Entity what, final Block block) {
+        super(what);
         this.block = block;
         this.cancel = false;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EndermanPlaceEvent.java b/src/main/java/org/bukkit/event/entity/EndermanPlaceEvent.java
index 1b07c4d2..8c18f15c 100644
--- a/src/main/java/org/bukkit/event/entity/EndermanPlaceEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EndermanPlaceEvent.java
@@ -16,10 +16,10 @@ public class EndermanPlaceEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancel;
-    private Location location;
+    private final Location location;
 
-    public EndermanPlaceEvent(Entity what, Location location) {
-        super(Type.ENDERMAN_PLACE, what);
+    public EndermanPlaceEvent(final Entity what, final Location location) {
+        super(what);
         this.location = location;
         this.cancel = false;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
index 30790750..3d73ea55 100644
--- a/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
@@ -14,12 +14,12 @@ import org.bukkit.event.HandlerList;
  */
 public class EntityChangeBlockEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Block block;
+    private final Block block;
     private boolean cancel;
-    private Material to;
+    private final Material to;
 
-    public EntityChangeBlockEvent(Entity what, Block block, Material to) {
-        super(Type.ENTITY_CHANGE_BLOCK, what);
+    public EntityChangeBlockEvent(final Entity what, final Block block, final Material to) {
+        super(what);
         this.block = block;
         this.cancel = false;
         this.to = to;
diff --git a/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
index 9a74dc31..b94ef0e2 100644
--- a/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
@@ -6,9 +6,9 @@ import org.bukkit.entity.Entity;
 @SuppressWarnings("serial")
 public class EntityCombustByBlockEvent extends EntityCombustEvent {
 
-    private Block combuster;
+    private final Block combuster;
 
-    public EntityCombustByBlockEvent(Block combuster, Entity combustee, int duration) {
+    public EntityCombustByBlockEvent(final Block combuster, final Entity combustee, final int duration) {
         super(combustee, duration);
         this.combuster = combuster;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
index af3d245a..894cdc78 100644
--- a/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
@@ -5,9 +5,9 @@ import org.bukkit.entity.Entity;
 @SuppressWarnings("serial")
 public class EntityCombustByEntityEvent extends EntityCombustEvent {
 
-    private Entity combuster;
+    private final Entity combuster;
 
-    public EntityCombustByEntityEvent(Entity combuster, Entity combustee, int duration) {
+    public EntityCombustByEntityEvent(final Entity combuster, final Entity combustee, final int duration) {
         super(combustee, duration);
         this.combuster = combuster;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java b/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
index d37f94cd..73b99d98 100644
--- a/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
@@ -15,8 +15,8 @@ public class EntityCombustEvent extends EntityEvent implements Cancellable {
     private int duration;
     private boolean cancel;
 
-    public EntityCombustEvent(Entity combustee, int duration) {
-        super(Type.ENTITY_COMBUST, combustee);
+    public EntityCombustEvent(final Entity combustee, final int duration) {
+        super(combustee);
         this.duration = duration;
         this.cancel = false;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
index beaf0c6c..8c5f72c6 100644
--- a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
@@ -13,12 +13,12 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class EntityCreatePortalEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private List<BlockState> blocks;
+    private final List<BlockState> blocks;
     private boolean cancelled = false;
     private PortalType type = PortalType.CUSTOM;
 
-    public EntityCreatePortalEvent(Entity what, List<BlockState> blocks, PortalType type) {
-        super(Type.ENTITY_CREATE_PORTAL, what);
+    public EntityCreatePortalEvent(final Entity what, final List<BlockState> blocks, final PortalType type) {
+        super(what);
 
         this.blocks = blocks;
         this.type = type;
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
index f18b7049..ce5e6bed 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
@@ -9,10 +9,10 @@ import org.bukkit.entity.Entity;
 @SuppressWarnings("serial")
 public class EntityDamageByBlockEvent extends EntityDamageEvent {
 
-    private Block damager;
+    private final Block damager;
 
-    public EntityDamageByBlockEvent(Block damager, Entity damagee, DamageCause cause, int damage) {
-        super(Type.ENTITY_DAMAGE, damagee, cause, damage);
+    public EntityDamageByBlockEvent(final Block damager, final Entity damagee, final DamageCause cause, final int damage) {
+        super(damagee, cause, damage);
         this.damager = damager;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
index 8efc3cbc..c55dd22e 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
@@ -8,10 +8,10 @@ import org.bukkit.entity.Entity;
 @SuppressWarnings("serial")
 public class EntityDamageByEntityEvent extends EntityDamageEvent {
 
-    private Entity damager;
+    private final Entity damager;
 
-    public EntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) {
-        super(Type.ENTITY_DAMAGE, damagee, cause, damage);
+    public EntityDamageByEntityEvent(final Entity damager, final Entity damagee, final DamageCause cause, final int damage) {
+        super(damagee, cause, damage);
         this.damager = damager;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
deleted file mode 100644
index e4fe40e0..00000000
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bukkit.event.entity;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Projectile;
-
-/**
- * Called when an entity is damaged by a projectile
- *
- * @deprecated use {@link EntityDamageByEntityEvent} instead, where {@link EntityDamageByEntityEvent#getDamager()} will return the {@link Projectile}
- */
-@SuppressWarnings("serial")
-@Deprecated
-public class EntityDamageByProjectileEvent extends EntityDamageByEntityEvent {
-
-    private Projectile projectile;
-
-    public EntityDamageByProjectileEvent(Entity damagee, Projectile projectile, DamageCause cause, int damage) {
-        this(projectile.getShooter(), damagee, projectile, cause, damage);
-    }
-
-    public EntityDamageByProjectileEvent(Entity damager, Entity damagee, Projectile projectile, DamageCause cause, int damage) {
-        super(damager, projectile, DamageCause.PROJECTILE, damage);
-        this.projectile = projectile;
-    }
-
-    /**
-     * The projectile used to cause the event
-     *
-     * @return the projectile
-     */
-    public Projectile getProjectile() {
-        return projectile;
-    }
-
-    public void setBounce(boolean bounce) {
-        projectile.setBounce(bounce);
-    }
-
-    public boolean getBounce() {
-        return projectile.doesBounce();
-    }
-}
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index d40f4489..09b933dc 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -3,7 +3,6 @@ package org.bukkit.event.entity;
 import org.bukkit.entity.ComplexEntityPart;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -15,14 +14,10 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
 
     private int damage;
     private boolean cancelled;
-    private DamageCause cause;
+    private final DamageCause cause;
 
-    public EntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
-        this(Event.Type.ENTITY_DAMAGE, damagee, cause, damage);
-    }
-
-    protected EntityDamageEvent(Event.Type type, Entity damagee, DamageCause cause, int damage) {
-        super(type, damagee);
+    public EntityDamageEvent(final Entity damagee, final DamageCause cause, final int damage) {
+        super(damagee);
         this.cause = cause;
         this.damage = damage;
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
index 0935f022..e7a15244 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
@@ -11,15 +11,15 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class EntityDeathEvent extends EntityEvent {
     private static final HandlerList handlers = new HandlerList();
-    private List<ItemStack> drops;
+    private final List<ItemStack> drops;
     private int dropExp = 0;
 
     public EntityDeathEvent(final Entity entity, final List<ItemStack> drops) {
         this(entity, drops, 0);
     }
 
-    public EntityDeathEvent(final Entity what, final List<ItemStack> drops, int droppedExp) {
-        super(Type.ENTITY_DEATH, what);
+    public EntityDeathEvent(final Entity what, final List<ItemStack> drops, final int droppedExp) {
+        super(what);
         this.drops = drops;
         this.dropExp = droppedExp;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityEvent.java
index de999170..574cc0a4 100644
--- a/src/main/java/org/bukkit/event/entity/EntityEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityEvent.java
@@ -10,8 +10,7 @@ import org.bukkit.event.Event;
 public abstract class EntityEvent extends Event {
     protected Entity entity;
 
-    public EntityEvent(final Event.Type type, final Entity what) {
-        super(type);
+    public EntityEvent(final Entity what) {
         entity = what;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
index 50036565..e4553311 100644
--- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
@@ -15,17 +15,12 @@ import java.util.List;
 public class EntityExplodeEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel;
-    private Location location;
-    private List<Block> blocks;
+    private final Location location;
+    private final List<Block> blocks;
     private float yield;
 
-    @Deprecated
-    public EntityExplodeEvent(Entity what, Location location, List<Block> blocks) {
-        this(what, location, blocks, 0.3F);
-    }
-
-    public EntityExplodeEvent(Entity what, Location location, List<Block> blocks, float yield) {
-        super(Type.ENTITY_EXPLODE, what);
+    public EntityExplodeEvent(final Entity what, final Location location, final List<Block> blocks, final float yield) {
+        super(what);
         this.location = location;
         this.blocks = blocks;
         this.yield = yield;
diff --git a/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java b/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
index c6da06bf..264e809e 100644
--- a/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
@@ -15,8 +15,8 @@ public class EntityInteractEvent extends EntityEvent implements Cancellable {
 
     private boolean cancelled;
 
-    public EntityInteractEvent(Entity entity, Block block) {
-        super(Type.ENTITY_INTERACT, entity);
+    public EntityInteractEvent(final Entity entity, final Block block) {
+        super(entity);
         this.block = block;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityListener.java b/src/main/java/org/bukkit/event/entity/EntityListener.java
deleted file mode 100644
index 234ff22d..00000000
--- a/src/main/java/org/bukkit/event/entity/EntityListener.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.bukkit.event.entity;
-
-import org.bukkit.event.Listener;
-import org.bukkit.event.painting.PaintingPlaceEvent;
-import org.bukkit.event.painting.PaintingBreakEvent;
-
-/**
- * Handles all events fired in relation to entities
- */
-@Deprecated
-public class EntityListener implements Listener {
-    public EntityListener() {}
-
-    /**
-     * Called when a creature is spawned into a world.
-     * <p />
-     * If a Creature Spawn event is cancelled, the creature will not spawn.
-     *
-     * @param event Relevant event details
-     */
-    public void onCreatureSpawn(CreatureSpawnEvent event) {}
-
-    /**
-     * Called when an item is spawned into a world
-     *
-     * @param event Relevant event details
-     */
-    public void onItemSpawn(ItemSpawnEvent event) {}
-
-    /**
-     * Called when an entity combusts.
-     * <p />
-     * If an Entity Combust event is cancelled, the entity will not combust.
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityCombust(EntityCombustEvent event) {}
-
-    /**
-     * Called when an entity is damaged
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityDamage(EntityDamageEvent event) {}
-
-    /**
-     * Called when an entity explodes
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityExplode(EntityExplodeEvent event) {}
-
-    /**
-     * Called when an entity's fuse is lit
-     *
-     * @param event Relevant event details
-     */
-    public void onExplosionPrime(ExplosionPrimeEvent event) {}
-
-    /**
-     * Called when an entity dies
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityDeath(EntityDeathEvent event) {}
-
-    /**
-     * Called when a creature targets another entity
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityTarget(EntityTargetEvent event) {}
-
-    /**
-     * Called when an entity interacts with an object
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityInteract(EntityInteractEvent event) {}
-
-    /**
-     * Called when an entity enters a portal
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityPortalEnter(EntityPortalEnterEvent event) {}
-
-    /**
-     * Called when a painting is placed
-     *
-     * @param event Relevant event details
-     */
-    public void onPaintingPlace(PaintingPlaceEvent event) {}
-
-    /**
-     * Called when a painting is broken
-     *
-     * @param event Relevant event details
-     */
-    public void onPaintingBreak(PaintingBreakEvent event) {}
-
-    /**
-     * Called when a Pig is struck by lightning
-     *
-     * @param event Relevant event details
-     */
-    public void onPigZap(PigZapEvent event) {}
-
-    /**
-     * Called when a Creeper is struck by lightning.
-     * <p />
-     * If a Creeper Power event is cancelled, the Creeper will not be powered.
-     *
-     * @param event Relevant event details
-     */
-    public void onCreeperPower(CreeperPowerEvent event) {}
-
-    /**
-     * Called when an entity is tamed (currently only applies to Wolves)
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityTame(EntityTameEvent event) {}
-
-    /**
-     * Called when an entity regains health (currently only applies to Players)
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityRegainHealth(EntityRegainHealthEvent event) {}
-
-    /**
-     * Called when a project hits an object
-     *
-     * @param event Relevant event details
-     */
-    public void onProjectileHit(ProjectileHitEvent event) {}
-
-    /**
-     * Called when an Enderman picks a block up
-     *
-     * @param event Relevant event details
-     */
-    public void onEndermanPickup(EndermanPickupEvent event) {}
-
-    /**
-     * Called when an Enderman places a block
-     *
-     * @param event Relevant event details
-     */
-    public void onEndermanPlace(EndermanPlaceEvent event) {}
-
-    /**
-     * Called when a human entity's food level changes
-     *
-     * @param event Relevant event details
-     */
-    public void onFoodLevelChange(FoodLevelChangeEvent event) {}
-
-    /**
-     * Called when a LivingEntity shoots a bow firing an arrow
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityShootBow(EntityShootBowEvent event) {}
-
-    /**
-     * Called when a Slime splits into smaller Slimes upon death
-     *
-     * @param event Relevant event details
-     */
-    public void onSlimeSplit(SlimeSplitEvent event) {}
-
-    /**
-     * Called when an item despawns from a world
-     *
-     * @param event Relevant event details
-     */
-    public void onItemDespawn(ItemDespawnEvent event) {}
-
-    /**
-     * Called when an entity creates a portal.
-     *
-     * @param event Relevant event details
-     */
-    public void onEntityCreatePortalEvent(EntityCreatePortalEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
index caa04354..2840313e 100644
--- a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
@@ -11,10 +11,10 @@ import org.bukkit.event.HandlerList;
 public class EntityPortalEnterEvent extends EntityEvent {
     private static final HandlerList handlers = new HandlerList();
 
-    private Location location;
+    private final Location location;
 
-    public EntityPortalEnterEvent(Entity entity, Location location) {
-        super(Type.ENTITY_PORTAL_ENTER, entity);
+    public EntityPortalEnterEvent(final Entity entity, final Location location) {
+        super(entity);
         this.location = location;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
index 5b7c2227..38624717 100644
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
@@ -2,7 +2,6 @@ package org.bukkit.event.entity;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -14,10 +13,10 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
 
     private boolean cancelled;
     private int amount;
-    private RegainReason regainReason;
+    private final RegainReason regainReason;
 
-    public EntityRegainHealthEvent(Entity entity, int amount, RegainReason regainReason) {
-        super(Event.Type.ENTITY_REGAIN_HEALTH, entity);
+    public EntityRegainHealthEvent(final Entity entity, final int amount, final RegainReason regainReason) {
+        super(entity);
         this.amount = amount;
         this.regainReason = regainReason;
     }
diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
index 8eca2edc..f65a0cc3 100644
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
@@ -14,13 +14,13 @@ import org.bukkit.inventory.ItemStack;
 public class EntityShootBowEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
-    private ItemStack bow;
+    private final ItemStack bow;
     private Entity projectile;
-    private float force;
+    private final float force;
     private boolean cancelled;
 
-    public EntityShootBowEvent(LivingEntity shooter, ItemStack bow, Projectile projectile, float force) {
-        super(Type.ENTITY_SHOOT_BOW, shooter);
+    public EntityShootBowEvent(final LivingEntity shooter, final ItemStack bow, final Projectile projectile, final float force) {
+        super(shooter);
         this.bow = bow;
         this.projectile = projectile;
         this.force = force;
diff --git a/src/main/java/org/bukkit/event/entity/EntityTameEvent.java b/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
index 3f53a13b..c5660560 100644
--- a/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
@@ -12,10 +12,10 @@ import org.bukkit.event.HandlerList;
 public class EntityTameEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private AnimalTamer owner;
+    private final AnimalTamer owner;
 
-    public EntityTameEvent(Entity entity, AnimalTamer owner) {
-        super(Type.ENTITY_TAME, entity);
+    public EntityTameEvent(final Entity entity, final AnimalTamer owner) {
+        super(entity);
         this.owner = owner;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
index b2024101..b8873449 100644
--- a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
@@ -12,10 +12,10 @@ public class EntityTargetEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel;
     private Entity target;
-    private TargetReason reason;
+    private final TargetReason reason;
 
-    public EntityTargetEvent(Entity entity, Entity target, TargetReason reason) {
-        super(Type.ENTITY_TARGET, entity);
+    public EntityTargetEvent(final Entity entity, final Entity target, final TargetReason reason) {
+        super(entity);
         this.target = target;
         this.cancel = false;
         this.reason = reason;
diff --git a/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java b/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
index a5d73bfd..64cdfd57 100644
--- a/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
+++ b/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
@@ -15,14 +15,14 @@ public class ExplosionPrimeEvent extends EntityEvent implements Cancellable {
     private float radius;
     private boolean fire;
 
-    public ExplosionPrimeEvent(Entity what, float radius, boolean fire) {
-        super(Type.EXPLOSION_PRIME, what);
+    public ExplosionPrimeEvent(final Entity what, final float radius, final boolean fire) {
+        super(what);
         this.cancel = false;
         this.radius = radius;
         this.fire = fire;
     }
 
-    public ExplosionPrimeEvent(Explosive explosive) {
+    public ExplosionPrimeEvent(final Explosive explosive) {
         this(explosive, explosive.getYield(), explosive.isIncendiary());
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java b/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
index 975388c9..98ed5fd6 100644
--- a/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
+++ b/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
@@ -13,8 +13,8 @@ public class FoodLevelChangeEvent extends EntityEvent implements Cancellable {
     private boolean cancel = false;
     private int level;
 
-    public FoodLevelChangeEvent(Entity what, int level) {
-        super(Type.FOOD_LEVEL_CHANGE, what);
+    public FoodLevelChangeEvent(final Entity what, final int level) {
+        super(what);
         this.level = level;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java b/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
index b0200c1d..93077cfd 100644
--- a/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
@@ -9,10 +9,10 @@ import org.bukkit.event.HandlerList;
 public class ItemDespawnEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean canceled;
-    private Location location;
+    private final Location location;
 
-    public ItemDespawnEvent(Entity spawnee, Location loc) {
-        super(Type.ITEM_DESPAWN, spawnee);
+    public ItemDespawnEvent(final Entity spawnee, final Location loc) {
+        super(spawnee);
         location = loc;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java b/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
index 091a5467..b6ebb26f 100644
--- a/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
@@ -12,11 +12,11 @@ import org.bukkit.event.HandlerList;
 public class ItemSpawnEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
-    private Location location;
+    private final Location location;
     private boolean canceled;
 
-    public ItemSpawnEvent(Entity spawnee, Location loc) {
-        super(Type.ITEM_SPAWN, spawnee);
+    public ItemSpawnEvent(final Entity spawnee, final Location loc) {
+        super(spawnee);
         this.location = loc;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
index 89db40bb..04a4b79a 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -12,11 +12,11 @@ public class PigZapEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean canceled;
-    private Entity pigzombie;
-    private Entity bolt;
+    private final Entity pigzombie;
+    private final Entity bolt;
 
-    public PigZapEvent(Entity pig, Entity bolt, Entity pigzombie) {
-        super(Type.PIG_ZAP, pig);
+    public PigZapEvent(final Entity pig, final Entity bolt, final Entity pigzombie) {
+        super(pig);
         this.bolt = bolt;
         this.pigzombie = pigzombie;
     }
diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
index 1af5b808..93e38670 100644
--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
@@ -16,15 +16,15 @@ public class PlayerDeathEvent extends EntityDeathEvent {
     private int newTotalExp = 0;
     private boolean keepLevel = false;
 
-    public PlayerDeathEvent(Player player, List<ItemStack> drops, int droppedExp, String deathMessage) {
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final String deathMessage) {
         this(player, drops, droppedExp, 0, deathMessage);
     }
 
-    public PlayerDeathEvent(Player player, List<ItemStack> drops, int droppedExp, int newExp, String deathMessage) {
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final int newExp, final String deathMessage) {
         this(player, drops, droppedExp, newExp, 0, 0, deathMessage);
     }
 
-    public PlayerDeathEvent(Player player, List<ItemStack> drops, int droppedExp, int newExp, int newTotalExp, int newLevel, String deathMessage) {
+    public PlayerDeathEvent(final Player player, final List<ItemStack> drops, final int droppedExp, final int newExp, final int newTotalExp, final int newLevel, final String deathMessage) {
         super(player, drops, droppedExp);
         this.newExp = newExp;
         this.newTotalExp = newTotalExp;
diff --git a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
index 9461181e..6ee14f4b 100644
--- a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
@@ -17,10 +17,10 @@ import org.bukkit.event.HandlerList;
 public class PotionSplashEvent extends ProjectileHitEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private Map<LivingEntity, Double> affectedEntities;
+    private final Map<LivingEntity, Double> affectedEntities;
 
-    public PotionSplashEvent(ThrownPotion potion, Map<LivingEntity, Double> affectedEntities) {
-        super(Type.POTION_SPLASH, potion);
+    public PotionSplashEvent(final ThrownPotion potion, final Map<LivingEntity, Double> affectedEntities) {
+        super(potion);
 
         this.affectedEntities = affectedEntities;
     }
diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
index 37a99885..786f1f1b 100644
--- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
@@ -10,12 +10,8 @@ import org.bukkit.event.HandlerList;
 public class ProjectileHitEvent extends EntityEvent {
     private static final HandlerList handlers = new HandlerList();
 
-    public ProjectileHitEvent(Projectile projectile) {
-        super(Type.PROJECTILE_HIT, projectile);
-    }
-
-    public ProjectileHitEvent(Type type, Projectile projectile) {
-        super(type, projectile);
+    public ProjectileHitEvent(final Projectile projectile) {
+        super(projectile);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java b/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
index b69175ae..6b3d61ab 100644
--- a/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
+++ b/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
@@ -14,8 +14,8 @@ public class SheepDyeWoolEvent extends EntityEvent implements Cancellable {
     private boolean cancel;
     private DyeColor color;
 
-    public SheepDyeWoolEvent(Entity what, DyeColor color) {
-        super(Type.SHEEP_DYE_WOOL, what);
+    public SheepDyeWoolEvent(final Entity what, final DyeColor color) {
+        super(what);
         this.cancel = false;
         this.color = color;
     }
diff --git a/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java b/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
index 73ef7fab..c6f0ba92 100644
--- a/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
+++ b/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
@@ -12,8 +12,8 @@ public class SheepRegrowWoolEvent extends EntityEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel;
 
-    public SheepRegrowWoolEvent(Entity what) {
-        super(Type.SHEEP_REGROW_WOOL, what);
+    public SheepRegrowWoolEvent(final Entity what) {
+        super(what);
         this.cancel = false;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java b/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
index 73013cc6..a170ae9b 100644
--- a/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
+++ b/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
@@ -13,8 +13,8 @@ public class SlimeSplitEvent extends EntityEvent implements Cancellable {
     private boolean cancel;
     private int count;
 
-    public SlimeSplitEvent(Entity what, int count) {
-        super(Type.SLIME_SPLIT, what);
+    public SlimeSplitEvent(final Entity what, final int count) {
+        super(what);
         this.cancel = false;
         this.count = count;
     }
diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
index 3d2cfd2b..85563d04 100644
--- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
@@ -12,15 +12,13 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class FurnaceBurnEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Block furnace;
-    private ItemStack fuel;
+    private final Block furnace;
+    private final ItemStack fuel;
     private int burnTime;
     private boolean cancelled;
     private boolean burning;
 
-    public FurnaceBurnEvent(Block furnace, ItemStack fuel, int burnTime) {
-        super(Type.FURNACE_BURN);
-
+    public FurnaceBurnEvent(final Block furnace, final ItemStack fuel, final int burnTime) {
         this.furnace = furnace;
         this.fuel = fuel;
         this.burnTime = burnTime;
diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
index f1c498e8..a98a2482 100644
--- a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
@@ -12,14 +12,12 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class FurnaceSmeltEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Block furnace;
-    private ItemStack source;
+    private final Block furnace;
+    private final ItemStack source;
     private ItemStack result;
     private boolean cancelled;
 
-    public FurnaceSmeltEvent(Block furnace, ItemStack source, ItemStack result) {
-        super(Type.FURNACE_SMELT);
-
+    public FurnaceSmeltEvent(final Block furnace, final ItemStack source, final ItemStack result) {
         this.furnace = furnace;
         this.source = source;
         this.result = result;
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryListener.java b/src/main/java/org/bukkit/event/inventory/InventoryListener.java
deleted file mode 100644
index e93f5d5e..00000000
--- a/src/main/java/org/bukkit/event/inventory/InventoryListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bukkit.event.inventory;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all events thrown in relation to Blocks
- */
-@Deprecated
-public class InventoryListener implements Listener {
-    public InventoryListener() {}
-
-    /**
-     * Called when an ItemStack is successfully smelted in a furnace.
-     *
-     * @param event Relevant event details
-     */
-    public void onFurnaceSmelt(FurnaceSmeltEvent event) {}
-
-    /**
-     * Called when an ItemStack is successfully burned as fuel in a furnace.
-     *
-     * @param event Relevant event details
-     */
-    public void onFurnaceBurn(FurnaceBurnEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java b/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java
index 00d6533a..7635fba0 100644
--- a/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java
+++ b/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Painting;
  */
 @SuppressWarnings("serial")
 public class PaintingBreakByEntityEvent extends PaintingBreakEvent {
-    private Entity remover;
+    private final Entity remover;
 
     public PaintingBreakByEntityEvent(final Painting painting, final Entity remover) {
         super(painting, RemoveCause.ENTITY);
diff --git a/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java b/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java
index cd086269..1c6b46fc 100644
--- a/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java
+++ b/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java
@@ -12,10 +12,10 @@ public class PaintingBreakEvent extends PaintingEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancelled;
-    private RemoveCause cause;
+    private final RemoveCause cause;
 
-    public PaintingBreakEvent(final Painting painting, RemoveCause cause) {
-        super(Type.PAINTING_BREAK, painting);
+    public PaintingBreakEvent(final Painting painting, final RemoveCause cause) {
+        super(painting);
         this.cause = cause;
     }
 
diff --git a/src/main/java/org/bukkit/event/painting/PaintingEvent.java b/src/main/java/org/bukkit/event/painting/PaintingEvent.java
index 4d2f441d..fb972b81 100644
--- a/src/main/java/org/bukkit/event/painting/PaintingEvent.java
+++ b/src/main/java/org/bukkit/event/painting/PaintingEvent.java
@@ -11,8 +11,7 @@ public abstract class PaintingEvent extends Event {
 
     protected Painting painting;
 
-    protected PaintingEvent(final Type type, final Painting painting) {
-        super(type);
+    protected PaintingEvent(final Painting painting) {
         this.painting = painting;
     }
 
diff --git a/src/main/java/org/bukkit/event/painting/PaintingPlaceEvent.java b/src/main/java/org/bukkit/event/painting/PaintingPlaceEvent.java
index 251bcee0..89ef543c 100644
--- a/src/main/java/org/bukkit/event/painting/PaintingPlaceEvent.java
+++ b/src/main/java/org/bukkit/event/painting/PaintingPlaceEvent.java
@@ -5,7 +5,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -17,12 +16,12 @@ public class PaintingPlaceEvent extends PaintingEvent implements Cancellable {
 
     private boolean cancelled;
 
-    private Player player;
-    private Block block;
-    private BlockFace blockFace;
+    private final Player player;
+    private final Block block;
+    private final BlockFace blockFace;
 
-    public PaintingPlaceEvent(final Painting painting, final Player player, Block block, BlockFace blockFace) {
-        super(Event.Type.PAINTING_PLACE, painting);
+    public PaintingPlaceEvent(final Painting painting, final Player player, final Block block, final BlockFace blockFace) {
+        super(painting);
         this.player = player;
         this.block = block;
         this.blockFace = blockFace;
diff --git a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
index ad590980..14e58fa9 100644
--- a/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
@@ -11,7 +11,7 @@ import org.bukkit.event.HandlerList;
 public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
-    private PlayerAnimationType animationType;
+    private final PlayerAnimationType animationType;
     private boolean isCancelled = false;
 
     /**
@@ -20,7 +20,7 @@ public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
      * @param player The player instance
      */
     public PlayerAnimationEvent(final Player player) {
-        super(Type.PLAYER_ANIMATION, player);
+        super(player);
 
         // Only supported animation type for now:
         animationType = PlayerAnimationType.ARM_SWING;
diff --git a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
index 174676be..de201b04 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
@@ -13,10 +13,10 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancel = false;
-    private Block bed;
+    private final Block bed;
 
-    public PlayerBedEnterEvent(Player who, Block bed) {
-        super(Type.PLAYER_BED_ENTER, who);
+    public PlayerBedEnterEvent(final Player who, final Block bed) {
+        super(who);
         this.bed = bed;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
index 01d0cfac..9a11c775 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
@@ -11,10 +11,10 @@ import org.bukkit.event.HandlerList;
 public class PlayerBedLeaveEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
 
-    private Block bed;
+    private final Block bed;
 
-    public PlayerBedLeaveEvent(Player who, Block bed) {
-        super(Type.PLAYER_BED_LEAVE, who);
+    public PlayerBedLeaveEvent(final Player who, final Block bed) {
+        super(who);
         this.bed = bed;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
index afdde9ae..a15ac8c8 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
@@ -13,9 +13,9 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class PlayerBucketEmptyEvent extends PlayerBucketEvent {
     private static final HandlerList handlers = new HandlerList();
-    public PlayerBucketEmptyEvent(Player who, Block blockClicked, BlockFace blockFace, Material bucket, ItemStack itemInHand) {
-        super(Type.PLAYER_BUCKET_EMPTY, who, blockClicked, blockFace, bucket, itemInHand);
 
+    public PlayerBucketEmptyEvent(final Player who, final Block blockClicked, final BlockFace blockFace, final Material bucket, final ItemStack itemInHand) {
+        super(who, blockClicked, blockFace, bucket, itemInHand);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
index c8f830e0..bf513053 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
@@ -12,12 +12,12 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
 
     private ItemStack itemStack;
     private boolean cancelled = false;
-    private Block blockClicked;
-    private BlockFace blockFace;
-    private Material bucket;
+    private final Block blockClicked;
+    private final BlockFace blockFace;
+    private final Material bucket;
 
-    public PlayerBucketEvent(Type type, Player who, Block blockClicked, BlockFace blockFace, Material bucket, ItemStack itemInHand) {
-        super(type, who);
+    public PlayerBucketEvent(final Player who, final Block blockClicked, final BlockFace blockFace, final Material bucket, final ItemStack itemInHand) {
+        super(who);
         this.blockClicked = blockClicked;
         this.blockFace = blockFace;
         this.itemStack = itemInHand;
diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
index 065df409..8d14af0b 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
@@ -13,8 +13,9 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("serial")
 public class PlayerBucketFillEvent extends PlayerBucketEvent {
     private static final HandlerList handlers = new HandlerList();
-    public PlayerBucketFillEvent(Player who, Block blockClicked, BlockFace blockFace, Material bucket, ItemStack itemInHand) {
-        super(Type.PLAYER_BUCKET_FILL, who, blockClicked, blockFace, bucket, itemInHand);
+
+    public PlayerBucketFillEvent(final Player who, final Block blockClicked, final BlockFace blockFace, final Material bucket, final ItemStack itemInHand) {
+        super(who, blockClicked, blockFace, bucket, itemInHand);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java b/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
index ee24b9c0..94de3853 100644
--- a/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
@@ -10,8 +10,8 @@ public class PlayerChangedWorldEvent extends PlayerEvent {
 
     private final World from;
 
-    public PlayerChangedWorldEvent(Player player, World from) {
-        super(Type.PLAYER_CHANGED_WORLD, player);
+    public PlayerChangedWorldEvent(final Player player, final World from) {
+        super(player);
         this.from = from;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
index e0975e77..64a169e9 100644
--- a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
@@ -20,12 +20,8 @@ public class PlayerChatEvent extends PlayerEvent implements Cancellable {
     private final Set<Player> recipients;
 
     public PlayerChatEvent(final Player player, final String message) {
-        this(Type.PLAYER_CHAT, player, message);
-    }
-
-    protected PlayerChatEvent(final Type type, final Player player, final String message) {
-        super(type, player);
-        recipients = new HashSet<Player>(Arrays.asList(player.getServer().getOnlinePlayers()));
+        super(player);
+        this.recipients = new HashSet<Player>(Arrays.asList(player.getServer().getOnlinePlayers()));
         this.message = message;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
index fd2fa752..f5db688e 100644
--- a/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
@@ -10,8 +10,9 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerCommandPreprocessEvent extends PlayerChatEvent {
     private static final HandlerList handlers = new HandlerList();
+
     public PlayerCommandPreprocessEvent(final Player player, final String message) {
-        super(Type.PLAYER_COMMAND_PREPROCESS, player, message);
+        super(player, message);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
index 274a02eb..a70af387 100644
--- a/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
@@ -15,7 +15,7 @@ public class PlayerDropItemEvent extends PlayerEvent implements Cancellable {
     private boolean cancel = false;
 
     public PlayerDropItemEvent(final Player player, final Item drop) {
-        super(Type.PLAYER_DROP_ITEM, player);
+        super(player);
         this.drop = drop;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java b/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
index a0736f58..f443c5af 100644
--- a/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
@@ -11,13 +11,13 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerEggThrowEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Egg egg;
+    private final Egg egg;
     private boolean hatching;
     private CreatureType hatchType;
     private byte numHatches;
 
-    public PlayerEggThrowEvent(Player player, Egg egg, boolean hatching, byte numHatches, CreatureType hatchType) {
-        super(Type.PLAYER_EGG_THROW, player);
+    public PlayerEggThrowEvent(final Player player, final Egg egg, final boolean hatching, final byte numHatches, final CreatureType hatchType) {
+        super(player);
         this.egg = egg;
         this.hatching = hatching;
         this.numHatches = numHatches;
diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
index 54ad08e1..0b0f47b6 100644
--- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
@@ -10,8 +10,7 @@ import org.bukkit.event.Event;
 public abstract class PlayerEvent extends Event {
     protected Player player;
 
-    public PlayerEvent(final Event.Type type, final Player who) {
-        super(type);
+    public PlayerEvent(final Player who) {
         player = who;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
index bd0610e8..b332f31a 100644
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
@@ -6,12 +6,13 @@ import org.bukkit.event.HandlerList;
 /**
  * Called when a players experience changes naturally
  */
+@SuppressWarnings("serial")
 public class PlayerExpChangeEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
     private int exp;
 
-    public PlayerExpChangeEvent(Player player, int expAmount) {
-         super(Type.PLAYER_EXP_CHANGE, player);
+    public PlayerExpChangeEvent(final Player player, final int expAmount) {
+         super(player);
          exp = expAmount;
     }
 
@@ -33,6 +34,7 @@ public class PlayerExpChangeEvent extends PlayerEvent {
         exp = amount;
     }
 
+    @Override
     public HandlerList getHandlers() {
         return handlers;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerFishEvent.java b/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
index 5b5cdab6..9c1defec 100644
--- a/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
@@ -13,10 +13,10 @@ public class PlayerFishEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private final Entity entity;
     private boolean cancel = false;
-    private State state;
+    private final State state;
 
-    public PlayerFishEvent(final Player player, final Entity entity, State state) {
-        super(Type.PLAYER_FISH, player);
+    public PlayerFishEvent(final Player player, final Entity entity, final State state) {
+        super(player);
         this.entity = entity;
         this.state = state;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
index c8406a89..7f95078b 100644
--- a/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
@@ -10,10 +10,10 @@ public class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellabl
     private static final HandlerList handlers = new HandlerList();
 
     private boolean cancelled;
-    private GameMode newGameMode;
+    private final GameMode newGameMode;
 
-    public PlayerGameModeChangeEvent(Player player, GameMode newGameMode) {
-        super(Type.PLAYER_GAME_MODE_CHANGE, player);
+    public PlayerGameModeChangeEvent(final Player player, final GameMode newGameMode) {
+        super(player);
         this.newGameMode = newGameMode;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
index 59f872fb..a14afa88 100644
--- a/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
@@ -14,8 +14,8 @@ public class PlayerInteractEntityEvent extends PlayerEvent implements Cancellabl
     protected Entity clickedEntity;
     boolean cancelled = false;
 
-    public PlayerInteractEntityEvent(Player who, Entity clickedEntity) {
-        super(Type.PLAYER_INTERACT_ENTITY, who);
+    public PlayerInteractEntityEvent(final Player who, final Entity clickedEntity) {
+        super(who);
         this.clickedEntity = clickedEntity;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
index 837ffa27..17a4b7b0 100644
--- a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
@@ -23,8 +23,8 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable {
     private Result useClickedBlock;
     private Result useItemInHand;
 
-    public PlayerInteractEvent(Player who, Action action, ItemStack item, Block clickedBlock, BlockFace clickedFace) {
-        super(Type.PLAYER_INTERACT, who);
+    public PlayerInteractEvent(final Player who, final Action action, final ItemStack item, final Block clickedBlock, final BlockFace clickedFace) {
+        super(who);
         this.action = action;
         this.item = item;
         this.blockClicked = clickedBlock;
diff --git a/src/main/java/org/bukkit/event/player/PlayerInventoryEvent.java b/src/main/java/org/bukkit/event/player/PlayerInventoryEvent.java
index 5993e841..144a2d59 100644
--- a/src/main/java/org/bukkit/event/player/PlayerInventoryEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerInventoryEvent.java
@@ -13,7 +13,7 @@ public class PlayerInventoryEvent extends PlayerEvent {
     protected Inventory inventory;
 
     public PlayerInventoryEvent(final Player player, final Inventory inventory) {
-        super(Type.PLAYER_INVENTORY, player);
+        super(player);
         this.inventory = inventory;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
index d345c861..26fac253 100644
--- a/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
@@ -9,11 +9,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerItemHeldEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
-    private int previous;
-    private int current;
+    private final int previous;
+    private final int current;
 
     public PlayerItemHeldEvent(final Player player, final int previous, final int current) {
-        super(Type.PLAYER_ITEM_HELD, player);
+        super(player);
         this.previous = previous;
         this.current = current;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
index 481e96cc..dd880fd0 100644
--- a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
@@ -11,8 +11,8 @@ public class PlayerJoinEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
     private String joinMessage;
 
-    public PlayerJoinEvent(Player playerJoined, String joinMessage) {
-        super(Type.PLAYER_JOIN, playerJoined);
+    public PlayerJoinEvent(final Player playerJoined, final String joinMessage) {
+        super(playerJoined);
         this.joinMessage = joinMessage;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
index 47155616..1907181a 100644
--- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
@@ -14,8 +14,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
     private String kickReason;
     private Boolean cancel;
 
-    public PlayerKickEvent(Player playerKicked, String kickReason, String leaveMessage) {
-        super(Type.PLAYER_KICK, playerKicked);
+    public PlayerKickEvent(final Player playerKicked, final String kickReason, final String leaveMessage) {
+        super(playerKicked);
         this.kickReason = kickReason;
         this.leaveMessage = leaveMessage;
         this.cancel = false;
diff --git a/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
index dd2708c8..1457c28d 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
@@ -6,13 +6,14 @@ import org.bukkit.event.HandlerList;
 /**
  * Called when a players level changes
  */
+@SuppressWarnings("serial")
 public class PlayerLevelChangeEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
-    private int oldLevel;
-    private int newLevel;
+    private final int oldLevel;
+    private final int newLevel;
 
-    public PlayerLevelChangeEvent(Player player, int oldLevel, int newLevel) {
-         super(Type.PLAYER_LEVEL_CHANGE, player);
+    public PlayerLevelChangeEvent(final Player player, final int oldLevel, final int newLevel) {
+         super(player);
          this.oldLevel = oldLevel;
          this.newLevel = newLevel;
     }
@@ -35,6 +36,7 @@ public class PlayerLevelChangeEvent extends PlayerEvent {
         return newLevel;
     }
 
+    @Override
     public HandlerList getHandlers() {
         return handlers;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerListener.java b/src/main/java/org/bukkit/event/player/PlayerListener.java
deleted file mode 100644
index cd461108..00000000
--- a/src/main/java/org/bukkit/event/player/PlayerListener.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bukkit.event.player;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all events thrown in relation to a Player
- */
-@Deprecated
-public class PlayerListener implements Listener {
-    public PlayerListener() {}
-
-    /**
-     * Called when a player joins a server
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerJoin(PlayerJoinEvent event) {}
-
-    /**
-     * Called when a player leaves a server
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerQuit(PlayerQuitEvent event) {}
-
-    /**
-     * Called when a player gets kicked from the server
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerKick(PlayerKickEvent event) {}
-
-    /**
-     * Called when a player sends a chat message
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerChat(PlayerChatEvent event) {}
-
-    /**
-     * Called early in the command handling process. This event is only
-     * for very exceptional cases and you should not normally use it.
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {}
-
-    /**
-     * Called when a player attempts to move location in a world
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerMove(PlayerMoveEvent event) {}
-
-    /**
-     * Called before a player gets a velocity vector sent, which will "push"
-     * the player in a certain direction
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerVelocity(PlayerVelocityEvent event) {}
-
-    /**
-     * Called when a player attempts to teleport to a new location in a world
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerTeleport(PlayerTeleportEvent event) {}
-
-    /**
-     * Called when a player respawns
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerRespawn(PlayerRespawnEvent event) {}
-
-    /**
-     * Called when a player interacts with an object or air.
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerInteract(PlayerInteractEvent event) {}
-
-    /**
-     * Called when a player right clicks an entity.
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {}
-
-    /**
-     * Called when a player attempts to log in to the server
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerLogin(PlayerLoginEvent event) {}
-
-    /**
-     * Called when a player has just been authenticated
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerPreLogin(PlayerPreLoginEvent event) {}
-
-    /**
-     * Called when a player throws an egg and it might hatch
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerEggThrow(PlayerEggThrowEvent event) {}
-
-    /**
-     * Called when a player plays an animation, such as an arm swing
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerAnimation(PlayerAnimationEvent event) {}
-
-    /**
-     * Called when a player opens an inventory
-     *
-     * @param event Relevant event details
-     */
-    public void onInventoryOpen(PlayerInventoryEvent event) {}
-
-    /**
-     * Called when a player changes their held item
-     *
-     * @param event Relevant event details
-     */
-    public void onItemHeldChange(PlayerItemHeldEvent event) {}
-
-    /**
-     * Called when a player drops an item from their inventory
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerDropItem(PlayerDropItemEvent event) {}
-
-    /**
-     * Called when a player picks an item up off the ground
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerPickupItem(PlayerPickupItemEvent event) {}
-
-    /**
-     * Called when a player toggles sneak mode
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {}
-
-    /**
-     * Called when a player toggles sprint mode
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerToggleSprint(PlayerToggleSprintEvent event) {}
-
-    /**
-     * Called when a player fills a bucket
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerBucketFill(PlayerBucketFillEvent event) {}
-
-    /**
-     * Called when a player empties a bucket
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {}
-
-    /**
-     * Called when a player enters a bed
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerBedEnter(PlayerBedEnterEvent event) {}
-
-    /**
-     * Called when a player leaves a bed
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerBedLeave(PlayerBedLeaveEvent event) {}
-
-    /**
-     * Called when a player is teleporting in a portal (after the animation)
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerPortal(PlayerPortalEvent event) {}
-
-    /**
-     * Called when a player is fishing
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerFish(PlayerFishEvent event) {}
-
-    /**
-     * Called when a player's game mode is changed
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {}
-
-    /**
-     * Called after a player changes to a new world
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {}
-
-    /**
-     * Called when a players level changes
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerLevelChange(PlayerLevelChangeEvent event) {}
-
-    /**
-     * Called when a players experience changes naturally
-     *
-     * @param event Relevant event details
-     */
-    public void onPlayerExpChange(PlayerExpChangeEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index 1982878c..5d002601 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -9,17 +9,15 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerLoginEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Result result;
-    private String message;
+    private Result result = Result.ALLOWED;
+    private String message = "";
 
     public PlayerLoginEvent(final Player player) {
-        super(Type.PLAYER_LOGIN, player);
-        this.result = Result.ALLOWED;
-        this.message = "";
+        super(player);
     }
 
-    public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) {
-        super(type, player);
+    public PlayerLoginEvent(final Player player, final Result result, final String message) {
+        this(player);
         this.result = result;
         this.message = message;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
index faa50282..817b70c0 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -3,7 +3,6 @@ package org.bukkit.event.player;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -17,13 +16,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
     private Location to;
 
     public PlayerMoveEvent(final Player player, final Location from, final Location to) {
-        super(Type.PLAYER_MOVE, player);
-        this.from = from;
-        this.to = to;
-    }
-
-    PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) {
-        super(type, player);
+        super(player);
         this.from = from;
         this.to = to;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
index e20b1c5a..13f7793c 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
@@ -13,10 +13,10 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private final Item item;
     private boolean cancel = false;
-    private int remaining;
+    private final int remaining;
 
-    public PlayerPickupItemEvent(final Player player, final Item item, int remaining) {
-        super(Type.PLAYER_PICKUP_ITEM, player);
+    public PlayerPickupItemEvent(final Player player, final Item item, final int remaining) {
+        super(player);
         this.item = item;
         this.remaining = remaining;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
index a5d80a71..a721e530 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
@@ -17,8 +17,8 @@ public class PlayerPortalEvent extends PlayerTeleportEvent {
     protected Player player;
     protected TravelAgent travelAgent;
 
-    public PlayerPortalEvent(Player player, Location from, Location to, TravelAgent pta) {
-        super(Type.PLAYER_PORTAL, player, from, to);
+    public PlayerPortalEvent(final Player player, final Location from, final Location to, final TravelAgent pta) {
+        super(player, from, to);
         this.travelAgent = pta;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
index e83724cb..ac57199f 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
@@ -12,11 +12,10 @@ public class PlayerPreLoginEvent extends Event {
     private static final HandlerList handlers = new HandlerList();
     private Result result;
     private String message;
-    private String name;
-    private InetAddress ipAddress;
+    private final String name;
+    private final InetAddress ipAddress;
 
-    public PlayerPreLoginEvent(String name, InetAddress ipAddress) {
-        super(Type.PLAYER_PRELOGIN);
+    public PlayerPreLoginEvent(final String name, final InetAddress ipAddress) {
         this.result = Result.ALLOWED;
         this.message = "";
         this.name = name;
diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
index 6eea9dc5..f29758bd 100644
--- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
@@ -12,8 +12,8 @@ public class PlayerQuitEvent extends PlayerEvent {
 
     private String quitMessage;
 
-    public PlayerQuitEvent(Player who, String quitMessage) {
-        super(Type.PLAYER_QUIT, who);
+    public PlayerQuitEvent(final Player who, final String quitMessage) {
+        super(who);
         this.quitMessage = quitMessage;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
index 9a3014d2..54fdd23e 100644
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
@@ -8,10 +8,10 @@ import org.bukkit.event.HandlerList;
 public class PlayerRespawnEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
     private Location respawnLocation;
-    private boolean isBedSpawn;
+    private final boolean isBedSpawn;
 
-    public PlayerRespawnEvent(Player respawnPlayer, Location respawnLocation, boolean isBedSpawn) {
-        super(Type.PLAYER_RESPAWN, respawnPlayer);
+    public PlayerRespawnEvent(final Player respawnPlayer, final Location respawnLocation, final boolean isBedSpawn) {
+        super(respawnPlayer);
         this.respawnLocation = respawnLocation;
         this.isBedSpawn = isBedSpawn;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
index 8fb73f78..8d948174 100644
--- a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
@@ -12,10 +12,10 @@ import org.bukkit.event.HandlerList;
 public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel;
-    private Entity what;
+    private final Entity what;
 
-    public PlayerShearEntityEvent(Player who, Entity what) {
-        super(Type.PLAYER_SHEAR_ENTITY, who);
+    public PlayerShearEntityEvent(final Player who, final Entity what) {
+        super(who);
         this.cancel = false;
         this.what = what;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
index e3cbb4c7..5c7fb9b0 100644
--- a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
@@ -2,7 +2,6 @@ package org.bukkit.event.player;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -13,22 +12,12 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
     private static final HandlerList handlers = new HandlerList();
     private TeleportCause cause = TeleportCause.UNKNOWN;
 
-    public PlayerTeleportEvent(Player player, Location from, Location to) {
-        super(Type.PLAYER_TELEPORT, player, from, to);
+    public PlayerTeleportEvent(final Player player, final Location from, final Location to) {
+        super(player, from, to);
     }
 
-    public PlayerTeleportEvent(Player player, Location from, Location to, TeleportCause cause) {
-        super(Type.PLAYER_TELEPORT, player, from, to);
-
-        this.cause = cause;
-    }
-
-    public PlayerTeleportEvent(final Event.Type type, Player player, Location from, Location to) {
-        super(type, player, from, to);
-    }
-
-    public PlayerTeleportEvent(final Event.Type type, Player player, Location from, Location to, TeleportCause cause) {
-        super(type, player, from, to);
+    public PlayerTeleportEvent(final Player player, final Location from, final Location to, final TeleportCause cause) {
+        this(player, from, to);
 
         this.cause = cause;
     }
diff --git a/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java b/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
index dcd39bc6..295680f4 100644
--- a/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
@@ -10,11 +10,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerToggleSneakEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private boolean isSneaking;
+    private final boolean isSneaking;
     private boolean cancel = false;
 
-    public PlayerToggleSneakEvent(final Player player, boolean isSneaking) {
-        super(Type.PLAYER_TOGGLE_SNEAK, player);
+    public PlayerToggleSneakEvent(final Player player, final boolean isSneaking) {
+        super(player);
         this.isSneaking = isSneaking;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java b/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
index 24a3cd8c..0bbeba36 100644
--- a/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
@@ -10,11 +10,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class PlayerToggleSprintEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private boolean isSprinting;
+    private final boolean isSprinting;
     private boolean cancel = false;
 
-    public PlayerToggleSprintEvent(final Player player, boolean isSprinting) {
-        super(Type.PLAYER_TOGGLE_SPRINT, player);
+    public PlayerToggleSprintEvent(final Player player, final boolean isSprinting) {
+        super(player);
         this.isSprinting = isSprinting;
     }
 
diff --git a/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java b/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
index a4309535..e2a0590f 100644
--- a/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
@@ -2,7 +2,6 @@ package org.bukkit.event.player;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.util.Vector;
 
@@ -17,12 +16,7 @@ public class PlayerVelocityEvent extends PlayerEvent implements Cancellable {
     private Vector velocity;
 
     public PlayerVelocityEvent(final Player player, final Vector velocity) {
-        super(Type.PLAYER_VELOCITY, player);
-        this.velocity = velocity;
-    }
-
-    PlayerVelocityEvent(final Event.Type type, final Player player, final Vector velocity) {
-        super(type, player);
+        super(player);
         this.velocity = velocity;
     }
 
diff --git a/src/main/java/org/bukkit/event/server/MapInitializeEvent.java b/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
index 5b5b15e1..e3836e10 100644
--- a/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
+++ b/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
@@ -1,6 +1,5 @@
 package org.bukkit.event.server;
 
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.map.MapView;
 
@@ -12,8 +11,7 @@ public class MapInitializeEvent extends ServerEvent {
     private static final HandlerList handlers = new HandlerList();
     private final MapView mapView;
 
-    public MapInitializeEvent(MapView mapView) {
-        super(Event.Type.MAP_INITIALIZE);
+    public MapInitializeEvent(final MapView mapView) {
         this.mapView = mapView;
     }
 
diff --git a/src/main/java/org/bukkit/event/server/PluginDisableEvent.java b/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
index 498aeaee..74482e4d 100644
--- a/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
+++ b/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
@@ -9,8 +9,9 @@ import org.bukkit.plugin.Plugin;
 @SuppressWarnings("serial")
 public class PluginDisableEvent extends PluginEvent {
     private static final HandlerList handlers = new HandlerList();
-    public PluginDisableEvent(Plugin plugin) {
-        super(Type.PLUGIN_DISABLE, plugin);
+
+    public PluginDisableEvent(final Plugin plugin) {
+        super(plugin);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/server/PluginEnableEvent.java b/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
index 4bd5fd84..429e8c94 100644
--- a/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
+++ b/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
@@ -9,8 +9,9 @@ import org.bukkit.plugin.Plugin;
 @SuppressWarnings("serial")
 public class PluginEnableEvent extends PluginEvent {
     private static final HandlerList handlers = new HandlerList();
-    public PluginEnableEvent(Plugin plugin) {
-        super(Type.PLUGIN_ENABLE, plugin);
+
+    public PluginEnableEvent(final Plugin plugin) {
+        super(plugin);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/server/PluginEvent.java b/src/main/java/org/bukkit/event/server/PluginEvent.java
index 987ac524..ba69393b 100644
--- a/src/main/java/org/bukkit/event/server/PluginEvent.java
+++ b/src/main/java/org/bukkit/event/server/PluginEvent.java
@@ -9,9 +9,7 @@ import org.bukkit.plugin.Plugin;
 public abstract class PluginEvent extends ServerEvent {
     private final Plugin plugin;
 
-    public PluginEvent(final Type type, final Plugin plugin) {
-        super(type);
-
+    public PluginEvent(final Plugin plugin) {
         this.plugin = plugin;
     }
 
diff --git a/src/main/java/org/bukkit/event/server/ServerCommandEvent.java b/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
index ebf9079b..7fbac654 100644
--- a/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
@@ -1,7 +1,6 @@
 package org.bukkit.event.server;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -11,15 +10,9 @@ import org.bukkit.event.HandlerList;
 public class ServerCommandEvent extends ServerEvent {
     private static final HandlerList handlers = new HandlerList();
     private String command;
-    private CommandSender sender;
+    private final CommandSender sender;
 
-    @Deprecated
-    public ServerCommandEvent(ConsoleCommandSender console, String message) {
-        this(Type.SERVER_COMMAND, console, message);
-    }
-
-    public ServerCommandEvent(Type type, CommandSender sender, String command) {
-        super(type);
+    public ServerCommandEvent(final CommandSender sender, final String command) {
         this.command = command;
         this.sender = sender;
     }
diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java
index 1ac8c359..b4fcbb3d 100644
--- a/src/main/java/org/bukkit/event/server/ServerEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
@@ -7,7 +7,4 @@ import org.bukkit.event.Event;
  */
 @SuppressWarnings("serial")
 public abstract class ServerEvent extends Event {
-    public ServerEvent(final Type type) {
-        super(type);
-    }
 }
diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
index 0df6f3cd..1945bb7e 100644
--- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
@@ -2,7 +2,6 @@ package org.bukkit.event.server;
 
 import java.net.InetAddress;
 
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
@@ -12,13 +11,12 @@ import org.bukkit.event.HandlerList;
 public class ServerListPingEvent extends ServerEvent {
     private static final HandlerList handlers = new HandlerList();
 
-    private InetAddress address;
+    private final InetAddress address;
     private String motd;
-    private int numPlayers;
+    private final int numPlayers;
     private int maxPlayers;
 
-    public ServerListPingEvent(InetAddress address, String motd, int numPlayers, int maxPlayers) {
-        super(Event.Type.SERVER_LIST_PING);
+    public ServerListPingEvent(final InetAddress address, final String motd, final int numPlayers, final int maxPlayers) {
         this.address = address;
         this.motd = motd;
         this.numPlayers = numPlayers;
diff --git a/src/main/java/org/bukkit/event/server/ServerListener.java b/src/main/java/org/bukkit/event/server/ServerListener.java
deleted file mode 100644
index 5c76e4f3..00000000
--- a/src/main/java/org/bukkit/event/server/ServerListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bukkit.event.server;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all miscellaneous server events
- */
-@Deprecated
-public class ServerListener implements Listener {
-
-    /**
-     * Called when a plugin is enabled
-     *
-     * @param event Relevant event details
-     */
-    public void onPluginEnable(PluginEnableEvent event) {}
-
-    /**
-     * Called when a plugin is disabled
-     *
-     * @param event Relevant event details
-     */
-    public void onPluginDisable(PluginDisableEvent event) {}
-
-    /**
-     * Called when a server command is used
-     *
-     * @param event Relevant event details
-     */
-    public void onServerCommand(ServerCommandEvent event) {}
-
-    /**
-     * Called when a map item is initialized (created or loaded into memory)
-     *
-     * @param event Relevant event details
-     */
-    public void onMapInitialize(MapInitializeEvent event) {}
-
-    /**
-     * Called when a server list ping has come in.
-     *
-     * @param event Relevant event details
-     */
-    public void onServerListPing(ServerListPingEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
index af840d49..de351f77 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
@@ -10,10 +10,10 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Block block;
+    private final Block block;
 
-    public VehicleBlockCollisionEvent(Vehicle vehicle, Block block) {
-        super(Type.VEHICLE_COLLISION_BLOCK, vehicle);
+    public VehicleBlockCollisionEvent(final Vehicle vehicle, final Block block) {
+        super(vehicle);
         this.block = block;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
index 7a3f7ac6..67b51d05 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
@@ -7,7 +7,7 @@ import org.bukkit.entity.Vehicle;
  */
 @SuppressWarnings("serial")
 public abstract class VehicleCollisionEvent extends VehicleEvent {
-    public VehicleCollisionEvent(Type type, Vehicle vehicle) {
-        super(type, vehicle);
+    public VehicleCollisionEvent(final Vehicle vehicle) {
+        super(vehicle);
     }
 }
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
index 2050c9d3..983d955a 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
@@ -9,8 +9,8 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleCreateEvent extends VehicleEvent {
     private static final HandlerList handlers = new HandlerList();
-    public VehicleCreateEvent(Vehicle vehicle) {
-        super(Type.VEHICLE_CREATE, vehicle);
+    public VehicleCreateEvent(final Vehicle vehicle) {
+        super(vehicle);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
index e67a9e78..a20b97b2 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
@@ -11,12 +11,12 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Entity attacker;
+    private final Entity attacker;
     private int damage;
     private boolean cancelled;
 
-    public VehicleDamageEvent(Vehicle vehicle, Entity attacker, int damage) {
-        super(Type.VEHICLE_DAMAGE, vehicle);
+    public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final int damage) {
+        super(vehicle);
         this.attacker = attacker;
         this.damage = damage;
     }
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
index d833e636..8e841958 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
@@ -13,11 +13,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleDestroyEvent extends VehicleEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Entity attacker;
+    private final Entity attacker;
     private boolean cancelled;
 
-    public VehicleDestroyEvent(Vehicle vehicle, Entity attacker) {
-        super(Type.VEHICLE_DESTROY, vehicle);
+    public VehicleDestroyEvent(final Vehicle vehicle, final Entity attacker) {
+        super(vehicle);
         this.attacker = attacker;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
index eeb0eb35..eaf211fd 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
@@ -12,10 +12,10 @@ import org.bukkit.event.HandlerList;
 public class VehicleEnterEvent extends VehicleEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private Entity entered;
+    private final Entity entered;
 
-    public VehicleEnterEvent(Vehicle vehicle, Entity entered) {
-        super(Type.VEHICLE_ENTER, vehicle);
+    public VehicleEnterEvent(final Vehicle vehicle, final Entity entered) {
+        super(vehicle);
         this.entered = entered;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
index 22877d6c..9879f933 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
@@ -11,13 +11,13 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
-    private Entity entity;
+    private final Entity entity;
     private boolean cancelled = false;
     private boolean cancelledPickup = false;
     private boolean cancelledCollision = false;
 
-    public VehicleEntityCollisionEvent(Vehicle vehicle, Entity entity) {
-        super(Type.VEHICLE_COLLISION_ENTITY, vehicle);
+    public VehicleEntityCollisionEvent(final Vehicle vehicle, final Entity entity) {
+        super(vehicle);
         this.entity = entity;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
index cd1ac7e9..8d69518e 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
@@ -10,8 +10,7 @@ import org.bukkit.event.Event;
 public abstract class VehicleEvent extends Event {
     protected Vehicle vehicle;
 
-    public VehicleEvent(final Event.Type type, final Vehicle vehicle) {
-        super(type);
+    public VehicleEvent(final Vehicle vehicle) {
         this.vehicle = vehicle;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
index 10223e60..cfb7c2a6 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
@@ -12,10 +12,10 @@ import org.bukkit.event.HandlerList;
 public class VehicleExitEvent extends VehicleEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled;
-    private LivingEntity exited;
+    private final LivingEntity exited;
 
-    public VehicleExitEvent(Vehicle vehicle, LivingEntity exited) {
-        super(Type.VEHICLE_EXIT, vehicle);
+    public VehicleExitEvent(final Vehicle vehicle, final LivingEntity exited) {
+        super(vehicle);
         this.exited = exited;
     }
 
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java b/src/main/java/org/bukkit/event/vehicle/VehicleListener.java
deleted file mode 100644
index 2d7fc208..00000000
--- a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bukkit.event.vehicle;
-
-import org.bukkit.event.Listener;
-
-/**
- * Listener for vehicle events.
- */
-@Deprecated
-public class VehicleListener implements Listener {
-    public VehicleListener() {}
-
-    /**
-     * Called when a vehicle is created by a player. This hook will be called
-     * for all vehicles created.
-     *
-     * @param event The event
-     */
-    public void onVehicleCreate(VehicleCreateEvent event) {}
-
-    /**
-     * Called when a vehicle is damaged by the player.
-     *
-     * @param event The event
-     */
-    public void onVehicleDamage(VehicleDamageEvent event) {}
-
-    /**
-     * Called when a vehicle collides with a block.
-     *
-     * @param event The event
-     */
-    public void onVehicleBlockCollision(VehicleBlockCollisionEvent event) {}
-
-    /**
-     * Called when a vehicle collides with an entity.
-     *
-     * @param event The event
-     */
-    public void onVehicleEntityCollision(VehicleEntityCollisionEvent event) {}
-
-    /**
-     * Called when an entity enters a vehicle.
-     *
-     * @param event The event
-     */
-    public void onVehicleEnter(VehicleEnterEvent event) {}
-
-    /**
-     * Called when an entity exits a vehicle.
-     *
-     * @param event The event
-     */
-    public void onVehicleExit(VehicleExitEvent event) {}
-
-    /**
-     * Called when an vehicle moves.
-     *
-     * @param event The event
-     */
-    public void onVehicleMove(VehicleMoveEvent event) {}
-
-    /**
-     * Called when a vehicle is destroyed.
-     *
-     * @param event The event
-     */
-    public void onVehicleDestroy(VehicleDestroyEvent event) {}
-
-    /**
-     * Called when a vehicle goes through an update cycle
-     *
-     * @param event The event
-     */
-    public void onVehicleUpdate(VehicleUpdateEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
index 6bf31c8d..d98ec396 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
@@ -10,11 +10,11 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleMoveEvent extends VehicleEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Location from;
-    private Location to;
+    private final Location from;
+    private final Location to;
 
-    public VehicleMoveEvent(Vehicle vehicle, Location from, Location to) {
-        super(Type.VEHICLE_MOVE, vehicle);
+    public VehicleMoveEvent(final Vehicle vehicle, final Location from, final Location to) {
+        super(vehicle);
 
         this.from = from;
         this.to = to;
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
index 9e2342e4..44abf9ea 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
@@ -6,8 +6,9 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class VehicleUpdateEvent extends VehicleEvent {
     private static final HandlerList handlers = new HandlerList();
-    public VehicleUpdateEvent(Vehicle vehicle) {
-        super(Type.VEHICLE_UPDATE, vehicle);
+
+    public VehicleUpdateEvent(final Vehicle vehicle) {
+        super(vehicle);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
index b778c595..1763f819 100644
--- a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
+++ b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
@@ -13,10 +13,10 @@ public class LightningStrikeEvent extends WeatherEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean canceled;
-    private LightningStrike bolt;
+    private final LightningStrike bolt;
 
-    public LightningStrikeEvent(World world, LightningStrike bolt) {
-        super(Type.LIGHTNING_STRIKE, world);
+    public LightningStrikeEvent(final World world, final LightningStrike bolt) {
+        super(world);
         this.bolt = bolt;
     }
 
diff --git a/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java b/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
index 2c36e2a1..0cd4887c 100644
--- a/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
+++ b/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
@@ -12,10 +12,10 @@ public class ThunderChangeEvent extends WeatherEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean canceled;
-    private boolean to;
+    private final boolean to;
 
-    public ThunderChangeEvent(World world, boolean to) {
-        super(Type.THUNDER_CHANGE, world);
+    public ThunderChangeEvent(final World world, final boolean to) {
+        super(world);
         this.to = to;
     }
 
diff --git a/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java b/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
index 631e0a04..0c6c5f2e 100644
--- a/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
+++ b/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
@@ -12,10 +12,10 @@ public class WeatherChangeEvent extends WeatherEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     private boolean canceled;
-    private boolean to;
+    private final boolean to;
 
-    public WeatherChangeEvent(World world, boolean to) {
-        super(Type.WEATHER_CHANGE, world);
+    public WeatherChangeEvent(final World world, final boolean to) {
+        super(world);
         this.to = to;
     }
 
diff --git a/src/main/java/org/bukkit/event/weather/WeatherEvent.java b/src/main/java/org/bukkit/event/weather/WeatherEvent.java
index 7d548f32..1deb3e9a 100644
--- a/src/main/java/org/bukkit/event/weather/WeatherEvent.java
+++ b/src/main/java/org/bukkit/event/weather/WeatherEvent.java
@@ -10,8 +10,7 @@ import org.bukkit.event.Event;
 public abstract class WeatherEvent extends Event {
     protected World world;
 
-    public WeatherEvent(final Event.Type type, final World where) {
-        super(type);
+    public WeatherEvent(final World where) {
         world = where;
     }
 
diff --git a/src/main/java/org/bukkit/event/weather/WeatherListener.java b/src/main/java/org/bukkit/event/weather/WeatherListener.java
deleted file mode 100644
index 98212480..00000000
--- a/src/main/java/org/bukkit/event/weather/WeatherListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bukkit.event.weather;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all events fired in relation to weather
- */
-@Deprecated
-public class WeatherListener implements Listener {
-    public WeatherListener() {}
-
-    /**
-     * Called when a weather change occurs
-     *
-     * @param event Relevant event details
-     */
-    public void onWeatherChange(WeatherChangeEvent event) {}
-
-    /**
-     * Called when the state of thunder changes
-     *
-     * @param event Relevant event details
-     */
-    public void onThunderChange(ThunderChangeEvent event) {}
-
-    /**
-     * Called when lightning strikes
-     *
-     * @param event Relevant event details
-     */
-    public void onLightningStrike(LightningStrikeEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/world/ChunkEvent.java b/src/main/java/org/bukkit/event/world/ChunkEvent.java
index f7702de0..0a32360f 100644
--- a/src/main/java/org/bukkit/event/world/ChunkEvent.java
+++ b/src/main/java/org/bukkit/event/world/ChunkEvent.java
@@ -9,8 +9,8 @@ import org.bukkit.Chunk;
 public abstract class ChunkEvent extends WorldEvent {
     protected Chunk chunk;
 
-    protected ChunkEvent(Type type, Chunk chunk) {
-        super(type, chunk.getWorld());
+    protected ChunkEvent(final Chunk chunk) {
+        super(chunk.getWorld());
         this.chunk = chunk;
     }
 
diff --git a/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java b/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
index 9941cc56..0e15ec41 100644
--- a/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
+++ b/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
@@ -12,7 +12,7 @@ public class ChunkLoadEvent extends ChunkEvent {
     private final boolean newChunk;
 
     public ChunkLoadEvent(final Chunk chunk, final boolean newChunk) {
-        super(Type.CHUNK_LOAD, chunk);
+        super(chunk);
         this.newChunk = newChunk;
     }
 
diff --git a/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java b/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
index 830189b3..257cbeea 100644
--- a/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
+++ b/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
@@ -13,7 +13,7 @@ import org.bukkit.generator.BlockPopulator;
 public class ChunkPopulateEvent extends ChunkEvent {
     private static final HandlerList handlers = new HandlerList();
     public ChunkPopulateEvent(final Chunk chunk) {
-        super(Type.CHUNK_POPULATED, chunk);
+        super(chunk);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java b/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
index b08ab9b1..d508f0eb 100644
--- a/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
+++ b/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
@@ -13,7 +13,7 @@ public class ChunkUnloadEvent extends ChunkEvent implements Cancellable {
     private boolean cancel = false;
 
     public ChunkUnloadEvent(final Chunk chunk) {
-        super(Type.CHUNK_UNLOAD, chunk);
+        super(chunk);
     }
 
     public boolean isCancelled() {
diff --git a/src/main/java/org/bukkit/event/world/PortalCreateEvent.java b/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
index 3c71935f..d653015a 100644
--- a/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
+++ b/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
@@ -15,10 +15,10 @@ import java.util.Collection;
 public class PortalCreateEvent extends WorldEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
-    private ArrayList<Block> blocks = new ArrayList<Block>();
+    private final ArrayList<Block> blocks = new ArrayList<Block>();
 
     public PortalCreateEvent(final Collection<Block> blocks, final World world) {
-        super(Type.PORTAL_CREATE, world);
+        super(world);
         this.blocks.addAll(blocks);
     }
 
diff --git a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
index c7bb1b3d..965dd033 100644
--- a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
+++ b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
@@ -11,10 +11,10 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class SpawnChangeEvent extends WorldEvent {
     private static final HandlerList handlers = new HandlerList();
-    private Location previousLocation;
+    private final Location previousLocation;
 
-    public SpawnChangeEvent(World world, Location previousLocation) {
-        super(Type.SPAWN_CHANGE, world);
+    public SpawnChangeEvent(final World world, final Location previousLocation) {
+        super(world);
         this.previousLocation = previousLocation;
     }
 
diff --git a/src/main/java/org/bukkit/event/world/StructureGrowEvent.java b/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
index 8b7b1685..9f8fcf45 100644
--- a/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
+++ b/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
@@ -15,14 +15,14 @@ public class StructureGrowEvent extends WorldEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private static final long serialVersionUID = 1L;
     private boolean cancelled = false;
-    private Location location;
+    private final Location location;
     private final TreeType species;
     private final boolean bonemeal;
-    private Player player;
-    private List<BlockState> blocks;
+    private final Player player;
+    private final List<BlockState> blocks;
 
-    public StructureGrowEvent(Location location, final TreeType species, final boolean bonemeal, Player player, List<BlockState> blocks) {
-        super(Type.STRUCTURE_GROW, location.getWorld());
+    public StructureGrowEvent(final Location location, final TreeType species, final boolean bonemeal, final Player player, final List<BlockState> blocks) {
+        super(location.getWorld());
         this.location = location;
         this.species = species;
         this.bonemeal = bonemeal;
diff --git a/src/main/java/org/bukkit/event/world/WorldEvent.java b/src/main/java/org/bukkit/event/world/WorldEvent.java
index 61941773..cb88f5b3 100644
--- a/src/main/java/org/bukkit/event/world/WorldEvent.java
+++ b/src/main/java/org/bukkit/event/world/WorldEvent.java
@@ -10,9 +10,7 @@ import org.bukkit.event.Event;
 public abstract class WorldEvent extends Event {
     private final World world;
 
-    public WorldEvent(final Type type, final World world) {
-        super(type);
-
+    public WorldEvent(final World world) {
         this.world = world;
     }
 
diff --git a/src/main/java/org/bukkit/event/world/WorldInitEvent.java b/src/main/java/org/bukkit/event/world/WorldInitEvent.java
index 340bcd0f..0a043b2d 100644
--- a/src/main/java/org/bukkit/event/world/WorldInitEvent.java
+++ b/src/main/java/org/bukkit/event/world/WorldInitEvent.java
@@ -9,8 +9,8 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class WorldInitEvent extends WorldEvent {
     private static final HandlerList handlers = new HandlerList();
-    public WorldInitEvent(World world) {
-        super(Type.WORLD_INIT, world);
+    public WorldInitEvent(final World world) {
+        super(world);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/world/WorldListener.java b/src/main/java/org/bukkit/event/world/WorldListener.java
deleted file mode 100644
index df46cb23..00000000
--- a/src/main/java/org/bukkit/event/world/WorldListener.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bukkit.event.world;
-
-import org.bukkit.event.Listener;
-
-/**
- * Handles all World related events
- */
-@Deprecated
-public class WorldListener implements Listener {
-
-    /**
-     * Called when a chunk is loaded
-     *
-     * @param event Relevant event details
-     */
-    public void onChunkLoad(ChunkLoadEvent event) {}
-
-    /**
-     * Called when a newly created chunk has been populated.
-     * <p />
-     * If your intent is to populate the chunk using this event, please see {@link org.bukkit.generator.BlockPopulator}
-     *
-     * @param event Relevant event details
-     */
-    public void onChunkPopulate(ChunkPopulateEvent event) {}
-
-    /**
-     * Called when a chunk is unloaded
-     *
-     * @param event Relevant event details
-     */
-    public void onChunkUnload(ChunkUnloadEvent event) {}
-
-    /**
-     * Called when a World's spawn is changed
-     *
-     * @param event Relevant event details
-     */
-    public void onSpawnChange(SpawnChangeEvent event) {}
-
-    /**
-     * Called when the world generates a portal end point
-     *
-     * @param event Relevant event details
-     */
-    public void onPortalCreate(PortalCreateEvent event) {}
-
-    /**
-     * Called when a world is saved
-     *
-     * @param event Relevant event details
-     */
-    public void onWorldSave(WorldSaveEvent event) {}
-
-    /**
-     * Called when a World is initializing
-     *
-     * @param event Relevant event details
-     */
-    public void onWorldInit(WorldInitEvent event) {}
-
-    /**
-     * Called when a World is loaded
-     *
-     * @param event Relevant event details
-     */
-    public void onWorldLoad(WorldLoadEvent event) {}
-
-    /**
-     * Called when a World is unloaded
-     *
-     * @param event Relevant event details
-     */
-    public void onWorldUnload(WorldUnloadEvent event) {}
-
-    /**
-     * Event that is called when an organic structure attempts to grow (Sapling -> Tree), (Mushroom -> Huge Mushroom), naturally or using bonemeal.
-     *
-     * @param event Relevant event details
-     */
-    public void onStructureGrow(StructureGrowEvent event) {}
-}
diff --git a/src/main/java/org/bukkit/event/world/WorldLoadEvent.java b/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
index fdc5fdfa..ab44bde7 100644
--- a/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
+++ b/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
@@ -9,8 +9,9 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class WorldLoadEvent extends WorldEvent {
     private static final HandlerList handlers = new HandlerList();
-    public WorldLoadEvent(World world) {
-        super(Type.WORLD_LOAD, world);
+
+    public WorldLoadEvent(final World world) {
+        super(world);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/world/WorldSaveEvent.java b/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
index 3db8ff34..af6ff5d6 100644
--- a/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
+++ b/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
@@ -6,8 +6,9 @@ import org.bukkit.event.HandlerList;
 @SuppressWarnings("serial")
 public class WorldSaveEvent extends WorldEvent {
     private static final HandlerList handlers = new HandlerList();
-    public WorldSaveEvent(World world) {
-        super(Type.WORLD_SAVE, world);
+
+    public WorldSaveEvent(final World world) {
+        super(world);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java b/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
index 2063e7e8..17ad2f8c 100644
--- a/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
+++ b/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
@@ -12,8 +12,8 @@ public class WorldUnloadEvent extends WorldEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean isCancelled;
 
-    public WorldUnloadEvent(World world) {
-        super(Type.WORLD_UNLOAD, world);
+    public WorldUnloadEvent(final World world) {
+        super(world);
     }
 
     public boolean isCancelled() {
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index 4cba6f76..450252d8 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
@@ -1,6 +1,5 @@
 package org.bukkit.plugin;
 
-import com.avaje.ebean.EbeanServer;
 import java.io.File;
 import java.io.InputStream;
 import java.util.logging.Logger;
@@ -8,9 +7,9 @@ import java.util.logging.Logger;
 import org.bukkit.Server;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.event.Event;
 import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.util.config.Configuration;
+
+import com.avaje.ebean.EbeanServer;
 
 /**
  * Represents a Plugin
@@ -32,13 +31,6 @@ public interface Plugin extends CommandExecutor {
      */
     public PluginDescriptionFile getDescription();
 
-    /**
-     * Returns the main configuration file. It should be loaded.
-     *
-     * @return The configuration
-     */
-    public Configuration getConfiguration();
-
     /**
      * Gets a {@link FileConfiguration} for this plugin, read through "config.yml"
      * <p>
diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
index 141311ab..83c65c89 100644
--- a/src/main/java/org/bukkit/plugin/PluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
@@ -26,21 +26,6 @@ public interface PluginLoader {
      */
     public Plugin loadPlugin(File file) throws InvalidPluginException, InvalidDescriptionException, UnknownDependencyException;
 
-    /**
-     * Loads the plugin contained in the specified file
-     *
-     * @deprecated SoftDependencies are always ignored
-     * @param file File to attempt to load
-     * @param ignoreSoftDependencies Loader will ignore soft dependencies if this flag is set to true
-     * @return Plugin that was contained in the specified file, or null if
-     *         unsuccessful
-     * @throws InvalidPluginException Thrown when the specified file is not a plugin
-     * @throws InvalidDescriptionException If the plugin description file was invalid
-     * @throws UnknownDependencyException If a required dependency could not be found
-     */
-    @Deprecated
-    public Plugin loadPlugin(File file, boolean ignoreSoftDependencies) throws InvalidPluginException, InvalidDescriptionException, UnknownDependencyException;
-
     /**
      * Loads a PluginDescriptionFile from the specified file
      *
@@ -58,17 +43,6 @@ public interface PluginLoader {
      */
     public Pattern[] getPluginFileFilters();
 
-    /**
-     * Creates and returns an event executor
-     *
-     * @param type Type of the event executor to create
-     * @param listener the object that will handle the eventual call back
-     * @return The new executor
-     * @deprecated see PluginLoader#createRegisteredListeners
-     */
-    @Deprecated
-    public EventExecutor createExecutor(Event.Type type, Listener listener);
-
     /**
      * Creates and returns registered listeners for the event classes used in this listener
      *
diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
index bf2da451..98bcc0f3 100644
--- a/src/main/java/org/bukkit/plugin/PluginManager.java
+++ b/src/main/java/org/bukkit/plugin/PluginManager.java
@@ -2,8 +2,8 @@ package org.bukkit.plugin;
 
 import java.io.File;
 import java.util.Set;
+
 import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.permissions.Permissible;
@@ -96,31 +96,6 @@ public interface PluginManager {
      */
     public void callEvent(Event event);
 
-    /**
-     * Registers the given event to the specified listener
-     *
-     * @param type EventType to register
-     * @param listener Listener to register
-     * @param priority Priority of this event
-     * @param plugin Plugin to register
-     * @deprecated see PluginManager#registerEvents
-     */
-    @Deprecated
-    public void registerEvent(Event.Type type, Listener listener, Priority priority, Plugin plugin);
-
-    /**
-     * Registers the given event to the specified executor
-     *
-     * @param type EventType to register
-     * @param listener Listener to register
-     * @param executor EventExecutor to register
-     * @param priority Priority of this event
-     * @param plugin Plugin to register
-     * @deprecated see PluginManager#registerEvent(Class, Listener, EventPriority, EventExecutor, Plugin)
-     */
-    @Deprecated
-    public void registerEvent(Event.Type type, Listener listener, EventExecutor executor, Priority priority, Plugin plugin);
-
     /**
      * Registers all the events in the given listener class
      *
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index e454c864..d09466cb 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -1,10 +1,19 @@
 package org.bukkit.plugin;
 
-import com.google.common.collect.ImmutableSet;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -14,13 +23,17 @@ import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.PluginCommandYamlParser;
 import org.bukkit.command.SimpleCommandMap;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.*;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
 import org.bukkit.permissions.Permissible;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.util.FileUtil;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Handles all plugin management from the Server
  */
@@ -86,6 +99,7 @@ public final class SimplePluginManager implements PluginManager {
      * @param directory Directory to check for plugins
      * @return A list of all plugins loaded
      */
+    @SuppressWarnings("unchecked")
     public Plugin[] loadPlugins(File directory) {
         Validate.notNull(directory, "Directory cannot be null");
         Validate.isTrue(directory.isDirectory(), "Directory must be a directory");
@@ -306,24 +320,6 @@ public final class SimplePluginManager implements PluginManager {
         }
     }
 
-    /**
-     * Loads the plugin in the specified file
-     * <p />
-     * File must be valid according to the current enabled Plugin interfaces
-     *
-     * @deprecated soft-dependencies are now ignored
-     * @param file File containing the plugin to load
-     * @param ignoreSoftDependencies Loader will ignore soft dependencies if this flag is set to true
-     * @return The Plugin loaded, or null if it was invalid
-     * @throws InvalidPluginException Thrown when the specified file is not a valid plugin
-     * @throws InvalidDescriptionException Thrown when the specified file contains an invalid description
-     * @throws UnknownDependencyException If a required dependency could not be found
-     */
-    @Deprecated
-    public synchronized Plugin loadPlugin(File file, boolean ignoreSoftDependencies) throws InvalidPluginException, InvalidDescriptionException, UnknownDependencyException {
-        return loadPlugin(file);
-    }
-
     /**
      * Checks if the given plugin is loaded and returns it when applicable
      * <p />
@@ -481,54 +477,6 @@ public final class SimplePluginManager implements PluginManager {
                 }
             }
         }
-        // This is an ugly hack to handle old-style custom events in old plugins without breakage. All in the name of plugin compatibility.
-        if (event.getType() == Event.Type.CUSTOM_EVENT) {
-            TransitionalCustomEvent.getHandlerList().bake();
-            listeners = TransitionalCustomEvent.getHandlerList().getRegisteredListeners();
-            if (listeners != null) {
-                for (int i = 0; i < listeners.length; i++) {
-                    for (RegisteredListener registration : listeners[i]) {
-                        try {
-                            registration.callEvent(event);
-                        } catch (Throwable ex) {
-                            server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getName(), ex);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Registers the given event to the specified listener
-     *
-     * @param type EventType to register
-     * @param listener PlayerListener to register
-     * @param priority Priority of this event
-     * @param plugin Plugin to register
-     * @deprecated See {@link #registerEvent(Class, Listener, EventPriority, EventExecutor, Plugin, boolean)}
-     */
-    @Deprecated
-    public void registerEvent(Event.Type type, Listener listener, Priority priority, Plugin plugin) {
-        registerEvent(type.getEventClass(), listener, priority.getNewPriority(), plugin.getPluginLoader().createExecutor(type, listener), plugin);
-    }
-
-    /**
-     * Registers the given event to the specified listener using a directly passed EventExecutor
-     *
-     * @param type EventType to register
-     * @param listener PlayerListener to register
-     * @param executor EventExecutor to register
-     * @param priority Priority of this event
-     * @param plugin Plugin to register
-     * @deprecated See {@link #registerEvent(Class, Listener, EventPriority, EventExecutor, Plugin, boolean)}
-     */
-    @Deprecated
-    public void registerEvent(Event.Type type, Listener listener, EventExecutor executor, Priority priority, Plugin plugin) {
-        Validate.notNull(type, "Type cannot be null");
-        Validate.notNull(priority, "Priority cannot be null");
-
-        registerEvent(type.getEventClass(), listener, priority.getNewPriority(), executor, plugin);
     }
 
     public void registerEvents(Listener listener, Plugin plugin) {
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index c74c1531..10b19e91 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -1,19 +1,17 @@
 package org.bukkit.plugin.java;
 
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.DataSourceConfig;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.ddl.DdlGenerator;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -25,7 +23,13 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.PluginLogger;
-import org.bukkit.util.config.Configuration;
+
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.EbeanServerFactory;
+import com.avaje.ebean.config.DataSourceConfig;
+import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.server.ddl.DdlGenerator;
 
 /**
  * Represents a Java plugin
@@ -39,7 +43,6 @@ public abstract class JavaPlugin implements Plugin {
     private PluginDescriptionFile description = null;
     private File dataFolder = null;
     private ClassLoader classLoader = null;
-    private Configuration config = null;
     private boolean naggable = true;
     private EbeanServer ebean = null;
     private FileConfiguration newConfig = null;
@@ -103,24 +106,6 @@ public abstract class JavaPlugin implements Plugin {
         return description;
     }
 
-    /**
-     * Returns the main configuration located at
-     * <plugin name>/config.yml and loads the file. If the configuration file
-     * does not exist and it cannot be loaded, no error will be emitted and
-     * the configuration file will have no values.
-     *
-     * @return The configuration.
-     * @deprecated See the new {@link JavaPlugin#getConfig()}
-     */
-    @Deprecated
-    public Configuration getConfiguration() {
-        if (config == null) {
-            config = new Configuration(configFile);
-            config.load();
-        }
-        return config;
-    }
-
     public FileConfiguration getConfig() {
         if (newConfig == null) {
             reloadConfig();
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 20e0a547..b11439b7 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -7,30 +7,36 @@ import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.Validate;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
-
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.bukkit.event.*;
-import org.bukkit.event.block.*;
-import org.bukkit.event.painting.*;
-import org.bukkit.event.entity.*;
-import org.bukkit.event.player.*;
-import org.bukkit.event.server.*;
-import org.bukkit.event.vehicle.*;
-import org.bukkit.event.world.*;
-import org.bukkit.event.weather.*;
-import org.bukkit.event.inventory.*;
-import org.bukkit.plugin.*;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventException;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.plugin.EventExecutor;
+import org.bukkit.plugin.InvalidDescriptionException;
+import org.bukkit.plugin.InvalidPluginException;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginLoader;
+import org.bukkit.plugin.RegisteredListener;
+import org.bukkit.plugin.TimedRegisteredListener;
+import org.bukkit.plugin.UnknownDependencyException;
 import org.yaml.snakeyaml.error.YAMLException;
 
 /**
@@ -46,6 +52,7 @@ public class JavaPluginLoader implements PluginLoader {
         server = instance;
     }
 
+    @SuppressWarnings("unchecked")
     public Plugin loadPlugin(File file) throws InvalidPluginException, InvalidDescriptionException, UnknownDependencyException {
         Validate.notNull(file, "File cannot be null");
 
@@ -258,737 +265,6 @@ public class JavaPluginLoader implements PluginLoader {
         }
     }
 
-    public EventExecutor createExecutor(Event.Type type, Listener listener) {
-        // TODONE: remove multiple Listener type and hence casts
-
-        switch (type) {
-        // Player Events
-
-        case PLAYER_JOIN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerJoin((PlayerJoinEvent) event);
-                }
-            };
-
-        case PLAYER_QUIT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerQuit((PlayerQuitEvent) event);
-                }
-            };
-
-        case PLAYER_RESPAWN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerRespawn((PlayerRespawnEvent) event);
-                }
-            };
-
-        case PLAYER_KICK:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerKick((PlayerKickEvent) event);
-                }
-            };
-
-        case PLAYER_COMMAND_PREPROCESS:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerCommandPreprocess((PlayerCommandPreprocessEvent) event);
-                }
-            };
-
-        case PLAYER_CHAT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerChat((PlayerChatEvent) event);
-                }
-            };
-
-        case PLAYER_MOVE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerMove((PlayerMoveEvent) event);
-                }
-            };
-
-        case PLAYER_VELOCITY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerVelocity((PlayerVelocityEvent) event);
-                }
-            };
-
-        case PLAYER_TELEPORT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerTeleport((PlayerTeleportEvent) event);
-                }
-            };
-
-        case PLAYER_PORTAL:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerPortal((PlayerPortalEvent) event);
-                }
-            };
-
-        case PLAYER_INTERACT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerInteract((PlayerInteractEvent) event);
-                }
-            };
-
-        case PLAYER_INTERACT_ENTITY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerInteractEntity((PlayerInteractEntityEvent) event);
-                }
-            };
-
-        case PLAYER_LOGIN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerLogin((PlayerLoginEvent) event);
-                }
-            };
-
-        case PLAYER_PRELOGIN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerPreLogin((PlayerPreLoginEvent) event);
-                }
-            };
-
-        case PLAYER_EGG_THROW:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerEggThrow((PlayerEggThrowEvent) event);
-                }
-            };
-
-        case PLAYER_ANIMATION:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerAnimation((PlayerAnimationEvent) event);
-                }
-            };
-
-        case PLAYER_LEVEL_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerLevelChange((PlayerLevelChangeEvent) event);
-                }
-            };
-
-        case INVENTORY_OPEN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onInventoryOpen((PlayerInventoryEvent) event);
-                }
-            };
-
-        case PLAYER_ITEM_HELD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onItemHeldChange((PlayerItemHeldEvent) event);
-                }
-            };
-
-        case PLAYER_DROP_ITEM:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerDropItem((PlayerDropItemEvent) event);
-                }
-            };
-
-        case PLAYER_PICKUP_ITEM:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerPickupItem((PlayerPickupItemEvent) event);
-                }
-            };
-
-        case PLAYER_TOGGLE_SNEAK:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerToggleSneak((PlayerToggleSneakEvent) event);
-                }
-            };
-
-        case PLAYER_TOGGLE_SPRINT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerToggleSprint((PlayerToggleSprintEvent) event);
-                }
-            };
-
-        case PLAYER_BUCKET_EMPTY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerBucketEmpty((PlayerBucketEmptyEvent) event);
-                }
-            };
-
-        case PLAYER_BUCKET_FILL:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerBucketFill((PlayerBucketFillEvent) event);
-                }
-            };
-
-        case PLAYER_BED_ENTER:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerBedEnter((PlayerBedEnterEvent) event);
-                }
-            };
-
-        case PLAYER_BED_LEAVE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerBedLeave((PlayerBedLeaveEvent) event);
-                }
-            };
-
-        case PLAYER_FISH:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerFish((PlayerFishEvent) event);
-                }
-            };
-
-        case PLAYER_GAME_MODE_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerGameModeChange((PlayerGameModeChangeEvent) event);
-                }
-            };
-
-        case PLAYER_CHANGED_WORLD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerChangedWorld((PlayerChangedWorldEvent) event);
-                }
-            };
-
-        case PLAYER_EXP_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerExpChange((PlayerExpChangeEvent) event);
-                }
-            };
-
-        // Block Events
-        case BLOCK_PHYSICS:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockPhysics((BlockPhysicsEvent) event);
-                }
-            };
-
-        case BLOCK_CANBUILD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockCanBuild((BlockCanBuildEvent) event);
-                }
-            };
-
-        case BLOCK_PLACE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockPlace((BlockPlaceEvent) event);
-                }
-            };
-
-        case BLOCK_DAMAGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockDamage((BlockDamageEvent) event);
-                }
-            };
-
-        case BLOCK_FROMTO:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockFromTo((BlockFromToEvent) event);
-                }
-            };
-
-        case LEAVES_DECAY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onLeavesDecay((LeavesDecayEvent) event);
-                }
-            };
-
-        case SIGN_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onSignChange((SignChangeEvent) event);
-                }
-            };
-
-        case BLOCK_IGNITE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockIgnite((BlockIgniteEvent) event);
-                }
-            };
-
-        case REDSTONE_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockRedstoneChange((BlockRedstoneEvent) event);
-                }
-            };
-
-        case BLOCK_BURN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockBurn((BlockBurnEvent) event);
-                }
-            };
-
-        case BLOCK_BREAK:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockBreak((BlockBreakEvent) event);
-                }
-            };
-
-        case BLOCK_FORM:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockForm((BlockFormEvent) event);
-                }
-            };
-
-        case BLOCK_SPREAD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockSpread((BlockSpreadEvent) event);
-                }
-            };
-
-        case BLOCK_FADE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockFade((BlockFadeEvent) event);
-                }
-            };
-
-        case BLOCK_DISPENSE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockDispense((BlockDispenseEvent) event);
-                }
-            };
-
-        case BLOCK_PISTON_RETRACT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockPistonRetract((BlockPistonRetractEvent) event);
-                }
-            };
-
-        case BLOCK_PISTON_EXTEND:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockPistonExtend((BlockPistonExtendEvent) event);
-                }
-            };
-
-        // Server Events
-        case PLUGIN_ENABLE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((ServerListener) listener).onPluginEnable((PluginEnableEvent) event);
-                }
-            };
-
-        case PLUGIN_DISABLE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((ServerListener) listener).onPluginDisable((PluginDisableEvent) event);
-                }
-            };
-
-        case SERVER_COMMAND:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((ServerListener) listener).onServerCommand((ServerCommandEvent) event);
-                }
-            };
-
-        case MAP_INITIALIZE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((ServerListener) listener).onMapInitialize((MapInitializeEvent) event);
-                }
-            };
-
-        case SERVER_LIST_PING:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((ServerListener) listener).onServerListPing((ServerListPingEvent) event);
-                }
-            };
-
-        // World Events
-        case CHUNK_LOAD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onChunkLoad((ChunkLoadEvent) event);
-                }
-            };
-
-        case CHUNK_POPULATED:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onChunkPopulate((ChunkPopulateEvent) event);
-                }
-            };
-
-        case CHUNK_UNLOAD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onChunkUnload((ChunkUnloadEvent) event);
-                }
-            };
-
-        case SPAWN_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onSpawnChange((SpawnChangeEvent) event);
-                }
-            };
-
-        case WORLD_SAVE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onWorldSave((WorldSaveEvent) event);
-                }
-            };
-
-        case WORLD_INIT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onWorldInit((WorldInitEvent) event);
-                }
-            };
-
-        case WORLD_LOAD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onWorldLoad((WorldLoadEvent) event);
-                }
-            };
-
-        case WORLD_UNLOAD:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onWorldUnload((WorldUnloadEvent) event);
-                }
-            };
-
-        case PORTAL_CREATE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onPortalCreate((PortalCreateEvent) event);
-                }
-            };
-        case STRUCTURE_GROW:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WorldListener) listener).onStructureGrow((StructureGrowEvent) event);
-                }
-            };
-
-        // Painting Events
-        case PAINTING_PLACE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onPaintingPlace((PaintingPlaceEvent) event);
-                }
-            };
-
-        case PAINTING_BREAK:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onPaintingBreak((PaintingBreakEvent) event);
-                }
-            };
-
-        // Entity Events
-        case ENTITY_DAMAGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityDamage((EntityDamageEvent) event);
-                }
-            };
-
-        case ENTITY_DEATH:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityDeath((EntityDeathEvent) event);
-                }
-            };
-
-        case ENTITY_COMBUST:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityCombust((EntityCombustEvent) event);
-                }
-            };
-
-        case ENTITY_EXPLODE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityExplode((EntityExplodeEvent) event);
-                }
-            };
-
-        case EXPLOSION_PRIME:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onExplosionPrime((ExplosionPrimeEvent) event);
-                }
-            };
-
-        case ENTITY_TARGET:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityTarget((EntityTargetEvent) event);
-                }
-            };
-
-        case ENTITY_INTERACT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityInteract((EntityInteractEvent) event);
-                }
-            };
-
-        case ENTITY_PORTAL_ENTER:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityPortalEnter((EntityPortalEnterEvent) event);
-                }
-            };
-
-        case ENTITY_CREATE_PORTAL:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityCreatePortalEvent((EntityCreatePortalEvent) event);
-                }
-            };
-
-        case CREATURE_SPAWN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onCreatureSpawn((CreatureSpawnEvent) event);
-                }
-            };
-
-        case ITEM_SPAWN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onItemSpawn((ItemSpawnEvent) event);
-                }
-            };
-
-        case PIG_ZAP:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onPigZap((PigZapEvent) event);
-                }
-            };
-
-        case CREEPER_POWER:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onCreeperPower((CreeperPowerEvent) event);
-                }
-            };
-
-        case ENTITY_TAME:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityTame((EntityTameEvent) event);
-                }
-            };
-
-        case ENTITY_REGAIN_HEALTH:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityRegainHealth((EntityRegainHealthEvent) event);
-                }
-            };
-
-        case ENTITY_SHOOT_BOW:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEntityShootBow((EntityShootBowEvent) event);
-                }
-            };
-
-        case PROJECTILE_HIT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onProjectileHit((ProjectileHitEvent) event);
-                }
-            };
-
-        case ENDERMAN_PICKUP:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEndermanPickup((EndermanPickupEvent) event);
-                }
-            };
-
-        case ENDERMAN_PLACE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onEndermanPlace((EndermanPlaceEvent) event);
-                }
-            };
-
-        case FOOD_LEVEL_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onFoodLevelChange((FoodLevelChangeEvent) event);
-                }
-            };
-
-        case SLIME_SPLIT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onSlimeSplit((SlimeSplitEvent) event);
-                }
-            };
-
-        case ITEM_DESPAWN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((EntityListener) listener).onItemDespawn((ItemDespawnEvent) event);
-                }
-            };
-
-        // Vehicle Events
-        case VEHICLE_CREATE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleCreate((VehicleCreateEvent) event);
-                }
-            };
-
-        case VEHICLE_DAMAGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleDamage((VehicleDamageEvent) event);
-                }
-            };
-
-        case VEHICLE_DESTROY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleDestroy((VehicleDestroyEvent) event);
-                }
-            };
-
-        case VEHICLE_COLLISION_BLOCK:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleBlockCollision((VehicleBlockCollisionEvent) event);
-                }
-            };
-
-        case VEHICLE_COLLISION_ENTITY:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleEntityCollision((VehicleEntityCollisionEvent) event);
-                }
-            };
-
-        case VEHICLE_ENTER:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleEnter((VehicleEnterEvent) event);
-                }
-            };
-
-        case VEHICLE_EXIT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleExit((VehicleExitEvent) event);
-                }
-            };
-
-        case VEHICLE_MOVE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleMove((VehicleMoveEvent) event);
-                }
-            };
-
-        case VEHICLE_UPDATE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((VehicleListener) listener).onVehicleUpdate((VehicleUpdateEvent) event);
-                }
-            };
-
-        // Weather Events
-        case WEATHER_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WeatherListener) listener).onWeatherChange((WeatherChangeEvent) event);
-                }
-            };
-
-        case THUNDER_CHANGE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WeatherListener) listener).onThunderChange((ThunderChangeEvent) event);
-                }
-            };
-
-        case LIGHTNING_STRIKE:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((WeatherListener) listener).onLightningStrike((LightningStrikeEvent) event);
-                }
-            };
-
-        // Inventory Events
-        case FURNACE_SMELT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((InventoryListener) listener).onFurnaceSmelt((FurnaceSmeltEvent) event);
-                }
-            };
-        case FURNACE_BURN:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((InventoryListener) listener).onFurnaceBurn((FurnaceBurnEvent) event);
-                }
-            };
-
-        // Custom Events
-        case CUSTOM_EVENT:
-            return new EventExecutor() {
-                public void execute(Listener listener, Event event) {
-                    ((CustomEventListener) listener).onCustomEvent(event);
-                }
-            };
-        }
-
-        throw new IllegalArgumentException("Event " + type + " is not supported");
-    }
-
     public Map<Class<? extends Event>, Set<RegisteredListener>> createRegisteredListeners(Listener listener, final Plugin plugin) {
         boolean useTimings = server.getPluginManager().useTimings();
         Map<Class<? extends Event>, Set<RegisteredListener>> ret = new HashMap<Class<? extends Event>, Set<RegisteredListener>>();
diff --git a/src/main/java/org/bukkit/util/config/Configuration.java b/src/main/java/org/bukkit/util/config/Configuration.java
deleted file mode 100644
index 4cf3af93..00000000
--- a/src/main/java/org/bukkit/util/config/Configuration.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.bukkit.util.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.introspector.Property;
-import org.yaml.snakeyaml.nodes.CollectionNode;
-import org.yaml.snakeyaml.nodes.MappingNode;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.nodes.NodeTuple;
-import org.yaml.snakeyaml.nodes.SequenceNode;
-import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml.reader.UnicodeReader;
-import org.yaml.snakeyaml.representer.Represent;
-import org.yaml.snakeyaml.representer.Representer;
-
-/**
- * YAML configuration loader. To use this class, construct it with path to
- * a file and call its load() method. For specifying node paths in the
- * various get*() methods, they support SK's path notation, allowing you to
- * select child nodes by delimiting node names with periods.
- * <p>
- * For example, given the following configuration file:
- * </p>
- *
- * <pre>
- * members:
- *     - Hollie
- *     - Jason
- *     - Bobo
- *     - Aya
- *     - Tetsu
- * worldguard:
- *     fire:
- *         spread: false
- *         blocks: [cloth, rock, glass]
- * sturmeh:
- *     cool: false
- *     eats:
- *         babies: true
- * </pre>
- * <p>
- * Calling code could access sturmeh's baby eating state by using <code>getBoolean("sturmeh.eats.babies", false)</code>. For lists, there are methods such as <code>getStringList</code> that will return a type safe list.
- *
- * <p>
- * This class is currently incomplete. It is not yet possible to get a node.
- * </p>
- *
- * @deprecated See {@link YamlConfiguration}
- */
-@Deprecated
-public class Configuration extends ConfigurationNode {
-    private Yaml yaml;
-    private File file;
-    private String header = null;
-
-    /**
-     * @deprecated See {@link YamlConfiguration}
-     */
-    @Deprecated
-    public Configuration(File file) {
-        super(new HashMap<String, Object>());
-
-        DumperOptions options = new DumperOptions();
-
-        options.setIndent(4);
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-
-        yaml = new Yaml(new SafeConstructor(), new EmptyNullRepresenter(), options);
-
-        this.file = file;
-    }
-
-    /**
-     * Loads the configuration file. All errors are thrown away.
-     */
-    public void load() {
-        FileInputStream stream = null;
-
-        try {
-            stream = new FileInputStream(file);
-            read(yaml.load(new UnicodeReader(stream)));
-        } catch (IOException e) {
-            root = new HashMap<String, Object>();
-        } catch (ConfigurationException e) {
-            root = new HashMap<String, Object>();
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close();
-                }
-            } catch (IOException e) {}
-        }
-    }
-
-    /**
-     * Set the header for the file as a series of lines that are terminated
-     * by a new line sequence.
-     *
-     * @param headerLines header lines to prepend
-     */
-    public void setHeader(String... headerLines) {
-        StringBuilder header = new StringBuilder();
-
-        for (String line : headerLines) {
-            if (header.length() > 0) {
-                header.append("\r\n");
-            }
-            header.append(line);
-        }
-
-        setHeader(header.toString());
-    }
-
-    /**
-     * Set the header for the file. A header can be provided to prepend the
-     * YAML data output on configuration save. The header is
-     * printed raw and so must be manually commented if used. A new line will
-     * be appended after the header, however, if a header is provided.
-     *
-     * @param header header to prepend
-     */
-    public void setHeader(String header) {
-        this.header = header;
-    }
-
-    /**
-     * Return the set header.
-     *
-     * @return The header comment.
-     */
-    public String getHeader() {
-        return header;
-    }
-
-    /**
-     * Saves the configuration to disk. All errors are clobbered.
-     *
-     * @return true if it was successful
-     */
-    public boolean save() {
-        FileOutputStream stream = null;
-
-        File parent = file.getParentFile();
-
-        if (parent != null) {
-            parent.mkdirs();
-        }
-
-        try {
-            stream = new FileOutputStream(file);
-            OutputStreamWriter writer = new OutputStreamWriter(stream, "UTF-8");
-            if (header != null) {
-                writer.append(header);
-                writer.append("\r\n");
-            }
-            yaml.dump(root, writer);
-            return true;
-        } catch (IOException e) {
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close();
-                }
-            } catch (IOException e) {}
-        }
-
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void read(Object input) throws ConfigurationException {
-        try {
-            if (null == input) {
-                root = new HashMap<String, Object>();
-            } else {
-                root = (Map<String, Object>) input;
-            }
-        } catch (ClassCastException e) {
-            throw new ConfigurationException("Root document must be an key-value structure");
-        }
-    }
-
-    /**
-     * This method returns an empty ConfigurationNode for using as a
-     * default in methods that select a node from a node list.
-     *
-     * @return The empty node.
-     */
-    public static ConfigurationNode getEmptyNode() {
-        return new ConfigurationNode(new HashMap<String, Object>());
-    }
-}
-
-class EmptyNullRepresenter extends Representer {
-
-    public EmptyNullRepresenter() {
-        super();
-        this.nullRepresenter = new EmptyRepresentNull();
-    }
-
-    protected class EmptyRepresentNull implements Represent {
-        public Node representData(Object data) {
-            return representScalar(Tag.NULL, ""); // Changed "null" to "" so as to avoid writing nulls
-        }
-    }
-
-    // Code borrowed from snakeyaml (http://code.google.com/p/snakeyaml/source/browse/src/test/java/org/yaml/snakeyaml/issues/issue60/SkipBeanTest.java)
-    @Override
-    protected NodeTuple representJavaBeanProperty(Object javaBean, Property property, Object propertyValue, Tag customTag) {
-        NodeTuple tuple = super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
-        Node valueNode = tuple.getValueNode();
-        if (valueNode instanceof CollectionNode) {
-            // Removed null check
-            if (Tag.SEQ.equals(valueNode.getTag())) {
-                SequenceNode seq = (SequenceNode) valueNode;
-                if (seq.getValue().isEmpty()) {
-                    return null; // skip empty lists
-                }
-            }
-            if (Tag.MAP.equals(valueNode.getTag())) {
-                MappingNode seq = (MappingNode) valueNode;
-                if (seq.getValue().isEmpty()) {
-                    return null; // skip empty maps
-                }
-            }
-        }
-        return tuple;
-    }
-    // End of borrowed code
-}
diff --git a/src/main/java/org/bukkit/util/config/ConfigurationException.java b/src/main/java/org/bukkit/util/config/ConfigurationException.java
deleted file mode 100644
index 953adc57..00000000
--- a/src/main/java/org/bukkit/util/config/ConfigurationException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bukkit.util.config;
-
-/**
- * Configuration exception.
- */
-public class ConfigurationException extends Exception {
-    private static final long serialVersionUID = -2442886939908724203L;
-
-    public ConfigurationException() {
-        super();
-    }
-
-    public ConfigurationException(String msg) {
-        super(msg);
-    }
-}
diff --git a/src/main/java/org/bukkit/util/config/ConfigurationNode.java b/src/main/java/org/bukkit/util/config/ConfigurationNode.java
deleted file mode 100644
index e2f16278..00000000
--- a/src/main/java/org/bukkit/util/config/ConfigurationNode.java
+++ /dev/null
@@ -1,586 +0,0 @@
-package org.bukkit.util.config;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- * Represents a configuration node.
- */
-public class ConfigurationNode {
-    protected Map<String, Object> root;
-
-    protected ConfigurationNode(Map<String, Object> root) {
-        this.root = root;
-    }
-
-    /**
-     * Gets all of the cofiguration values within the Node as
-     * a key value pair, with the key being the full path and the
-     * value being the Object that is at the path.
-     *
-     * @return A map of key value pairs with the path as the key and the object as the value
-     */
-    public Map<String, Object> getAll() {
-        return recursiveBuilder(root);
-    }
-
-    /**
-     * A helper method for the getAll method that deals with the recursion
-     * involved in traversing the tree
-     *
-     * @param node The map for that node of the tree
-     * @return The fully pathed map for that point in the tree, with the path as the key
-     */
-    @SuppressWarnings("unchecked")
-    protected Map<String, Object> recursiveBuilder(Map<String, Object> node) {
-        Map<String, Object> map = new TreeMap<String, Object>();
-
-        Set<String> keys = node.keySet();
-        for (String k : keys) {
-            Object tmp = node.get(k);
-            if (tmp instanceof Map<?, ?>) {
-                Map<String, Object> rec = recursiveBuilder((Map<String, Object>) tmp);
-
-                Set<String> subkeys = rec.keySet();
-                for (String sk : subkeys) {
-                    map.put(k + "." + sk, rec.get(sk));
-                }
-            } else {
-                map.put(k, tmp);
-            }
-        }
-
-        return map;
-    }
-
-    /**
-     * Gets a property at a location. This will either return an Object
-     * or null, with null meaning that no configuration value exists at
-     * that location. This could potentially return a default value (not yet
-     * implemented) as defined by a plugin, if this is a plugin-tied
-     * configuration.
-     *
-     * @param path path to node (dot notation)
-     * @return object or null
-     */
-    @SuppressWarnings("unchecked")
-    public Object getProperty(String path) {
-        if (!path.contains(".")) {
-            Object val = root.get(path);
-
-            if (val == null) {
-                return null;
-            }
-            return val;
-        }
-
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-
-            if (o == null) {
-                return null;
-            }
-
-            if (i == parts.length - 1) {
-                return o;
-            }
-
-            try {
-                node = (Map<String, Object>) o;
-            } catch (ClassCastException e) {
-                return null;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Set the property at a location. This will override existing
-     * configuration data to have it conform to key/value mappings.
-     *
-     * @param path The property path
-     * @param value The new value
-     */
-    @SuppressWarnings("unchecked")
-    public void setProperty(String path, Object value) {
-        if (!path.contains(".")) {
-            root.put(path, value);
-            return;
-        }
-
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-
-            // Found our target!
-            if (i == parts.length - 1) {
-                node.put(parts[i], value);
-                return;
-            }
-
-            if (o == null || !(o instanceof Map)) {
-                // This will override existing configuration data!
-                o = new HashMap<String, Object>();
-                node.put(parts[i], o);
-            }
-
-            node = (Map<String, Object>) o;
-        }
-    }
-
-    /**
-     * Gets a string at a location. This will either return an String
-     * or null, with null meaning that no configuration value exists at
-     * that location. If the object at the particular location is not actually
-     * a string, it will be converted to its string representation.
-     *
-     * @param path path to node (dot notation)
-     * @return string or null
-     */
-    public String getString(String path) {
-        Object o = getProperty(path);
-
-        if (o == null) {
-            return null;
-        }
-        return o.toString();
-    }
-
-    /**
-     * Gets a string at a location. This will either return an String
-     * or the default value. If the object at the particular location is not
-     * actually a string, it will be converted to its string representation.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return string or default
-     */
-    public String getString(String path, String def) {
-        String o = getString(path);
-
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        }
-        return o;
-    }
-
-    /**
-     * Gets an integer at a location. This will either return an integer
-     * or the default value. If the object at the particular location is not
-     * actually a integer, the default value will be returned. However, other
-     * number types will be casted to an integer.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return int or default
-     */
-    public int getInt(String path, int def) {
-        Integer o = castInt(getProperty(path));
-
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a double at a location. This will either return an double
-     * or the default value. If the object at the particular location is not
-     * actually a double, the default value will be returned. However, other
-     * number types will be casted to an double.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return double or default
-     */
-    public double getDouble(String path, double def) {
-        Double o = castDouble(getProperty(path));
-
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a boolean at a location. This will either return an boolean
-     * or the default value. If the object at the particular location is not
-     * actually a boolean, the default value will be returned.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return boolean or default
-     */
-    public boolean getBoolean(String path, boolean def) {
-        Boolean o = castBoolean(getProperty(path));
-
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Get a list of keys at a location. If the map at the particular location
-     * does not exist or it is not a map, null will be returned.
-     *
-     * @param path path to node (dot notation)
-     * @return list of keys
-     */
-    @SuppressWarnings("unchecked")
-    public List<String> getKeys(String path) {
-        if (path == null) {
-            return new ArrayList<String>(root.keySet());
-        }
-        Object o = getProperty(path);
-
-        if (o == null) {
-            return null;
-        } else if (o instanceof Map) {
-            return new ArrayList<String>(((Map<String, Object>) o).keySet());
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a list of all keys at the root path
-     *
-     * @return List of keys
-     */
-    public List<String> getKeys() {
-        return new ArrayList<String>(root.keySet());
-    }
-
-    /**
-     * Gets a list of objects at a location. If the list is not defined,
-     * null will be returned. The node must be an actual list.
-     *
-     * @param path path to node (dot notation)
-     * @return boolean or default
-     */
-    @SuppressWarnings("unchecked")
-    public List<Object> getList(String path) {
-        Object o = getProperty(path);
-
-        if (o == null) {
-            return null;
-        } else if (o instanceof List) {
-            return (List<Object>) o;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets a list of strings. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. If an item in the list
-     * is not a string, it will be converted to a string. The node must be
-     * an actual list and not just a string.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of strings
-     */
-    public List<String> getStringList(String path, List<String> def) {
-        List<Object> raw = getList(path);
-
-        if (raw == null) {
-            return def != null ? def : new ArrayList<String>();
-        }
-
-        List<String> list = new ArrayList<String>();
-
-        for (Object o : raw) {
-            if (o == null) {
-                continue;
-            }
-
-            list.add(o.toString());
-        }
-
-        return list;
-    }
-
-    /**
-     * Gets a list of integers. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and not just an integer.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Integer> getIntList(String path, List<Integer> def) {
-        List<Object> raw = getList(path);
-
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Integer>();
-        }
-
-        List<Integer> list = new ArrayList<Integer>();
-
-        for (Object o : raw) {
-            Integer i = castInt(o);
-
-            if (i != null) {
-                list.add(i);
-            }
-        }
-
-        return list;
-    }
-
-    /**
-     * Gets a list of doubles. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and cannot be just a double.
-     *
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Double> getDoubleList(String path, List<Double> def) {
-        List<Object> raw = getList(path);
-
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Double>();
-        }
-
-        List<Double> list = new ArrayList<Double>();
-
-        for (Object o : raw) {
-            Double i = castDouble(o);
-
-            if (i != null) {
-                list.add(i);
-            }
-        }
-
-        return list;
-    }
-
-    /**
-     * Gets a list of booleans. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and cannot be just a boolean,
-     *
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Boolean> getBooleanList(String path, List<Boolean> def) {
-        List<Object> raw = getList(path);
-
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Boolean>();
-        }
-
-        List<Boolean> list = new ArrayList<Boolean>();
-
-        for (Object o : raw) {
-            Boolean tetsu = castBoolean(o);
-
-            if (tetsu != null) {
-                list.add(tetsu);
-            }
-        }
-
-        return list;
-    }
-
-    /**
-     * Gets a list of nodes. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual node and cannot be just a boolean,
-     *
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    @SuppressWarnings("unchecked")
-    public List<ConfigurationNode> getNodeList(String path, List<ConfigurationNode> def) {
-        List<Object> raw = getList(path);
-
-        if (raw == null) {
-            return def != null ? def : new ArrayList<ConfigurationNode>();
-        }
-
-        List<ConfigurationNode> list = new ArrayList<ConfigurationNode>();
-
-        for (Object o : raw) {
-            if (o instanceof Map) {
-                list.add(new ConfigurationNode((Map<String, Object>) o));
-            }
-        }
-
-        return list;
-    }
-
-    /**
-     * Get a configuration node at a path. If the node doesn't exist or the
-     * path does not lead to a node, null will be returned. A node has
-     * key/value mappings.
-     *
-     * @param path The property path
-     * @return node or null
-     */
-    @SuppressWarnings("unchecked")
-    public ConfigurationNode getNode(String path) {
-        Object raw = getProperty(path);
-
-        if (raw instanceof Map) {
-            return new ConfigurationNode((Map<String, Object>) raw);
-        }
-
-        return null;
-    }
-
-    /**
-     * Get a list of nodes at a location. If the map at the particular location
-     * does not exist or it is not a map, null will be returned.
-     *
-     * @param path path to node (dot notation)
-     * @return map of nodes
-     */
-    @SuppressWarnings("unchecked")
-    public Map<String, ConfigurationNode> getNodes(String path) {
-        Object o = getProperty(path);
-
-        if (o == null) {
-            return null;
-        } else if (o instanceof Map) {
-            Map<String, ConfigurationNode> nodes = new HashMap<String, ConfigurationNode>();
-
-            for (Map.Entry<String, Object> entry : ((Map<String, Object>) o).entrySet()) {
-                if (entry.getValue() instanceof Map) {
-                    nodes.put(entry.getKey(), new ConfigurationNode((Map<String, Object>) entry.getValue()));
-                }
-            }
-
-            return nodes;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Casts a value to an integer. May return null.
-     *
-     * @param o
-     * @return
-     */
-    private static Integer castInt(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Byte) {
-            return (int) (Byte) o;
-        } else if (o instanceof Integer) {
-            return (Integer) o;
-        } else if (o instanceof Double) {
-            return (int) (double) (Double) o;
-        } else if (o instanceof Float) {
-            return (int) (float) (Float) o;
-        } else if (o instanceof Long) {
-            return (int) (long) (Long) o;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Casts a value to a double. May return null.
-     *
-     * @param o
-     * @return
-     */
-    private static Double castDouble(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Float) {
-            return (double) (Float) o;
-        } else if (o instanceof Double) {
-            return (Double) o;
-        } else if (o instanceof Byte) {
-            return (double) (Byte) o;
-        } else if (o instanceof Integer) {
-            return (double) (Integer) o;
-        } else if (o instanceof Long) {
-            return (double) (Long) o;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Casts a value to a boolean. May return null.
-     *
-     * @param o
-     * @return
-     */
-    private static Boolean castBoolean(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Boolean) {
-            return (Boolean) o;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Remove the property at a location. This will override existing
-     * configuration data to have it conform to key/value mappings.
-     *
-     * @param path The property path
-     */
-    @SuppressWarnings("unchecked")
-    public void removeProperty(String path) {
-        if (!path.contains(".")) {
-            root.remove(path);
-            return;
-        }
-
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-
-            // Found our target!
-            if (i == parts.length - 1) {
-                node.remove(parts[i]);
-                return;
-            }
-
-            node = (Map<String, Object>) o;
-        }
-    }
-}
-- 
cgit v1.2.3