From a3a60921136c95a758e3eb00740c380fe2634fe7 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 1 Apr 2011 16:23:44 -0700 Subject: [PATCH] Updated for Minecraft 1.4. --- src/com/sk89q/worldedit/EditSession.java | 2 +- src/com/sk89q/worldedit/blocks/BlockType.java | 3 ++- src/com/sk89q/worldedit/blocks/ItemType.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/sk89q/worldedit/EditSession.java b/src/com/sk89q/worldedit/EditSession.java index 5f2ee4f8c..5d871d538 100755 --- a/src/com/sk89q/worldedit/EditSession.java +++ b/src/com/sk89q/worldedit/EditSession.java @@ -150,7 +150,7 @@ public class EditSession { } // No invalid blocks - if ((type > 26 && type < 35) || type == 36 || type > 94) { + if ((type > 26 && type < 35) || type == 36 || type > 95) { return false; } diff --git a/src/com/sk89q/worldedit/blocks/BlockType.java b/src/com/sk89q/worldedit/blocks/BlockType.java index 2ce0d47ac..dd2c9d5e0 100644 --- a/src/com/sk89q/worldedit/blocks/BlockType.java +++ b/src/com/sk89q/worldedit/blocks/BlockType.java @@ -127,7 +127,8 @@ public enum BlockType { new String[] {"pumpkinlighted", "pumpkinon", "litpumpkin", "jackolantern"}), CAKE(92, "Cake", new String[] {"cake", "cakeblock"}), REDSTONE_REPEATER_OFF(93, "Redstone repeater (off)", new String[] {"diode", "redstonerepeater", "repeater", "delayer"}), - REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diodeon", "redstonerepeateron", "repeateron", "delayeron"}); + REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diodeon", "redstonerepeateron", "repeateron", "delayeron"}), + LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}); /** * Stores a list of dropped blocks for blocks. diff --git a/src/com/sk89q/worldedit/blocks/ItemType.java b/src/com/sk89q/worldedit/blocks/ItemType.java index 6dfaec492..fa2b19c07 100644 --- a/src/com/sk89q/worldedit/blocks/ItemType.java +++ b/src/com/sk89q/worldedit/blocks/ItemType.java @@ -128,6 +128,7 @@ public enum ItemType { CAKE(92, "Cake", new String[] {"cake", "cakeblock"}), REDSTONE_REPEATER_OFF(93, "Redstone repeater (off)", new String[] {"diode", "redstonerepeater", "repeater", "delayer"}), REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diodeon", "redstonerepeateron", "repeateron", "delayeron"}), + LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}), IRON_SHOVEL(256, "Iron shovel", "ironshovel"), IRON_PICK(257, "Iron pick", new String[] {"ironpick", "ironpickaxe"}), @@ -236,6 +237,7 @@ public enum ItemType { CAKE_ITEM(354, "Cake", "cake"), BED_ITEM(355, "Bed", "bed"), REDSTONE_REPEATER(356, "Redstone repeater", new String[] {"redstonerepeater", "diode", "delayer"}), + COOKIE(357, "Cookie", "cookie"), GOLD_RECORD(2256, "Gold Record", new String[] {"goldrecord", "golddisc"}), GREEN_RECORD(2257, "Green Record", new String[] {"greenrecord", "greenddisc"});