diff --git a/src/com/sk89q/worldedit/blocks/BlockID.java b/src/com/sk89q/worldedit/blocks/BlockID.java index d951eed67..e62b94434 100644 --- a/src/com/sk89q/worldedit/blocks/BlockID.java +++ b/src/com/sk89q/worldedit/blocks/BlockID.java @@ -52,6 +52,9 @@ public final class BlockID { public static final int SANDSTONE = 24; public static final int NOTE_BLOCK = 25; public static final int BED = 26; + public static final int POWERED_RAIL = 27; + public static final int DETECTOR_RAIL = 28; + public static final int WEB = 30; public static final int CLOTH = 35; public static final int YELLOW_FLOWER = 37; public static final int RED_FLOWER = 38; @@ -112,4 +115,5 @@ public final class BlockID { public static final int CAKE_BLOCK = 92; public static final int REDSTONE_REPEATER_OFF = 93; public static final int REDSTONE_REPEATER_ON = 94; + public static final int LOCKED_CHEST = 95; } diff --git a/src/com/sk89q/worldedit/blocks/BlockType.java b/src/com/sk89q/worldedit/blocks/BlockType.java index dd2c9d5e0..94f844219 100644 --- a/src/com/sk89q/worldedit/blocks/BlockType.java +++ b/src/com/sk89q/worldedit/blocks/BlockType.java @@ -35,27 +35,33 @@ public enum BlockType { DIRT(3, "Dirt", "dirt"), COBBLESTONE(4, "Cobblestone", new String[] {"cobblestone", "cobble"}), WOOD(5, "Wood", new String[] {"wood", "woodplank", "plank", "woodplanks", "planks"}), - SAPLING(6, "Sapling", new String[] {"tree", "sapling"}), + SAPLING(6, "Sapling", "sapling"), BEDROCK(7, "Bedrock", new String[] {"adminium", "bedrock"}), WATER(8, "Water", new String[] {"watermoving", "movingwater"}), - STATIONARY_WATER(9, "Water (stationary)", new String[] {"water", "waterstationary", "stationarywater"}), + STATIONARY_WATER(9, "Water (stationary)", + new String[] {"water", "waterstationary", "stationarywater", "stillwater"}), LAVA(10, "Lava", new String[] {"lavamoving", "movinglava"}), - STATIONARY_LAVA(11, "Lava (stationary)", new String[] {"lava", "lavastationary", "stationarylava"}), + STATIONARY_LAVA(11, "Lava (stationary)", + new String[] {"lava", "lavastationary", "stationarylava", "stilllava"}), SAND(12, "Sand", "sand"), GRAVEL(13, "Gravel", "gravel"), GOLD_ORE(14, "Gold ore", "goldore"), IRON_ORE(15, "Iron ore", "ironore"), COAL_ORE(16, "Coal ore", "coalore"), - LOG(17, "Log", new String[] {"log", "pine", "oak", "birch", "redwood"}), - LEAVES(18, "Leaves", new String[] {"leaves", "leaf", "tree"}), + LOG(17, "Log", new String[] {"log", "tree", "pine", "oak", "birch", "redwood"}), + LEAVES(18, "Leaves", new String[] {"leaves", "leaf"}), SPONGE(19, "Sponge", "sponge"), GLASS(20, "Glass", "glass"), - LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore"}), + LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore", "lapisore"}), LAPIS_LAZULI(22, "Lapis lazuli", new String[] {"lapislazuli", "lapislazuliblock", "bluerock"}), DISPENSER(23, "Dispenser", "dispenser"), SANDSTONE(24, "Sandstone", "sandstone"), NOTE_BLOCK(25, "Note block", new String[] {"musicblock", "noteblock", "note", "music", "instrument"}), BED(26, "Bed", "bed"), + POWERED_RAIL(27, "Powered Rail", + new String[] {"poweredrail", "boosterrail", "poweredtrack", "boostertrack"}), + DETECTOR_RAIL(28, "Detector Rail", "detectorrail"), + WEB(30, "Web", new String[] {"web", "spiderweb"}), CLOTH(35, "Wool", new String[] {"cloth", "wool"}), YELLOW_FLOWER(37, "Yellow flower", new String[] {"yellowflower", "flower"}), RED_FLOWER(38, "Red rose", new String[] {"redflower", "redrose", "rose"}), @@ -70,7 +76,7 @@ public enum BlockType { BOOKCASE(47, "Bookcase", new String[] {"bookshelf", "bookshelves"}), MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", new String[] {"mossycobblestone", "mossstone", "mossystone", - "mosscobble", "mossycobble", "moss", "mossy"}), + "mosscobble", "mossycobble", "moss", "mossy", "sossymobblecone"}), OBSIDIAN(49, "Obsidian", "obsidian"), TORCH(50, "Torch", "torch"), FIRE(51, "Fire", new String[] {"fire", "flame", "flames"}), @@ -83,9 +89,9 @@ public enum BlockType { DIAMOND_BLOCK(57, "Diamond block", new String[] {"diamond", "diamondblock"}), WORKBENCH(58, "Workbench", new String[] {"workbench", "table", "craftingtable"}), CROPS(59, "Crops", new String[] {"crops", "crop", "plant", "plants"}), - SOIL(60, "Soil", "soil"), + SOIL(60, "Soil", new String[] {"soil", "farmland"}), FURNACE(61, "Furnace", "furnace"), - BURNING_FURNACE(62, "Furnace (burning)", "burningfurnace"), + BURNING_FURNACE(62, "Furnace (burning)", new String[] {"burningfurnace", "litfurnace"}), SIGN_POST(63, "Sign post", new String[] {"sign", "signpost"}), WOODEN_DOOR(64, "Wooden door", new String[] {"wooddoor", "woodendoor", "door"}), LADDER(65, "Ladder", "ladder"), @@ -103,8 +109,9 @@ public enum BlockType { REDSTONE_ORE(73, "Redstone ore", "redstoneore"), GLOWING_REDSTONE_ORE(74, "Glowing redstone ore", "glowingredstoneore"), REDSTONE_TORCH_OFF(75, "Redstone torch (off)", - new String[] {"redstonetorch"," redstonetorchoff", "rstorch"}), - REDSTONE_TORCH_ON(76, "Redstone torch (on)", "redstonetorchon"), + new String[] {"redstonetorchoff", "rstorchoff"}), + REDSTONE_TORCH_ON(76, "Redstone torch (on)", + new String [] {"redstonetorch", "redstonetorchon", "rstorchon"}), STONE_BUTTON(77, "Stone Button", new String[] {"stonebutton", "button"}), SNOW(78, "Snow", "snow"), ICE(79, "Ice", "ice"), @@ -126,8 +133,8 @@ public enum BlockType { JACK_O_LANTERN(91, "Pumpkin (on)", 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_OFF(93, "Redstone repeater (off)", new String[] {"diodeoff", "redstonerepeater", "repeater", "delayer"}), + REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diode", "diodeon", "redstonerepeateron", "repeateron", "delayeron"}), LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}); /** @@ -160,6 +167,10 @@ public enum BlockType { blockDrops.put(23, 23); blockDrops.put(24, 24); blockDrops.put(25, 25); + blockDrops.put(26, 355); + blockDrops.put(27, 27); + blockDrops.put(28, 28); + blockDrops.put(30, 30); blockDrops.put(35, 35); blockDrops.put(37, 37); blockDrops.put(38, 38); @@ -177,7 +188,7 @@ public enum BlockType { blockDrops.put(53, 53); blockDrops.put(54, 54); blockDrops.put(55, 331); - blockDrops.put(56, 56); + blockDrops.put(56, 264); blockDrops.put(57, 57); blockDrops.put(58, 58); blockDrops.put(59, 295); @@ -199,17 +210,22 @@ public enum BlockType { blockDrops.put(75, 76); blockDrops.put(76, 76); blockDrops.put(77, 77); + blockDrops.put(78, 332); blockDrops.put(80, 80); blockDrops.put(81, 81); blockDrops.put(82, 82); - blockDrops.put(83, 83); + blockDrops.put(83, 338); blockDrops.put(84, 84); blockDrops.put(85, 85); blockDrops.put(86, 86); blockDrops.put(87, 87); blockDrops.put(88, 88); - blockDrops.put(89, 248); + blockDrops.put(89, 348); blockDrops.put(91, 91); + blockDrops.put(92, 354); + blockDrops.put(93, 356); + blockDrops.put(94, 356); + blockDrops.put(95, 95); } /** @@ -315,6 +331,8 @@ public boolean shouldPlaceLast() { public static boolean shouldPlaceLast(int id) { return id == 6 // Saplings || id == 26 // Beds + || id == 27 // Powered rails + || id == 28 // Detector rails || id == 37 // Yellow flower || id == 38 // Red flower || id == 39 // Brown mushroom @@ -338,7 +356,10 @@ public static boolean shouldPlaceLast(int id) { || id == 78 // Snow || id == 81 // Cactus || id == 83 // Reed - || id == 90; // Portal + || id == 90 // Portal + || id == 92 // Cake + || id == 93 // Repeater (off) + || id == 94; // Repeater (on) } /** @@ -352,6 +373,9 @@ public static boolean canPassThrough(int id) { || id == 8 // Water || id == 9 // Water || id == 6 // Saplings + || id == 27 // Powered rails + || id == 28 // Detector rails + || id == 30 // Web <- someone will hate me for this || id == 37 // Yellow flower || id == 38 // Red flower || id == 39 // Brown mushroom @@ -372,7 +396,9 @@ public static boolean canPassThrough(int id) { || id == 77 // Stone button || id == 78 // Snow || id == 83 // Reed - || id == 90; // Portal + || id == 90 // Portal + || id == 93 // Diode (off) + || id == 94; // Diode (on) } /** @@ -390,7 +416,10 @@ public static boolean usesData(int id) { || id == 17 // Wood || id == 18 // Leaves || id == 23 // Dispenser + || id == 25 // Note Block || id == 26 // Bed + || id == 27 // Powered rails + || id == 28 // Detector rails || id == 35 // Wool || id == 43 // Double slab || id == 44 // Slab @@ -442,7 +471,9 @@ public static boolean isContainerBlock(int id) { * @return */ public static boolean isRedstoneBlock(int id) { - return id == 69 // Lever + return id == 27 // Powered rail + || id == 28 // Detector rail + || id == 69 // Lever || id == 70 // Stone pressure plate || id == 72 // Wood pressure plate || id == 76 // Redstone torch @@ -450,7 +481,43 @@ public static boolean isRedstoneBlock(int id) { || id == 77 // Stone button || id == 55 // Redstone wire || id == 64 // Wooden door - || id == 71; // Iron door + || id == 71 // Iron door + || id == 46 // TNT + || id == 23 // Dispenser + || id == 25 // Note block + || id == 93 // Diode (off) + || id == 94; // Diode (on) + } + + /** + * Returns true if a block can transfer redstone. + * Made this since isRedstoneBlock was getting big. + * + * @param id + * @return + */ + public static boolean canTransferRedstone(int id) { + return id == 75 // Redstone torch (off) + || id == 76 // Redstone torch (on) + || id == 55 // Redstone wire + || id == 93 // Diode (off) + || id == 94; // Diode (on) + } + + /** + * Yay for convenience methods. + * + * @param id + * @return + */ + public static boolean isRedstoneSource(int id) { + return id == 28 // Detector rail + || id == 75 // Redstone torch (off) + || id == 76 // Redstone torch (on) + || id == 69 // Lever + || id == 70 // Stone plate + || id == 72 // Wood plate + || id == 77; // Button } /** @@ -468,4 +535,4 @@ public static int getDroppedBlock(int id) { } return dropped; } -} \ No newline at end of file +} diff --git a/src/com/sk89q/worldedit/blocks/ItemType.java b/src/com/sk89q/worldedit/blocks/ItemType.java index fa2b19c07..7905524ea 100644 --- a/src/com/sk89q/worldedit/blocks/ItemType.java +++ b/src/com/sk89q/worldedit/blocks/ItemType.java @@ -29,33 +29,40 @@ * @author sk89q */ public enum ItemType { + // Blocks AIR(0, "Air", "air"), STONE(1, "Stone", new String[] {"stone", "rock"}), GRASS(2, "Grass", "grass"), DIRT(3, "Dirt", "dirt"), COBBLESTONE(4, "Cobblestone", new String[] {"cobblestone", "cobble"}), WOOD(5, "Wood", new String[] {"wood", "woodplank", "plank", "woodplanks", "planks"}), - SAPLING(6, "Sapling", new String[] {"tree", "sapling"}), + SAPLING(6, "Sapling", "sapling"), BEDROCK(7, "Bedrock", new String[] {"adminium", "bedrock"}), WATER(8, "Water", new String[] {"watermoving", "movingwater"}), - STATIONARY_WATER(9, "Water (stationary)", new String[] {"water", "waterstationary", "stationarywater"}), + STATIONARY_WATER(9, "Water (stationary)", + new String[] {"water", "waterstationary", "stationarywater", "stillwater"}), LAVA(10, "Lava", new String[] {"lavamoving", "movinglava"}), - STATIONARY_LAVA(11, "Lava (stationary)", new String[] {"lava", "lavastationary", "stationarylava"}), + STATIONARY_LAVA(11, "Lava (stationary)", + new String[] {"lava", "lavastationary", "stationarylava", "stilllava"}), SAND(12, "Sand", "sand"), GRAVEL(13, "Gravel", "gravel"), GOLD_ORE(14, "Gold ore", "goldore"), IRON_ORE(15, "Iron ore", "ironore"), COAL_ORE(16, "Coal ore", "coalore"), - LOG(17, "Log", new String[] {"log", "pine", "oak", "birch", "redwood"}), - LEAVES(18, "Leaves", new String[] {"leaves", "leaf", "tree"}), + LOG(17, "Log", new String[] {"log", "tree", "pine", "oak", "birch", "redwood"}), + LEAVES(18, "Leaves", new String[] {"leaves", "leaf"}), SPONGE(19, "Sponge", "sponge"), GLASS(20, "Glass", "glass"), - LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore"}), + LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore", "lapisore"}), LAPIS_LAZULI(22, "Lapis lazuli", new String[] {"lapislazuli", "lapislazuliblock", "bluerock"}), DISPENSER(23, "Dispenser", "dispenser"), SANDSTONE(24, "Sandstone", "sandstone"), NOTE_BLOCK(25, "Note block", new String[] {"musicblock", "noteblock", "note", "music", "instrument"}), BED(26, "Bed", "bed"), + POWERED_RAIL(27, "Powered Rail", + new String[] {"poweredrail", "boosterrail", "poweredtrack", "boostertrack"}), + DETECTOR_RAIL(28, "Detector Rail", "detectorrail"), + WEB(30, "Web", new String[] {"web", "spiderweb"}), CLOTH(35, "Wool", new String[] {"cloth", "wool"}), YELLOW_FLOWER(37, "Yellow flower", new String[] {"yellowflower", "flower"}), RED_FLOWER(38, "Red rose", new String[] {"redflower", "redrose", "rose"}), @@ -70,7 +77,7 @@ public enum ItemType { BOOKCASE(47, "Bookcase", new String[] {"bookshelf", "bookshelves"}), MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", new String[] {"mossycobblestone", "mossstone", "mossystone", - "mosscobble", "mossycobble", "moss", "mossy"}), + "mosscobble", "mossycobble", "moss", "mossy", "sossymobblecone"}), OBSIDIAN(49, "Obsidian", "obsidian"), TORCH(50, "Torch", "torch"), FIRE(51, "Fire", new String[] {"fire", "flame", "flames"}), @@ -83,9 +90,9 @@ public enum ItemType { DIAMOND_BLOCK(57, "Diamond block", new String[] {"diamond", "diamondblock"}), WORKBENCH(58, "Workbench", new String[] {"workbench", "table", "craftingtable"}), CROPS(59, "Crops", new String[] {"crops", "crop", "plant", "plants"}), - SOIL(60, "Soil", "soil"), + SOIL(60, "Soil", new String[] {"soil", "farmland"}), FURNACE(61, "Furnace", "furnace"), - BURNING_FURNACE(62, "Furnace (burning)", "burningfurnace"), + BURNING_FURNACE(62, "Furnace (burning)", new String[] {"burningfurnace", "litfurnace"}), SIGN_POST(63, "Sign post", new String[] {"sign", "signpost"}), WOODEN_DOOR(64, "Wooden door", new String[] {"wooddoor", "woodendoor", "door"}), LADDER(65, "Ladder", "ladder"), @@ -103,8 +110,9 @@ public enum ItemType { REDSTONE_ORE(73, "Redstone ore", "redstoneore"), GLOWING_REDSTONE_ORE(74, "Glowing redstone ore", "glowingredstoneore"), REDSTONE_TORCH_OFF(75, "Redstone torch (off)", - new String[] {"redstonetorch"," redstonetorchoff", "rstorch"}), - REDSTONE_TORCH_ON(76, "Redstone torch (on)", "redstonetorchon"), + new String[] {"redstonetorchoff", "rstorchoff"}), + REDSTONE_TORCH_ON(76, "Redstone torch (on)", + new String [] {"redstonetorch", "redstonetorchon", "rstorchon"}), STONE_BUTTON(77, "Stone Button", new String[] {"stonebutton", "button"}), SNOW(78, "Snow", "snow"), ICE(79, "Ice", "ice"), @@ -115,10 +123,10 @@ public enum ItemType { JUKEBOX(84, "Jukebox", new String[] {"jukebox", "stereo", "recordplayer"}), FENCE(85, "Fence", "fence"), PUMPKIN(86, "Pumpkin", "pumpkin"), - NETHERRACK(87, "Netherrack", + NETHERRACK(87, "Netherrack", new String[] {"redmossycobblestone", "redcobblestone", "redmosstone", "redcobble", "netherstone", "netherrack", "nether", "hellstone"}), - SOUL_SAND(88, "Soul sand", + SOUL_SAND(88, "Soul sand", new String[] {"slowmud", "mud", "soulsand", "hellmud"}), GLOWSTONE(89, "Glowstone", new String[] {"brittlegold", "glowstone", "lightstone", "brimstone", "australium"}), @@ -126,10 +134,11 @@ public enum ItemType { JACK_O_LANTERN(91, "Pumpkin (on)", 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_OFF(93, "Redstone repeater (off)", new String[] {"diodeoff", "redstonerepeater", "repeater", "delayer"}), + REDSTONE_REPEATER_ON(94, "Redstone repeater (on)", new String[] {"diode", "diodeon", "redstonerepeateron", "repeateron", "delayeron"}), LOCKED_CHEST(95, "Locked chest", new String[] {"lockedchest", "steveco", "supplycrate", "valveneedstoworkonep3nottf2kthx"}), - + + // Items IRON_SHOVEL(256, "Iron shovel", "ironshovel"), IRON_PICK(257, "Iron pick", new String[] {"ironpick", "ironpickaxe"}), IRON_AXE(258, "Iron axe", "ironaxe"), @@ -158,14 +167,14 @@ public enum ItemType { DIAMOND_AXE(279, "Diamond axe", "diamondaxe"), STICK(280, "Stick", "stick"), BOWL(281, "Bowl", "bowl"), - MUSHROOM_SOUP(282, "Mushroom soup", "mushroomsoup"), + MUSHROOM_SOUP(282, "Mushroom soup", new String[] {"mushroomsoup", "soup", "brbsoup"}), GOLD_SWORD(283, "Golden sword", "goldsword"), GOLD_SHOVEL(284, "Golden shovel", "goldshovel"), GOLD_PICKAXE(285, "Golden pickaxe", new String[] {"goldpick", "goldpickaxe"}), GOLD_AXE(286, "Golden axe", "goldaxe"), STRING(287, "String", "string"), FEATHER(288, "Feather", "feather"), - SULPHUR(289, "Sulphur", new String[] {"sulphur", "gunpowder"}), + SULPHUR(289, "Sulphur", new String[] {"sulphur", "sulfur", "gunpowder"}), WOOD_HOE(290, "Wooden hoe", "woodhoe"), STONE_HOE(291, "Stone hoe", "stonehoe"), IRON_HOE(292, "Iron hoe", "ironhoe"), @@ -203,9 +212,9 @@ public enum ItemType { GOLD_APPLE(322, "Golden apple", new String[] {"goldapple", "goldenapple"}), SIGN(323, "Wooden sign", "sign"), WOODEN_DOOR_ITEM(324, "Wooden door", new String[] {"wooddoor", "door"}), - BUCKET(325, "Bucket", "bucket"), - WATER_BUCKET(326, "Water bucket", "waterbucket"), - LAVA_BUCKET(327, "Lava bucket", "lavabucket"), + BUCKET(325, "Bucket", new String[] {"bucket", "bukkit"}), + WATER_BUCKET(326, "Water bucket", new String[] {"waterbucket", "waterbukkit"}), + LAVA_BUCKET(327, "Lava bucket", new String[] {"lavabucket", "lavabukkit"}), MINECART(328, "Minecart", new String[] {"minecart", "cart"}), SADDLE(329, "Saddle", "saddle"), IRON_DOOR_ITEM(330, "Iron door", "irondoor"), @@ -213,7 +222,7 @@ public enum ItemType { SNOWBALL(332, "Snowball", "snowball"), WOOD_BOAT(333, "Wooden boat", new String[] {"woodboat", "woodenboat", "boat"}), LEATHER(334, "Leather", new String[] {"leather", "cowhide"}), - MILK_BUCKET(335, "Milk bucket", new String[] {"milkbucket", "milk"}), + MILK_BUCKET(335, "Milk bucket", new String[] {"milkbucket", "milk", "milkbukkit"}), BRICK_BAR(336, "Brick", "brick"), CLAY_BALL(337, "Clay", "clay"), SUGAR_CANE_ITEM(338, "Sugar cane", new String[] {"sugarcane", "reed", "reeds"}), @@ -231,7 +240,7 @@ public enum ItemType { "brittlegolddust", "brimstonedust"}), RAW_FISH(349, "Raw fish", new String[] {"rawfish", "fish"}), COOKED_FISH(350, "Cooked fish", "cookedfish"), - INK_SACK(351, "Ink sac", new String[] {"inksac", "ink", "dye"}), + INK_SACK(351, "Ink sac", new String[] {"inksac", "ink", "dye", "inksack"}), BONE(352, "Bone", "bone"), SUGAR(353, "Sugar", "sugar"), CAKE_ITEM(354, "Cake", "cake"), @@ -383,7 +392,9 @@ public static boolean shouldNotStack(int id) { || (id >= 298 && id <= 317) || (id >= 325 && id <= 327) || id == 335 - || id == 346; + || id == 354 + || id == 355 + || id >= 2256; } /** @@ -397,4 +408,4 @@ public static boolean usesDamageValue(int id) { return id == 35 || id == 351; } -} \ No newline at end of file +}