From 29e823d1360ee441bb10a9ba6b0d14e45bc11af0 Mon Sep 17 00:00:00 2001 From: zml2008 Date: Fri, 19 Oct 2012 17:01:45 -0700 Subject: [PATCH] Added some more aliases for 1.3 blocks --- src/main/java/com/sk89q/worldedit/blocks/BlockID.java | 1 + src/main/java/com/sk89q/worldedit/blocks/BlockType.java | 4 ++-- src/main/java/com/sk89q/worldedit/blocks/ItemType.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockID.java b/src/main/java/com/sk89q/worldedit/blocks/BlockID.java index 55bc6a1c2..b496389ab 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BlockID.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BlockID.java @@ -79,6 +79,7 @@ public final class BlockID { public static final int FIRE = 51; public static final int MOB_SPAWNER = 52; public static final int WOODEN_STAIRS = 53; + public static final int OAK_WOOD_STAIRS = 53; public static final int CHEST = 54; public static final int REDSTONE_WIRE = 55; public static final int DIAMOND_ORE = 56; diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockType.java b/src/main/java/com/sk89q/worldedit/blocks/BlockType.java index df5f28cbb..915c419dd 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BlockType.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BlockType.java @@ -167,8 +167,8 @@ public enum BlockType { EMERALD_ORE(BlockID.EMERALD_ORE, "Emerald ore", "emeraldore"), ENDER_CHEST(BlockID.ENDER_CHEST, "Ender chest", "enderchest"), TRIPWIRE_HOOK(BlockID.TRIPWIRE_HOOK, "Tripwire hook", "tripwirehook"), - TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire"), - EMERALD_BLOCK(BlockID.EMERALD_BLOCK, "Emerald block", "emeraldblock"), + TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire", "string"), + 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"); diff --git a/src/main/java/com/sk89q/worldedit/blocks/ItemType.java b/src/main/java/com/sk89q/worldedit/blocks/ItemType.java index c572c3fbd..e058fc63c 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/ItemType.java +++ b/src/main/java/com/sk89q/worldedit/blocks/ItemType.java @@ -167,8 +167,8 @@ public enum ItemType { EMERALD_ORE(BlockID.EMERALD_ORE, "Emerald ore", "emeraldore"), ENDER_CHEST(BlockID.ENDER_CHEST, "Ender chest", "enderchest"), TRIPWIRE_HOOK(BlockID.TRIPWIRE_HOOK, "Tripwire hook", "tripwirehook"), - TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire"), - EMERALD_BLOCK(BlockID.EMERALD_BLOCK, "Emerald block", "emeraldblock"), + TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire", "string"), + 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"), @@ -306,7 +306,7 @@ public enum ItemType { FIRE_CHARGE(ItemID.FIRE_CHARGE, "Fire Charge", "firecharge", "firestarter", "firerock"), 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", "emerald"), + EMERALD(ItemID.EMERALD, "Emerald", "emeraldingot", "emerald"), 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"),