diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 21:23:28 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 21:24:07 +0000 |
commit | 9150e8d85d50a6d634c5683bd5a1763ca07801d0 (patch) | |
tree | 7803d258c4cec3c2f78d24d1789abc56aba94c8a /src/main/java/org | |
parent | d501bbf1a23a12611592dc466ebe6cb1669a0a38 (diff) | |
download | craftbukkit-9150e8d85d50a6d634c5683bd5a1763ca07801d0.tar craftbukkit-9150e8d85d50a6d634c5683bd5a1763ca07801d0.tar.gz craftbukkit-9150e8d85d50a6d634c5683bd5a1763ca07801d0.tar.lz craftbukkit-9150e8d85d50a6d634c5683bd5a1763ca07801d0.tar.xz craftbukkit-9150e8d85d50a6d634c5683bd5a1763ca07801d0.zip |
All entity stuff in org.bukkit.craftbukkit moved to org.bukkit.craftbukkit.entity
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftMappable.java | 2 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java | 1 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 11 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftArrow.java) | 5 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftBoat.java) | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftEgg.java) | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftEntity.java) | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftMinecart.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftPlayer.java) | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftSnowball.java) | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java (renamed from src/main/java/org/bukkit/craftbukkit/CraftVehicle.java) | 4 |
15 files changed, 45 insertions, 13 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMappable.java b/src/main/java/org/bukkit/craftbukkit/CraftMappable.java index 8e411846..8a0de5e2 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 84b5707d..313c6563 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 b9609c8e..46d4eff5 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 index 71cb39e1..8749a4ef 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 index 740d4c90..da80e332 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 index 5b8fe147..b1babc6b 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 index a07cda54..e6be1ca4 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 index ad2477fc..d1a0afc7 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 index af21e985..f8a54555 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 index 31012e4f..8a3f274c 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 index 86e442ae..cc89d70a 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 index e0a1336b..1c03f38a 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 index d0ebd11d..220e917e 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 index c854d8aa..8e9d8f4d 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 index e0a24016..2a9a1fae 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; |