Merge pull request #107 from wizjany/master

MC 1.6 support

src/main/java/com/sk89q/worldedit/EditSession.java

@@ -150,7 +150,7 @@ public class EditSession {
         }
         
         // No invalid blocks
-        if ((type > 30 && type < 35) || type == 36 || type == 29 || type > 95) {
+        if ((type > 32 && type < 35) || type == 36 || type == 29 || type > 96) {
             return false;
         }
         

src/main/java/com/sk89q/worldedit/blocks/BlockID.java

@@ -55,6 +55,8 @@ public final class BlockID {
     public static final int POWERED_RAIL = 27;
     public static final int DETECTOR_RAIL = 28;
     public static final int WEB = 30;
+    public static final int LONG_GRASS = 31;
+    public static final int DEAD_BUSH = 32;
     public static final int CLOTH = 35;
     public static final int YELLOW_FLOWER = 37;
     public static final int RED_FLOWER = 38;
@@ -116,4 +118,5 @@ public final class BlockID {
     public static final int REDSTONE_REPEATER_OFF = 93;
     public static final int REDSTONE_REPEATER_ON = 94;
     public static final int LOCKED_CHEST = 95;
+    public static final int TRAP_DOOR = 96;
 }

src/main/java/com/sk89q/worldedit/blocks/BlockType.java

@@ -62,6 +62,8 @@ public enum BlockType {
             new String[] {"poweredrail", "boosterrail", "poweredtrack", "boostertrack"}),
     DETECTOR_RAIL(28, "Detector Rail", "detectorrail"),
     WEB(30, "Web", new String[] {"web", "spiderweb"}),
+    LONG_GRASS(31, "Long grass", new String[] {"longgrass", "tallgrass"}),
+    DEAD_BUSH(32, "Shrub", new String[] {"deadbush", "shrub", "deadshrub", "tumbleweed"}),
     CLOTH(35, "Wool", new String[] {"cloth", "wool"}),
     YELLOW_FLOWER(37, "Yellow flower", new String[] {"yellowflower", "flower"}),
     RED_FLOWER(38, "Red rose", new String[] {"redflower", "redrose", "rose"}),
@@ -135,7 +137,8 @@ public enum BlockType {
     CAKE(92, "Cake", new String[] {"cake", "cakeblock"}),
     REDSTONE_REPEATER_OFF(93, "Redstone repeater (off)", new String[] {"diodeoff", "redstonerepeater", "repeater", "delayer"}),
     REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diode", "diodeon", "redstonerepeateron", "repeateron", "delayeron"}),
-    LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"});
+    LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}),
+    TRAP_DOOR(96, "Trap door", new String[] {"trapdoor", "hatch"});
 
     /**
      * Stores a list of dropped blocks for blocks.
@@ -226,6 +229,7 @@ public enum BlockType {
         blockDrops.put(93, 356);
         blockDrops.put(94, 356);
         blockDrops.put(95, 95);
+        blockDrops.put(96, 96);
     }
 
     /**
@@ -333,6 +337,8 @@ public enum BlockType {
                 || id == 26 // Beds
                 || id == 27 // Powered rails
                 || id == 28 // Detector rails
+                || id == 31 // Long grass
+                || id == 32 // Shrub
                 || id == 37 // Yellow flower
                 || id == 38 // Red flower
                 || id == 39 // Brown mushroom
@@ -359,7 +365,8 @@ public enum BlockType {
                 || id == 90 // Portal
                 || id == 92 // Cake
                 || id == 93 // Repeater (off)
-                || id == 94; // Repeater (on)
+                || id == 94 // Repeater (on)
+                || id == 96; // Trap door
     }
 
     /**
@@ -376,6 +383,8 @@ public enum BlockType {
                 || id == 27 // Powered rails
                 || id == 28 // Detector rails
                 || id == 30 // Web <- someone will hate me for this
+                || id == 31 // Long grass
+                || id == 32 // Shrub
                 || id == 37 // Yellow flower
                 || id == 38 // Red flower
                 || id == 39 // Brown mushroom
@@ -420,6 +429,7 @@ public enum BlockType {
                 || id == 26 // Bed
                 || id == 27 // Powered rails
                 || id == 28 // Detector rails
+                || id == 31 // Tall grass
                 || id == 35 // Wool
                 || id == 43 // Double slab
                 || id == 44 // Slab
@@ -448,7 +458,8 @@ public enum BlockType {
                 || id == 91 // Jack-o-lantern
                 || id == 92 // Cake
                 || id == 93 // Redstone repeater (off)
-                || id == 94; // Redstone repeater (on)
+                || id == 94 // Redstone repeater (on)
+                || id == 96; // Trap door
     }
     
     /**

src/main/java/com/sk89q/worldedit/blocks/ItemType.java

@@ -63,6 +63,8 @@ public enum ItemType {
             new String[] {"poweredrail", "boosterrail", "poweredtrack", "boostertrack"}),
     DETECTOR_RAIL(28, "Detector Rail", "detectorrail"),
     WEB(30, "Web", new String[] {"web", "spiderweb"}),
+    LONG_GRASS(31, "Long grass", new String[] {"longgrass", "tallgrass"}),
+    DEAD_BUSH(32, "Shrub", new String[] {"deadbush", "shrub", "deadshrub", "tumbleweed"}),
     CLOTH(35, "Wool", new String[] {"cloth", "wool"}),
     YELLOW_FLOWER(37, "Yellow flower", new String[] {"yellowflower", "flower"}),
     RED_FLOWER(38, "Red rose", new String[] {"redflower", "redrose", "rose"}),
@@ -137,7 +139,8 @@ public enum ItemType {
     REDSTONE_REPEATER_OFF(93, "Redstone repeater (off)", new String[] {"diodeoff", "redstonerepeater", "repeater", "delayer"}),
     REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diode", "diodeon", "redstonerepeateron", "repeateron", "delayeron"}),
     LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}),
-
+    TRAP_DOOR(96, "Trap door", new String[] {"trapdoor", "hatch"}),
+    
     // Items
     IRON_SHOVEL(256, "Iron shovel", "ironshovel"),
     IRON_PICK(257, "Iron pick", new String[] {"ironpick", "ironpickaxe"}),
@@ -247,6 +250,7 @@ public enum ItemType {
     BED_ITEM(355, "Bed", "bed"),
     REDSTONE_REPEATER(356, "Redstone repeater", new String[] {"redstonerepeater", "diode", "delayer"}),
     COOKIE(357, "Cookie", "cookie"),
+    MAP(358, "Map", "map"),
     GOLD_RECORD(2256, "Gold Record", new String[] {"goldrecord", "golddisc"}),
     GREEN_RECORD(2257, "Green Record", new String[] {"greenrecord", "greenddisc"});