diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockID.java b/src/main/java/com/sk89q/worldedit/blocks/BlockID.java index 1fb083320..01d160d6e 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BlockID.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BlockID.java @@ -164,4 +164,13 @@ public final class BlockID { public static final int SPRUCE_WOOD_STAIRS = 134; public static final int BIRCH_WOOD_STAIRS = 135; public static final int JUNGLE_WOOD_STAIRS = 136; + public static final int COMMAND_BLOCK = 137; + public static final int BEACON = 138; + public static final int COBBLESTONE_WALL = 139; + public static final int FLOWER_POT = 140; + public static final int CARROTS = 141; + public static final int POTATOES = 142; + public static final int WOODEN_BUTTON = 143; + public static final int HEAD = 144; + public static final int ANVIL = 145; } diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockType.java b/src/main/java/com/sk89q/worldedit/blocks/BlockType.java index 915c419dd..c8c29a70e 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BlockType.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BlockType.java @@ -19,10 +19,10 @@ package com.sk89q.worldedit.blocks; +import java.util.EnumSet; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.HashMap; -import java.util.EnumSet; import java.util.Random; import java.util.Set; @@ -171,7 +171,16 @@ public enum BlockType { EMERALD_BLOCK(BlockID.EMERALD_BLOCK, "Emerald block", "emeraldblock", "emerald"), SPRUCE_WOOD_STAIRS(BlockID.SPRUCE_WOOD_STAIRS, "Spruce wood stairs", "sprucestairs", "sprucewoodstairs"), BIRCH_WOOD_STAIRS(BlockID.BIRCH_WOOD_STAIRS, "Birch wood stairs", "birchstairs", "birchwoodstairs"), - JUNGLE_WOOD_STAIRS(BlockID.JUNGLE_WOOD_STAIRS, "Jungle wood stairs", "junglestairs", "junglewoodstairs"); + JUNGLE_WOOD_STAIRS(BlockID.JUNGLE_WOOD_STAIRS, "Jungle wood stairs", "junglestairs", "junglewoodstairs"), + COMMAND_BLOCK(BlockID.COMMAND_BLOCK, "Command block", "commandblock", "cmdblock", "command", "cmd"), + BEACON(BlockID.BEACON, "Beacon", "beacon", "beaconblock"), + COBBLESTONE_WALL(BlockID.COBBLESTONE_WALL, "Cobblestone wall", "cobblestonewall", "cobblewall"), + FLOWER_POT(BlockID.FLOWER_POT, "Flower pot", "flowerpot", "plantpot", "pot"), + CARROTS(BlockID.CARROTS, "Carrots", "carrots", "carrotsplant", "carrotsblock"), + POTATOES(BlockID.POTATOES, "Potatoes", "patatoes", "potatoesblock"), + WOODEN_BUTTON(BlockID.WOODEN_BUTTON, "Wooden button", "woodbutton", "woodenbutton"), + HEAD(BlockID.HEAD, "Head", "head", "headmount", "mount"), + ANVIL(BlockID.ANVIL, "Anvil", "anvil", "blacksmith"); /** * Stores a map of the IDs for fast access. diff --git a/src/main/java/com/sk89q/worldedit/blocks/ItemID.java b/src/main/java/com/sk89q/worldedit/blocks/ItemID.java index 66ea730d5..987821b86 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/ItemID.java +++ b/src/main/java/com/sk89q/worldedit/blocks/ItemID.java @@ -158,6 +158,19 @@ public final class ItemID { public static final int BOOK_AND_QUILL = 386; public static final int WRITTEN_BOOK = 387; public static final int EMERALD = 388; + public static final int ITEM_FRAME = 389; + public static final int FLOWER_POT = 390; + public static final int CARROT = 391; + public static final int POTATO = 392; + public static final int BAKED_POTATO = 393; + public static final int POISONOUS_POTATO = 394; + public static final int BLANK_MAP = 395; + public static final int GOLDEN_CARROT = 396; + public static final int HEAD = 397; + public static final int CARROT_ON_A_STICK = 398; + public static final int NETHER_STAR = 399; + public static final int PUMPKIN_PIE = 400; + @Deprecated public static final int GOLD_RECORD = 2256; // deprecated, but leave it there @Deprecated public static final int GREEN_RECORD = 2257; // deprecated, but leave it there public static final int DISC_13 = 2256; diff --git a/src/main/java/com/sk89q/worldedit/blocks/ItemType.java b/src/main/java/com/sk89q/worldedit/blocks/ItemType.java index 848d0f8dc..42ee0df49 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/ItemType.java +++ b/src/main/java/com/sk89q/worldedit/blocks/ItemType.java @@ -19,11 +19,11 @@ package com.sk89q.worldedit.blocks; +import java.util.EnumSet; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -import java.util.HashMap; -import java.util.EnumSet; import java.util.Set; import com.sk89q.util.StringUtil; @@ -172,6 +172,15 @@ public enum ItemType { SPRUCE_WOOD_STAIRS(BlockID.SPRUCE_WOOD_STAIRS, "Spruce wood stairs", "sprucestairs", "sprucewoodstairs"), BIRCH_WOOD_STAIRS(BlockID.BIRCH_WOOD_STAIRS, "Birch wood stairs", "birchstairs", "birchwoodstairs"), JUNGLE_WOOD_STAIRS(BlockID.JUNGLE_WOOD_STAIRS, "Jungle wood stairs", "junglestairs", "junglewoodstairs"), + COMMAND_BLOCK(BlockID.COMMAND_BLOCK, "Command block", "commandblock", "cmdblock", "command", "cmd"), + BEACON(BlockID.BEACON, "Beacon", "beacon", "beaconblock"), + COBBLESTONE_WALL(BlockID.COBBLESTONE_WALL, "Cobblestone wall", "cobblestonewall", "cobblewall"), + FLOWER_POT_BLOCK(BlockID.FLOWER_POT, "Flower pot", "flowerpot", "plantpot", "pot", "flowerpotblock"), + CARROTS_BLOCK(BlockID.CARROTS, "Carrots", "carrots", "carrotsplant", "carrotsblock"), + POTATOES_BLOCK(BlockID.POTATOES, "Potatoes", "patatoes", "potatoesblock"), + WOODEN_BUTTON(BlockID.WOODEN_BUTTON, "Wooden button", "woodbutton", "woodenbutton"), + HEAD_BLOCK(BlockID.HEAD, "Head", "head", "headmount", "mount", "headblock", "mountblock"), + ANVIL(BlockID.ANVIL, "Anvil", "anvil", "blacksmith"), // Items IRON_SHOVEL(ItemID.IRON_SHOVEL, "Iron shovel", "ironshovel"), @@ -307,6 +316,18 @@ public enum ItemType { BOOK_AND_QUILL(ItemID.BOOK_AND_QUILL, "Book and Quill", "bookandquill", "quill", "writingbook"), WRITTEN_BOOK(ItemID.WRITTEN_BOOK, "Written Book", "writtenbook"), EMERALD(ItemID.EMERALD, "Emerald", "emeraldingot", "emerald"), + ITEM_FRAME(ItemID.ITEM_FRAME, "Item frame", "itemframe", "frame", "itempainting"), + FLOWER_POT(ItemID.FLOWER_POT, "Flower pot", "flowerpot", "plantpot", "pot"), + CARROT(ItemID.CARROT, "Carrot", "carrot"), + POTATO(ItemID.POTATO, "Potato", "potato"), + BAKED_POTATO(ItemID.BAKED_POTATO, "Baked potato", "bakedpotato", "potatobaked"), + POISONOUS_POTATO(ItemID.POISONOUS_POTATO, "Poisonous potato", "poisonpotato", "poisonouspotato"), + BLANK_MAP(ItemID.BLANK_MAP, "Blank map", "blankmap", "emptymap"), + GOLDEN_CARROT(ItemID.GOLDEN_CARROT, "Golden carrot", "goldencarrot", "goldcarrot"), + HEAD(ItemID.HEAD, "Head", "head", "headmount", "mount"), + CARROT_ON_A_STICK(ItemID.CARROT_ON_A_STICK, "Carrot on a stick", "carrotonastick", "carrotonstick", "stickcarrot", "carrotstick"), + NETHER_STAR(ItemID.NETHER_STAR, "Nether star", "netherstar", "starnether"), + PUMPKIN_PIE(ItemID.PUMPKIN_PIE, "Pumpkin pie", "pumpkinpie"), DISC_13(ItemID.DISC_13, "Music Disc - 13", "disc_13"), DISC_CAT(ItemID.DISC_CAT, "Music Disc - Cat", "disc_cat"), DISC_BLOCKS(ItemID.DISC_BLOCKS, "Music Disc - blocks", "disc_blocks"),