Improved handling of valid blocks not in BlockType and added dragon egg to BlockType

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

@@ -321,6 +321,7 @@ public class WorldEdit {
                     data = 0;
                 }
             } catch (NumberFormatException e) {
+                if (blockType != null) {
                     switch (blockType) {
                         case CLOTH:
                             ClothColor col = ClothColor.lookup(typeAndData[1]);
@@ -370,11 +371,15 @@ public class WorldEdit {
                         default:
                             throw new InvalidItemException(arg, "Unknown data value '" + typeAndData[1] + "'");
                     }
+                } else {
+                    throw new InvalidItemException(arg, "Unknown data value '" + typeAndData[1] + "'");
+                }
             }
         }
 
         // Check if the item is allowed
         if (allAllowed || player.hasPermission("worldedit.anyblock") || !config.disallowedBlocks.contains(blockId)) {
+            if (blockType != null) {
                 switch (blockType) {
                     case SIGN_POST:
                     case WALL_SIGN:
@@ -420,6 +425,9 @@ public class WorldEdit {
                     default:
                         return new BaseBlock(blockId, data);
                 }
+            } else {
+                return new BaseBlock(blockId, data);
+            }
         }
 
         throw new DisallowedItemException(arg);

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

@@ -148,4 +148,5 @@ public final class BlockID {
     public static final int END_PORTAL = 119;
     public static final int END_PORTAL_FRAME = 120;
     public static final int END_STONE = 121;
+    public static final int DRAGON_EGG = 122;
 }

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

@@ -157,7 +157,8 @@ public enum BlockType {
     CAULDRON(BlockID.CAULDRON, "Cauldron"),
     END_PORTAL(BlockID.END_PORTAL, "End Portal", "endportal", "blackstuff", "airportal", "weirdblackstuff"),
     END_PORTAL_FRAME(BlockID.END_PORTAL_FRAME, "End Portal Frame", "endportalframe", "airportalframe", "crystalblock"),
-    END_STONE(BlockID.END_STONE, "End Stone", "endstone", "enderstone", "endersand");
+    END_STONE(BlockID.END_STONE, "End Stone", "endstone", "enderstone", "endersand"),
+    DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons");
 
     /**
      * Stores a map of the IDs for fast access.

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

@@ -158,6 +158,7 @@ public enum ItemType {
     END_PORTAL(BlockID.END_PORTAL, "End Portal", "endportal", "blackstuff", "airportal", "weirdblackstuff"),
     END_PORTAL_FRAME(BlockID.END_PORTAL_FRAME, "End Portal Frame", "endportalframe", "airportalframe", "crystalblock"),
     END_STONE(BlockID.END_STONE, "End Stone", "endstone", "enderstone", "endersand"),
+    DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons"),
 
     // Items
     IRON_SHOVEL(ItemID.IRON_SHOVEL, "Iron shovel", "ironshovel"),