Added full tile entity data support for all block types that use it, including chests, dispensers, furnaces, mob spawners, and note blocks.

7 files changed, 162 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
new file mode 100644
index 00000000..8d2af5d9
--- /dev/null
+++ b/src/main/java/org/bukkit/block/Chest.java
@@ -0,0 +1,9 @@
+package org.bukkit.block;

+

+/**

+ * Represents a chest.

+ * 

+ * @author sk89q

+ */

+public interface Chest extends BlockState, ContainerBlock {

+}

diff --git a/src/main/java/org/bukkit/block/ContainerBlock.java b/src/main/java/org/bukkit/block/ContainerBlock.java
new file mode 100644
index 00000000..6c271ffa
--- /dev/null
+++ b/src/main/java/org/bukkit/block/ContainerBlock.java
@@ -0,0 +1,17 @@
+package org.bukkit.block;

+

+import org.bukkit.inventory.Inventory;

+

+/**

+ * Indicates a block type that has inventory.

+ * 

+ * @author sk89q

+ */

+public interface ContainerBlock {

+    /**

+     * Get the block's inventory.

+     * 

+     * @return

+     */

+    public Inventory getInventory();

+}

diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
new file mode 100644
index 00000000..64692514
--- /dev/null
+++ b/src/main/java/org/bukkit/block/Dispenser.java
@@ -0,0 +1,9 @@
+package org.bukkit.block;

+

+/**

+ * Represents a dispenser.

+ * 

+ * @author sk89q

+ */

+public interface Dispenser extends BlockState, ContainerBlock {

+}

diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
new file mode 100644
index 00000000..6f3e2bea
--- /dev/null
+++ b/src/main/java/org/bukkit/block/Furnace.java
@@ -0,0 +1,36 @@
+package org.bukkit.block;

+

+/**

+ * Represents a furnace.

+ * 

+ * @author sk89q

+ */

+public interface Furnace extends BlockState, ContainerBlock {

+    /**

+     * Get burn time.

+     * 

+     * @return

+     */

+    public short getBurnTime();

+    

+    /**

+     * Set burn time.

+     * 

+     * @param burnTime

+     */

+    public void setBurnTime(short burnTime);

+    

+    /**

+     * Get cook time.

+     * 

+     * @return

+     */

+    public short getCookTime();

+    

+    /**

+     * Set cook time.

+     * 

+     * @param cookTime

+     */

+    public void setCookTime(short cookTime);

+}

diff --git a/src/main/java/org/bukkit/block/MobSpawner.java b/src/main/java/org/bukkit/block/MobSpawner.java
new file mode 100644
index 00000000..53c2ee6b
--- /dev/null
+++ b/src/main/java/org/bukkit/block/MobSpawner.java
@@ -0,0 +1,52 @@
+package org.bukkit.block;

+

+import org.bukkit.entity.MobType;

+

+/**

+ * Represents a mob spawner.

+ * 

+ * @author sk89q

+ */

+public interface MobSpawner extends BlockState {

+    /**

+     * Get the spawner's mob type.

+     * 

+     * @return

+     */

+    public MobType getMobType();

+    

+    /**

+     * Set the spawner mob type.

+     * 

+     * @param mobType

+     */

+    public void setMobType(MobType mobType);

+    

+    /**

+     * Get the spawner's mob type.

+     * 

+     * @return

+     */

+    public String getMobTypeId();

+    

+    /**

+     * Set the spawner mob type.

+     * 

+     * @param mobType

+     */

+    public void setMobTypeId(String mobType);

+    

+    /**

+     * Get the spawner's delay.

+     * 

+     * @return

+     */

+    public int getDelay();

+    

+    /**

+     * Set the spawner's delay.

+     * 

+     * @param delay

+     */

+    public void setDelay(int delay);

+}

diff --git a/src/main/java/org/bukkit/block/NoteBlock.java b/src/main/java/org/bukkit/block/NoteBlock.java
new file mode 100644
index 00000000..5e318a19
--- /dev/null
+++ b/src/main/java/org/bukkit/block/NoteBlock.java
@@ -0,0 +1,22 @@
+package org.bukkit.block;

+

+/**

+ * Represents a note.

+ * 

+ * @author sk89q

+ */

+public interface NoteBlock extends BlockState {

+    /**

+     * Gets the note.

+     * 

+     * @return

+     */

+    public byte getNote();

+    

+    /**

+     * Set the note.

+     * 

+     * @param note

+     */

+    public void setNote(byte note);

+}

diff --git a/src/main/java/org/bukkit/entity/MobType.java b/src/main/java/org/bukkit/entity/MobType.java
index 7f52a7ad..9fc3f933 100644
--- a/src/main/java/org/bukkit/entity/MobType.java
+++ b/src/main/java/org/bukkit/entity/MobType.java
@@ -1,5 +1,9 @@
 package org.bukkit.entity;
 
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
 public enum MobType {
     CHICKEN("Chicken"),
     COW("Cow"),
@@ -13,6 +17,15 @@ public enum MobType {
     ZOMBIE("Zombie");
 
     private String name;
+    
+    private static final Map<String, MobType> mapping
+            = new HashMap<String, MobType>();
+
+    static {
+        for (MobType type : EnumSet.allOf(MobType.class)) {
+            mapping.put(type.name, type);
+        }
+    }
 
     private MobType(String name) {
         this.name = name;
@@ -21,5 +34,8 @@ public enum MobType {
     public String getName() {
         return name;
     }
-
+    
+    public static MobType fromName(String name) {
+        return mapping.get(name);
+    }
 }