From a6042e76f965ad589539b5b1347b8cc7d2152950 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 18 Feb 2011 17:46:26 -0800 Subject: [PATCH] Expanded block/item list. --- src/com/sk89q/worldedit/blocks/BlockType.java | 110 ++++++----- src/com/sk89q/worldedit/blocks/ItemType.java | 177 ++++++++++-------- 2 files changed, 159 insertions(+), 128 deletions(-) diff --git a/src/com/sk89q/worldedit/blocks/BlockType.java b/src/com/sk89q/worldedit/blocks/BlockType.java index 34b50968c..7460ab0f7 100644 --- a/src/com/sk89q/worldedit/blocks/BlockType.java +++ b/src/com/sk89q/worldedit/blocks/BlockType.java @@ -30,89 +30,101 @@ import java.util.EnumSet; */ public enum BlockType { AIR(0, "Air", "air"), - STONE(1, "Stone", new String[]{"stone", "rock"}), + 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", "wood"), - 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"}), - LAVA(10, "Lava", new String[]{"lavamoving", "movinglava"}), - STATIONARY_LAVA(11, "Lava (stationary)", new String[]{"lava", "lavastationary", "stationarylava"}), + COBBLESTONE(4, "Cobblestone", new String[] {"cobblestone", "cobble"}), + WOOD(5, "Wood", new String[] {"wood", "woodplank", "plank", "woodplanks", "planks"}), + SAPLING(6, "Sapling", new String[] {"tree", "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"}), + LAVA(10, "Lava", new String[] {"lavamoving", "movinglava"}), + STATIONARY_LAVA(11, "Lava (stationary)", new String[] {"lava", "lavastationary", "stationarylava"}), 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", "tree", "pine", "oak", "birch"}), - LEAVES(18, "Leaves", new String[]{"leaves", "leaf"}), + LOG(17, "Log", new String[] {"log", "pine", "oak", "birch", "redwood"}), + LEAVES(18, "Leaves", new String[] {"leaves", "leaf", "tree"}), SPONGE(19, "Sponge", "sponge"), GLASS(20, "Glass", "glass"), - LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[]{"lapislazuliore", "blueore"}), - LAPIS_LAZULI(22, "Lapis lazuli", new String[]{"lapislazuli", "lapislazuliblock", "blue", "bluerock"}), + LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore"}), + LAPIS_LAZULI(22, "Lapis lazuli", new String[] {"lapislazuli", "lapislazuliblock", "blue", "bluerock"}), DISPENSER(23, "Dispenser", "dispenser"), SANDSTONE(24, "Sandstone", "sandstone"), - NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}), - CLOTH(35, "Cloth", new String[]{"cloth", "wool"}), - YELLOW_FLOWER(37, "Yellow flower", new String[]{"yellowflower", "flower"}), - RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose", "rose"}), - BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}), + NOTE_BLOCK(25, "Note block", new String[] {"musicblock", "noteblock", "note", "music", "instrument"}), + 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"}), + BROWN_MUSHROOM(39, "Brown mushroom", new String[] {"brownmushroom", "mushroom"}), RED_MUSHROOM(40, "Red mushroom", "redmushroom"), - GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}), - IRON_BLOCK(42, "Iron block", new String[]{"iron", "ironblock"}), - DOUBLE_STEP(43, "Double step", new String[]{"doubleslab", "doublestoneslab", "doublestep"}), - STEP(44, "Step", new String[]{"slab", "stoneslab", "step"}), - BRICK(45, "Brick", new String[]{"brick", "brickblock"}), + GOLD_BLOCK(41, "Gold block", new String[] {"gold", "goldblock"}), + IRON_BLOCK(42, "Iron block", new String[] {"iron", "ironblock"}), + DOUBLE_STEP(43, "Double step", new String[] {"doubleslab", "doublestoneslab", "doublestep"}), + STEP(44, "Step", new String[] {"slab", "stoneslab", "step", "halfstep"}), + BRICK(45, "Brick", new String[] {"brick", "brickblock"}), TNT(46, "TNT", "tnt"), - BOOKCASE(47, "Bookcase", new String[]{"bookshelf", "bookshelves"}), - MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", new String[]{"mossycobblestone", "mossstone", "mossystone", "mosscobble", "mossycobble"}), + BOOKCASE(47, "Bookcase", new String[] {"bookshelf", "bookshelves"}), + MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", + new String[] {"mossycobblestone", "mossstone", "mossystone", + "mosscobble", "mossycobble", "moss", "mossy"}), OBSIDIAN(49, "Obsidian", "obsidian"), TORCH(50, "Torch", "torch"), - FIRE(51, "Fire", "fire"), - MOB_SPAWNER(52, "Mob spawner", "mobspawner"), - WOODEN_STAIRS(53, "Wooden stairs", new String[]{"woodstair", "woodstairs", "woodenstair", "woodenstairs"}), - CHEST(54, "Chest", "chest"), + FIRE(51, "Fire", new String[] {"fire", "flame", "flames"}), + MOB_SPAWNER(52, "Mob spawner", new String[] {"mobspawner", "spawner"}), + WOODEN_STAIRS(53, "Wooden stairs", + new String[] {"woodstair", "woodstairs", "woodenstair", "woodenstairs"}), + CHEST(54, "Chest", new String[] {"chest", "storage"}), REDSTONE_WIRE(55, "Redstone wire", "redstone"), DIAMOND_ORE(56, "Diamond ore", "diamondore"), - 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"}), + 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"), FURNACE(61, "Furnace", "furnace"), BURNING_FURNACE(62, "Furnace (burning)", "burningfurnace"), - SIGN_POST(63, "Sign post", new String[]{"sign", "signpost"}), - WOODEN_DOOR(64, "Wooden door", new String[]{"wooddoor", "woodendoor"}), + SIGN_POST(63, "Sign post", new String[] {"sign", "signpost"}), + WOODEN_DOOR(64, "Wooden door", new String[] {"wooddoor", "woodendoor", "door"}), LADDER(65, "Ladder", "ladder"), - MINECART_TRACKS(66, "Minecart tracks", new String[]{"track", "tracks", "minecrattrack", "minecarttracks"}), - COBBLESTONE_STAIRS(67, "Cobblestone stairs", new String[]{"cobblestonestair", "cobblestonestairs", "cobblestair", "cobblestairs"}), + MINECART_TRACKS(66, "Minecart tracks", + new String[] {"track", "tracks", "minecrattrack", "minecarttracks", "rails", "rail"}), + COBBLESTONE_STAIRS(67, "Cobblestone stairs", + new String[] {"cobblestonestair", "cobblestonestairs", "cobblestair", "cobblestairs"}), WALL_SIGN(68, "Wall sign", "wallsign"), - LEVER(69, "Lever", "lever"), - STONE_PRESSURE_PLATE(70, "Stone pressure plate", new String[]{"stonepressureplate", "stoneplate"}), + LEVER(69, "Lever", new String[] {"lever", "switch", "stonelever", "stoneswitch"}), + STONE_PRESSURE_PLATE(70, "Stone pressure plate", + new String[] {"stonepressureplate", "stoneplate"}), IRON_DOOR(71, "Iron Door", "irondoor"), - WOODEN_PRESSURE_PLATE(72, "Wooden pressure plate", new String[]{"woodpressureplate", "woodplate", "woodenpressureplate", "woodenplate"}), + WOODEN_PRESSURE_PLATE(72, "Wooden pressure plate", + new String[] {"woodpressureplate", "woodplate", "woodenpressureplate", "woodenplate"}), 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"}), + new String[] {"redstonetorch"," redstonetorchoff", "rstorch"}), REDSTONE_TORCH_ON(76, "Redstone torch (on)", "redstonetorchon"), - STONE_BUTTON(77, "Stone Button", "stonebutton"), + STONE_BUTTON(77, "Stone Button", new String[] {"stonebutton", "button"}), SNOW(78, "Snow", "snow"), ICE(79, "Ice", "ice"), SNOW_BLOCK(80, "Snow block", "snowblock"), - CACTUS(81, "Cactus", "cactus"), + CACTUS(81, "Cactus", new String[] {"cactus", "cacti"}), CLAY(82, "Clay", "clay"), - SUGAR_CANE(83, "Reed", new String[]{"reed", "cane", "sugarcane", "sugarcanes"}), - JUKEBOX(84, "Jukebox", "jukebox"), + SUGAR_CANE(83, "Reed", new String[] {"reed", "cane", "sugarcane", "sugarcanes"}), + JUKEBOX(84, "Jukebox", new String[] {"jukebox", "stereo", "recordplayer"}), FENCE(85, "Fence", "fence"), PUMPKIN(86, "Pumpkin", "pumpkin"), - NETHERRACK(87, "Netherrack", new String[]{"redmossycobblestone", "redcobblestone", "redmosstone", "redcobble", "netherstone", "netherrack", "nether"}), - SOUL_SAND(88, "Soul sand", new String[]{"slowmud", "slowsand", "mud", "soulsand"}), - GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}), + NETHERRACK(87, "Netherrack", + new String[] {"redmossycobblestone", "redcobblestone", "redmosstone", + "redcobble", "netherstone", "netherrack", "nether", "hellstone"}), + SOUL_SAND(88, "Soul sand", + new String[] {"slowmud", "mud", "soulsand", "hellmud"}), + GLOWSTONE(89, "Glowstone", + new String[] {"brittlegold", "glowstone", "lightstone", "brimstone", "australium"}), PORTAL(90, "Portal", "portal"), - JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}), - CAKE(92, "Cake", "cake"); + JACK_O_LANTERN(91, "Pumpkin (on)", + new String[] {"pumpkinlighted", "pumpkinon", "litpumpkin", "jackolantern"}), + CAKE(92, "Cake", new String[] {"cake", "cakeblock"}); /** * 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 04e6c43e2..49c5a8b42 100644 --- a/src/com/sk89q/worldedit/blocks/ItemType.java +++ b/src/com/sk89q/worldedit/blocks/ItemType.java @@ -30,94 +30,109 @@ import java.util.EnumSet; */ public enum ItemType { AIR(0, "Air", "air"), - STONE(1, "Stone", new String[]{"stone", "rock"}), + 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", "wood"), - 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"}), - LAVA(10, "Lava", new String[]{"lavamoving", "movinglava"}), - STATIONARY_LAVA(11, "Lava (stationary)", new String[]{"lava", "lavastationary", "stationarylava"}), + COBBLESTONE(4, "Cobblestone", new String[] {"cobblestone", "cobble"}), + WOOD(5, "Wood", new String[] {"wood", "woodplank", "plank", "woodplanks", "planks"}), + SAPLING(6, "Sapling", new String[] {"tree", "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"}), + LAVA(10, "Lava", new String[] {"lavamoving", "movinglava"}), + STATIONARY_LAVA(11, "Lava (stationary)", new String[] {"lava", "lavastationary", "stationarylava"}), 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", "tree", "pine", "oak", "birch"}), - LEAVES(18, "Leaves", new String[]{"leaves", "leaf"}), + LOG(17, "Log", new String[] {"log", "pine", "oak", "birch", "redwood"}), + LEAVES(18, "Leaves", new String[] {"leaves", "leaf", "tree"}), SPONGE(19, "Sponge", "sponge"), GLASS(20, "Glass", "glass"), - LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[]{"lapislazuliore", "blueore"}), - LAPIS_LAZULI(22, "Lapis lazuli", new String[]{"lapislazuli", "lapislazuliblock", "blue", "bluerock"}), + LAPIS_LAZULI_ORE(21, "Lapis lazuli ore", new String[] {"lapislazuliore", "blueore"}), + LAPIS_LAZULI(22, "Lapis lazuli", new String[] {"lapislazuli", "lapislazuliblock", "blue", "bluerock"}), DISPENSER(23, "Dispenser", "dispenser"), SANDSTONE(24, "Sandstone", "sandstone"), - NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}), - CLOTH(35, "Cloth", "cloth"), - YELLOW_FLOWER(37, "Yellow flower", new String[]{"yellowflower", "flower"}), - RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose", "rose"}), - BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}), + NOTE_BLOCK(25, "Note block", new String[] {"musicblock", "noteblock", "note", "music", "instrument"}), + 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"}), + BROWN_MUSHROOM(39, "Brown mushroom", new String[] {"brownmushroom", "mushroom"}), RED_MUSHROOM(40, "Red mushroom", "redmushroom"), - GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}), - IRON_BLOCK(42, "Iron block", new String[]{"iron", "ironblock"}), - DOUBLE_STEP(43, "Double step", new String[]{"doubleslab", "doublestoneslab", "doublestep"}), - STEP(44, "Step", new String[]{"slab", "stoneslab", "step"}), - BRICK(45, "Brick", new String[]{"brick", "brickblock"}), + GOLD_BLOCK(41, "Gold block", new String[] {"gold", "goldblock"}), + IRON_BLOCK(42, "Iron block", new String[] {"iron", "ironblock"}), + DOUBLE_STEP(43, "Double step", new String[] {"doubleslab", "doublestoneslab", "doublestep"}), + STEP(44, "Step", new String[] {"slab", "stoneslab", "step", "halfstep"}), + BRICK(45, "Brick", new String[] {"brick", "brickblock"}), TNT(46, "TNT", "tnt"), - BOOKCASE(47, "Bookcase", new String[]{"bookshelf", "bookshelves"}), - MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", new String[]{"mossycobblestone", "mossstone", "mossystone", "mosscobble", "mossycobble"}), + BOOKCASE(47, "Bookcase", new String[] {"bookshelf", "bookshelves"}), + MOSSY_COBBLESTONE(48, "Cobblestone (mossy)", + new String[] {"mossycobblestone", "mossstone", "mossystone", + "mosscobble", "mossycobble", "moss", "mossy"}), OBSIDIAN(49, "Obsidian", "obsidian"), TORCH(50, "Torch", "torch"), - FIRE(51, "Fire", "fire"), - MOB_SPAWNER(52, "Mob spawner", "mobspawner"), - WOODEN_STAIRS(53, "Wooden stairs", new String[]{"woodstair", "woodstairs", "woodenstair", "woodenstairs"}), - CHEST(54, "Chest", "chest"), + FIRE(51, "Fire", new String[] {"fire", "flame", "flames"}), + MOB_SPAWNER(52, "Mob spawner", new String[] {"mobspawner", "spawner"}), + WOODEN_STAIRS(53, "Wooden stairs", + new String[] {"woodstair", "woodstairs", "woodenstair", "woodenstairs"}), + CHEST(54, "Chest", new String[] {"chest", "storage"}), REDSTONE_WIRE(55, "Redstone wire", "redstone"), DIAMOND_ORE(56, "Diamond ore", "diamondore"), - 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"}), + 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"), FURNACE(61, "Furnace", "furnace"), BURNING_FURNACE(62, "Furnace (burning)", "burningfurnace"), - SIGN_POST(63, "Sign post", new String[]{"sign", "signpost"}), - WOODEN_DOOR(64, "Wooden door", new String[]{"wooddoor", "woodendoor"}), + SIGN_POST(63, "Sign post", new String[] {"sign", "signpost"}), + WOODEN_DOOR(64, "Wooden door", new String[] {"wooddoor", "woodendoor", "door"}), LADDER(65, "Ladder", "ladder"), - MINECART_TRACKS(66, "Minecart tracks", new String[]{"track", "tracks", "minecrattrack", "minecarttracks"}), - COBBLESTONE_STAIRS(67, "Cobblestone stairs", new String[]{"cobblestonestair", "cobblestonestairs", "cobblestair", "cobblestairs"}), + MINECART_TRACKS(66, "Minecart tracks", + new String[] {"track", "tracks", "minecrattrack", "minecarttracks", "rails", "rail"}), + COBBLESTONE_STAIRS(67, "Cobblestone stairs", + new String[] {"cobblestonestair", "cobblestonestairs", "cobblestair", "cobblestairs"}), WALL_SIGN(68, "Wall sign", "wallsign"), - LEVER(69, "Lever", "lever"), - STONE_PRESSURE_PLATE(70, "Stone pressure plate", new String[]{"stonepressureplate", "stoneplate"}), + LEVER(69, "Lever", new String[] {"lever", "switch", "stonelever", "stoneswitch"}), + STONE_PRESSURE_PLATE(70, "Stone pressure plate", + new String[] {"stonepressureplate", "stoneplate"}), IRON_DOOR(71, "Iron Door", "irondoor"), - WOODEN_PRESSURE_PLATE(72, "Wooden pressure plate", new String[]{"woodpressureplate", "woodplate", "woodenpressureplate", "woodenplate"}), + WOODEN_PRESSURE_PLATE(72, "Wooden pressure plate", + new String[] {"woodpressureplate", "woodplate", "woodenpressureplate", "woodenplate"}), 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"}), + new String[] {"redstonetorch"," redstonetorchoff", "rstorch"}), REDSTONE_TORCH_ON(76, "Redstone torch (on)", "redstonetorchon"), - STONE_BUTTON(77, "Stone Button", "stonebutton"), + STONE_BUTTON(77, "Stone Button", new String[] {"stonebutton", "button"}), SNOW(78, "Snow", "snow"), ICE(79, "Ice", "ice"), SNOW_BLOCK(80, "Snow block", "snowblock"), - CACTUS(81, "Cactus", "cactus"), + CACTUS(81, "Cactus", new String[] {"cactus", "cacti"}), CLAY(82, "Clay", "clay"), - SUGAR_CANE(83, "Reed", new String[]{"reed", "cane", "sugarcane", "sugarcanes"}), - JUKEBOX(84, "Jukebox", "jukebox"), + SUGAR_CANE(83, "Reed", new String[] {"reed", "cane", "sugarcane", "sugarcanes"}), + JUKEBOX(84, "Jukebox", new String[] {"jukebox", "stereo", "recordplayer"}), FENCE(85, "Fence", "fence"), PUMPKIN(86, "Pumpkin", "pumpkin"), - NETHERRACK(87, "Netherrack", new String[]{"redmossycobblestone", "redcobblestone", "redmosstone", "redcobble", "netherstone", "netherrack", "nether"}), - SOUL_SAND(88, "Soul sand", new String[]{"slowmud", "mud", "soulsand"}), - GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}), + NETHERRACK(87, "Netherrack", + new String[] {"redmossycobblestone", "redcobblestone", "redmosstone", + "redcobble", "netherstone", "netherrack", "nether", "hellstone"}), + SOUL_SAND(88, "Soul sand", + new String[] {"slowmud", "mud", "soulsand", "hellmud"}), + GLOWSTONE(89, "Glowstone", + new String[] {"brittlegold", "glowstone", "lightstone", "brimstone", "australium"}), PORTAL(90, "Portal", "portal"), - JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}), - CAKE(92, "Cake", "cake"), + JACK_O_LANTERN(91, "Pumpkin (on)", + new String[] {"pumpkinlighted", "pumpkinon", "litpumpkin", "jackolantern"}), + CAKE(92, "Cake", new String[] {"cake", "cakeblock"}), + IRON_SHOVEL(256, "Iron shovel", "ironshovel"), - IRON_PICK(257, "Iron pick", "ironpick"), + IRON_PICK(257, "Iron pick", new String[] {"ironpick", "ironpickaxe"}), IRON_AXE(258, "Iron axe", "ironaxe"), - FLINT_AND_TINDER(259, "Flint and tinder", "flintandtinder"), - RED_APPLE(260, "Red apple", "redapple"), + FLINT_AND_TINDER(259, "Flint and tinder", + new String[] {"flintandtinder", "lighter", "flintandsteel", "flintsteel", + "flintandiron", "flintnsteel", "flintniron", "flintntinder"}), + RED_APPLE(260, "Red apple", new String[] {"redapple", "apple"}), BOW(261, "Bow", "bow"), ARROW(262, "Arrow", "arrow"), COAL(263, "Coal", "coal"), @@ -127,32 +142,32 @@ public enum ItemType { IRON_SWORD(267, "Iron sword", "ironsword"), WOOD_SWORD(268, "Wooden sword", "woodsword"), WOOD_SHOVEL(269, "Wooden shovel", "woodshovel"), - WOOD_PICKAXE(270, "Wooden pickaxe", "woodpick"), + WOOD_PICKAXE(270, "Wooden pickaxe", new String[] {"woodpick", "woodpickaxe"}), WOOD_AXE(271, "Wooden axe", "woodaxe"), STONE_SWORD(272, "Stone sword", "stonesword"), STONE_SHOVEL(273, "Stone shovel", "stoneshovel"), - STONE_PICKAXE(274, "Stone pickaxe", "stonepick"), + STONE_PICKAXE(274, "Stone pickaxe", new String[] {"stonepick", "stonepickaxe"}), STONE_AXE(275, "Stone pickaxe", "stoneaxe"), DIAMOND_SWORD(276, "Diamond sword", "diamondsword"), DIAMOND_SHOVEL(277, "Diamond shovel", "diamondshovel"), - DIAMOND_PICKAXE(278, "Diamond pickaxe", "diamondpick"), + DIAMOND_PICKAXE(278, "Diamond pickaxe", new String[] {"diamondpick", "diamondpickaxe"}), DIAMOND_AXE(279, "Diamond axe", "diamondaxe"), STICK(280, "Stick", "stick"), BOWL(281, "Bowl", "bowl"), MUSHROOM_SOUP(282, "Mushroom soup", "mushroomsoup"), GOLD_SWORD(283, "Golden sword", "goldsword"), GOLD_SHOVEL(284, "Golden shovel", "goldshovel"), - GOLD_PICKAXE(285, "Golden pickaxe", "goldpick"), + 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", "sulphur"), + SULPHUR(289, "Sulphur", new String[] {"sulphur", "gunpowder"}), WOOD_HOE(290, "Wooden hoe", "woodhoe"), STONE_HOE(291, "Stone hoe", "stonehoe"), IRON_HOE(292, "Iron hoe", "ironhoe"), DIAMOND_HOE(293, "Diamond hoe", "diamondhoe"), GOLD_HOE(294, "Golden hoe", "goldhoe"), - SEEDS(295, "Seeds", "seeds"), + SEEDS(295, "Seeds", new String[] {"seeds", "seed"}), WHEAT(296, "Wheat", "wheat"), BREAD(297, "Bread", "bread"), LEATHER_HELMET(298, "Leather helmet", "leatherhelmet"), @@ -176,44 +191,48 @@ public enum ItemType { GOLD_PANTS(316, "Gold pants", "goldpants"), GOLD_BOOTS(317, "Gold boots", "goldboots"), FLINT(318, "Flint", "flint"), - RAW_PORKCHOP(319, "Raw porkchop", "rawporkchop"), - COOKED_PORKCHOP(320, "Cooked porkchop", "cookedporkchop"), + RAW_PORKCHOP(319, "Raw porkchop", + new String[] {"rawpork", "rawporkchop", "rawbacon", "baconstrips", "rawmeat"}), + COOKED_PORKCHOP(320, "Cooked porkchop", + new String[] {"pork", "cookedpork", "cookedporkchop", "cookedbacon", "bacon", "meat"}), PAINTING(321, "Painting", "painting"), - GOLD_APPLE(322, "Golden apple", "goldapple"), + GOLD_APPLE(322, "Golden apple", new String[] {"goldapple", "goldenapple"}), SIGN(323, "Wooden sign", "sign"), - WOODEN_DOOR_ITEM(324, "Wooden door", "wooddoor"), + 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"), - MINECART(328, "Minecart", "minecart"), + MINECART(328, "Minecart", new String[] {"minecart", "cart"}), SADDLE(329, "Saddle", "saddle"), IRON_DOOR_ITEM(330, "Iron door", "irondoor"), - REDSTONE_DUST(331, "Redstone dust", "redstonedust"), + REDSTONE_DUST(331, "Redstone dust", new String[] {"redstonedust", "reddust"}), SNOWBALL(332, "Snowball", "snowball"), - WOOD_BOAT(333, "Wooden boat", "woodboat"), - LEATHER(334, "Leather", "leather"), - MILK_BUCKET(335, "Milk bucket", "milkbucket"), + 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"}), BRICK_BAR(336, "Brick", "brick"), CLAY_BALL(337, "Clay", "clay"), - SUGAR_CANE_ITEM(338, "Sugar cane", new String[]{"sugarcane", "reed", "reeds"}), + SUGAR_CANE_ITEM(338, "Sugar cane", new String[] {"sugarcane", "reed", "reeds"}), PAPER(339, "Paper", "paper"), BOOK(340, "Book", "book"), - SLIME_BALL(341, "Slime ball", "slimeball"), - STORAGE_MINECART(342, "Storage minecart", "storageminecart"), - POWERED_MINECART(343, "Powered minecart", "poweredminecart"), + SLIME_BALL(341, "Slime ball", new String[] {"slimeball", "slime"}), + STORAGE_MINECART(342, "Storage minecart", new String[] {"storageminecart", "storagecart"}), + POWERED_MINECART(343, "Powered minecart", new String[] {"poweredminecart", "poweredcart"}), EGG(344, "Egg", "egg"), COMPASS(345, "Compass", "compass"), - FISHING_ROD(346, "Fishing rod", "fishingrod"), - WATCH(347, "Watch", "watch"), - LIGHTSTONE_DUST(348, "Lightstone dust", "lightstonedust"), - RAW_FISH(349, "Raw fish", "rawfish"), + FISHING_ROD(346, "Fishing rod", new String[] {"fishingrod", "fishingpole"}), + WATCH(347, "Watch", new String[] {"watch", "clock", "timer" }), + LIGHTSTONE_DUST(348, "Glowstone dust", new String[] { + "lightstonedust", "glowstonedone", "brightstonedust", + "brittlegolddust", "brimstonedust"}), + RAW_FISH(349, "Raw fish", new String[] {"rawfish", "fish"}), COOKED_FISH(350, "Cooked fish", "cookedfish"), - INK_SACK(351, "Ink sack", "inksack"), + INK_SACK(351, "Ink sac", new String[] {"inksac", "ink", "dye"}), BONE(352, "Bone", "bone"), SUGAR(353, "Sugar", "sugar"), CAKE_ITEM(354, "Cake", "cake"), - GOLD_RECORD(2256, "Gold Record", "goldrecord"), - GREEN_RECORD(2257, "Green Record", "greenrecord"); + GOLD_RECORD(2256, "Gold Record", new String[] {"goldrecord", "golddisc"}), + GREEN_RECORD(2257, "Green Record", new String[] {"greenrecord", "greenddisc"}); /** * Stores a map of the IDs for fast access. @@ -247,7 +266,7 @@ public enum ItemType { ItemType(int id, String name, String lookupKey) { this.id = id; this.name = name; - this.lookupKeys = new String[]{lookupKey}; + this.lookupKeys = new String[] {lookupKey}; } /**