From dcbc0f4b64966363199b2025be4d883f993532ab Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 15 Jan 2011 21:21:05 +0000 Subject: [PATCH] All entity stuff in org.bukkit moved to org.bukkit.entity By: Dinnerbone --- .../org/bukkit/craftbukkit/CraftArrow.java | 30 ++++++------ .../org/bukkit/craftbukkit/CraftBoat.java | 2 +- .../java/org/bukkit/craftbukkit/CraftEgg.java | 30 ++++++------ .../org/bukkit/craftbukkit/CraftEntity.java | 4 +- .../bukkit/craftbukkit/CraftHumanEntity.java | 2 +- .../org/bukkit/craftbukkit/CraftItemDrop.java | 46 +++++++++---------- .../bukkit/craftbukkit/CraftLivingEntity.java | 12 ++--- .../org/bukkit/craftbukkit/CraftMinecart.java | 2 +- .../org/bukkit/craftbukkit/CraftPlayer.java | 2 +- .../craftbukkit/CraftPoweredMinecart.java | 2 +- .../org/bukkit/craftbukkit/CraftServer.java | 1 + .../org/bukkit/craftbukkit/CraftSnowball.java | 30 ++++++------ .../craftbukkit/CraftStorageMinecart.java | 2 +- .../org/bukkit/craftbukkit/CraftVehicle.java | 4 +- .../org/bukkit/craftbukkit/CraftWorld.java | 12 ++--- 15 files changed, 91 insertions(+), 90 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java index b9dd0c3ead..71cb39e18e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java @@ -1,15 +1,15 @@ -package org.bukkit.craftbukkit; - -import org.bukkit.Arrow; -import net.minecraft.server.EntityArrow; - -/** - * Represents an arrow. - * - * @author sk89q - */ -public class CraftArrow extends CraftEntity implements Arrow { - CraftArrow(CraftServer server, EntityArrow entity) { - super(server, entity); - } -} +package org.bukkit.craftbukkit; + +import org.bukkit.entity.Arrow; +import net.minecraft.server.EntityArrow; + +/** + * Represents an arrow. + * + * @author sk89q + */ +public class CraftArrow extends CraftEntity implements Arrow { + CraftArrow(CraftServer server, EntityArrow entity) { + super(server, entity); + } +} diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java index cad1e40779..740d4c90c2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java @@ -1,7 +1,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityBoat; -import org.bukkit.Boat; +import org.bukkit.entity.Boat; /** * A minecart. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java index d0a5ee8979..5b8fe147cd 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java @@ -1,15 +1,15 @@ -package org.bukkit.craftbukkit; - -import net.minecraft.server.EntityEgg; -import org.bukkit.Egg; - -/** - * An egg. - * - * @author sk89q - */ -public class CraftEgg extends CraftEntity implements Egg { - public CraftEgg(CraftServer server, EntityEgg ent) { - super(server, ent); - } -} +package org.bukkit.craftbukkit; + +import net.minecraft.server.EntityEgg; +import org.bukkit.entity.Egg; + +/** + * An egg. + * + * @author sk89q + */ +public class CraftEgg extends CraftEntity implements Egg { + public CraftEgg(CraftServer server, EntityEgg ent) { + super(server, ent); + } +} diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java index 1902c1d2ac..a07cda547a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java @@ -6,7 +6,7 @@ import org.bukkit.Location; import org.bukkit.Vector; import org.bukkit.World; -public abstract class CraftEntity implements org.bukkit.Entity { +public abstract class CraftEntity implements org.bukkit.entity.Entity { protected final CraftServer server; private Entity entity; @@ -37,7 +37,7 @@ public abstract class CraftEntity implements org.bukkit.Entity { entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); } - public void teleportTo(org.bukkit.Entity destination) { + public void teleportTo(org.bukkit.entity.Entity destination) { teleportTo(destination.getLocation()); } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java index 5ffd168868..ad2477fcc6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java @@ -2,7 +2,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityPlayer; -import org.bukkit.HumanEntity; +import org.bukkit.entity.HumanEntity; import org.bukkit.ItemStack; import org.bukkit.PlayerInventory; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java index 0def182530..af21e98505 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java @@ -1,23 +1,23 @@ -package org.bukkit.craftbukkit; - -import net.minecraft.server.EntityItem; -import org.bukkit.ItemDrop; -import org.bukkit.ItemStack; - -/** - * Represents an item drop. - * - * @author sk89q - */ -public class CraftItemDrop extends CraftEntity implements ItemDrop { - private EntityItem item; - - public CraftItemDrop(CraftServer server, EntityItem ent) { - super(server, ent); - this.item = ent; - } - - public ItemStack getItemStack() { - return new CraftItemStack(item.a); - } -} +package org.bukkit.craftbukkit; + +import net.minecraft.server.EntityItem; +import org.bukkit.entity.ItemDrop; +import org.bukkit.ItemStack; + +/** + * Represents an item drop. + * + * @author sk89q + */ +public class CraftItemDrop extends CraftEntity implements ItemDrop { + private EntityItem item; + + public CraftItemDrop(CraftServer server, EntityItem ent) { + super(server, ent); + this.item = ent; + } + + public ItemStack getItemStack() { + return new CraftItemStack(item.a); + } +} diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java index 9964bf9e0f..31012e4f12 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java @@ -7,11 +7,11 @@ import net.minecraft.server.EntityEgg; import net.minecraft.server.EntityLiving; import net.minecraft.server.EntitySnowball; -import org.bukkit.Arrow; -import org.bukkit.Egg; -import org.bukkit.LivingEntity; -import org.bukkit.Snowball; -import org.bukkit.Vehicle; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Egg; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Snowball; +import org.bukkit.entity.Vehicle; public class CraftLivingEntity extends CraftEntity implements LivingEntity { private EntityLiving entity; @@ -87,7 +87,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return null; } - org.bukkit.Entity vehicle = ((CraftWorld)getWorld()).toCraftEntity(entity.k); + org.bukkit.entity.Entity vehicle = ((CraftWorld)getWorld()).toCraftEntity(entity.k); if (vehicle instanceof Vehicle) { return (Vehicle)vehicle; } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java index d293e0799b..86e442ae8f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java @@ -1,7 +1,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityMinecart; -import org.bukkit.Minecart; +import org.bukkit.entity.Minecart; /** * A minecart. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java index ea562fef39..e0a1336bf9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java @@ -6,7 +6,7 @@ import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayerMP; import net.minecraft.server.Packet3Chat; import org.bukkit.Location; -import org.bukkit.Player; +import org.bukkit.entity.Player; public class CraftPlayer extends CraftHumanEntity implements Player { private EntityPlayerMP entity; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java index 2a1a8f1f38..84b5707d93 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java @@ -1,7 +1,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityMinecart; -import org.bukkit.PoweredMinecart; +import org.bukkit.entity.PoweredMinecart; /** * A powered minecart. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index fe76a9706f..9b94c1fbbb 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1,5 +1,6 @@ package org.bukkit.craftbukkit; +import org.bukkit.entity.Player; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java index 1cefa011a0..d0ebd11d03 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java @@ -1,15 +1,15 @@ -package org.bukkit.craftbukkit; - -import net.minecraft.server.EntitySnowball; -import org.bukkit.Snowball; - -/** - * A snowball. - * - * @author sk89q - */ -public class CraftSnowball extends CraftEntity implements Snowball { - public CraftSnowball(CraftServer server, EntitySnowball ent) { - super(server, ent); - } -} +package org.bukkit.craftbukkit; + +import net.minecraft.server.EntitySnowball; +import org.bukkit.entity.Snowball; + +/** + * A snowball. + * + * @author sk89q + */ +public class CraftSnowball extends CraftEntity implements Snowball { + public CraftSnowball(CraftServer server, EntitySnowball ent) { + super(server, ent); + } +} diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java index 3063482daa..c854d8aa7c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java @@ -3,7 +3,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityMinecart; import org.bukkit.Inventory; -import org.bukkit.StorageMinecart; +import org.bukkit.entity.StorageMinecart; /** * A storage minecart. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java index ed940d60f7..e0a240160a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java @@ -1,7 +1,7 @@ package org.bukkit.craftbukkit; -import org.bukkit.Entity; -import org.bukkit.Vehicle; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Vehicle; /** * A vehicle. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 42ef546aa8..b9609c8e4c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -18,16 +18,16 @@ import net.minecraft.server.TileEntity; import net.minecraft.server.WorldGenBigTree; import net.minecraft.server.WorldServer; import net.minecraft.server.WorldGenTrees; -import org.bukkit.Arrow; +import org.bukkit.entity.Arrow; import org.bukkit.Block; -import org.bukkit.Boat; +import org.bukkit.entity.Boat; import org.bukkit.Chunk; -import org.bukkit.ItemDrop; +import org.bukkit.entity.ItemDrop; import org.bukkit.ItemStack; import org.bukkit.Location; -import org.bukkit.Minecart; -import org.bukkit.PoweredMinecart; -import org.bukkit.StorageMinecart; +import org.bukkit.entity.Minecart; +import org.bukkit.entity.PoweredMinecart; +import org.bukkit.entity.StorageMinecart; import org.bukkit.Vector; import org.bukkit.World;