From 465161145b0424d7bb6ebe24cd48813c962a251b Mon Sep 17 00:00:00 2001 From: wizjany Date: Wed, 23 Nov 2016 18:14:17 -0500 Subject: [PATCH] Add new blocks and items to lookups. --- .../com/sk89q/worldedit/blocks/BlockID.java | 17 +++++++++++++++++ .../com/sk89q/worldedit/blocks/BlockType.java | 15 +++++++++++++++ .../java/com/sk89q/worldedit/blocks/ItemID.java | 2 ++ .../com/sk89q/worldedit/blocks/ItemType.java | 17 +++++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockID.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockID.java index a3e558f9e..89d53fdef 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockID.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockID.java @@ -247,6 +247,23 @@ public final class BlockID { public static final int RED_NETHER_BRICK = 215; public static final int BONE_BLOCK = 216; public static final int STRUCTURE_VOID = 217; + public static final int OBSERVER = 218; + public static final int SHULKER_BOX_WHITE = 219; + public static final int SHULKER_BOX_ORANGE = 220; + public static final int SHULKER_BOX_MAGENTA = 221; + public static final int SHULKER_BOX_LIGHT_BLUE = 222; + public static final int SHULKER_BOX_YELLOW = 223; + public static final int SHULKER_BOX_LIME = 224; + public static final int SHULKER_BOX_PINK = 225; + public static final int SHULKER_BOX_GRAY = 226; + public static final int SHULKER_BOX_LIGHT_GRAY = 227; + public static final int SHULKER_BOX_CYAN = 228; + public static final int SHULKER_BOX_PURPLE = 229; + public static final int SHULKER_BOX_BLUE = 230; + public static final int SHULKER_BOX_BROWN = 231; + public static final int SHULKER_BOX_GREEN = 232; + public static final int SHULKER_BOX_RED = 233; + public static final int SHULKER_BOX_BLACK = 234; public static final int STRUCTURE_BLOCK = 255; private BlockID() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java index 883808223..bfe64a9cf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java @@ -257,6 +257,21 @@ public enum BlockType { RED_NETHER_BRICK(BlockID.RED_NETHER_BRICK, "Red Nether Brick", "rednetherbrick", "netherbrickred"), BONE_BLOCK(BlockID.BONE_BLOCK, "Bone Block", "boneblock", "blockbone", "fossil", "fossilblock", "blockfossil"), STRUCTURE_VOID(BlockID.STRUCTURE_VOID, "Structure Void", "structurevoid", "structureair"), + OBSERVER(BlockID.OBSERVER, "Observer", "observer", "blockupdatedetector"), + SHULKER_BOX_MAGENTA(BlockID.SHULKER_BOX_MAGENTA, "Magenta Shulker Box", "shulkerboxmagenta"), + SHULKER_BOX_LIGHT_BLUE(BlockID.SHULKER_BOX_LIGHT_BLUE, "Light Blue Shulker Box", "shulkerboxlightblue"), + SHULKER_BOX_YELLOW(BlockID.SHULKER_BOX_YELLOW, "Yellow Shulker Box", "shulkerboxyellow"), + SHULKER_BOX_LIME(BlockID.SHULKER_BOX_LIME, "Lime Shulker Box", "shulkerboxlime"), + SHULKER_BOX_PINK(BlockID.SHULKER_BOX_PINK, "Pink Shulker Box", "shulkerboxpink"), + SHULKER_BOX_GRAY(BlockID.SHULKER_BOX_GRAY, "Gray Shulker Box", "shulkerboxgray"), + SHULKER_BOX_LIGHT_GRAY(BlockID.SHULKER_BOX_LIGHT_GRAY, "Light Gray Shulker Box", "shulkerboxlightgray"), + SHULKER_BOX_CYAN(BlockID.SHULKER_BOX_CYAN, "Cyan Shulker Box", "shulkerboxcyan"), + SHULKER_BOX_PURPLE(BlockID.SHULKER_BOX_PURPLE, "Purple Shulker Box", "shulkerboxpurple"), + SHULKER_BOX_BLUE(BlockID.SHULKER_BOX_BLUE, "Blue Shulker Box", "shulkerboxblue"), + SHULKER_BOX_BROWN(BlockID.SHULKER_BOX_BROWN, "Brown Shulker Box", "shulkerboxbrown"), + SHULKER_BOX_GREEN(BlockID.SHULKER_BOX_GREEN, "Green Shulker Box", "shulkerboxgreen"), + SHULKER_BOX_RED(BlockID.SHULKER_BOX_RED, "Red Shulker Box", "shulkerboxred"), + SHULKER_BOX_BLACK(BlockID.SHULKER_BOX_BLACK, "Black Shulker Box", "shulkerboxblack"), STRUCTURE_BLOCK(BlockID.STRUCTURE_BLOCK, "Structure Block", "structureblock"); /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemID.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemID.java index 50b0eebd7..f45d6f2ed 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemID.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemID.java @@ -209,6 +209,8 @@ public final class ItemID { public static final int JUNGLE_BOAT = 446; public static final int ACACIA_BOAT = 447; public static final int DARK_OAK_BOAT = 448; + public static final int TOTEM_OF_UNDYING = 449; + public static final int SHULKER_SHELL = 450; @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 diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemType.java index 0b59e0cc2..96426fa71 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ItemType.java @@ -229,6 +229,21 @@ public enum ItemType { RED_NETHER_BRICK(BlockID.RED_NETHER_BRICK, "Red Nether Brick", "rednetherbrick", "netherbrickred"), BONE_BLOCK(BlockID.BONE_BLOCK, "Bone Block", "boneblock", "blockbone", "fossil", "fossilblock", "blockfossil"), STRUCTURE_VOID(BlockID.STRUCTURE_VOID, "Structure Void", "structurevoid", "structureair"), + OBSERVER(BlockID.OBSERVER, "Observer", "observer", "blockupdatedetector"), + SHULKER_BOX_MAGENTA(BlockID.SHULKER_BOX_MAGENTA, "Magenta Shulker Box", "shulkerboxmagenta"), + SHULKER_BOX_LIGHT_BLUE(BlockID.SHULKER_BOX_LIGHT_BLUE, "Light Blue Shulker Box", "shulkerboxlightblue"), + SHULKER_BOX_YELLOW(BlockID.SHULKER_BOX_YELLOW, "Yellow Shulker Box", "shulkerboxyellow"), + SHULKER_BOX_LIME(BlockID.SHULKER_BOX_LIME, "Lime Shulker Box", "shulkerboxlime"), + SHULKER_BOX_PINK(BlockID.SHULKER_BOX_PINK, "Pink Shulker Box", "shulkerboxpink"), + SHULKER_BOX_GRAY(BlockID.SHULKER_BOX_GRAY, "Gray Shulker Box", "shulkerboxgray"), + SHULKER_BOX_LIGHT_GRAY(BlockID.SHULKER_BOX_LIGHT_GRAY, "Light Gray Shulker Box", "shulkerboxlightgray"), + SHULKER_BOX_CYAN(BlockID.SHULKER_BOX_CYAN, "Cyan Shulker Box", "shulkerboxcyan"), + SHULKER_BOX_PURPLE(BlockID.SHULKER_BOX_PURPLE, "Purple Shulker Box", "shulkerboxpurple"), + SHULKER_BOX_BLUE(BlockID.SHULKER_BOX_BLUE, "Blue Shulker Box", "shulkerboxblue"), + SHULKER_BOX_BROWN(BlockID.SHULKER_BOX_BROWN, "Brown Shulker Box", "shulkerboxbrown"), + SHULKER_BOX_GREEN(BlockID.SHULKER_BOX_GREEN, "Green Shulker Box", "shulkerboxgreen"), + SHULKER_BOX_RED(BlockID.SHULKER_BOX_RED, "Red Shulker Box", "shulkerboxred"), + SHULKER_BOX_BLACK(BlockID.SHULKER_BOX_BLACK, "Black Shulker Box", "shulkerboxblack"), STRUCTURE_BLOCK(BlockID.STRUCTURE_BLOCK, "Structure Block", "structureblock"), // Items @@ -417,6 +432,8 @@ public enum ItemType { JUNGLE_BOAT(ItemID.JUNGLE_BOAT, "Jungle Boat", "jungleboat", "boatjungle"), ACACIA_BOAT(ItemID.ACACIA_BOAT, "Acacia Boat", "acaciaboat", "boatacacia"), DARK_OAK_BOAT(ItemID.DARK_OAK_BOAT, "Dark Oak Boat", "darkoakboat", "boatdarkoak"), + TOTEM_OF_UNDYING(ItemID.TOTEM_OF_UNDYING, "Totem of Undying", "totemofundying", "undyingtotem"), + SHULKER_SHELL(ItemID.SHULKER_SHELL, "Shulker Shell", "shulkershell"), DISC_13(ItemID.DISC_13, "Music Disc - 13", "disc_13"), DISC_CAT(ItemID.DISC_CAT, "Music Disc - Cat", "disc_cat"),