Added Entity interfaces, changed Player to implement these

5 files changed, 311 insertions, 15 deletions

diff --git a/src/org/bukkit/Entity.java b/src/org/bukkit/Entity.java
new file mode 100644
index 00000000..849bdd2d
--- /dev/null
+++ b/src/org/bukkit/Entity.java
@@ -0,0 +1,35 @@
+
+package org.bukkit;
+
+/**
+ * Represents a base entity in the world
+ */
+public interface Entity {
+    /**
+     * Gets the entitys current position
+     *
+     * @return Location containing the position of this entity
+     */
+    public Location getLocation();
+
+    /**
+     * Gets the current world this entity resides in
+     *
+     * @return World
+     */
+    public World getWorld();
+
+    /**
+     * Teleports this entity to the given location
+     * 
+     * @param location New location to teleport this entity to
+     */
+    public void teleportTo(Location location);
+    
+    /**
+     * Returns a unique ID for this entity
+     * 
+     * @return Entity ID
+     */
+    public int getEntityID();
+}
diff --git a/src/org/bukkit/EntityHuman.java b/src/org/bukkit/EntityHuman.java
new file mode 100644
index 00000000..9e3b7926
--- /dev/null
+++ b/src/org/bukkit/EntityHuman.java
@@ -0,0 +1,15 @@
+
+package org.bukkit;
+
+/**
+ * Represents a human entity, such as an NPC or a player
+ */
+public interface EntityHuman {
+    /**
+     * Gets the item this entity has currently selected, which will be shown in
+     * their hand
+     *
+     * @return ItemStack containing details on the item this entity has selected
+     */
+    public ItemStack getSelectedItem();
+}
diff --git a/src/org/bukkit/ItemStack.java b/src/org/bukkit/ItemStack.java
new file mode 100644
index 00000000..d9fb7c60
--- /dev/null
+++ b/src/org/bukkit/ItemStack.java
@@ -0,0 +1,239 @@
+
+package org.bukkit;
+
+/**
+ * Represents a stack of items
+ */
+public interface ItemStack {
+    /**
+     * Gets the type of this item
+     *
+     * @return Type of the items in this stack
+     */
+    public Type getType();
+
+    /**
+     * Sets the type of this item
+     *
+     * @param type New type to set the items in this stack to
+     */
+    public void setType(Type type);
+
+    /**
+     * Gets the type ID of this item
+     *
+     * @return Type ID of the items in this stack
+     */
+    public int getTypeID();
+
+    /**
+     * Sets the type ID of this item
+     *
+     * @param type New type ID to set the items in this stack to
+     */
+    public void setTypeID(int type);
+
+    /**
+     * Gets the amount of items in this stack
+     *
+     * @return Amount of items in this stick
+     */
+    public int getAmount();
+
+    /**
+     * Sets the amount of items in this stack
+     *
+     * @param amount New amount of items in this stack
+     */
+    public void setAmount(int amount);
+
+    /**
+     * An enum of all type IDs accepted by the official server + client
+     */
+    public enum Type {
+        Air (0),
+        Stone (1),
+        Grass(2),
+        Dirt(3),
+        Cobblestone(4),
+        Wood(5),
+        Sapling(6),
+        Bedrock(7),
+        Water(8),
+        StationaryWater(9),
+        Lava(10),
+        StationaryLava(11),
+        Sand(12),
+        Gravel(13),
+        GoldOre(14),
+        IronOre(15),
+        CoalOre(16),
+        Log(17),
+        Leaves(18),
+        Sponge(19),
+        Glass(20),
+        Cloth(35),
+        YellowFlower(37),
+        RedRose(38),
+        BrownMushroom(39),
+        RedMushroom(40),
+        GoldBlock(41),
+        IronBlock(42),
+        DoubleStep(43),
+        Step(44),
+        Brick(45),
+        TNT(46),
+        BookShelf(47),
+        MossyCobblestone(48),
+        Obsidian(49),
+        Torch(50),
+        Fire(51),
+        MobSpawner(52),
+        WoodStairs(53),
+        Chest(54),
+        RedstoneWire(55),
+        DiamondOre(56),
+        DiamondBlock(57),
+        Workbench(58),
+        Crops(59),
+        Soil(60),
+        Furnace(61),
+        BurningFurnace(62),
+        SignPost(63),
+        WoodenDoor(64),
+        Ladder(65),
+        Rails(66),
+        CobblestoneStairs(67),
+        WallSign(68),
+        Lever(69),
+        StonePlate(70),
+        IronDoorBlock(71),
+        WoodPlate(72),
+        RedstoneOre(73),
+        GlowingRedstoneOre(74),
+        RedstoneTorchOff(75),
+        RedstoneTorchOn(76),
+        StoneButton(77),
+        Snow(78),
+        Ice(79),
+        SnowBlock(80),
+        Cactus(81),
+        Clay(82),
+        ReedBlock(83),
+        Jukebox(84),
+        Fence(85),
+        Pumpkin(86),
+        Netherstone(87),
+        SlowSand(88),
+        LightStone(89),
+        Portal(90),
+        JackOLantern(91),
+        IronSpade(256),
+        IronPickaxe(257),
+        IronAxe(258),
+        FlintAndSteel(259),
+        Apple(260),
+        Bow(261),
+        Arrow(262),
+        Coal(263),
+        Diamond(264),
+        IronIngot(265),
+        GoldIngot(266),
+        IronSword(267),
+        WoodSword(268),
+        WoodSpade(269),
+        WoodPickaxe(270),
+        WoodAxe(271),
+        StoneSword(272),
+        StoneSpade(273),
+        StonePickaxe(274),
+        StoneAxe(275),
+        DiamondSword(276),
+        DiamondSpade(277),
+        DiamondPickaxe(278),
+        DiamondAxe(279),
+        Stick(280),
+        Bowl(281),
+        MushroomSoup(282),
+        GoldSword(283),
+        GoldSpade(284),
+        GoldPickaxe(285),
+        GoldAxe(286),
+        String(287),
+        Feather(288),
+        Gunpowder(289),
+        WoodHoe(290),
+        StoneHoe(291),
+        IronHoe(292),
+        DiamondHoe(293),
+        GoldHoe(294),
+        Seeds(295),
+        Wheat(296),
+        Bread(297),
+        LeatherHelmet(298),
+        LeatherChestplate(299),
+        LeatherLeggings(300),
+        LeatherBoots(301),
+        ChainmailHelmet(302),
+        ChainmailChestplate(303),
+        ChainmailLeggings(304),
+        ChainmailBoots(305),
+        IronHelmet(306),
+        IronChestplate(307),
+        IronLeggings(308),
+        IronBoots(309),
+        DiamondHelmet(310),
+        DiamondChestplate(311),
+        DiamondLeggings(312),
+        DiamondBoots(313),
+        GoldHelmet(314),
+        GoldChestplate(315),
+        GoldLeggings(316),
+        GoldBoots(317),
+        Flint(318),
+        Pork(319),
+        GrilledPork(320),
+        Painting(321),
+        GoldenApple(322),
+        Sign(323),
+        WoodDoor(324),
+        Bucket(325),
+        WaterBucket(326),
+        LavaBucket(327),
+        Minecart(328),
+        Saddle(329),
+        IronDoor(330),
+        RedStone(331),
+        SnowBall(332),
+        Boat(333),
+        Leather(334),
+        MilkBucket(335),
+        ClayBrick(336),
+        ClayBall(337),
+        Reed(338),
+        Paper(339),
+        Book(340),
+        SlimeBall(341),
+        StorageMinecart(342),
+        PoweredMinecart(343),
+        Egg(344),
+        Compass(345),
+        FishingRod(346),
+        Watch(347),
+        LightstoneDust(348),
+        RawFish(349),
+        CookedFish(350),
+        GoldRecord(2256),
+        GreenRecord(2257);
+
+        private final int id;
+
+        private Type(final int id) {
+            this.id = id;
+        }
+
+        public int getID() {
+            return id;
+        }
+    }
+}
diff --git a/src/org/bukkit/LivingEntity.java b/src/org/bukkit/LivingEntity.java
new file mode 100644
index 00000000..1fd153c9
--- /dev/null
+++ b/src/org/bukkit/LivingEntity.java
@@ -0,0 +1,21 @@
+
+package org.bukkit;
+
+/**
+ * Represents a living entity, such as a monster or player
+ */
+public interface LivingEntity extends Entity {
+    /**
+     * Gets the entitys health from 0-20, where 0 is dead and 20 is full
+     *
+     * @return Health represented from 0-20
+     */
+    public int getHealth();
+
+    /**
+     * Sets the entitys health from 0-20, where 0 is dead and 20 is full
+     *
+     * @param health New health represented from 0-20
+     */
+    public void setHealth(int health);
+}
diff --git a/src/org/bukkit/Player.java b/src/org/bukkit/Player.java
index f12efa08..bc3446c7 100644
--- a/src/org/bukkit/Player.java
+++ b/src/org/bukkit/Player.java
@@ -5,7 +5,7 @@ package org.bukkit;
  * Represents a player, connected or not
  * 
  */
-public interface Player {
+public interface Player extends EntityHuman {
     /**
      * Returns the name of this player
      *
@@ -19,18 +19,4 @@ public interface Player {
      * @return true if they are online
      */
     public boolean isOnline();
-
-    /**
-     * Gets the players current position in the world
-     *
-     * @return Location of this player
-     */
-    public Location getLocation();
-
-    /**
-     * Gets the current world this player is on
-     *
-     * @return World
-     */
-    public World getWorld();
 }