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

src/main/java/net/minecraft/server/BlockButton.java

@@ -5,7 +5,7 @@ import java.util.Random;
 // CraftBukkit start
 import org.bukkit.BlockFace;
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 import org.bukkit.event.block.BlockRedstoneEvent;

src/main/java/net/minecraft/server/BlockCactus.java

@@ -3,9 +3,9 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/BlockChest.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/BlockDoor.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/BlockFurnace.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/BlockJukeBox.java

@@ -2,7 +2,7 @@ package net.minecraft.server;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/BlockLever.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.BlockFace;
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 import org.bukkit.event.block.BlockRedstoneEvent;

src/main/java/net/minecraft/server/BlockPressurePlate.java

@@ -5,8 +5,8 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.BlockFace;import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 import org.bukkit.event.block.BlockRedstoneEvent;

src/main/java/net/minecraft/server/BlockWorkbench.java

@@ -2,7 +2,7 @@ package net.minecraft.server;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockInteractEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/Entity.java

@@ -1,9 +1,9 @@
 package net.minecraft.server;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.entity.EntityDamageEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/EntityBoat.java

@@ -5,8 +5,8 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.CraftBoat;
+import org.bukkit.craftbukkit.entity.CraftBoat;
-import org.bukkit.craftbukkit.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.CraftMappable;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;

src/main/java/net/minecraft/server/EntityEgg.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 import org.bukkit.entity.MobType;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerEggThrowEvent;

src/main/java/net/minecraft/server/EntityMinecart.java

@@ -6,9 +6,9 @@ import java.util.Random;
 // CraftBukkit start
 import org.bukkit.Location;
 import org.bukkit.Vector;
-import org.bukkit.craftbukkit.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.CraftMappable;
-import org.bukkit.craftbukkit.CraftMinecart;
+import org.bukkit.craftbukkit.entity.CraftMinecart;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.vehicle.*;

src/main/java/net/minecraft/server/EntitySkeleton.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 import java.util.Random;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityCombustEvent;

src/main/java/net/minecraft/server/EntityZombie.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 import java.util.Random;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityCombustEvent;

src/main/java/net/minecraft/server/Explosion.java

@@ -1,9 +1,9 @@
 package net.minecraft.server;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;

src/main/java/net/minecraft/server/ItemBlock.java

@@ -4,7 +4,7 @@ package net.minecraft.server;
 import org.bukkit.BlockFace;
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockPlaceEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemBoat.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemBucket.java

@@ -6,7 +6,7 @@ import java.util.Random;
 import org.bukkit.BlockFace;
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;

src/main/java/net/minecraft/server/ItemFlintAndSteel.java

@@ -5,7 +5,7 @@ import java.util.Random;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 import org.bukkit.event.block.BlockIgniteEvent;

src/main/java/net/minecraft/server/ItemHoe.java

@@ -5,7 +5,7 @@ import java.util.Random;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemMinecart.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemRedstone.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemSeeds.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/ItemSign.java

@@ -3,7 +3,7 @@ package net.minecraft.server;
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerItemEvent;
 // CraftBukkit end

src/main/java/net/minecraft/server/NetServerHandler.java

@@ -10,7 +10,7 @@ import org.bukkit.BlockDamageLevel;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftBlock;
 import org.bukkit.craftbukkit.CraftItemStack;
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.block.BlockDamageEvent;

src/main/java/net/minecraft/server/ServerConfigurationManager.java

@@ -5,7 +5,7 @@ import java.util.*;
 import java.util.logging.Logger;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerEvent;

src/main/java/org/bukkit/craftbukkit/CraftMappable.java

@@ -1,5 +1,7 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftEntity;
+
 /**
  * Indicates that an object has a method to get its CraftBukkit-equivalent
  * CraftEntity object from its Minecraft net.minecraft.server.Entity object.

src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java

@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftMinecart;
 import net.minecraft.server.EntityMinecart;
 import org.bukkit.entity.PoweredMinecart;
 

src/main/java/org/bukkit/craftbukkit/CraftWorld.java

@@ -1,5 +1,16 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEgg;
+import org.bukkit.craftbukkit.entity.CraftBoat;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftSnowball;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftArrow;
+import org.bukkit.craftbukkit.entity.CraftMinecart;
+import org.bukkit.craftbukkit.entity.CraftStorageMinecart;
+import org.bukkit.craftbukkit.entity.CraftItemDrop;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java

@@ -1,7 +1,8 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import org.bukkit.entity.Arrow;
 import net.minecraft.server.EntityArrow;
+import org.bukkit.craftbukkit.CraftServer;
 
 /**
  * Represents an arrow.
@@ -9,7 +10,7 @@ import net.minecraft.server.EntityArrow;
  * @author sk89q
  */
 public class CraftArrow extends CraftEntity implements Arrow {
-    CraftArrow(CraftServer server, EntityArrow entity) {
+    public CraftArrow(CraftServer server, EntityArrow entity) {
         super(server, entity);
     }
 }

src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java

@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityBoat;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Boat;
 
 /**

src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java

@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityEgg;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Egg;
 
 /**

src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

@@ -1,10 +1,11 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.Vector;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftServer;
 
 public abstract class CraftEntity implements org.bukkit.entity.Entity {
     protected final CraftServer server;

src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java

@@ -1,10 +1,12 @@
 
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityPlayer;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.ItemStack;
 import org.bukkit.PlayerInventory;
+import org.bukkit.craftbukkit.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.CraftServer;
 
 public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
     private EntityPlayer entity;

src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java

@@ -1,8 +1,10 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityItem;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.ItemStack;
+import org.bukkit.craftbukkit.CraftItemStack;
+import org.bukkit.craftbukkit.CraftServer;
 
 /**
  * Represents an item drop.

src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

@@ -1,11 +1,13 @@
 
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.EntityArrow;
 import net.minecraft.server.EntityEgg;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntitySnowball;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Egg;

src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java

@@ -1,6 +1,8 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecart;
+import org.bukkit.craftbukkit.CraftPoweredMinecart;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Minecart;
 
 /**

src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -6,6 +6,7 @@ import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.EntityPlayerMP;
 import net.minecraft.server.Packet3Chat;
 import org.bukkit.Location;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Player;
 
 public class CraftPlayer extends CraftHumanEntity implements Player {

src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java

@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySnowball;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Snowball;
 
 /**

src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java

@@ -1,8 +1,10 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecart;
 
 import org.bukkit.Inventory;
+import org.bukkit.craftbukkit.CraftInventory;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.StorageMinecart;
 
 /**

src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java

@@ -1,5 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Vehicle;