diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index 4c19f0bf4e..b89ab6f8bd 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 5806a8a6d3..d8f7abf120 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/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.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java index 33765d5263..52b2bdde98 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index d7f46c814e..67385dbfae 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java index 4435bdb356..1f2351280b 100644 --- a/src/main/java/net/minecraft/server/BlockFurnace.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/BlockJukeBox.java b/src/main/java/net/minecraft/server/BlockJukeBox.java index 91c37d6136..bb5bb2051e 100644 --- a/src/main/java/net/minecraft/server/BlockJukeBox.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index 646c1dbc6c..3b92c7b422 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockPressurePlate.java b/src/main/java/net/minecraft/server/BlockPressurePlate.java index f96bd5f160..dad613bf4f 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlate.java +++ b/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.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/net/minecraft/server/BlockWorkbench.java b/src/main/java/net/minecraft/server/BlockWorkbench.java index 9a23565de8..ceb6086146 100644 --- a/src/main/java/net/minecraft/server/BlockWorkbench.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 75f53ac2bb..212da33a71 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/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.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 004c8243bc..3c01822d21 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/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.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftBoat; +import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.CraftMappable; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index 12c4777fb7..bad76af2f6 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java index 53367fd54e..4287d39a4c 100644 --- a/src/main/java/net/minecraft/server/EntityMinecart.java +++ b/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.*; diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java index dc207a0a1a..1ff4c47911 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index 77192b05ef..96dd4270b3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index 87abf71ce4..f98fd302d7 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/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.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index 7fa6380863..38e0ee734e 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemBoat.java b/src/main/java/net/minecraft/server/ItemBoat.java index a7e1abf74a..1a6d92d56c 100644 --- a/src/main/java/net/minecraft/server/ItemBoat.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index 8944b8e649..fc85b5a701 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java index 637e99c6f4..57a9eb9e8d 100644 --- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/ItemHoe.java b/src/main/java/net/minecraft/server/ItemHoe.java index f956213917..9e656b1e21 100644 --- a/src/main/java/net/minecraft/server/ItemHoe.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java index 23b592f236..f8ad951969 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemRedstone.java b/src/main/java/net/minecraft/server/ItemRedstone.java index ee942843ff..4ea4705263 100644 --- a/src/main/java/net/minecraft/server/ItemRedstone.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemSeeds.java b/src/main/java/net/minecraft/server/ItemSeeds.java index ae33789d2a..cd086db0be 100644 --- a/src/main/java/net/minecraft/server/ItemSeeds.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/ItemSign.java b/src/main/java/net/minecraft/server/ItemSign.java index da0e62d5fc..f8fedd37ff 100644 --- a/src/main/java/net/minecraft/server/ItemSign.java +++ b/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 diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index a1f3a9bc7c..81b7a994af 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 36b1260e64..670bcef578 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMappable.java b/src/main/java/org/bukkit/craftbukkit/CraftMappable.java index 8e411846bd..8a0de5e21b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftMappable.java +++ b/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. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java b/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java index 84b5707d93..313c6563b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index b9609c8e4c..46d4eff54d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java similarity index 61% rename from src/main/java/org/bukkit/craftbukkit/CraftArrow.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java index 71cb39e18e..8749a4ef9d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftArrow.java +++ b/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); } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java similarity index 80% rename from src/main/java/org/bukkit/craftbukkit/CraftBoat.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java index 740d4c90c2..da80e33231 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftBoat.java +++ b/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; /** diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEgg.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java similarity index 76% rename from src/main/java/org/bukkit/craftbukkit/CraftEgg.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java index 5b8fe147cd..b1babc6b0a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEgg.java +++ b/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; /** diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/CraftEntity.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index a07cda547a..e6be1ca4bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEntity.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index ad2477fcc6..d1a0afc7a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java similarity index 78% rename from src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java index af21e98505..f8a545557e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java +++ b/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. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 31012e4f12..8a3f274c84 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java +++ b/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; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/CraftMinecart.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java index 86e442ae8f..cc89d70acf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java +++ b/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; /** diff --git a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/CraftPlayer.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index e0a1336bf9..1c03f38ab2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java +++ b/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 { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java similarity index 78% rename from src/main/java/org/bukkit/craftbukkit/CraftSnowball.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java index d0ebd11d03..220e917e26 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java +++ b/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; /** diff --git a/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java similarity index 80% rename from src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java index c854d8aa7c..8e9d8f4df6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java +++ b/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; /** diff --git a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/CraftVehicle.java rename to src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java index e0a240160a..2a9a1fae5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java +++ b/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;