From e2fd2dfd00c7be4c7c71f1091a3b5c1c81b6c333 Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Sat, 15 Jan 2011 21:20:59 +0000
Subject: [PATCH] All entity stuff in org.bukkit moved to org.bukkit.entity

By: Dinnerbone <dinnerbone@dinnerbone.com>
---
 .../src/main/java/org/bukkit/Server.java      |   1 +
 paper-api/src/main/java/org/bukkit/World.java |   7 +
 .../java/org/bukkit/{ => entity}/Arrow.java   |   2 +-
 .../java/org/bukkit/{ => entity}/Boat.java    |   2 +-
 .../java/org/bukkit/{ => entity}/Egg.java     |   2 +-
 .../java/org/bukkit/{ => entity}/Entity.java  |   5 +-
 .../org/bukkit/{ => entity}/HumanEntity.java  |   5 +-
 .../org/bukkit/{ => entity}/ItemDrop.java     |   4 +-
 .../org/bukkit/{ => entity}/LivingEntity.java |   2 +-
 .../org/bukkit/{ => entity}/Minecart.java     |   2 +-
 .../java/org/bukkit/{ => entity}/MobType.java |   2 +-
 .../java/org/bukkit/{ => entity}/Player.java  |   2 +-
 .../bukkit/{ => entity}/PoweredMinecart.java  |   2 +-
 .../org/bukkit/{ => entity}/Snowball.java     |   2 +-
 .../bukkit/{ => entity}/StorageMinecart.java  |   4 +-
 .../java/org/bukkit/{ => entity}/Vehicle.java |   4 +-
 .../bukkit/event/block/BlockDamageEvent.java  |   2 +-
 .../bukkit/event/block/BlockIgniteEvent.java  |   2 +-
 .../event/block/BlockInteractEvent.java       |   4 +-
 .../bukkit/event/block/BlockPlaceEvent.java   |   2 +-
 .../event/block/BlockRightClickEvent.java     |   2 +-
 .../event/entity/EntityCombustEvent.java      |   2 +-
 .../entity/EntityDamageByBlockEvent.java      |   2 +-
 .../entity/EntityDamageByEntityEvent.java     |   2 +-
 .../event/entity/EntityDamageEvent.java       |   2 +-
 .../org/bukkit/event/entity/EntityEvent.java  |   2 +-
 .../bukkit/event/player/PlayerChatEvent.java  |   2 +-
 .../event/player/PlayerEggThrowEvent.java     |   4 +-
 .../org/bukkit/event/player/PlayerEvent.java  |  50 ++---
 .../bukkit/event/player/PlayerItemEvent.java  |   2 +-
 .../bukkit/event/player/PlayerLoginEvent.java | 208 +++++++++---------
 .../bukkit/event/player/PlayerMoveEvent.java  | 172 +++++++--------
 .../vehicle/VehicleBlockCollisionEvent.java   |   2 +-
 .../event/vehicle/VehicleCollisionEvent.java  |   2 +-
 .../event/vehicle/VehicleCreateEvent.java     |   2 +-
 .../event/vehicle/VehicleDamageEvent.java     |   4 +-
 .../event/vehicle/VehicleEnterEvent.java      |   4 +-
 .../vehicle/VehicleEntityCollisionEvent.java  |   4 +-
 .../bukkit/event/vehicle/VehicleEvent.java    |   2 +-
 .../event/vehicle/VehicleExitEvent.java       |   4 +-
 .../event/vehicle/VehicleMoveEvent.java       |   2 +-
 .../main/java/org/bukkit/fillr/Checker.java   |   1 +
 .../java/org/bukkit/fillr/Downloader.java     |   1 +
 .../java/org/bukkit/fillr/FillrListener.java  |   1 +
 .../main/java/org/bukkit/fillr/Getter.java    |   1 +
 .../main/java/org/bukkit/fillr/Updater.java   |   1 +
 46 files changed, 282 insertions(+), 257 deletions(-)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Arrow.java (72%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Boat.java (73%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Egg.java (71%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Entity.java (91%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/HumanEntity.java (92%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/ItemDrop.java (73%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/LivingEntity.java (98%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Minecart.java (88%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/MobType.java (93%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Player.java (98%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/PoweredMinecart.java (76%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Snowball.java (73%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/StorageMinecart.java (79%)
 rename paper-api/src/main/java/org/bukkit/{ => entity}/Vehicle.java (90%)

diff --git a/paper-api/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java
index f355692239..268faf3db2 100644
--- a/paper-api/src/main/java/org/bukkit/Server.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java
index 45acbeca6d..c2d9432d15 100644
--- a/paper-api/src/main/java/org/bukkit/World.java
+++ b/paper-api/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.
  *
diff --git a/paper-api/src/main/java/org/bukkit/Arrow.java b/paper-api/src/main/java/org/bukkit/entity/Arrow.java
similarity index 72%
rename from paper-api/src/main/java/org/bukkit/Arrow.java
rename to paper-api/src/main/java/org/bukkit/entity/Arrow.java
index bdbe263ba6..90efb643c6 100644
--- a/paper-api/src/main/java/org/bukkit/Arrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Arrow.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents an arrow.
diff --git a/paper-api/src/main/java/org/bukkit/Boat.java b/paper-api/src/main/java/org/bukkit/entity/Boat.java
similarity index 73%
rename from paper-api/src/main/java/org/bukkit/Boat.java
rename to paper-api/src/main/java/org/bukkit/entity/Boat.java
index 33958ec039..9cb3b810cb 100644
--- a/paper-api/src/main/java/org/bukkit/Boat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Boat.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a boat entity.
diff --git a/paper-api/src/main/java/org/bukkit/Egg.java b/paper-api/src/main/java/org/bukkit/entity/Egg.java
similarity index 71%
rename from paper-api/src/main/java/org/bukkit/Egg.java
rename to paper-api/src/main/java/org/bukkit/entity/Egg.java
index dc0beb2ed4..c7b3d0223f 100644
--- a/paper-api/src/main/java/org/bukkit/Egg.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Egg.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents an egg.
diff --git a/paper-api/src/main/java/org/bukkit/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
similarity index 91%
rename from paper-api/src/main/java/org/bukkit/Entity.java
rename to paper-api/src/main/java/org/bukkit/entity/Entity.java
index 1ffa850104..42e0cf49b8 100644
--- a/paper-api/src/main/java/org/bukkit/Entity.java
+++ b/paper-api/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
diff --git a/paper-api/src/main/java/org/bukkit/HumanEntity.java b/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
similarity index 92%
rename from paper-api/src/main/java/org/bukkit/HumanEntity.java
rename to paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
index 04b391a8dc..34ea3e8cfe 100644
--- a/paper-api/src/main/java/org/bukkit/HumanEntity.java
+++ b/paper-api/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
diff --git a/paper-api/src/main/java/org/bukkit/ItemDrop.java b/paper-api/src/main/java/org/bukkit/entity/ItemDrop.java
similarity index 73%
rename from paper-api/src/main/java/org/bukkit/ItemDrop.java
rename to paper-api/src/main/java/org/bukkit/entity/ItemDrop.java
index 3e2fd59881..0ab8ab0ad2 100644
--- a/paper-api/src/main/java/org/bukkit/ItemDrop.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/LivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
similarity index 98%
rename from paper-api/src/main/java/org/bukkit/LivingEntity.java
rename to paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
index f0987ba28a..e58122d1ea 100644
--- a/paper-api/src/main/java/org/bukkit/LivingEntity.java
+++ b/paper-api/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
diff --git a/paper-api/src/main/java/org/bukkit/Minecart.java b/paper-api/src/main/java/org/bukkit/entity/Minecart.java
similarity index 88%
rename from paper-api/src/main/java/org/bukkit/Minecart.java
rename to paper-api/src/main/java/org/bukkit/entity/Minecart.java
index 275a084e2c..d4469a4c2d 100644
--- a/paper-api/src/main/java/org/bukkit/Minecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Minecart.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a minecart entity.
diff --git a/paper-api/src/main/java/org/bukkit/MobType.java b/paper-api/src/main/java/org/bukkit/entity/MobType.java
similarity index 93%
rename from paper-api/src/main/java/org/bukkit/MobType.java
rename to paper-api/src/main/java/org/bukkit/entity/MobType.java
index 0290c92677..7f52a7ad59 100644
--- a/paper-api/src/main/java/org/bukkit/MobType.java
+++ b/paper-api/src/main/java/org/bukkit/entity/MobType.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 public enum MobType {
     CHICKEN("Chicken"),
diff --git a/paper-api/src/main/java/org/bukkit/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
similarity index 98%
rename from paper-api/src/main/java/org/bukkit/Player.java
rename to paper-api/src/main/java/org/bukkit/entity/Player.java
index eb6cc73aca..d02d97fafb 100644
--- a/paper-api/src/main/java/org/bukkit/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -1,5 +1,5 @@
 
-package org.bukkit;
+package org.bukkit.entity;
 
 import java.net.InetSocketAddress;
 
diff --git a/paper-api/src/main/java/org/bukkit/PoweredMinecart.java b/paper-api/src/main/java/org/bukkit/entity/PoweredMinecart.java
similarity index 76%
rename from paper-api/src/main/java/org/bukkit/PoweredMinecart.java
rename to paper-api/src/main/java/org/bukkit/entity/PoweredMinecart.java
index c6ca47164e..66f5ba7f2a 100644
--- a/paper-api/src/main/java/org/bukkit/PoweredMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PoweredMinecart.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Represents a powered minecart.
diff --git a/paper-api/src/main/java/org/bukkit/Snowball.java b/paper-api/src/main/java/org/bukkit/entity/Snowball.java
similarity index 73%
rename from paper-api/src/main/java/org/bukkit/Snowball.java
rename to paper-api/src/main/java/org/bukkit/entity/Snowball.java
index cebe0dff95..69ac03abd0 100644
--- a/paper-api/src/main/java/org/bukkit/Snowball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Snowball.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.entity;
 
 /**
  * Implements a snowball.
diff --git a/paper-api/src/main/java/org/bukkit/StorageMinecart.java b/paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java
similarity index 79%
rename from paper-api/src/main/java/org/bukkit/StorageMinecart.java
rename to paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java
index 7ec1b5ac62..6b0f2e32ee 100644
--- a/paper-api/src/main/java/org/bukkit/StorageMinecart.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/Vehicle.java b/paper-api/src/main/java/org/bukkit/entity/Vehicle.java
similarity index 90%
rename from paper-api/src/main/java/org/bukkit/Vehicle.java
rename to paper-api/src/main/java/org/bukkit/entity/Vehicle.java
index 76b7267be4..1d61891322 100644
--- a/paper-api/src/main/java/org/bukkit/Vehicle.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
index 1bd4201d90..fa4b3d2309 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
index c43a6a2b7b..90a14ca63d 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockInteractEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockInteractEvent.java
index 37a343ad55..a3e28c2625 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockInteractEvent.java
+++ b/paper-api/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.Player;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index a2ba16ed22..4074b338d4 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
index dff08f0895..d0df4c1b57 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
+++ b/paper-api/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
diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
index e47bb8c004..6f404f5935 100644
--- a/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
index 44e14060ba..dfdd2c7780 100644
--- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
index 716a57baa3..c2b347e564 100644
--- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 332470c353..e073fce0f4 100644
--- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityEvent.java
index dcd60372b0..a4f4911ce6 100644
--- a/paper-api/src/main/java/org/bukkit/event/entity/EntityEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
index b97ac5a6a9..047b270fa2 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
index f1c26b93a9..391cc6bc7e 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
+++ b/paper-api/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.Player;
+import org.bukkit.entity.MobType;
+import org.bukkit.entity.Player;
 
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
index 2e4ea068a0..2e176535a2 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
@@ -1,25 +1,25 @@
-
-package org.bukkit.event.player;
-
-import org.bukkit.Player;
-import org.bukkit.event.Event;
-
-/**
- * Represents a player related event
- */
-public class PlayerEvent extends Event {
-    protected Player player;
-
-    public PlayerEvent(final Event.Type type, final Player who) {
-        super(type);
-        player = who;
-    }
-
-    /**
-     * Returns the player involved in this event
-     * @return Player who is involved in this event
-     */
-    public final Player getPlayer() {
-        return player;
-    }
-}
+
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+
+/**
+ * Represents a player related event
+ */
+public class PlayerEvent extends Event {
+    protected Player player;
+
+    public PlayerEvent(final Event.Type type, final Player who) {
+        super(type);
+        player = who;
+    }
+
+    /**
+     * Returns the player involved in this event
+     * @return Player who is involved in this event
+     */
+    public final Player getPlayer() {
+        return player;
+    }
+}
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
index a77194bec9..af7279726c 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index e19475a94e..7aedea504e 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -1,104 +1,104 @@
-
-package org.bukkit.event.player;
-
-import org.bukkit.Player;
-
-/**
- * Stores details for players attempting to log in
- */
-public class PlayerLoginEvent extends PlayerEvent {
-    private Result result;
-    private String message;
-
-    public PlayerLoginEvent(final Type type, final Player player) {
-        super(type, player);
-        this.result = Result.ALLOWED;
-        this.message = "";
-    }
-
-    public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) {
-        super(type, player);
-        this.result = result;
-        this.message = message;
-    }
-
-    /**
-     * Gets the current result of the login, as an enum
-     *
-     * @return Current Result of the login
-     */
-    public Result getResult() {
-        return result;
-    }
-
-    /**
-     * Sets the new result of the login, as an enum
-     *
-     * @param result New result to set
-     */
-    public void setResult(final Result result) {
-        this.result = result;
-    }
-
-    /**
-     * Gets the current kick message that will be used if getResult() != Result.ALLOWED
-     *
-     * @return Current kick message
-     */
-    public String getKickMessage() {
-        return message;
-    }
-
-    /**
-     * Sets the kick message to display if getResult() != Result.ALLOWED
-     *
-     * @param message New kick message
-     */
-    public void setKickMessage(final String message) {
-        this.message = message;
-    }
-
-    /**
-     * Allows the player to log in
-     */
-    public void allow() {
-        result = Result.ALLOWED;
-        message = "";
-    }
-
-    /**
-     * Disallows the player from logging in, with the given reason
-     *
-     * @param result New result for disallowing the player
-     * @param message Kick message to display to the user
-     */
-    public void disallow(final Result result, final String message) {
-        this.result = result;
-        this.message = message;
-    }
-
-    /**
-     * Basic kick reasons for communicating to plugins
-     */
-    public enum Result {
-        /**
-         * The player is allowed to log in
-         */
-        ALLOWED,
-
-        /**
-         * The player is not allowed to log in, due to the server being full
-         */
-        KICK_FULL,
-
-        /**
-         * The player is not allowed to log in, due to them being banned
-         */
-        KICK_BANNED,
-
-        /**
-         * The player is not allowed to log in, for reasons undefined
-         */
-        KICK_OTHER
-    }
-}
+
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+
+/**
+ * Stores details for players attempting to log in
+ */
+public class PlayerLoginEvent extends PlayerEvent {
+    private Result result;
+    private String message;
+
+    public PlayerLoginEvent(final Type type, final Player player) {
+        super(type, player);
+        this.result = Result.ALLOWED;
+        this.message = "";
+    }
+
+    public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) {
+        super(type, player);
+        this.result = result;
+        this.message = message;
+    }
+
+    /**
+     * Gets the current result of the login, as an enum
+     *
+     * @return Current Result of the login
+     */
+    public Result getResult() {
+        return result;
+    }
+
+    /**
+     * Sets the new result of the login, as an enum
+     *
+     * @param result New result to set
+     */
+    public void setResult(final Result result) {
+        this.result = result;
+    }
+
+    /**
+     * Gets the current kick message that will be used if getResult() != Result.ALLOWED
+     *
+     * @return Current kick message
+     */
+    public String getKickMessage() {
+        return message;
+    }
+
+    /**
+     * Sets the kick message to display if getResult() != Result.ALLOWED
+     *
+     * @param message New kick message
+     */
+    public void setKickMessage(final String message) {
+        this.message = message;
+    }
+
+    /**
+     * Allows the player to log in
+     */
+    public void allow() {
+        result = Result.ALLOWED;
+        message = "";
+    }
+
+    /**
+     * Disallows the player from logging in, with the given reason
+     *
+     * @param result New result for disallowing the player
+     * @param message Kick message to display to the user
+     */
+    public void disallow(final Result result, final String message) {
+        this.result = result;
+        this.message = message;
+    }
+
+    /**
+     * Basic kick reasons for communicating to plugins
+     */
+    public enum Result {
+        /**
+         * The player is allowed to log in
+         */
+        ALLOWED,
+
+        /**
+         * The player is not allowed to log in, due to the server being full
+         */
+        KICK_FULL,
+
+        /**
+         * The player is not allowed to log in, due to them being banned
+         */
+        KICK_BANNED,
+
+        /**
+         * The player is not allowed to log in, for reasons undefined
+         */
+        KICK_OTHER
+    }
+}
diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
index 24b31b5941..cbcc9b3757 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -1,86 +1,86 @@
-
-package org.bukkit.event.player;
-
-import org.bukkit.Location;
-import org.bukkit.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-
-/**
- * Holds information for player movement and teleportation events
- */
-public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
-    private boolean cancel = false;
-    private Location from;
-    private Location to;
-
-    public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) {
-        super(type, player);
-        this.from = from;
-        this.to = to;
-    }
-
-    /**
-     * Gets the cancellation state of this event. A cancelled event will not
-     * be executed in the server, but will still pass to other plugins
-     *
-     * If a move or teleport event is cancelled, the player will be moved or
-     * teleported back to the Location as defined by getFrom(). This will not
-     * fire an event
-     *
-     * @return true if this event is cancelled
-     */
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    /**
-     * Sets the cancellation state of this event. A cancelled event will not
-     * be executed in the server, but will still pass to other plugins
-     *
-     * If a move or teleport event is cancelled, the player will be moved or
-     * teleported back to the Location as defined by getFrom(). This will not
-     * fire an event
-     *
-     * @param cancel true if you wish to cancel this event
-     */
-    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
-    }
-
-    /**
-     * Gets the location this player moved from
-     *
-     * @return Location the player moved from
-     */
-    public Location getFrom() {
-        return from;
-    }
-
-    /**
-     * Sets the location to mark as where the player moved from
-     *
-     * @param from New location to mark as the players previous location
-     */
-    public void setFrom(Location from) {
-        this.from = from;
-    }
-
-    /**
-     * Gets the location this player moved to
-     *
-     * @return Location the player moved to
-     */
-    public Location getTo() {
-        return to;
-    }
-
-    /**
-     * Sets the location that this player will move to
-     *
-     * @param to New Location this player will move to
-     */
-    public void setTo(Location to) {
-        this.to = to;
-    }
-}
+
+package org.bukkit.event.player;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+/**
+ * Holds information for player movement and teleportation events
+ */
+public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
+    private boolean cancel = false;
+    private Location from;
+    private Location to;
+
+    public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) {
+        super(type, player);
+        this.from = from;
+        this.to = to;
+    }
+
+    /**
+     * Gets the cancellation state of this event. A cancelled event will not
+     * be executed in the server, but will still pass to other plugins
+     *
+     * If a move or teleport event is cancelled, the player will be moved or
+     * teleported back to the Location as defined by getFrom(). This will not
+     * fire an event
+     *
+     * @return true if this event is cancelled
+     */
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    /**
+     * Sets the cancellation state of this event. A cancelled event will not
+     * be executed in the server, but will still pass to other plugins
+     *
+     * If a move or teleport event is cancelled, the player will be moved or
+     * teleported back to the Location as defined by getFrom(). This will not
+     * fire an event
+     *
+     * @param cancel true if you wish to cancel this event
+     */
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    /**
+     * Gets the location this player moved from
+     *
+     * @return Location the player moved from
+     */
+    public Location getFrom() {
+        return from;
+    }
+
+    /**
+     * Sets the location to mark as where the player moved from
+     *
+     * @param from New location to mark as the players previous location
+     */
+    public void setFrom(Location from) {
+        this.from = from;
+    }
+
+    /**
+     * Gets the location this player moved to
+     *
+     * @return Location the player moved to
+     */
+    public Location getTo() {
+        return to;
+    }
+
+    /**
+     * Sets the location that this player will move to
+     *
+     * @param to New Location this player will move to
+     */
+    public void setTo(Location to) {
+        this.to = to;
+    }
+}
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
index 6141c1c12e..a16fe0b0d9 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
index 6e4bb48a89..da7e2bd983 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
index 9be4d55b9a..9cfde547f5 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
index 3d762e8cf0..67acac3437 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
+++ b/paper-api/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.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
index 5ac6242822..97e5d930b6 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
+++ b/paper-api/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.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
index 514c569767..c85e6c8ba3 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
+++ b/paper-api/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.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
index b08c334046..78fc757d13 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
+++ b/paper-api/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;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
index 957571edd6..d1936c3eb7 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/paper-api/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.Vehicle;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Cancellable;
 
 /**
diff --git a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
index 65921ad489..c680dfcbfa 100644
--- a/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
+++ b/paper-api/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.
diff --git a/paper-api/src/main/java/org/bukkit/fillr/Checker.java b/paper-api/src/main/java/org/bukkit/fillr/Checker.java
index f00b136308..248652386c 100644
--- a/paper-api/src/main/java/org/bukkit/fillr/Checker.java
+++ b/paper-api/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.*;
diff --git a/paper-api/src/main/java/org/bukkit/fillr/Downloader.java b/paper-api/src/main/java/org/bukkit/fillr/Downloader.java
index 3b9d8e7573..6a96a5f517 100644
--- a/paper-api/src/main/java/org/bukkit/fillr/Downloader.java
+++ b/paper-api/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;
 
diff --git a/paper-api/src/main/java/org/bukkit/fillr/FillrListener.java b/paper-api/src/main/java/org/bukkit/fillr/FillrListener.java
index f25c111b73..a6c22ff4a5 100644
--- a/paper-api/src/main/java/org/bukkit/fillr/FillrListener.java
+++ b/paper-api/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.*;
 
diff --git a/paper-api/src/main/java/org/bukkit/fillr/Getter.java b/paper-api/src/main/java/org/bukkit/fillr/Getter.java
index c1197d483a..63a1f4cdbb 100644
--- a/paper-api/src/main/java/org/bukkit/fillr/Getter.java
+++ b/paper-api/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;
diff --git a/paper-api/src/main/java/org/bukkit/fillr/Updater.java b/paper-api/src/main/java/org/bukkit/fillr/Updater.java
index 3a301538a4..a78329523b 100644
--- a/paper-api/src/main/java/org/bukkit/fillr/Updater.java
+++ b/paper-api/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.*;