All entity stuff in org.bukkit moved to org.bukkit.entity

src/main/java/org/bukkit/Server.java

@@ -1,6 +1,7 @@
 
 package org.bukkit;
 
+import org.bukkit.entity.Player;
 import java.util.List;
 import org.bukkit.plugin.PluginManager;
 

src/main/java/org/bukkit/World.java

@@ -1,6 +1,13 @@
 
 package org.bukkit;
 
+import org.bukkit.entity.ItemDrop;
+import org.bukkit.entity.PoweredMinecart;
+import org.bukkit.entity.Minecart;
+import org.bukkit.entity.StorageMinecart;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Boat;
+
 /**
  * Represents a world.
  *

src/main/java/org/bukkit/entity/Arrow.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents an arrow.

src/main/java/org/bukkit/entity/Boat.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a boat entity.

src/main/java/org/bukkit/entity/Egg.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents an egg.

src/main/java/org/bukkit/entity/Entity.java

@@ -1,5 +1,8 @@
 
-package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.Location;
+import org.bukkit.World;
 
 /**
  * Represents a base entity in the world

src/main/java/org/bukkit/entity/HumanEntity.java

@@ -1,5 +1,8 @@
 
-package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.ItemStack;
+import org.bukkit.PlayerInventory;
 
 /**
  * Represents a human entity, such as an NPC or a player

src/main/java/org/bukkit/entity/ItemDrop.java

@@ -1,4 +1,6 @@
-package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.ItemStack;
 
 /**
  * Represents a dropped item.

src/main/java/org/bukkit/entity/LivingEntity.java

@@ -1,5 +1,5 @@
 
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a living entity, such as a monster or player

src/main/java/org/bukkit/entity/Minecart.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a minecart entity.

src/main/java/org/bukkit/entity/MobType.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 public enum MobType {
     CHICKEN("Chicken"),

src/main/java/org/bukkit/entity/Player.java

@@ -1,5 +1,5 @@
 
-package org.bukkit;
+package org.bukkit.entity;
 
 import java.net.InetSocketAddress;
 

src/main/java/org/bukkit/entity/PoweredMinecart.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a powered minecart.

src/main/java/org/bukkit/entity/Snowball.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Implements a snowball.

src/main/java/org/bukkit/entity/StorageMinecart.java

@@ -1,4 +1,6 @@
-package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.Inventory;
 
 /**
  * Represents a storage minecart.

src/main/java/org/bukkit/entity/Vehicle.java

@@ -1,4 +1,6 @@
-package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.Vector;
 
 /**
  * Represents a vehicle entity.

src/main/java/org/bukkit/event/block/BlockDamageEvent.java

@@ -2,7 +2,7 @@ package org.bukkit.event.block;
 
 import org.bukkit.Block;
 import org.bukkit.BlockDamageLevel;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/block/BlockIgniteEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
 import org.bukkit.Block;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/block/BlockInteractEvent.java

@@ -1,8 +1,8 @@
 package org.bukkit.event.block;
 
 import org.bukkit.Block;
-import org.bukkit.LivingEntity;
+import org.bukkit.entity.LivingEntity;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/block/BlockPlaceEvent.java

@@ -2,7 +2,7 @@ package org.bukkit.event.block;
 
 import org.bukkit.Block;
 import org.bukkit.ItemStack;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/block/BlockRightClickEvent.java

@@ -3,7 +3,7 @@ package org.bukkit.event.block;
 import org.bukkit.Block;
 import org.bukkit.BlockFace;
 import org.bukkit.ItemStack;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 
 /**
  * Not implemented yet

src/main/java/org/bukkit/event/entity/EntityCombustEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.entity;
 
 import org.bukkit.Block;
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/entity/EntityDamageEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/entity/EntityEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 
 /**

src/main/java/org/bukkit/event/player/PlayerChatEvent.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.event.player;
 
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.player;
 
-import org.bukkit.MobType;
+import org.bukkit.entity.MobType;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 
 
 /**

src/main/java/org/bukkit/event/player/PlayerEvent.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.event.player;
 
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 
 /**

src/main/java/org/bukkit/event/player/PlayerItemEvent.java

@@ -4,7 +4,7 @@ import org.bukkit.Block;
 import org.bukkit.BlockFace;
 import org.bukkit.ItemStack;
 import org.bukkit.Material;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/player/PlayerLoginEvent.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.event.player;
 
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 
 /**
  * Stores details for players attempting to log in

src/main/java/org/bukkit/event/player/PlayerMoveEvent.java

@@ -2,7 +2,7 @@
 package org.bukkit.event.player;
 
 import org.bukkit.Location;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
 import org.bukkit.Block;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 
 /**
  * Raised when a vehicle collides with a block.

src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 
 /**
  * Raised when a vehicle collides.

src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 
 /**
  * Raised when a vehicle is created.

src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Entity;
+import org.bukkit.entity.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/vehicle/VehicleEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Event;
 
 /**

src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.LivingEntity;
+import org.bukkit.entity.LivingEntity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.vehicle;
 
 import org.bukkit.Location;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
 
 /**
  * Raised when a vehicle moves.

src/main/java/org/bukkit/fillr/Checker.java

@@ -1,5 +1,6 @@
 package org.bukkit.fillr;
 
+import org.bukkit.entity.Player;
 import java.io.*;
 import java.util.jar.*;
 import org.bukkit.*;

src/main/java/org/bukkit/fillr/Downloader.java

@@ -1,5 +1,6 @@
 package org.bukkit.fillr;
 
+import org.bukkit.entity.Player;
 import org.bukkit.*;
 import org.bukkit.plugin.PluginDescriptionFile;
 

src/main/java/org/bukkit/fillr/FillrListener.java

@@ -1,5 +1,6 @@
 package org.bukkit.fillr;
 
+import org.bukkit.entity.Player;
 import org.bukkit.*;
 import org.bukkit.event.player.*;
 

src/main/java/org/bukkit/fillr/Getter.java

@@ -1,5 +1,6 @@
 package org.bukkit.fillr;
 
+import org.bukkit.entity.Player;
 import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/main/java/org/bukkit/fillr/Updater.java

@@ -1,5 +1,6 @@
 package org.bukkit.fillr;
 
+import org.bukkit.entity.Player;
 import org.bukkit.*;
 import org.bukkit.plugin.*;