15 files changed, 157 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 303388e5..63e3ee6e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -122,6 +122,18 @@ public enum Material {
     FENCE_GATE(107),
     BRICK_STAIRS(108),
     SMOOTH_STAIRS(109),
+    MYCEL(110),
+    WATER_LILY(111),
+    NETHER_BRICK(112),
+    NETHER_FENCE(113),
+    NETHER_BRICK_STAIRS(114),
+    NETHER_WATER(115),
+    ENCHANTMENT_TABLE(116),
+    BREWING_STAND(117),
+    CAULDRON(118),
+    ENDER_PORTAL(119),
+    ENTER_PORTAL_FRAME(120),
+    WHITESTONE(121),
     // ----- Item Separator -----
     IRON_SPADE(256, 1, 250),
     IRON_PICKAXE(257, 1, 250),
@@ -236,8 +248,31 @@ public enum Material {
     COOKED_CHICKEN(366),
     ROTTEN_FLESH(367),
     ENDER_PEARL(368),
+    BLAZE_ROD(369),
+    GHAST_TEAR(370),
+    GOLD_NUGGET(371),
+    NETHER_STALK(372),
+    POTION(373),
+    GLASS_BOTTLE(374),
+    SPIDER_EYE(375),
+    FERMENTED_SPIDER_EYE(376),
+    BLAZE_POWDER(377),
+    MAGMA_CREAM(378),
+    BREWING_STAND_ITEM(379),
+    CAULDRON_ITEM(380),
+    EYE_OF_ENDER(381),
+    SPECKLED_MELON(382),
     GOLD_RECORD(2256, 1),
-    GREEN_RECORD(2257, 1);
+    GREEN_RECORD(2257, 1),
+    RECORD_3(2258, 1),
+    RECORD_4(2259, 1),
+    RECORD_5(2260, 1),
+    RECORD_6(2261, 1),
+    RECORD_7(2262, 1),
+    RECORD_8(2263, 1),
+    RECORD_9(2264, 1),
+    RECORD_10(2265, 1),
+    RECORD_11(2266, 1);
 
     private final int id;
     private final Class<? extends MaterialData> data;
diff --git a/src/main/java/org/bukkit/entity/Blaze.java b/src/main/java/org/bukkit/entity/Blaze.java
new file mode 100644
index 00000000..0033acd0
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Blaze.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Blaze monster
+ */
+public interface Blaze extends Monster {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/ComplexEntityPart.java b/src/main/java/org/bukkit/entity/ComplexEntityPart.java
new file mode 100644
index 00000000..ced09c4b
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/ComplexEntityPart.java
@@ -0,0 +1,13 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a single part of a {@link ComplexLivingEntity}
+ */
+public interface ComplexEntityPart extends Entity {
+    /**
+     * Gets the parent {@link ComplexLivingEntity} of this part.
+     * 
+     * @return Parent complex entity
+     */
+    public ComplexLivingEntity getParent();
+}
diff --git a/src/main/java/org/bukkit/entity/ComplexLivingEntity.java b/src/main/java/org/bukkit/entity/ComplexLivingEntity.java
new file mode 100644
index 00000000..6de2c561
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/ComplexLivingEntity.java
@@ -0,0 +1,15 @@
+package org.bukkit.entity;
+
+import java.util.Set;
+
+/**
+ * Represents a complex living entity - one that is made up of various smaller parts
+ */
+public interface ComplexLivingEntity extends LivingEntity {
+    /**
+     * Gets a list of parts that belong to this complex entity
+     * 
+     * @return List of parts
+     */
+    public Set<ComplexEntityPart> getParts();
+}
diff --git a/src/main/java/org/bukkit/entity/CreatureType.java b/src/main/java/org/bukkit/entity/CreatureType.java
index 9d2f5686..9d5f12f5 100644
--- a/src/main/java/org/bukkit/entity/CreatureType.java
+++ b/src/main/java/org/bukkit/entity/CreatureType.java
@@ -22,7 +22,11 @@ public enum CreatureType {
     WOLF("Wolf", Wolf.class),
     CAVE_SPIDER("CaveSpider", CaveSpider.class),
     ENDERMAN("Enderman", Enderman.class),
-    SILVERFISH("Silverfish", Silverfish.class);
+    SILVERFISH("Silverfish", Silverfish.class),
+    ENDER_DRAGON("EnderDragon", EnderDragon.class),
+    VILLAGER("Villager", Villager.class),
+    BLAZE("Blaze", Blaze.class),
+    MUSHROOM_COW("MushroomCow", MushroomCow.class);
 
     private String name;
     private Class<? extends Entity> clazz;
diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
new file mode 100644
index 00000000..18e8bca6
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an Ender Dragon
+ */
+public interface EnderDragon extends ComplexLivingEntity {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/EnderDragonPart.java b/src/main/java/org/bukkit/entity/EnderDragonPart.java
new file mode 100644
index 00000000..4bb822a3
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/EnderDragonPart.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an ender dragon part
+ */
+public interface EnderDragonPart extends ComplexEntityPart {
+    public EnderDragon getParent();
+}
diff --git a/src/main/java/org/bukkit/entity/EnderPearl.java b/src/main/java/org/bukkit/entity/EnderPearl.java
new file mode 100644
index 00000000..77c81ec1
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/EnderPearl.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an Ender Pearl entity
+ */
+public interface EnderPearl extends Projectile {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/EnderSignal.java b/src/main/java/org/bukkit/entity/EnderSignal.java
new file mode 100644
index 00000000..94a2f947
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/EnderSignal.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an Ender Signal, which is often created upon throwing an ender eye
+ */
+public interface EnderSignal extends Entity {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java
new file mode 100644
index 00000000..56439497
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/MushroomCow.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a mushroom {@link Cow}
+ */
+public interface MushroomCow extends Cow {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/NPC.java b/src/main/java/org/bukkit/entity/NPC.java
new file mode 100644
index 00000000..2c651a5b
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/NPC.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a non-player character
+ */
+public interface NPC extends Creature {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/SmallFireball.java b/src/main/java/org/bukkit/entity/SmallFireball.java
new file mode 100644
index 00000000..870b8a26
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/SmallFireball.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a small {@link Fireball}
+ */
+public interface SmallFireball extends Fireball {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
new file mode 100644
index 00000000..84c31e9e
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Snowman.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a snowman entity
+ */
+public interface Snowman extends Creature {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/ThrownPotion.java b/src/main/java/org/bukkit/entity/ThrownPotion.java
new file mode 100644
index 00000000..1daffced
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/ThrownPotion.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a thrown potion bottle
+ */
+public interface ThrownPotion extends Projectile {
+    
+}
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
new file mode 100644
index 00000000..6d8dc763
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -0,0 +1,8 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a villager NPC
+ */
+public interface Villager extends NPC {
+    
+}