From 6354efab91ca42b860406809184d9a376df0e083 Mon Sep 17 00:00:00 2001 From: Zrips Date: Wed, 1 Aug 2018 16:55:30 +0300 Subject: [PATCH] Better item recognition --- .classpath | 8 +- .settings/org.eclipse.jdt.core.prefs | 11 +- .../gamingmesh/jobs/CMILib/ItemManager.java | 1239 +++++++++++------ src/main/java/com/gamingmesh/jobs/Jobs.java | 3 +- .../jobs/MythicMobs/MythicMobs4.java | 1 - .../jobs/actions/BlockActionInfo.java | 4 + .../jobs/commands/list/editjobs.java | 2 +- .../gamingmesh/jobs/config/ConfigManager.java | 36 +- .../com/gamingmesh/jobs/container/Job.java | 2 + .../jobs/listeners/JobsPaymentListener.java | 9 +- .../jobs/stuff/FurnaceBrewingHandling.java | 4 +- 11 files changed, 889 insertions(+), 430 deletions(-) diff --git a/.classpath b/.classpath index 8e6499f1..2a02d03d 100644 --- a/.classpath +++ b/.classpath @@ -12,12 +12,8 @@ - - - - - - + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index c788ee34..529ef073 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 0c32fcfb..4ae792ab 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -58,8 +58,8 @@ public class ItemManager { cm.setBukkitName(bukkitName); cm.setMojangName(mojangName); - byBukkitName.put(id + ":" + cm.getData(), cm); - byBukkitName.put(legacyId + ":" + cm.getData(), cm); + byBukkitName.put(id + ":" + one.getData(), cm); + byBukkitName.put(legacyId + ":" + one.getLegacyData(), cm); if (!one.getLegacyName().isEmpty()) { byBukkitName.put(one.getLegacyName().toLowerCase().replace("_", "").replace(" ", ""), cm); } @@ -598,340 +598,57 @@ public class ItemManager { public enum CMIMaterial { NONE(-1, -1, -1, "None"), - AIR(0, 0, 9648, "Unknown", "Air"), - STONE(1, 0, 22948, "Stone"), - GRANITE(1, 1, 21091, "Granite"), - POLISHED_GRANITE(1, 2, 5477, "Polished Granite"), - DIORITE(1, 3, 24688, "Diorite"), - POLISHED_DIORITE(1, 4, 31615, "Polished Diorite"), - ANDESITE(1, 5, 25975, "Andesite"), - POLISHED_ANDESITE(1, 6, 8335, "Polished Andesite"), - GRASS_BLOCK(2, 0, 28346, "Grass", "Grass Block"), - DIRT(3, 0, 10580, "Dirt"), - COARSE_DIRT(3, 1, 15411, "Coarse Dirt"), - PODZOL(3, 2, 24068, "Podzol"), - COBBLESTONE(4, 0, 32147, "Cobblestone"), - OAK_PLANKS(5, 0, 14905, "Oak Wood Plank", "Oak Planks"), - SPRUCE_PLANKS(5, 1, 14593, "Spruce Wood Plank", "Spruce Planks"), - BIRCH_PLANKS(5, 2, 29322, "Birch Wood Plank", "Birch Planks"), - JUNGLE_PLANKS(5, 3, 26445, "Jungle Wood Plank", "Jungle Planks"), - ACACIA_PLANKS(5, 4, 31312, "Acacia Wood Plank", "Acacia Planks"), - DARK_OAK_PLANKS(5, 5, 20869, "Dark Oak Wood Plank", "Dark Oak Planks"), - OAK_SAPLING(6, 0, 9636, "Oak Sapling"), - SPRUCE_SAPLING(6, 1, 19874, "Spruce Sapling"), - BIRCH_SAPLING(6, 2, 31533, "Birch Sapling"), - JUNGLE_SAPLING(6, 3, 17951, "Jungle Sapling"), - ACACIA_SAPLING(6, 4, 20806, "Acacia Sapling"), - ACACIA_SLAB(126, 4, 23730, "Acacia Wood Slab", "Acacia Slab"), - DARK_OAK_SLAB(126, 5, 28852, "Dark Oak Wood Slab", "Dark Oak Slab"), - COCOA(127, 0, 29709, "Cocoa"), - SANDSTONE_STAIRS(128, 0, 18474, "Sandstone Stairs"), - EMERALD_ORE(129, 0, 16630, "Emerald Ore"), - ENDER_CHEST(130, 0, 32349, "Ender Chest"), - TRIPWIRE_HOOK(131, 0, 8130, "Tripwire Hook"), - TRIPWIRE(132, 0, 8810, "Tripwire"), - EMERALD_BLOCK(133, 0, 9914, "Emerald Block", "Block of Emerald"), - SPRUCE_STAIRS(134, 0, 11192, "Spruce Wood Stairs", "Spruce Stairs"), - BIRCH_STAIRS(135, 0, 7657, "Birch Wood Stairs", "Birch Stairs"), - JUNGLE_STAIRS(136, 0, 20636, "Jungle Wood Stairs", "Jungle Stairs"), - CHAINMAIL_BOOTS(305, 0, 17953, "Chainmail Boots"), - IRON_HELMET(306, 0, 12025, "Iron Helmet"), - IRON_CHESTPLATE(307, 0, 28112, "Iron Chestplate"), - IRON_LEGGINGS(308, 0, 18951, "Iron Leggings"), - IRON_BOOTS(309, 0, 8531, "Iron Boots"), - DIAMOND_HELMET(310, 0, 10755, "Diamond Helmet"), - DIAMOND_CHESTPLATE(311, 0, 32099, "Diamond Chestplate"), - DIAMOND_LEGGINGS(312, 0, 11202, "Diamond Leggings"), - DIAMOND_BOOTS(313, 0, 16522, "Diamond Boots"), - GOLDEN_HELMET(314, 0, 7945, "Golden Helmet"), - GOLDEN_CHESTPLATE(315, 0, 4507, "Golden Chestplate"), - GOLDEN_LEGGINGS(316, 0, 21002, "Golden Leggings"), - GOLDEN_BOOTS(317, 0, 7859, "Golden Boots"), - FLINT(318, 0, 23596, "Flint"), - PORKCHOP(319, 0, 30896, "Raw Porkchop"), - COOKED_PORKCHOP(320, 0, 27231, "Cooked Porkchop", "grilledpork"), - PAINTING(321, 0, 23945, "Painting"), - GOLDEN_APPLE(322, 0, 27732, "Golden Apple"), - ENCHANTED_GOLDEN_APPLE(322, 1, 8280, "Enchanted Golden Apple"), - SIGN(323, 0, 16918, "Sign"), - OAK_DOOR(324, 0, 20341, "Wooden Door", "wooddoor"), - BUCKET(325, 0, 15215, "Bucket"), - WATER_BUCKET(326, 0, 8802, "Water Bucket"), - LAVA_BUCKET(327, 0, 9228, "Lava Bucket"), - MINECART(328, 0, 14352, "Minecart"), - SADDLE(329, 0, 30206, "Saddle"), - IRON_DOOR(330, 0, 4788, "Iron Door"), - REDSTONE(331, 0, 11233, "Redstone", "Redstone Dust"), - SNOWBALL(332, 0, 19487, "Snowball"), - OAK_BOAT(333, 0, 17570, "Boat", "Oak Boat"), - LEATHER(334, 0, 16414, "Leather"), - MILK_BUCKET(335, 0, 9680, "Milk Bucket"), - BRICK(336, 0, 6820, "Brick", "claybrick"), - CLAY_BALL(337, 0, 24603, "Clay Ball", "Clay"), - SUGAR_CANE(338, 0, 7726, "Sugar Canes", "Sugar Cane"), - PAPER(339, 0, 9923, "Paper"), - BOOK(340, 0, 23097, "Book"), - SLIME_BALL(341, 0, 5242, "Slimeball"), - CHEST_MINECART(342, 0, 4497, "Minecart with Chest", "Storageminecart"), - FURNACE_MINECART(343, 0, 14196, "Minecart with Furnace", "POWERED_MINECART"), - EGG(344, 0, 21603, "Egg"), - COMPASS(345, 0, 24139, "Compass"), - FISHING_ROD(346, 0, 4167, "Fishing Rod"), - CLOCK(347, 0, 14980, "Clock", "watch"), - GLOWSTONE_DUST(348, 0, 6665, "Glowstone Dust"), - RAW_FISH(349, 0, 24691, "Raw Fish", "RAW_FISH"), - SALMON(349, 1, 18516, "Raw Salmon"), - CLOWN_FISH(349, 2, 12795, "Clownfish"), - PUFFERFISH(349, 3, 8115, "Pufferfish"), - COOKED_FISH(350, 0, -1, "Cooked Fish", "COOKED_FISH"), - COOKED_SALMON(350, 1, 5615, "Cooked Salmon"), - INK_SAC(351, 0, 7184, "Ink Sack", "Ink Sac"), - ROSE_RED(351, 1, 15694, "Rose Red"), - CACTUS_GREEN(351, 2, 17296, "Cactus Green"), - INK_SACK(351, 3, -1, "Coco Beans", "INK_SACK"), - LAPIS_LAZULI(351, 4, 11075, "Lapis Lazuli"), - PURPLE_DYE(351, 5, 6347, "Purple Dye"), - CYAN_DYE(351, 6, 8043, "Cyan Dye"), - LIGHT_GRAY_DYE(351, 7, 27643, "Light Gray Dye"), - GRAY_DYE(351, 8, 9184, "Gray Dye"), - PINK_DYE(351, 9, 31151, "Pink Dye"), - LIME_DYE(351, 10, 6147, "Lime Dye"), - DANDELION_YELLOW(351, 11, 21789, "Dandelion Yellow"), - LIGHT_BLUE_DYE(351, 12, 28738, "Light Blue Dye"), - MAGENTA_DYE(351, 13, 11788, "Magenta Dye"), - ORANGE_DYE(351, 14, 13866, "Orange Dye"), - BONE_MEAL(351, 15, 32458, "Bone Meal"), - BONE(352, 0, 5686, "Bone"), - SUGAR(353, 0, 30638, "Sugar"), - CAKE(354, 0, 27048, "Cake"), - WHITE_BED(355, 0, 8185, "White Bed", "Bed"), - ORANGE_BED(355, 1, 11194, "Orange Bed", "Orange Bed"), - MAGENTA_BED(355, 2, 20061, "Magenta Bed", "Magenta Bed"), - LIGHT_BLUE_BED(355, 3, 20957, "Light Blue Bed", "Light Blue Bed"), - YELLOW_BED(355, 4, 30410, "Yellow Bed", "Yellow Bed"), - LIME_BED(355, 5, 27860, "Lime Bed", "Lime Bed"), - PINK_BED(355, 6, 13795, "Pink Bed", "Pink Bed"), - GRAY_BED(355, 7, 15745, "Gray Bed", "Gray Bed"), - LIGHT_GRAY_BED(355, 8, 5090, "Light Gray Bed", "Light Gray Bed"), - CYAN_BED(355, 9, 16746, "Cyan Bed", "Cyan Bed"), - PURPLE_BED(355, 10, 29755, "Purple Bed", "Purple Bed"), - BLUE_BED(355, 11, 12714, "Blue Bed", "Blue Bed"), - BROWN_BED(355, 12, 25624, "Brown Bed", "Brown Bed"), - GREEN_BED(355, 13, 13797, "Green Bed", "Green Bed"), - RED_BED(355, 14, 30910, "Red Bed", "Red Bed"), - BLACK_BED(355, 15, 20490, "Black Bed", "Black Bed"), - REPEATER(356, 0, 28823, "Redstone Repeater", "Diode"), - COOKIE(357, 0, 27431, "Cookie"), - FILLED_MAP(358, 0, 23504, "Map"), - SHEARS(359, 0, 27971, "Shears"), - MELON_SLICE(360, 0, 5347, "Melon", "Melon Slice"), - PUMPKIN_SEEDS(361, 0, 28985, "Pumpkin Seeds"), - MELON_SEEDS(362, 0, 18340, "Melon Seeds"), - BEEF(363, 0, 4803, "Raw Beef"), - COOKED_BEEF(364, 0, 21595, "Steak"), - CHICKEN(365, 0, 17281, "Raw Chicken"), - COOKED_CHICKEN(366, 0, 20780, "Cooked Chicken"), - ROTTEN_FLESH(367, 0, 21591, "Rotten Flesh"), - ENDER_PEARL(368, 0, 5259, "Ender Pearl"), - BLAZE_ROD(369, 0, 8289, "Blaze Rod"), - GHAST_TEAR(370, 0, 18222, "Ghast Tear"), - GOLD_NUGGET(371, 0, 28814, "Gold Nugget"), - NETHER_STALK(372, 0, -1, "Nether Wart", "NETHER_STALK"), - POTION(373, 0, 24020, "Potion"), - GLASS_BOTTLE(374, 0, 6116, "Glass Bottle"), - SPIDER_EYE(375, 0, 9318, "Spider Eye"), - FERMENTED_SPIDER_EYE(376, 0, 19386, "Fermented Spider Eye"), - BLAZE_POWDER(377, 0, 18941, "Blaze Powder"), - MAGMA_CREAM(378, 0, 25097, "Magma Cream"), - BREWING_STAND_ITEM(379, 0, -1, "Brewing Stand", "BREWING_STAND_ITEM"), - CAULDRON_ITEM(380, 0, -1, "Cauldron", "CAULDRON_ITEM"), - ENDER_EYE(381, 0, 24860, "Eye of Ender"), - GLISTERING_MELON_SLICE(382, 0, 20158, "Glistering Melon", "speckledmelon"), - ELDER_GUARDIAN_SPAWN_EGG(383, 4, 11418, "Spawn Elder Guardian", "Elder Guardian Spawn Egg"), - WITHER_SKELETON_SPAWN_EGG(383, 5, 10073, "Spawn Wither Skeleton", "Wither Skeleton Spawn Egg"), - STRAY_SPAWN_EGG(383, 6, 30153, "Spawn Stray", "Stray Spawn Egg"), - HUSK_SPAWN_EGG(383, 23, 20178, "Spawn Husk", "Husk Spawn Egg"), - ZOMBIE_VILLAGER_SPAWN_EGG(383, 27, 10311, "Spawn Zombie Villager", "Zombie Villager Spawn Egg"), - SKELETON_HORSE_SPAWN_EGG(383, 28, 21356, "Spawn Skeleton Horse", "Skeleton Horse Spawn Egg"), - ZOMBIE_HORSE_SPAWN_EGG(383, 29, 4275, "Spawn Zombie Horse", "Zombie Horse Spawn Egg"), - ARMOR_STAND_SPAWN_EGG(383, 30, -1, "Spawn Armor Stand", "MONSTER_EGG"), - DONKEY_SPAWN_EGG(383, 31, 14513, "Spawn Donkey", "Donkey Spawn Egg"), - MULE_SPAWN_EGG(383, 32, 11229, "Spawn Mule", "Mule Spawn Egg"), - EVOKER_SPAWN_EGG(383, 34, 19365, "Spawn Evoker", "Evoker Spawn Egg"), - VEX_SPAWN_EGG(383, 35, 27751, "Spawn Vex", "Vex Spawn Egg"), - VINDICATOR_SPAWN_EGG(383, 36, 21672, "Spawn Vindicator", "Vindicator Spawn Egg"), - ILLUSIONER_SPAWN_EGG(383, 37, -1, "Spawn Illusioner", "MONSTER_EGG"), - CREEPER_SPAWN_EGG(383, 50, 9653, "Spawn Creeper", "Creeper Spawn Egg"), - SKELETON_SPAWN_EGG(383, 51, 15261, "Spawn Skeleton", "Skeleton Spawn Egg"), - SPIDER_SPAWN_EGG(383, 52, 14984, "Spawn Spider", "Spider Spawn Egg"), - GIANT_SPAWN_EGG(383, 53, -1, "Spawn Giant", "MONSTER_EGG"), - ZOMBIE_SPAWN_EGG(383, 54, 5814, "Spawn Zombie", "Zombie Spawn Egg"), - SLIME_SPAWN_EGG(383, 55, 6550, "Spawn Slime", "Slime Spawn Egg"), - GHAST_SPAWN_EGG(383, 56, 9970, "Spawn Ghast", "Ghast Spawn Egg"), - ZOMBIE_PIGMAN_SPAWN_EGG(383, 57, 11531, "Spawn Zombie Pigman", "Zombie Pigman Spawn Egg"), - ENDERMAN_SPAWN_EGG(383, 58, 29488, "Spawn Enderman", "Enderman Spawn Egg"), - CAVE_SPIDER_SPAWN_EGG(383, 59, 23341, "Spawn Cave Spider", "Cave Spider Spawn Egg"), - SILVERFISH_SPAWN_EGG(383, 60, 14537, "Spawn Silverfish", "Silverfish Spawn Egg"), - BLAZE_SPAWN_EGG(383, 61, 4759, "Spawn Blaze", "Blaze Spawn Egg"), - MAGMA_CUBE_SPAWN_EGG(383, 62, 26638, "Spawn Magma Cube", "Magma Cube Spawn Egg"), - ENDER_DRAGON_SPAWN_EGG(383, 63, -1, "Spawn Ender Dragon", "MONSTER_EGG"), - WITHER_SPAWN_EGG(383, 64, -1, "Spawn Wither", "MONSTER_EGG"), - BAT_SPAWN_EGG(383, 65, 14607, "Spawn Bat", "Bat Spawn Egg"), - WITCH_SPAWN_EGG(383, 66, 11837, "Spawn Witch", "Witch Spawn Egg"), - ENDERMITE_SPAWN_EGG(383, 67, 16617, "Spawn Endermite", "Endermite Spawn Egg"), - GUARDIAN_SPAWN_EGG(383, 68, 20113, "Spawn Guardian", "Guardian Spawn Egg"), - SHULKER_SPAWN_EGG(383, 69, 31848, "Spawn Shulker", "Shulker Spawn Egg"), - PIG_SPAWN_EGG(383, 90, 22584, "Spawn Pig", "Pig Spawn Egg"), - SHEEP_SPAWN_EGG(383, 91, 24488, "Spawn Sheep", "Sheep Spawn Egg"), - COW_SPAWN_EGG(383, 92, 14761, "Spawn Cow", "Cow Spawn Egg"), - CHICKEN_SPAWN_EGG(383, 93, 5462, "Spawn Chicken", "Chicken Spawn Egg"), - SQUID_SPAWN_EGG(383, 94, 10682, "Spawn Squid", "Squid Spawn Egg"), - WOLF_SPAWN_EGG(383, 95, 21692, "Spawn Wolf", "Wolf Spawn Egg"), - MOOSHROOM_SPAWN_EGG(383, 96, 22125, "Spawn Mushroom Cow", "Mooshroom Spawn Egg"), - SNOWMAN_SPAWN_EGG(383, 97, -1, "Spawn Snowman", "MONSTER_EGG"), - OCELOT_SPAWN_EGG(383, 98, 30080, "Spawn Ocelot", "Ocelot Spawn Egg"), - IRON_GOLEM_SPAWN_EGG(383, 99, -1, "Spawn Iron Golem", "MONSTER_EGG"), - HORSE_SPAWN_EGG(383, 100, 25981, "Spawn Horse", "Horse Spawn Egg"), - RABBIT_SPAWN_EGG(383, 101, 26496, "Spawn Rabbit", "Rabbit Spawn Egg"), - POLAR_BEAR_SPAWN_EGG(383, 102, 17015, "Spawn Polar Bear", "Polar Bear Spawn Egg"), - LLAMA_SPAWN_EGG(383, 103, 23640, "Spawn Llama", "Llama Spawn Egg"), - PARROT_SPAWN_EGG(383, 105, 23614, "Spawn Parrot", "Parrot Spawn Egg"), - VILLAGER_SPAWN_EGG(383, 120, 30348, "Spawn Villager", "Villager Spawn Egg"), - EXPERIENCE_BOTTLE(384, 0, 12858, "Bottle o' Enchanting", "expbottle"), - FIRE_CHARGE(385, 0, 4842, "Fire Charge", "Fireball"), - WRITABLE_BOOK(386, 0, 13393, "Book and Quill"), - WRITTEN_BOOK(387, 0, 24164, "Written Book"), - EMERALD(388, 0, 5654, "Emerald"), - ITEM_FRAME(389, 0, 27318, "Item Frame"), - FLOWER_POT_ITEM(390, 0, -1, "Flower Pot", "FLOWER_POT_ITEM"), - CARROT(391, 0, 22824, "Carrot", "Carrotitem"), - POTATO(392, 0, 21088, "Potato", "Potatoitem"), - BAKED_POTATO(393, 0, 14624, "Baked Potato"), - POISONOUS_POTATO(394, 0, 32640, "Poisonous Potato"), - EMPTY_MAP(395, 0, -1, "Empty Map", "EMPTY_MAP"), - GOLDEN_CARROT(396, 0, 5300, "Golden Carrot"), - SKELETON_SKULL(397, 0, 13270, "Mob Head (Skeleton)", "Skeleton Skull"), - WITHER_SKELETON_SKULL(397, 1, 31487, "Mob Head (Wither Skeleton)", "Wither Skeleton Skull"), - ZOMBIE_HEAD(397, 2, 9304, "Mob Head (Zombie)", "Zombie Head"), - PLAYER_HEAD(397, 3, 21174, "Mob Head (Human)", "Player Head"), - CREEPER_HEAD(397, 4, 29146, "Mob Head (Creeper)", "Creeper Head"), - CARROT_ON_A_STICK(398, 0, 27809, "Carrot on a Stick", "carrotstick"), - NETHER_STAR(399, 0, 12469, "Nether Star"), - PUMPKIN_PIE(400, 0, 28725, "Pumpkin Pie"), - FIREWORK_ROCKET(401, 0, 23841, "Firework Rocket"), - FIREWORK_STAR(402, 0, 12190, "Firework Star", "FIREWORK_CHARGE"), - ENCHANTED_BOOK(403, 0, 11741, "Enchanted Book"), - COMPARATOR(404, 0, 18911, "Redstone Comparator"), - NETHER_BRICKS(405, 0, 27802, "Nether Brick", "Nether Bricks"), - QUARTZ(406, 0, 23608, "Nether Quartz"), - TNT_MINECART(407, 0, 4277, "Minecart with TNT", "explosiveminecart"), - HOPPER_MINECART(408, 0, 19024, "Minecart with Hopper"), - PRISMARINE_SHARD(409, 0, 10993, "Prismarine Shard"), - PRISMARINE_CRYSTALS(410, 0, 31546, "Prismarine Crystals"), - RABBIT(411, 0, 23068, "Raw Rabbit"), - COOKED_RABBIT(412, 0, 4454, "Cooked Rabbit"), - RABBIT_STEW(413, 0, 10611, "Rabbit Stew"), - RABBIT_FOOT(414, 0, 13864, "Rabbit's Foot"), - RABBIT_HIDE(415, 0, 12467, "Rabbit Hide"), - ARMOR_STAND(416, 0, 12852, "Armor Stand"), - IRON_HORSE_ARMOR(417, 0, 30108, "Iron Horse Armor", "Iron_barding"), - GOLDEN_HORSE_ARMOR(418, 0, 7996, "Golden Horse Armor", "gold_barding"), - DIAMOND_HORSE_ARMOR(419, 0, 10321, "Diamond Horse Armor", "Diamond_barding"), - LEAD(420, 0, 29539, "Lead", "Leash"), - NAME_TAG(421, 0, 30731, "Name Tag"), - COMMAND_BLOCK_MINECART(422, 0, 7992, "Minecart with Command Block"), - MUTTON(423, 0, 4792, "Raw Mutton"), - COOKED_MUTTON(424, 0, 31447, "Cooked Mutton"), - BLACK_BANNER(425, 0, 9365, "Banner", "Black Banner"), - END_CRYSTAL(426, 0, 19090, "End Crystal"), - SPRUCE_DOOR_ITEM(427, 0, -1, "Spruce Door", "SPRUCE_DOOR_ITEM"), - BIRCH_DOOR_ITEM(428, 0, -1, "Birch Door", "BIRCH_DOOR_ITEM"), - JUNGLE_DOOR_ITEM(429, 0, -1, "Jungle Door", "JUNGLE_DOOR_ITEM"), - ACACIA_DOOR_ITEM(430, 0, -1, "Acacia Door", "ACACIA_DOOR_ITEM"), - DARK_OAK_DOOR_ITEM(431, 0, -1, "Dark Oak Door", "DARK_OAK_DOOR_ITEM"), - CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit"), - POPPED_CHORUS_FRUIT(433, 0, 16880, "Popped Chorus Fruit"), - BEETROOT(434, 0, 23305, "Beetroot"), - BEETROOT_SEEDS(435, 0, 21282, "Beetroot Seeds"), - BEETROOT_SOUP(436, 0, 16036, "Beetroot Soup"), - DRAGON_BREATH(437, 0, 20154, "Dragon's Breath"), - SPECTRAL_ARROW(439, 0, 4568, "Spectral Arrow"), - TIPPED_ARROW(440, 0, 25164, "Tipped Arrow"), - LINGERING_POTION(441, 0, 25857, "Lingering Potion"), - SHIELD(442, 0, 29943, "Shield"), - ELYTRA(443, 0, 23829, "Elytra"), - TOTEM_OF_UNDYING(449, 0, 10139, "Totem Of Undying"), - MUSIC_DISC_13(2256, 0, 16359, "13 Disc", "GOLD_RECORD"), - MUSIC_DISC_CAT(2257, 0, 16246, "Cat Disc", "GREEN_RECORD"), - MUSIC_DISC_BLOCKS(2258, 0, 26667, "Blocks Disc", "RECORD_3"), - MUSIC_DISC_CHIRP(2259, 0, 19436, "Chirp Disc", "RECORD_4"), - MUSIC_DISC_FAR(2260, 0, 13823, "Far Disc", "RECORD_5"), - MUSIC_DISC_MALL(2261, 0, 11517, "Mall Disc", "RECORD_6"), - MUSIC_DISC_MELLOHI(2262, 0, 26117, "Mellohi Disc", "RECORD_7"), - MUSIC_DISC_STAL(2263, 0, 14989, "Stal Disc", "RECORD_8"), - MUSIC_DISC_STRAD(2264, 0, 16785, "Strad Disc", "RECORD_9"), - MUSIC_DISC_WARD(2265, 0, 24026, "Ward Disc", "RECORD_10"), - MUSIC_DISC_11(2266, 0, 27426, "11 Disc", "RECORD_11"), - MUSIC_DISC_WAIT(2267, 0, 26499, "Wait Disc", "RECORD_12"), - PISTON_MOVING_PIECE(36, 0, -1, "Piston Moving Piece"), - CROPS(59, 0, -1, "Crops"), - BURNING_FURNACE(62, 0, -1, "Burning Furnace"), - SIGN_POST(63, 0, -1, "Sign Post"), - WOODEN_DOOR(64, 0, -1, "Wooden Door"), - GLOWING_REDSTONE_ORE(74, 0, -1, "Glowing Redstone Ore"), - SUGAR_CANE_BLOCK(83, 0, -1, "Sugar Cane Block"), - DIODE_BLOCK_OFF(93, 0, -1, "Diode Block Off"), - DIODE_BLOCK_ON(94, 0, -1, "Diode Block On"), - REDSTONE_LAMP_ON(124, 0, -1, "Redstone Lamp On"), - WOOD_DOUBLE_STEP(125, 0, -1, "Wood Step Double"), - SKULL(144, 0, -1, "Skull"), - REDSTONE_COMPARATOR_OFF(149, 0, -1, "Redstone Comparator Off"), - REDSTONE_COMPARATOR_ON(150, 0, -1, "Redstone Comparator Off"), - STANDING_BANNER(176, 0, -1, "Standing Banner"), - WALL_BANNER(177, 0, -1, "Wall Banner"), - DAYLIGHT_DETECTOR_INVERTED(178, 0, -1, "Daylight Detector Inverted"), - DOUBLE_STONE_SLAB2(181, 0, -1, "Double Stone Slab2"), - PURPUR_DOUBLE_SLAB(204, 0, -1, "Purpur Ddouble Slab"), - COMMAND_REPEATING(210, 0, -1, "Repeating Command Block"), - COMMAND_CHAIN(211, 0, -1, "Chain Command Block"), - - // 1.13 - ACACIA_BOAT(447, 0, 27326, "Acacia Boat", "BOAT_ACACIA"), ACACIA_BUTTON(-1, -1, 13993, "Acacia Button", ""), - ACACIA_DOOR(196, 0, 23797, "Acacia Door", "ACACIA_DOOR"), + ACACIA_DOOR(430, 0, 23797, "Acacia Door", "ACACIA_DOOR_ITEM"), ACACIA_FENCE(192, 0, 4569, "Acacia Fence", "ACACIA_FENCE"), ACACIA_FENCE_GATE(187, 0, 14145, "Acacia Fence Gate", "ACACIA_FENCE_GATE"), ACACIA_LEAVES(161, 0, 16606, "Acacia Leaves", "LEAVES_2"), ACACIA_LOG(162, 0, 8385, "Acacia Log", "LOG_2"), + ACACIA_PLANKS(5, 4, 31312, "Acacia Wood Plank", "Acacia Planks"), ACACIA_PRESSURE_PLATE(-1, -1, 17586, "Acacia Pressure Plate", ""), + ACACIA_SAPLING(6, 4, 20806, "Acacia Sapling", ""), + ACACIA_SLAB(126, 4, 23730, "Acacia Wood Slab", "Acacia Slab"), ACACIA_STAIRS(163, 0, 17453, "Acacia Stairs", "ACACIA_STAIRS"), ACACIA_TRAPDOOR(-1, -1, 18343, "Acacia Trapdoor", ""), - ACACIA_WOOD(162, 0, 21861, "Acacia Wood", ""), + ACACIA_WOOD(-1, -1, 21861, "Acacia Wood", "Acacia Log"), ACTIVATOR_RAIL(157, 0, 5834, "Activator Rail", "ACTIVATOR_RAIL"), + AIR(0, 0, 9648, "Unknown", "Air"), ALLIUM(38, 2, 6871, "Allium", "RED_ROSE"), + ANDESITE(1, 5, 25975, "Andesite", ""), ANVIL(145, 0, 18718, "Anvil", "ANVIL"), APPLE(260, 0, 7720, "Apple", "APPLE"), + ARMOR_STAND(416, 0, 12852, "Armor Stand", ""), ARROW(262, 0, 31091, "Arrow", "ARROW"), ATTACHED_MELON_STEM(-1, -1, 30882, "Attached Melon Stem", ""), ATTACHED_PUMPKIN_STEM(-1, -1, 12724, "Attached Pumpkin Stem", ""), AZURE_BLUET(38, 3, 17608, "Azure Bluet", ""), + BAKED_POTATO(393, 0, 14624, "Baked Potato", ""), BARRIER(166, 0, 26453, "Barrier", "BARRIER"), + BAT_SPAWN_EGG(383, 65, 14607, "Spawn Bat", "Bat Spawn Egg"), BEACON(138, 0, 6608, "Beacon", "BEACON"), - BED_BLOCK(26, 0, 23130, "Bed Block"), - BEDROCK(7, 0, 23130, "Bedrock", "BEDROCK"), + BEDROCK(7, 0, 23130, "Bedrock", ""), + BEEF(363, 0, 4803, "Raw Beef", ""), + BEETROOT(434, 0, 23305, "Beetroot", ""), BEETROOTS(207, 0, 22075, "Beetroots", "BEETROOT_BLOCK"), + BEETROOT_SEEDS(435, 0, 21282, "Beetroot Seeds", ""), + BEETROOT_SOUP(436, 0, 16036, "Beetroot Soup", ""), BIRCH_BOAT(445, 0, 28104, "Birch Boat", "BOAT_BIRCH"), BIRCH_BUTTON(-1, -1, 26934, "Birch Button", ""), - BIRCH_DOOR(194, 0, 14759, "Birch Door", "BIRCH_DOOR"), + BIRCH_DOOR(428, 0, 14759, "Birch Door", "BIRCH_DOOR_ITEM"), BIRCH_FENCE(189, 0, 17347, "Birch Fence", "BIRCH_FENCE"), BIRCH_FENCE_GATE(184, 0, 6322, "Birch Fence Gate", "BIRCH_FENCE_GATE"), BIRCH_LEAVES(18, 2, 12601, "Birch Leaves", "LEAVES"), BIRCH_LOG(17, 2, 26727, "Birch Log", "LOG"), + BIRCH_PLANKS(5, 2, 29322, "Birch Wood Plank", "Birch Planks"), BIRCH_PRESSURE_PLATE(-1, -1, 9664, "Birch Pressure Plate", ""), + BIRCH_SAPLING(6, 2, 31533, "Birch Sapling", ""), BIRCH_SLAB(126, 2, 13807, "Birch Slab", ""), + BIRCH_STAIRS(135, 0, 7657, "Birch Wood Stairs", "Birch Stairs"), BIRCH_TRAPDOOR(-1, -1, 32585, "Birch Trapdoor", ""), - BIRCH_WOOD(17, 2, 7924, "Birch Wood", ""), + BIRCH_WOOD(-1, -1, 7924, "Birch Wood", ""), + BLACK_BANNER(425, 0, 9365, "Banner", "Black Banner"), + BLACK_BED(355, 15, 20490, "Black Bed", "Black Bed"), BLACK_CARPET(171, 15, 6056, "Black Carpet", "CARPET"), BLACK_CONCRETE(251, 15, 13338, "Black Concrete", "CONCRETE"), BLACK_CONCRETE_POWDER(252, 15, 16150, "Black Concrete Powder", "CONCRETE_POWDER"), @@ -942,7 +659,11 @@ public class ItemManager { BLACK_TERRACOTTA(159, 15, 26691, "Black Terracotta", "STAINED_CLAY"), BLACK_WALL_BANNER(425, -1, 4919, "Black Banner", ""), BLACK_WOOL(35, 15, 16693, "Black Wool", ""), + BLAZE_POWDER(377, 0, 18941, "Blaze Powder", ""), + BLAZE_ROD(369, 0, 8289, "Blaze Rod", ""), + BLAZE_SPAWN_EGG(383, 61, 4759, "Spawn Blaze", "Blaze Spawn Egg"), BLUE_BANNER(245, 4, 18481, "Blue Banner", "PURPLE_GLAZED_TERRACOTTA"), + BLUE_BED(355, 11, 12714, "Blue Bed", "Blue Bed"), BLUE_CARPET(171, 11, 13292, "Blue Carpet", ""), BLUE_CONCRETE(251, 11, 18756, "Blue Concrete", ""), BLUE_CONCRETE_POWDER(252, 11, 17773, "Blue Concrete Powder", ""), @@ -955,19 +676,25 @@ public class ItemManager { BLUE_TERRACOTTA(159, 11, 5236, "Blue Terracotta", ""), BLUE_WALL_BANNER(425, -1, 17757, "Blue Banner", ""), BLUE_WOOL(35, 11, 15738, "Blue Wool", ""), + BONE(352, 0, 5686, "Bone", ""), BONE_BLOCK(216, 0, 17312, "Bone Block", "BONE_BLOCK"), + BONE_MEAL(351, 15, 32458, "Bone Meal", ""), + BOOK(340, 0, 23097, "Book", ""), BOOKSHELF(47, 0, 10069, "Bookshelf", "BOOKSHELF"), BOW(261, 0, 8745, "Bow", "BOW"), BOWL(281, 0, 32661, "Bowl", "BOWL"), BRAIN_CORAL(-1, -1, 31316, "Brain Coral", ""), BRAIN_CORAL_BLOCK(-1, -1, 30618, "Brain Coral Block", ""), BRAIN_CORAL_FAN(-1, -1, 13849, "Brain Coral Fan", ""), + BRAIN_CORAL_WALL_FAN(-1, -1, 22685, "Brain Coral Wall Fan", ""), BREAD(297, 0, 32049, "Bread", "BREAD"), - BREWING_STAND(117, 0, 14539, "Brewing Stand", "BREWING_STAND"), + BREWING_STAND(379, 0, 14539, "Brewing Stand", "BREWING_STAND_ITEM"), + BRICK(336, 0, 6820, "Brick", "claybrick"), BRICKS(45, 0, 14165, "Bricks", "BRICK"), BRICK_SLAB(44, 4, 26333, "Brick Slab", "STEP"), BRICK_STAIRS(108, 0, 21534, "Brick Stairs", "BRICK_STAIRS"), BROWN_BANNER(425, 3, 11481, "Brown Banner", ""), + BROWN_BED(355, 12, 25624, "Brown Bed", "Brown Bed"), BROWN_CARPET(171, 12, 23352, "Brown Carpet", ""), BROWN_CONCRETE(251, 12, 19006, "Brown Concrete", ""), BROWN_CONCRETE_POWDER(252, 12, 21485, "Brown Concrete Powder", ""), @@ -984,49 +711,80 @@ public class ItemManager { BUBBLE_CORAL(-1, -1, 12464, "Bubble Coral", ""), BUBBLE_CORAL_BLOCK(-1, -1, 15437, "Bubble Coral Block", ""), BUBBLE_CORAL_FAN(-1, -1, 10795, "Bubble Coral Fan", ""), + BUBBLE_CORAL_WALL_FAN(-1, -1, 20382, "Bubble Coral Wall Fan", ""), + BUCKET(325, 0, 15215, "Bucket", ""), CACTUS(81, 0, 12191, "Cactus", "CACTUS"), - CAKE_BLOCK(92, 0, 27048, "Cake block", "CAKE_BLOCK"), + CACTUS_GREEN(351, 2, 17296, "Cactus Green", ""), + CAKE(354, 0, 27048, "Cake", ""), + CARROT(391, 0, 22824, "Carrot", "Carrotitem"), CARROTS(141, 0, 17258, "Carrots", "CARROT"), + CARROT_ON_A_STICK(398, 0, 27809, "Carrot on a Stick", "carrotstick"), CARVED_PUMPKIN(-1, -1, 25833, "Carved Pumpkin", ""), - CAULDRON(118, 0, 26531, "Cauldron", "CAULDRON"), - CAVE_AIR(0, 0, 17422, "Air", ""), + CAULDRON(380, 0, 26531, "Cauldron", "CAULDRON_ITEM"), + CAVE_AIR(-1, -1, 17422, "Air", ""), + CAVE_SPIDER_SPAWN_EGG(383, 59, 23341, "Spawn Cave Spider", "Cave Spider Spawn Egg"), + CHAINMAIL_BOOTS(305, 0, 17953, "Chainmail Boots", ""), CHAINMAIL_CHESTPLATE(303, 0, 23602, "Chainmail Chestplate", "CHAINMAIL_CHESTPLATE"), CHAINMAIL_HELMET(302, 0, 26114, "Chainmail Helmet", "CHAINMAIL_HELMET"), CHAINMAIL_LEGGINGS(304, 0, 19087, "Chainmail Leggings", "CHAINMAIL_LEGGINGS"), CHAIN_COMMAND_BLOCK(-1, -1, 26798, "Chain Command Block", ""), CHARCOAL(263, 1, 5390, "Charcoal", "COAL"), CHEST(54, 0, 22969, "Chest", "CHEST"), + CHEST_MINECART(342, 0, 4497, "Minecart with Chest", "Storageminecart"), + CHICKEN(365, 0, 17281, "Raw Chicken", ""), + CHICKEN_SPAWN_EGG(383, 93, 5462, "Spawn Chicken", "Chicken Spawn Egg"), CHIPPED_ANVIL(145, 1, 10623, "Chipped Anvil", ""), CHISELED_QUARTZ_BLOCK(155, 1, 30964, "Chiseled Quartz Block", "QUARTZ_BLOCK"), CHISELED_RED_SANDSTONE(179, 1, 15529, "Chiseled Red Sandstone", "RED_SANDSTONE"), CHISELED_SANDSTONE(24, 1, 31763, "Chiseled Sandstone", "SANDSTONE"), CHISELED_STONE_BRICKS(98, 3, 9087, "Chiseled Stone Bricks", "SMOOTH_BRICK"), CHORUS_FLOWER(200, 0, 28542, "Chorus Flower", "CHORUS_FLOWER"), + CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""), CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"), CLAY(82, 0, 27880, "Clay", "CLAY"), + CLAY_BALL(337, 0, 24603, "Clay Ball", "Clay"), + CLOCK(347, 0, 14980, "Clock", "watch"), COAL(263, 0, 29067, "Coal", ""), COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"), COAL_ORE(16, 0, 30965, "Coal Ore", "COAL_ORE"), + COARSE_DIRT(3, 1, 15411, "Coarse Dirt", ""), + COBBLESTONE(4, 0, 32147, "Cobblestone", ""), COBBLESTONE_SLAB(44, 3, 6340, "Cobblestone Slab", ""), COBBLESTONE_STAIRS(67, 0, 24715, "Cobblestone Stairs", "COBBLESTONE_STAIRS"), COBBLESTONE_WALL(139, 0, 12616, "Cobblestone Wall", "COBBLE_WALL"), COBWEB(30, 0, 9469, "Cobweb", "WEB"), - COCOA_BEANS(-1, -1, 27381, "Cocoa Beans", ""), - COD(-1, -1, 24691, "Raw Cod", "rawfish"), + COCOA(127, 0, 29709, "Cocoa", ""), + COCOA_BEANS(351, 3, 27381, "Coco Beans", "INK_SACK"), + COD(349, 0, 24691, "Raw Fish", "RAW_FISH"), COD_BUCKET(-1, -1, 28601, "Bucket of Cod", ""), COD_SPAWN_EGG(-1, -1, 27248, "Cod Spawn Egg", ""), COMMAND_BLOCK(137, 0, 4355, "Command Block", "COMMAND"), + COMMAND_BLOCK_MINECART(422, 0, 7992, "Minecart with Command Block", ""), + COMPARATOR(404, 0, 18911, "Redstone Comparator", ""), + COMPASS(345, 0, 24139, "Compass", ""), CONDUIT(-1, -1, 5148, "Conduit", ""), - COOKED_COD(-1, -1, 9681, "Cooked Cod", ""), + COOKED_BEEF(364, 0, 21595, "Steak", ""), + COOKED_CHICKEN(366, 0, 20780, "Cooked Chicken", ""), + COOKED_COD(350, 0, 9681, "Cooked Fish", "COOKED_FISH"), + COOKED_MUTTON(424, 0, 31447, "Cooked Mutton", ""), + COOKED_PORKCHOP(320, 0, 27231, "Cooked Porkchop", "grilledpork"), + COOKED_RABBIT(412, 0, 4454, "Cooked Rabbit", ""), + COOKED_SALMON(350, 1, 5615, "Cooked Salmon", ""), + COOKIE(357, 0, 27431, "Cookie", ""), + COW_SPAWN_EGG(383, 92, 14761, "Spawn Cow", "Cow Spawn Egg"), CRACKED_STONE_BRICKS(98, 2, 27869, "Cracked Stone Bricks", ""), CRAFTING_TABLE(58, 0, 20706, "Crafting Table", "WORKBENCH"), + CREEPER_HEAD(397, 4, 29146, "Mob Head (Creeper)", "Creeper Head"), + CREEPER_SPAWN_EGG(383, 50, 9653, "Spawn Creeper", "Creeper Spawn Egg"), CREEPER_WALL_HEAD(397, -1, 30123, "Creeper Wall Head", ""), CUT_RED_SANDSTONE(-1, -1, 26842, "Cut Red Sandstone", ""), CUT_SANDSTONE(-1, -1, 6118, "Cut Sandstone", ""), CYAN_BANNER(425, 6, 9839, "Cyan Banner", ""), + CYAN_BED(355, 9, 16746, "Cyan Bed", "Cyan Bed"), CYAN_CARPET(171, 9, 31495, "Cyan Carpet", ""), CYAN_CONCRETE(251, 9, 26522, "Cyan Concrete", ""), CYAN_CONCRETE_POWDER(252, 9, 15734, "Cyan Concrete Powder", ""), + CYAN_DYE(351, 6, 8043, "Cyan Dye", ""), CYAN_GLAZED_TERRACOTTA(244, 0, 9550, "Cyan Glazed Terracotta", "CYAN_GLAZED_TERRACOTTA"), CYAN_SHULKER_BOX(228, 0, 28123, "Cyan Shulker Box", "CYAN_SHULKER_BOX"), CYAN_STAINED_GLASS(95, 9, 30604, "Cyan Stained Glass", ""), @@ -1036,40 +794,62 @@ public class ItemManager { CYAN_WOOL(35, 9, 12221, "Cyan Wool", ""), DAMAGED_ANVIL(145, 2, 10274, "Damaged Anvil", ""), DANDELION(37, 0, 30558, "Dandelion", "YELLOW_FLOWER"), + DANDELION_YELLOW(351, 11, 21789, "Dandelion Yellow", ""), DARK_OAK_BOAT(448, 0, 28618, "Dark Oak Boat", "BOAT_DARK_OAK"), DARK_OAK_BUTTON(-1, -1, 6214, "Dark Oak Button", ""), - DARK_OAK_DOOR(197, 0, 10669, "Dark Oak Door", "DARK_OAK_DOOR"), + DARK_OAK_DOOR(431, 0, 10669, "Dark Oak Door", "DARK_OAK_DOOR_ITEM"), DARK_OAK_FENCE(191, 0, 21767, "Dark Oak Fence", "DARK_OAK_FENCE"), DARK_OAK_FENCE_GATE(186, 0, 10679, "Dark Oak Fence Gate", "DARK_OAK_FENCE_GATE"), DARK_OAK_LEAVES(161, 1, 22254, "Dark Oak Leaves", ""), DARK_OAK_LOG(162, 1, 14831, "Dark Oak Log", ""), + DARK_OAK_PLANKS(5, 5, 20869, "Dark Oak Wood Plank", "Dark Oak Planks"), DARK_OAK_PRESSURE_PLATE(-1, -1, 31375, "Dark Oak Pressure Plate", ""), DARK_OAK_SAPLING(6, 5, 14933, "Dark Oak Sapling", ""), + DARK_OAK_SLAB(126, 5, 28852, "Dark Oak Wood Slab", "Dark Oak Slab"), DARK_OAK_STAIRS(164, 0, 22921, "Dark Oak Stairs", "DARK_OAK_STAIRS"), DARK_OAK_TRAPDOOR(-1, -1, 10355, "Dark Oak Trapdoor", ""), - DARK_OAK_WOOD(162, 1, 7871, "Dark Oak Wood", ""), + DARK_OAK_WOOD(-1, -1, 7871, "Dark Oak Wood", ""), DARK_PRISMARINE(168, 2, 19940, "Dark Prismarine", "PRISMARINE"), DARK_PRISMARINE_SLAB(-1, -1, 7577, "Dark Prismarine Slab", ""), DARK_PRISMARINE_STAIRS(-1, -1, 26511, "Dark Prismarine Stairs", ""), DAYLIGHT_DETECTOR(151, 0, 8864, "Daylight Detector", "DAYLIGHT_DETECTOR"), DEAD_BRAIN_CORAL_BLOCK(-1, -1, 12979, "Dead Brain Coral Block", ""), + DEAD_BRAIN_CORAL_FAN(-1, -1, 26150, "Dead Brain Coral Fan", ""), + DEAD_BRAIN_CORAL_WALL_FAN(-1, -1, 23718, "Dead Brain Coral Wall Fan", ""), DEAD_BUBBLE_CORAL_BLOCK(-1, -1, 28220, "Dead Bubble Coral Block", ""), + DEAD_BUBBLE_CORAL_FAN(-1, -1, 17322, "Dead Bubble Coral Fan", ""), + DEAD_BUBBLE_CORAL_WALL_FAN(-1, -1, 18453, "Dead Bubble Coral Wall Fan", ""), DEAD_BUSH(32, 0, 22888, "Dead Bush", "DEAD_BUSH"), DEAD_FIRE_CORAL_BLOCK(-1, -1, 5307, "Dead Fire Coral Block", ""), + DEAD_FIRE_CORAL_FAN(-1, -1, 27073, "Dead Fire Coral Fan", ""), + DEAD_FIRE_CORAL_WALL_FAN(-1, -1, 23375, "Dead Fire Coral Wall Fan", ""), DEAD_HORN_CORAL_BLOCK(-1, -1, 15103, "Dead Horn Coral Block", ""), + DEAD_HORN_CORAL_FAN(-1, -1, 11387, "Dead Horn Coral Fan", ""), + DEAD_HORN_CORAL_WALL_FAN(-1, -1, 27550, "Dead Horn Coral Wall Fan", ""), DEAD_TUBE_CORAL_BLOCK(-1, -1, 28350, "Dead Tube Coral Block", ""), + DEAD_TUBE_CORAL_FAN(-1, -1, 17628, "Dead Tube Coral Fan", ""), + DEAD_TUBE_CORAL_WALL_FAN(-1, -1, 5128, "Dead Tube Coral Wall Fan", ""), DEBUG_STICK(-1, -1, 24562, "Debug Stick", ""), DETECTOR_RAIL(28, 0, 13475, "Detector Rail", "DETECTOR_RAIL"), DIAMOND(264, 0, 20865, "Diamond", "DIAMOND"), DIAMOND_AXE(279, 0, 27277, "Diamond Axe", "DIAMOND_AXE"), DIAMOND_BLOCK(57, 0, 5944, "Block of Diamond", "DIAMOND_BLOCK"), + DIAMOND_BOOTS(313, 0, 16522, "Diamond Boots", ""), + DIAMOND_CHESTPLATE(311, 0, 32099, "Diamond Chestplate", ""), + DIAMOND_HELMET(310, 0, 10755, "Diamond Helmet", ""), DIAMOND_HOE(293, 0, 24050, "Diamond Hoe", "DIAMOND_HOE"), + DIAMOND_HORSE_ARMOR(419, 0, 10321, "Diamond Horse Armor", "Diamond_barding"), + DIAMOND_LEGGINGS(312, 0, 11202, "Diamond Leggings", ""), DIAMOND_ORE(56, 0, 9292, "Diamond Ore", "DIAMOND_ORE"), DIAMOND_PICKAXE(278, 0, 24291, "Diamond Pickaxe", "DIAMOND_PICKAXE"), DIAMOND_SHOVEL(277, 0, 25415, "Diamond Shovel", "DIAMOND_SPADE"), DIAMOND_SWORD(276, 0, 27707, "Diamond Sword", "DIAMOND_SWORD"), + DIORITE(1, 3, 24688, "Diorite", ""), + DIRT(3, 0, 10580, "Dirt", ""), DISPENSER(23, 0, 20871, "Dispenser", "DISPENSER"), DOLPHIN_SPAWN_EGG(-1, -1, 20787, "Dolphin Spawn Egg", ""), + DONKEY_SPAWN_EGG(383, 31, 14513, "Spawn Donkey", "Donkey Spawn Egg"), + DRAGON_BREATH(437, 0, 20154, "Dragon's Breath", ""), DRAGON_EGG(122, 0, 29946, "Dragon Egg", "DRAGON_EGG"), DRAGON_HEAD(397, 5, 20084, "Dragon Head", ""), DRAGON_WALL_HEAD(-1, -1, 19818, "Dragon Wall Head", ""), @@ -1077,50 +857,84 @@ public class ItemManager { DRIED_KELP_BLOCK(-1, -1, 12966, "Dried Kelp Block", ""), DROPPER(158, 0, 31273, "Dropper", "DROPPER"), DROWNED_SPAWN_EGG(-1, -1, 19368, "Drowned Spawn Egg", ""), - DOUBLE_STONE_SLAB(43, 0, 19117, "Double Stone Slab"), - DOUBLE_SANDSTONE_SLAB(43, 1, 19117, "Double Sandstone Slab"), - DOUBLE_WOODEN_SLAB(43, 2, 19117, "Double Wooden Slab"), - DOUBLE_COBBLESTONE_SLAB(43, 3, 19117, "Double Cobblestone Slab"), - DOUBLE_BRICK_SLAB(43, 4, 19117, "Double Brick Slab"), - DOUBLE_STONE_BRICK_SLAB(43, 5, 19117, "Double Stone Brick Slab"), - DOUBLE_NETHER_BRICK_SLAB(43, 6, 19117, "Double Nether Brick Slab"), - DOUBLE_QUARTZ_SLAB(43, 7, 19117, "Double Quartz Slab"), + EGG(344, 0, 21603, "Egg", ""), + ELDER_GUARDIAN_SPAWN_EGG(383, 4, 11418, "Spawn Elder Guardian", "Elder Guardian Spawn Egg"), + ELYTRA(443, 0, 23829, "Elytra", ""), + EMERALD(388, 0, 5654, "Emerald", ""), + EMERALD_BLOCK(133, 0, 9914, "Emerald Block", "Block of Emerald"), + EMERALD_ORE(129, 0, 16630, "Emerald Ore", ""), + ENCHANTED_BOOK(403, 0, 11741, "Enchanted Book", ""), + ENCHANTED_GOLDEN_APPLE(322, 1, 8280, "Enchanted Golden Apple", ""), ENCHANTING_TABLE(116, 0, 16255, "Enchanting Table", "ENCHANTMENT_TABLE"), + ENDERMAN_SPAWN_EGG(383, 58, 29488, "Spawn Enderman", "Enderman Spawn Egg"), + ENDERMITE_SPAWN_EGG(383, 67, 16617, "Spawn Endermite", "Endermite Spawn Egg"), + ENDER_CHEST(130, 0, 32349, "Ender Chest", ""), + ENDER_EYE(381, 0, 24860, "Eye of Ender", ""), + ENDER_PEARL(368, 0, 5259, "Ender Pearl", ""), + END_CRYSTAL(426, 0, 19090, "End Crystal", ""), END_GATEWAY(209, 0, 26605, "End Gateway", "END_GATEWAY"), END_PORTAL(119, 0, 16782, "End Portal", "ENDER_PORTAL"), END_PORTAL_FRAME(120, 0, 15480, "End Portal Frame", "ENDER_PORTAL_FRAME"), END_ROD(198, 0, 24832, "End Rod", "END_ROD"), END_STONE(121, 0, 29686, "End Stone", "ENDER_STONE"), END_STONE_BRICKS(206, 0, 20314, "End Stone Bricks", "END_BRICKS"), + EVOKER_SPAWN_EGG(383, 34, 19365, "Spawn Evoker", "Evoker Spawn Egg"), + EXPERIENCE_BOTTLE(384, 0, 12858, "Bottle o' Enchanting", "expbottle"), FARMLAND(60, 0, 31166, "Farmland", "SOIL"), FEATHER(288, 0, 30548, "Feather", "FEATHER"), + FERMENTED_SPIDER_EYE(376, 0, 19386, "Fermented Spider Eye", ""), FERN(31, 2, 15794, "Fern", "LONG_GRASS"), + FILLED_MAP(358, 0, 23504, "Map", ""), FIRE(51, 0, 16396, "Fire", "FIRE"), + FIREWORK_ROCKET(401, 0, 23841, "Firework Rocket", ""), + FIREWORK_STAR(402, 0, 12190, "Firework Star", "FIREWORK_CHARGE"), + FIRE_CHARGE(385, 0, 4842, "Fire Charge", "Fireball"), FIRE_CORAL(-1, -1, 29151, "Fire Coral", ""), FIRE_CORAL_BLOCK(-1, -1, 12119, "Fire Coral Block", ""), FIRE_CORAL_FAN(-1, -1, 11112, "Fire Coral Fan", ""), + FIRE_CORAL_WALL_FAN(-1, -1, 20100, "Fire Coral Wall Fan", ""), + FISHING_ROD(346, 0, 4167, "Fishing Rod", ""), + FLINT(318, 0, 23596, "Flint", ""), FLINT_AND_STEEL(259, 0, 28620, "Flint and Steel", "FLINT_AND_STEEL"), - FLOWER_POT(140, 0, 30567, "Flower Pot", "FLOWER_POT"), + FLOWER_POT(390, 0, 30567, "Flower Pot", "FLOWER_POT_ITEM"), FROSTED_ICE(212, 0, 21814, "Frosted Ice", "FROSTED_ICE"), - FURNACE(61, 0, 8133, "Furnace", "FURNACE"), + FURNACE(61, 0, 8133, "Furnace", ""), + FURNACE_MINECART(343, 0, 14196, "Minecart with Furnace", "POWERED_MINECART"), + GHAST_SPAWN_EGG(383, 56, 9970, "Spawn Ghast", "Ghast Spawn Egg"), + GHAST_TEAR(370, 0, 18222, "Ghast Tear", ""), GLASS(20, 0, 6195, "Glass", "GLASS"), + GLASS_BOTTLE(374, 0, 6116, "Glass Bottle", ""), GLASS_PANE(102, 0, 5709, "Glass Pane", "THIN_GLASS"), + GLISTERING_MELON_SLICE(382, 0, 20158, "Glistering Melon", "speckledmelon"), GLOWSTONE(89, 0, 32713, "Glowstone", "GLOWSTONE"), + GLOWSTONE_DUST(348, 0, 6665, "Glowstone Dust", ""), + GOLDEN_APPLE(322, 0, 27732, "Golden Apple", ""), GOLDEN_AXE(286, 0, 4878, "Golden Axe", "GOLD_AXE"), + GOLDEN_BOOTS(317, 0, 7859, "Golden Boots", ""), + GOLDEN_CARROT(396, 0, 5300, "Golden Carrot", ""), + GOLDEN_CHESTPLATE(315, 0, 4507, "Golden Chestplate", ""), + GOLDEN_HELMET(314, 0, 7945, "Golden Helmet", ""), GOLDEN_HOE(294, 0, 19337, "Golden Hoe", "GOLD_HOE"), + GOLDEN_HORSE_ARMOR(418, 0, 7996, "Golden Horse Armor", "gold_barding"), + GOLDEN_LEGGINGS(316, 0, 21002, "Golden Leggings", ""), GOLDEN_PICKAXE(285, 0, 10901, "Golden Pickaxe", "GOLD_PICKAXE"), GOLDEN_SHOVEL(284, 0, 15597, "Golden Shovel", "GOLD_SPADE"), GOLDEN_SWORD(283, 0, 10505, "Golden Sword", "GOLD_SWORD"), GOLD_BLOCK(41, 0, 27392, "Block of Gold", "GOLD_BLOCK"), GOLD_INGOT(266, 0, 28927, "Gold Ingot", "GOLD_INGOT"), + GOLD_NUGGET(371, 0, 28814, "Gold Nugget", ""), GOLD_ORE(14, 0, 32625, "Gold Ore", "GOLD_ORE"), + GRANITE(1, 1, 21091, "Granite", ""), GRASS(31, 1, 6155, "Grass", ""), + GRASS_BLOCK(2, 0, 28346, "Grass", "Grass Block"), GRASS_PATH(208, 0, 8604, "Grass Path", "GRASS_PATH"), GRAVEL(13, 0, 7804, "Gravel", "GRAVEL"), GRAY_BANNER(425, 8, 12053, "Gray Banner", ""), + GRAY_BED(355, 7, 15745, "Gray Bed", "Gray Bed"), GRAY_CARPET(171, 7, 26991, "Gray Carpet", ""), GRAY_CONCRETE(251, 7, 13959, "Gray Concrete", ""), GRAY_CONCRETE_POWDER(252, 7, 13031, "Gray Concrete Powder", ""), + GRAY_DYE(351, 8, 9184, "Gray Dye", ""), GRAY_GLAZED_TERRACOTTA(242, 0, 6256, "Gray Glazed Terracotta", "GRAY_GLAZED_TERRACOTTA"), GRAY_SHULKER_BOX(226, 0, 12754, "Gray Shulker Box", "GRAY_SHULKER_BOX"), GRAY_STAINED_GLASS(95, 7, 29979, "Gray Stained Glass", ""), @@ -1129,6 +943,7 @@ public class ItemManager { GRAY_WALL_BANNER(425, -1, 24275, "Gray Banner", ""), GRAY_WOOL(35, 7, 27209, "Gray Wool", ""), GREEN_BANNER(425, 2, 10698, "Green Banner", ""), + GREEN_BED(355, 13, 13797, "Green Bed", "Green Bed"), GREEN_CARPET(171, 13, 7780, "Green Carpet", ""), GREEN_CONCRETE(251, 13, 17949, "Green Concrete", ""), GREEN_CONCRETE_POWDER(252, 13, 6904, "Green Concrete Powder", ""), @@ -1139,14 +954,19 @@ public class ItemManager { GREEN_TERRACOTTA(159, 13, 4105, "Green Terracotta", ""), GREEN_WALL_BANNER(425, -1, 15046, "Green Banner", ""), GREEN_WOOL(35, 13, 25085, "Green Wool", ""), + GUARDIAN_SPAWN_EGG(383, 68, 20113, "Spawn Guardian", "Guardian Spawn Egg"), GUNPOWDER(289, 0, 29974, "Gunpowder", "SULPHUR"), HAY_BLOCK(170, 0, 17461, "Hay Bale", "HAY_BLOCK"), HEART_OF_THE_SEA(-1, -1, 11807, "Heart of the Sea", ""), HEAVY_WEIGHTED_PRESSURE_PLATE(148, 0, 16970, "Heavy Weighted Pressure Plate", "IRON_PLATE"), HOPPER(154, 0, 31974, "Hopper", "HOPPER"), + HOPPER_MINECART(408, 0, 19024, "Minecart with Hopper", ""), HORN_CORAL(-1, -1, 19511, "Horn Coral", ""), HORN_CORAL_BLOCK(-1, -1, 19958, "Horn Coral Block", ""), HORN_CORAL_FAN(-1, -1, 13610, "Horn Coral Fan", ""), + HORN_CORAL_WALL_FAN(-1, -1, 28883, "Horn Coral Wall Fan", ""), + HORSE_SPAWN_EGG(383, 100, 25981, "Spawn Horse", "Horse Spawn Egg"), + HUSK_SPAWN_EGG(383, 23, 20178, "Spawn Husk", "Husk Spawn Egg"), ICE(79, 0, 30428, "Ice", "ICE"), INFESTED_CHISELED_STONE_BRICKS(97, 5, 4728, "Infested Chiseled Stone Bricks", "MONSTER_EGGS"), INFESTED_COBBLESTONE(97, 1, 28798, "Infested Cobblestone", ""), @@ -1154,49 +974,64 @@ public class ItemManager { INFESTED_MOSSY_STONE_BRICKS(97, 3, 9850, "Infested Mossy Stone Bricks", ""), INFESTED_STONE(97, 0, 18440, "Infested Stone", ""), INFESTED_STONE_BRICKS(97, 2, 19749, "Infested Stone Bricks", ""), + INK_SAC(351, 0, 7184, "Ink Sack", "Ink Sac"), IRON_AXE(258, 0, 15894, "Iron Axe", "IRON_AXE"), IRON_BARS(101, 0, 9378, "Iron Bars", "IRON_FENCE"), IRON_BLOCK(42, 0, 24754, "Block of Iron", "IRON_BLOCK"), - IRON_DOOR_BLOCK(71, 0, 4788, "Iron Door Block", "IRON_DOOR_BLOCK"), + IRON_BOOTS(309, 0, 8531, "Iron Boots", ""), + IRON_CHESTPLATE(307, 0, 28112, "Iron Chestplate", ""), + IRON_DOOR(330, 0, 4788, "Iron Door", ""), + IRON_HELMET(306, 0, 12025, "Iron Helmet", ""), IRON_HOE(292, 0, 11339, "Iron Hoe", "IRON_HOE"), + IRON_HORSE_ARMOR(417, 0, 30108, "Iron Horse Armor", "Iron_barding"), IRON_INGOT(265, 0, 24895, "Iron Ingot", "IRON_INGOT"), + IRON_LEGGINGS(308, 0, 18951, "Iron Leggings", ""), IRON_NUGGET(452, 0, 13715, "Iron Nugget", ""), IRON_ORE(15, 0, 19834, "Iron Ore", "IRON_ORE"), IRON_PICKAXE(257, 0, 8842, "Iron Pickaxe", "IRON_PICKAXE"), IRON_SHOVEL(256, 0, 30045, "Iron Shovel", "IRON_SPADE"), IRON_SWORD(267, 0, 10904, "Iron Sword", "IRON_SWORD"), IRON_TRAPDOOR(167, 0, 17095, "Iron Trapdoor", "IRON_TRAPDOOR"), + ITEM_FRAME(389, 0, 27318, "Item Frame", ""), JACK_O_LANTERN(91, 0, 31612, "Jack o'Lantern", "JACK_O_LANTERN"), JUKEBOX(84, 0, 19264, "Jukebox", "JUKEBOX"), JUNGLE_BOAT(446, 0, 4495, "Jungle Boat", "BOAT_JUNGLE"), JUNGLE_BUTTON(-1, -1, 25317, "Jungle Button", ""), - JUNGLE_DOOR(195, 0, 28163, "Jungle Door", "JUNGLE_DOOR"), + JUNGLE_DOOR(429, 0, 28163, "Jungle Door", "JUNGLE_DOOR_ITEM"), JUNGLE_FENCE(190, 0, 14358, "Jungle Fence", "JUNGLE_FENCE"), JUNGLE_FENCE_GATE(185, 0, 21360, "Jungle Fence Gate", "JUNGLE_FENCE_GATE"), JUNGLE_LEAVES(18, 3, 5133, "Jungle Leaves", ""), JUNGLE_LOG(17, 3, 20721, "Jungle Log", ""), + JUNGLE_PLANKS(5, 3, 26445, "Jungle Wood Plank", "Jungle Planks"), JUNGLE_PRESSURE_PLATE(-1, -1, 11376, "Jungle Pressure Plate", ""), - JUNGLE_SLAB(126, 3, 19117, "Jungle Slab", ""), + JUNGLE_SAPLING(6, 3, 17951, "Jungle Sapling", ""), + JUNGLE_SLAB(43, 0, 19117, "Double Stone Slab", ""), + JUNGLE_STAIRS(136, 0, 20636, "Jungle Wood Stairs", "Jungle Stairs"), JUNGLE_TRAPDOOR(-1, -1, 8626, "Jungle Trapdoor", ""), - JUNGLE_WOOD(17, 3, 30228, "Jungle Wood", ""), + JUNGLE_WOOD(-1, -1, 30228, "Jungle Wood", ""), KELP(-1, -1, 21916, "Kelp", ""), KELP_PLANT(-1, -1, 29697, "Kelp Plant", ""), KNOWLEDGE_BOOK(453, 0, 12646, "Knowledge Book", ""), LADDER(65, 0, 23599, "Ladder", "LADDER"), LAPIS_BLOCK(22, 0, 14485, "Lapis Lazuli Block", "LAPIS_BLOCK"), + LAPIS_LAZULI(351, 4, 11075, "Lapis Lazuli", ""), LAPIS_ORE(21, 0, 22934, "Lapis Lazuli Ore", "LAPIS_ORE"), LARGE_FERN(175, 3, 30177, "Large Fern", "DOUBLE_PLANT"), - FLOWING_LAVA(10, 0, 8415, "Flowing Lava", "FLOWING_LAVA"), - LAVA(11, 0, 8415, "Lava", "STATIONARY_LAVA"), + LAVA(10, 0, 8415, "Flowing Lava", "FLOWING_LAVA"), + LAVA_BUCKET(327, 0, 9228, "Lava Bucket", ""), + LEAD(420, 0, 29539, "Lead", "Leash"), + LEATHER(334, 0, 16414, "Leather", ""), LEATHER_BOOTS(301, 0, 15282, "Leather Boots", "LEATHER_BOOTS"), LEATHER_CHESTPLATE(299, 0, 29275, "Leather Tunic", "LEATHER_CHESTPLATE"), LEATHER_HELMET(298, 0, 11624, "Leather Cap", "LEATHER_HELMET"), LEATHER_LEGGINGS(300, 0, 28210, "Leather Pants", "LEATHER_LEGGINGS"), LEVER(69, 0, 15319, "Lever", "LEVER"), LIGHT_BLUE_BANNER(425, 12, 18060, "Light Blue Banner", ""), + LIGHT_BLUE_BED(355, 3, 20957, "Light Blue Bed", "Light Blue Bed"), LIGHT_BLUE_CARPET(171, 3, 21194, "Light Blue Carpet", ""), LIGHT_BLUE_CONCRETE(251, 3, 29481, "Light Blue Concrete", ""), LIGHT_BLUE_CONCRETE_POWDER(252, 3, 31206, "Light Blue Concrete Powder", ""), + LIGHT_BLUE_DYE(351, 12, 28738, "Light Blue Dye", ""), LIGHT_BLUE_GLAZED_TERRACOTTA(238, 0, 4336, "Light Blue Glazed Terracotta", "LIGHT_BLUE_GLAZED_TERRACOTTA"), LIGHT_BLUE_SHULKER_BOX(222, 0, 18226, "Light Blue Shulker Box", "LIGHT_BLUE_SHULKER_BOX"), LIGHT_BLUE_STAINED_GLASS(95, 3, 17162, "Light Blue Stained Glass", ""), @@ -1205,9 +1040,11 @@ public class ItemManager { LIGHT_BLUE_WALL_BANNER(425, -1, 12011, "Light Blue Banner", ""), LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool", ""), LIGHT_GRAY_BANNER(425, -1, 11417, "Light Gray Banner", ""), + LIGHT_GRAY_BED(355, 8, 5090, "Light Gray Bed", "Light Gray Bed"), LIGHT_GRAY_CARPET(171, 8, 11317, "Light Gray Carpet", ""), LIGHT_GRAY_CONCRETE(251, 8, 14453, "Light Gray Concrete", ""), LIGHT_GRAY_CONCRETE_POWDER(252, 8, 21589, "Light Gray Concrete Powder", ""), + LIGHT_GRAY_DYE(351, 7, 27643, "Light Gray Dye", ""), LIGHT_GRAY_GLAZED_TERRACOTTA(243, 0, 10707, "Light Gray Glazed Terracotta", "SILVER_GLAZED_TERRACOTTA"), LIGHT_GRAY_SHULKER_BOX(227, 0, 21345, "Light Gray Shulker Box", "SILVER_SHULKER_BOX"), LIGHT_GRAY_STAINED_GLASS(95, 8, 5843, "Light Gray Stained Glass", ""), @@ -1219,9 +1056,11 @@ public class ItemManager { LILAC(175, 1, 22837, "Lilac", ""), LILY_PAD(111, 0, 19271, "Lily Pad", "WATER_LILY"), LIME_BANNER(425, 10, 18887, "Lime Banner", ""), + LIME_BED(355, 5, 27860, "Lime Bed", "Lime Bed"), LIME_CARPET(171, 5, 15443, "Lime Carpet", ""), LIME_CONCRETE(251, 5, 5863, "Lime Concrete", ""), LIME_CONCRETE_POWDER(252, 5, 28859, "Lime Concrete Powder", ""), + LIME_DYE(351, 10, 6147, "Lime Dye", ""), LIME_GLAZED_TERRACOTTA(240, 0, 13861, "Lime Glazed Terracotta", "LIME_GLAZED_TERRACOTTA"), LIME_SHULKER_BOX(224, 0, 28360, "Lime Shulker Box", "LIME_SHULKER_BOX"), LIME_STAINED_GLASS(95, 5, 24266, "Lime Stained Glass", ""), @@ -1229,10 +1068,14 @@ public class ItemManager { LIME_TERRACOTTA(159, 5, 24013, "Lime Terracotta", ""), LIME_WALL_BANNER(425, -1, 21422, "Lime Banner", ""), LIME_WOOL(35, 5, 10443, "Lime Wool", ""), + LINGERING_POTION(441, 0, 25857, "Lingering Potion", ""), + LLAMA_SPAWN_EGG(383, 103, 23640, "Spawn Llama", "Llama Spawn Egg"), MAGENTA_BANNER(425, 13, 15591, "Magenta Banner", ""), + MAGENTA_BED(355, 2, 20061, "Magenta Bed", "Magenta Bed"), MAGENTA_CARPET(171, 2, 6180, "Magenta Carpet", ""), MAGENTA_CONCRETE(251, 2, 20591, "Magenta Concrete", ""), MAGENTA_CONCRETE_POWDER(252, 2, 8272, "Magenta Concrete Powder", ""), + MAGENTA_DYE(351, 13, 11788, "Magenta Dye", ""), MAGENTA_GLAZED_TERRACOTTA(237, 0, 8067, "Magenta Glazed Terracotta", "MAGENTA_GLAZED_TERRACOTTA"), MAGENTA_SHULKER_BOX(221, 0, 21566, "Magenta Shulker Box", "MAGENTA_SHULKER_BOX"), MAGENTA_STAINED_GLASS(95, 2, 26814, "Magenta Stained Glass", ""), @@ -1241,43 +1084,74 @@ public class ItemManager { MAGENTA_WALL_BANNER(425, -1, 23291, "Magenta Banner", ""), MAGENTA_WOOL(35, 2, 11853, "Magenta Wool", ""), MAGMA_BLOCK(213, 0, 25927, "Magma Block", "MAGMA"), - MAP(358, 0, 21655, "Empty Map"), + MAGMA_CREAM(378, 0, 25097, "Magma Cream", ""), + MAGMA_CUBE_SPAWN_EGG(383, 62, 26638, "Spawn Magma Cube", "Magma Cube Spawn Egg"), + MAP(395, 0, 21655, "Empty Map", "EMPTY_MAP"), MELON(103, 0, 25172, "Melon", "Melon_Block"), + MELON_SEEDS(362, 0, 18340, "Melon Seeds", ""), + MELON_SLICE(360, 0, 5347, "Melon", "Melon Slice"), MELON_STEM(105, 0, 8247, "Melon Stem", "MELON_STEM"), + MILK_BUCKET(335, 0, 9680, "Milk Bucket", ""), + MINECART(328, 0, 14352, "Minecart", ""), + MOOSHROOM_SPAWN_EGG(383, 96, 22125, "Spawn Mushroom Cow", "Mooshroom Spawn Egg"), MOSSY_COBBLESTONE(48, 0, 21900, "Mossy Cobblestone", "MOSSY_COBBLESTONE"), MOSSY_COBBLESTONE_WALL(139, 1, 11536, "Mossy Cobblestone Wall", ""), MOSSY_STONE_BRICKS(98, 1, 16415, "Mossy Stone Bricks", ""), - MOVING_PISTON(-1, -1, 13831, "Moving Piston", ""), + MOVING_PISTON(36, 0, 13831, "Piston Moving Piece", ""), + MULE_SPAWN_EGG(383, 32, 11229, "Spawn Mule", "Mule Spawn Egg"), MUSHROOM_STEM(-1, -1, 16543, "Mushroom Stem", ""), MUSHROOM_STEW(282, 0, 16336, "Mushroom Stew", "MUSHROOM_SOUP"), + MUSIC_DISC_11(2266, 0, 27426, "11 Disc", "RECORD_11"), + MUSIC_DISC_13(2256, 0, 16359, "13 Disc", "GOLD_RECORD"), + MUSIC_DISC_BLOCKS(2258, 0, 26667, "Blocks Disc", "RECORD_3"), + MUSIC_DISC_CAT(2257, 0, 16246, "Cat Disc", "GREEN_RECORD"), + MUSIC_DISC_CHIRP(2259, 0, 19436, "Chirp Disc", "RECORD_4"), + MUSIC_DISC_FAR(2260, 0, 13823, "Far Disc", "RECORD_5"), + MUSIC_DISC_MALL(2261, 0, 11517, "Mall Disc", "RECORD_6"), + MUSIC_DISC_MELLOHI(2262, 0, 26117, "Mellohi Disc", "RECORD_7"), + MUSIC_DISC_STAL(2263, 0, 14989, "Stal Disc", "RECORD_8"), + MUSIC_DISC_STRAD(2264, 0, 16785, "Strad Disc", "RECORD_9"), + MUSIC_DISC_WAIT(2267, 0, 26499, "Wait Disc", "RECORD_12"), + MUSIC_DISC_WARD(2265, 0, 24026, "Ward Disc", "RECORD_10"), + MUTTON(423, 0, 4792, "Raw Mutton", ""), MYCELIUM(110, 0, 9913, "Mycelium", "MYCEL"), + NAME_TAG(421, 0, 30731, "Name Tag", ""), NAUTILUS_SHELL(-1, -1, 19989, "Nautilus Shell", ""), NETHERRACK(87, 0, 23425, "Netherrack", "NETHERRACK"), NETHER_BRICK(112, 0, 19996, "Nether Brick", "NETHER_BRICK"), + NETHER_BRICKS(405, 0, 27802, "Nether Brick", "Nether Bricks"), NETHER_BRICK_FENCE(113, 0, 5286, "Nether Brick Fence", "NETHER_FENCE"), NETHER_BRICK_SLAB(44, 6, 26586, "Nether Brick Slab", ""), NETHER_BRICK_STAIRS(114, 0, 12085, "Nether Brick Stairs", "NETHER_BRICK_STAIRS"), NETHER_PORTAL(90, 0, 19085, "Nether Portal", "PORTAL"), NETHER_QUARTZ_ORE(153, 0, 4807, "Nether Quartz Ore", "QUARTZ_ORE"), - NETHER_WART(115, 0, 29227, "Nether Wart", "NETHER_WARTS"), + NETHER_STAR(399, 0, 12469, "Nether Star", ""), + NETHER_WART(372, 0, 29227, "Nether Wart", "NETHER_STALK"), NETHER_WART_BLOCK(214, 0, 15486, "Nether Wart Block", "NETHER_WART_BLOCK"), NOTE_BLOCK(25, 0, 20979, "Note Block", "NOTE_BLOCK"), + OAK_BOAT(333, 0, 17570, "Boat", "Oak Boat"), OAK_BUTTON(143, 0, 13510, "Oak Button", "Wooden_button"), + OAK_DOOR(324, 0, 20341, "Wooden Door", "wooddoor"), OAK_FENCE(85, 0, 6442, "Oak Fence", "FENCE"), OAK_FENCE_GATE(107, 0, 16689, "Oak Fence Gate", "FENCE_GATE"), OAK_LEAVES(18, 0, 4385, "Oak Leaves", ""), OAK_LOG(17, 0, 26723, "Oak Log", ""), + OAK_PLANKS(5, 0, 14905, "Oak Wood Plank", "Oak Planks"), OAK_PRESSURE_PLATE(72, 0, 20108, "Oak Pressure Plate", "Wooden_Presure_Plate"), + OAK_SAPLING(6, 0, 9636, "Oak Sapling", ""), OAK_SLAB(126, 0, 12002, "Oak Slab", "Wood step"), OAK_STAIRS(53, 0, 5449, "Oak Stairs", "WOOD_STAIRS"), OAK_TRAPDOOR(96, 0, 16927, "Oak Trapdoor", "Trapdoor"), - OAK_WOOD(17, 0, 23286, "Oak Wood", ""), + OAK_WOOD(-1, -1, 23286, "Oak Wood", ""), OBSERVER(218, 0, 10726, "Observer", "OBSERVER"), OBSIDIAN(49, 0, 32723, "Obsidian", "OBSIDIAN"), + OCELOT_SPAWN_EGG(383, 98, 30080, "Spawn Ocelot", "Ocelot Spawn Egg"), ORANGE_BANNER(425, 14, 4839, "Orange Banner", ""), + ORANGE_BED(355, 1, 11194, "Orange Bed", "Orange Bed"), ORANGE_CARPET(171, 1, 24752, "Orange Carpet", ""), ORANGE_CONCRETE(251, 1, 19914, "Orange Concrete", ""), ORANGE_CONCRETE_POWDER(252, 1, 30159, "Orange Concrete Powder", ""), + ORANGE_DYE(351, 14, 13866, "Orange Dye", ""), ORANGE_GLAZED_TERRACOTTA(236, 0, 27451, "Orange Glazed Terracotta", "ORANGE_GLAZED_TERRACOTTA"), ORANGE_SHULKER_BOX(220, 0, 21673, "Orange Shulker Box", "ORANGE_SHULKER_BOX"), ORANGE_STAINED_GLASS(95, 1, 25142, "Orange Stained Glass", ""), @@ -1288,14 +1162,20 @@ public class ItemManager { ORANGE_WOOL(35, 1, 23957, "Orange Wool", ""), OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy", ""), PACKED_ICE(174, 0, 28993, "Packed Ice", "PACKED_ICE"), + PAINTING(321, 0, 23945, "Painting", ""), + PAPER(339, 0, 9923, "Paper", ""), + PARROT_SPAWN_EGG(383, 105, 23614, "Spawn Parrot", "Parrot Spawn Egg"), PEONY(175, 5, 21155, "Peony", ""), PETRIFIED_OAK_SLAB(-1, -1, 18658, "Petrified Oak Slab", ""), PHANTOM_MEMBRANE(-1, -1, 18398, "Phantom Membrane", ""), PHANTOM_SPAWN_EGG(-1, -1, 24648, "Phantom Spawn Egg", ""), + PIG_SPAWN_EGG(383, 90, 22584, "Spawn Pig", "Pig Spawn Egg"), PINK_BANNER(425, 9, 19439, "Pink Banner", ""), + PINK_BED(355, 6, 13795, "Pink Bed", "Pink Bed"), PINK_CARPET(171, 6, 30186, "Pink Carpet", ""), PINK_CONCRETE(251, 6, 5227, "Pink Concrete", ""), PINK_CONCRETE_POWDER(252, 6, 6421, "Pink Concrete Powder", ""), + PINK_DYE(351, 9, 31151, "Pink Dye", ""), PINK_GLAZED_TERRACOTTA(241, 0, 10260, "Pink Glazed Terracotta", "PINK_GLAZED_TERRACOTTA"), PINK_SHULKER_BOX(225, 0, 24968, "Pink Shulker Box", "PINK_SHULKER_BOX"), PINK_STAINED_GLASS(95, 6, 16164, "Pink Stained Glass", ""), @@ -1306,9 +1186,20 @@ public class ItemManager { PINK_WOOL(35, 6, 7611, "Pink Wool", ""), PISTON(33, 0, 21130, "Piston", "PISTON_BASE"), PISTON_HEAD(34, 0, 30226, "Piston Head", "PISTON_EXTENSION"), + PLAYER_HEAD(397, 3, 21174, "Mob Head (Human)", "Player Head"), PLAYER_WALL_HEAD(-1, -1, 13164, "Player Wall Head", ""), + PODZOL(3, 2, 24068, "Podzol", ""), + POISONOUS_POTATO(394, 0, 32640, "Poisonous Potato", ""), + POLAR_BEAR_SPAWN_EGG(383, 102, 17015, "Spawn Polar Bear", "Polar Bear Spawn Egg"), + POLISHED_ANDESITE(1, 6, 8335, "Polished Andesite", ""), + POLISHED_DIORITE(1, 4, 31615, "Polished Diorite", ""), + POLISHED_GRANITE(1, 2, 5477, "Polished Granite", ""), + POPPED_CHORUS_FRUIT(433, 0, 16880, "Popped Chorus Fruit", ""), POPPY(38, 0, 12851, "Poppy", ""), + PORKCHOP(319, 0, 30896, "Raw Porkchop", ""), + POTATO(392, 0, 21088, "Potato", "Potatoitem"), POTATOES(142, 0, 10879, "Potatoes", "POTATO"), + POTION(373, 0, 24020, "Potion", ""), POTTED_ACACIA_SAPLING(-1, -1, 14096, "Potted Acacia Sapling", ""), POTTED_ALLIUM(-1, -1, 13184, "Potted Allium", ""), POTTED_AZURE_BLUET(-1, -1, 8754, "Potted Azure Bluet", ""), @@ -1335,16 +1226,23 @@ public class ItemManager { PRISMARINE_BRICKS(168, 1, 29118, "Prismarine Bricks", ""), PRISMARINE_BRICK_SLAB(-1, -1, 26672, "Prismarine Brick Slab", ""), PRISMARINE_BRICK_STAIRS(-1, -1, 15445, "Prismarine Brick Stairs", ""), + PRISMARINE_CRYSTALS(410, 0, 31546, "Prismarine Crystals", ""), + PRISMARINE_SHARD(409, 0, 10993, "Prismarine Shard", ""), PRISMARINE_SLAB(-1, -1, 31323, "Prismarine Slab", ""), PRISMARINE_STAIRS(-1, -1, 19217, "Prismarine Stairs", ""), + PUFFERFISH(349, 3, 8115, "Pufferfish", ""), PUFFERFISH_BUCKET(-1, -1, 8861, "Bucket of Pufferfish", ""), PUFFERFISH_SPAWN_EGG(-1, -1, 24573, "Pufferfish Spawn Egg", ""), PUMPKIN(86, 0, 19170, "Pumpkin", "PUMPKIN"), + PUMPKIN_PIE(400, 0, 28725, "Pumpkin Pie", ""), + PUMPKIN_SEEDS(361, 0, 28985, "Pumpkin Seeds", ""), PUMPKIN_STEM(104, 0, 19021, "Pumpkin Stem", "PUMPKIN_STEM"), PURPLE_BANNER(425, 5, 29027, "Purple Banner", ""), + PURPLE_BED(355, 10, 29755, "Purple Bed", "Purple Bed"), PURPLE_CARPET(171, 10, 5574, "Purple Carpet", ""), PURPLE_CONCRETE(251, 10, 20623, "Purple Concrete", ""), PURPLE_CONCRETE_POWDER(252, 10, 26808, "Purple Concrete Powder", ""), + PURPLE_DYE(351, 5, 6347, "Purple Dye", ""), PURPLE_GLAZED_TERRACOTTA(245, 0, 4818, "Purple Glazed Terracotta", ""), PURPLE_SHULKER_BOX(229, 0, 10373, "Purple Shulker Box", "PURPLE_SHULKER_BOX"), PURPLE_STAINED_GLASS(95, 10, 21845, "Purple Stained Glass", ""), @@ -1356,19 +1254,26 @@ public class ItemManager { PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar", "PURPUR_PILLAR"), PURPUR_SLAB(205, 0, 11487, "Purpur Slab", "PURPUR_SLAB"), PURPUR_STAIRS(203, 0, 8921, "Purpur Stairs", "PURPUR_STAIRS"), + QUARTZ(406, 0, 23608, "Nether Quartz", ""), QUARTZ_BLOCK(155, 0, 11987, "Block of Quartz", ""), QUARTZ_PILLAR(155, 2, 16452, "Quartz Pillar", ""), QUARTZ_SLAB(44, 7, 4423, "Quartz Slab", ""), QUARTZ_STAIRS(156, 0, 24079, "Quartz Stairs", "QUARTZ_STAIRS"), + RABBIT(411, 0, 23068, "Raw Rabbit", ""), + RABBIT_FOOT(414, 0, 13864, "Rabbit's Foot", ""), + RABBIT_HIDE(415, 0, 12467, "Rabbit Hide", ""), + RABBIT_SPAWN_EGG(383, 101, 26496, "Spawn Rabbit", "Rabbit Spawn Egg"), + RABBIT_STEW(413, 0, 10611, "Rabbit Stew", ""), RAIL(66, 0, 13285, "Rail", "RAILS"), + REDSTONE(331, 0, 11233, "Redstone", "Redstone Dust"), REDSTONE_BLOCK(152, 0, 19496, "Block of Redstone", "REDSTONE_BLOCK"), REDSTONE_LAMP(123, 0, 8217, "Redstone Lamp", "REDSTONE_LAMP_OFF"), - REDSTONE_ORE(73, 0, 10887, "Redstone Ore", "REDSTONE_ORE"), + REDSTONE_ORE(74, 0, 10887, "Redstone Ore", ""), REDSTONE_TORCH(76, 0, 22547, "Redstone Torch(on)", "REDSTONE_TORCH_ON"), - UNLIT_REDSTONE_TORCH(75, 0, 22547, "Redstone Torch(off)", "REDSTONE_TORCH_ON"), REDSTONE_WALL_TORCH(76, -1, 7595, "Redstone Wall Torch", ""), REDSTONE_WIRE(55, 0, 25984, "Redstone Dust", "REDSTONE_WIRE"), RED_BANNER(425, 1, 26961, "Red Banner", ""), + RED_BED(355, 14, 30910, "Red Bed", "Red Bed"), RED_CARPET(171, 14, 5424, "Red Carpet", ""), RED_CONCRETE(251, 14, 8032, "Red Concrete", ""), RED_CONCRETE_POWDER(252, 14, 13286, "Red Concrete Powder", ""), @@ -1387,44 +1292,70 @@ public class ItemManager { RED_TULIP(38, 4, 16781, "Red Tulip", ""), RED_WALL_BANNER(425, -1, 4378, "Red Banner", ""), RED_WOOL(35, 14, 11621, "Red Wool", ""), + REPEATER(356, 0, 28823, "Redstone Repeater", "Diode"), REPEATING_COMMAND_BLOCK(-1, -1, 12405, "Repeating Command Block", ""), ROSE_BUSH(175, 4, 6080, "Rose Bush", ""), + ROSE_RED(351, 1, 15694, "Rose Red", ""), + ROTTEN_FLESH(367, 0, 21591, "Rotten Flesh", ""), + SADDLE(329, 0, 30206, "Saddle", ""), + SALMON(349, 1, 18516, "Raw Salmon", ""), SALMON_BUCKET(-1, -1, 31427, "Bucket of Salmon", ""), SALMON_SPAWN_EGG(-1, -1, 18739, "Salmon Spawn Egg", ""), SAND(12, 0, 11542, "Sand", ""), SANDSTONE(24, 0, 13141, "Sandstone", ""), SANDSTONE_SLAB(44, 1, 29830, "Sandstone Slab", ""), + SANDSTONE_STAIRS(128, 0, 18474, "Sandstone Stairs", ""), SCUTE(-1, -1, 11914, "Scute", ""), SEAGRASS(-1, -1, 23942, "Seagrass", ""), SEA_LANTERN(169, 0, 16984, "Sea Lantern", "SEA_LANTERN"), SEA_PICKLE(-1, -1, 19562, "Sea Pickle", ""), + SHEARS(359, 0, 27971, "Shears", ""), + SHEEP_SPAWN_EGG(383, 91, 24488, "Spawn Sheep", "Sheep Spawn Egg"), + SHIELD(442, 0, 29943, "Shield", ""), SHULKER_BOX(229, 0, 7776, "Shulker Box", ""), SHULKER_SHELL(450, 0, 27848, "Shulker Shell", "SHULKER_SHELL"), + SHULKER_SPAWN_EGG(383, 69, 31848, "Spawn Shulker", "Shulker Spawn Egg"), + SIGN(323, 0, 16918, "Sign", ""), + SILVERFISH_SPAWN_EGG(383, 60, 14537, "Spawn Silverfish", "Silverfish Spawn Egg"), + SKELETON_HORSE_SPAWN_EGG(383, 28, 21356, "Spawn Skeleton Horse", "Skeleton Horse Spawn Egg"), + SKELETON_SKULL(397, 0, 13270, "Mob Head (Skeleton)", "Skeleton Skull"), + SKELETON_SPAWN_EGG(383, 51, 15261, "Spawn Skeleton", "Skeleton Spawn Egg"), SKELETON_WALL_SKULL(397, -1, 31650, "Skeleton Wall Skull", ""), + SLIME_BALL(341, 0, 5242, "Slimeball", ""), SLIME_BLOCK(165, 0, 31892, "Slime Block", "SLIME_BLOCK"), + SLIME_SPAWN_EGG(383, 55, 6550, "Spawn Slime", "Slime Spawn Egg"), SMOOTH_QUARTZ(-1, -1, 14415, "Smooth Quartz", ""), SMOOTH_RED_SANDSTONE(179, 2, 25180, "Smooth Red Sandstone", ""), SMOOTH_SANDSTONE(24, 2, 30039, "Smooth Sandstone", ""), SMOOTH_STONE(-1, -1, 21910, "Smooth Stone", ""), SNOW(78, 0, 14146, "Snow", "SNOW"), + SNOWBALL(332, 0, 19487, "Snowball", ""), SNOW_BLOCK(80, 0, 19913, "Snow Block", "SNOW_BLOCK"), SOUL_SAND(88, 0, 16841, "Soul Sand", "SOUL_SAND"), SPAWNER(52, 90, 25500, "Spawner", "MOB_SPAWNER"), + SPECTRAL_ARROW(439, 0, 4568, "Spectral Arrow", ""), + SPIDER_EYE(375, 0, 9318, "Spider Eye", ""), + SPIDER_SPAWN_EGG(383, 52, 14984, "Spawn Spider", "Spider Spawn Egg"), SPLASH_POTION(438, 0, 30248, "Splash Potion", "SPLASH_POTION"), SPONGE(19, 0, 15860, "Sponge", "SPONGE"), SPRUCE_BOAT(444, 0, 9606, "Spruce Boat", "BOAT_SPRUCE"), SPRUCE_BUTTON(-1, -1, 23281, "Spruce Button", ""), - SPRUCE_DOOR(193, 0, 10642, "Spruce Door", "SPRUCE_DOOR"), + SPRUCE_DOOR(427, 0, 10642, "Spruce Door", "SPRUCE_DOOR_ITEM"), SPRUCE_FENCE(188, 0, 25416, "Spruce Fence", "SPRUCE_FENCE"), SPRUCE_FENCE_GATE(183, 0, 26423, "Spruce Fence Gate", "SPRUCE_FENCE_GATE"), SPRUCE_LEAVES(18, 1, 20039, "Spruce Leaves", ""), SPRUCE_LOG(17, 1, 9726, "Spruce Log", ""), + SPRUCE_PLANKS(5, 1, 14593, "Spruce Wood Plank", "Spruce Planks"), SPRUCE_PRESSURE_PLATE(-1, -1, 15932, "Spruce Pressure Plate", ""), + SPRUCE_SAPLING(6, 1, 19874, "Spruce Sapling", ""), SPRUCE_SLAB(126, 1, 4348, "Spruce Slab", ""), + SPRUCE_STAIRS(134, 0, 11192, "Spruce Wood Stairs", "Spruce Stairs"), SPRUCE_TRAPDOOR(-1, -1, 10289, "Spruce Trapdoor", ""), - SPRUCE_WOOD(17, 1, 22538, "Spruce Wood", ""), + SPRUCE_WOOD(-1, -1, 22538, "Spruce Wood", ""), + SQUID_SPAWN_EGG(383, 94, 10682, "Spawn Squid", "Squid Spawn Egg"), STICK(280, 0, 9773, "Stick", "STICK"), STICKY_PISTON(29, 0, 18127, "Sticky Piston", "PISTON_STICKY_BASE"), + STONE(1, 0, 22948, "Stone", ""), STONE_AXE(275, 0, 6338, "Stone Axe", "STONE_AXE"), STONE_BRICKS(98, 0, 6962, "Stone Bricks", ""), STONE_BRICK_SLAB(44, 5, 19676, "Stone Brick Slab", ""), @@ -1436,48 +1367,61 @@ public class ItemManager { STONE_SHOVEL(273, 0, 9520, "Stone Shovel", "STONE_SPADE"), STONE_SLAB(44, 0, 19838, "Stone Slab", ""), STONE_SWORD(272, 0, 25084, "Stone Sword", "STONE_SWORD"), + STRAY_SPAWN_EGG(383, 6, 30153, "Spawn Stray", "Stray Spawn Egg"), STRING(287, 0, 12806, "String", "STRING"), - STRIPPED_ACACIA_LOG(-1, -1, 18167, "Stripped Acacia Log", ""), - STRIPPED_ACACIA_WOOD(-1, -1, 17579, "Stripped Acacia Wood", ""), - STRIPPED_BIRCH_LOG(-1, -1, 8838, "Stripped Birch Log", ""), - STRIPPED_BIRCH_WOOD(-1, -1, 30740, "Stripped Birch Wood", ""), - STRIPPED_DARK_OAK_LOG(-1, -1, 6492, "Stripped Dark Oak Log", ""), - STRIPPED_DARK_OAK_WOOD(-1, -1, 6606, "Stripped Dark Oak Wood", ""), - STRIPPED_JUNGLE_LOG(-1, -1, 15476, "Stripped Jungle Log", ""), - STRIPPED_JUNGLE_WOOD(-1, -1, 5072, "Stripped Jungle Wood", ""), - STRIPPED_OAK_LOG(-1, -1, 20523, "Stripped Oak Log", ""), - STRIPPED_OAK_WOOD(-1, -1, 4514, "Stripped Oak Wood", ""), - STRIPPED_SPRUCE_LOG(-1, -1, 6140, "Stripped Spruce Log", ""), - STRIPPED_SPRUCE_WOOD(-1, -1, 15634, "Stripped Spruce Wood", ""), - STRUCTURE_BLOCK(255, -1, 26831, "Structure Block", ""), - STRUCTURE_VOID(217, -1, 30806, "Structure Void", ""), + STRIPPED_ACACIA_LOG(-1, -1, 18167, "Stripped Acacia Log", "Oak Log"), + STRIPPED_ACACIA_WOOD(-1, -1, 27193, "Stripped Acacia Wood", "Oak Planks"), + STRIPPED_BIRCH_LOG(-1, -1, 8838, "Stripped Birch Log", "Spruce Log"), + STRIPPED_BIRCH_WOOD(-1, -1, 22350, "Stripped Birch Wood", "Spruce Planks"), + STRIPPED_DARK_OAK_LOG(-1, -1, 6492, "Stripped Dark Oak Log", "Birch Log"), + STRIPPED_DARK_OAK_WOOD(-1, -1, 16000, "Stripped Dark Oak Wood", "Birch Planks"), + STRIPPED_JUNGLE_LOG(-1, -1, 15476, "Stripped Jungle Log", "Jungle Log"), + STRIPPED_JUNGLE_WOOD(-1, -1, 30315, "Stripped Jungle Wood", "Jungle Planks"), + STRIPPED_OAK_LOG(-1, -1, 20523, "Stripped Oak Log", "Acacia Log"), + STRIPPED_OAK_WOOD(-1, -1, 31455, "Stripped Oak Wood", "Acacia Planks"), + STRIPPED_SPRUCE_LOG(-1, -1, 6140, "Stripped Spruce Log", "Dark Oak Log"), + STRIPPED_SPRUCE_WOOD(-1, -1, 6467, "Stripped Spruce Wood", "Dark Oak Planks"), + STRUCTURE_BLOCK(255, 0, 26831, "Structure Block", "STRUCTURE_BLOCK"), + STRUCTURE_VOID(217, 0, 30806, "Structure Void", "STRUCTURE_VOID"), + SUGAR(353, 0, 30638, "Sugar", ""), + SUGAR_CANE(338, 0, 7726, "Sugar Canes", "Sugar Cane"), SUNFLOWER(175, 0, 7408, "Sunflower", ""), TALL_GRASS(31, 0, 21559, "Tall Grass", ""), TALL_SEAGRASS(-1, -1, 27189, "Tall Seagrass", ""), TERRACOTTA(172, 0, 16544, "Terracotta", "HARD_CLAY"), + TIPPED_ARROW(440, 0, 25164, "Tipped Arrow", ""), TNT(46, 0, 7896, "TNT", "TNT"), + TNT_MINECART(407, 0, 4277, "Minecart with TNT", "explosiveminecart"), TORCH(50, 0, 6063, "Torch", "TORCH"), + TOTEM_OF_UNDYING(449, 0, 10139, "Totem Of Undying", ""), TRAPPED_CHEST(146, 0, 18970, "Trapped Chest", "TRAPPED_CHEST"), TRIDENT(-1, -1, 7534, "Trident", ""), + TRIPWIRE(132, 0, 8810, "Tripwire", ""), + TRIPWIRE_HOOK(131, 0, 8130, "Tripwire Hook", ""), TROPICAL_FISH(-1, -1, 12795, "Tropical Fish", ""), TROPICAL_FISH_BUCKET(-1, -1, 30390, "Bucket of Tropical Fish", ""), TROPICAL_FISH_SPAWN_EGG(-1, -1, 19713, "Tropical Fish Spawn Egg", ""), TUBE_CORAL(-1, -1, 23048, "Tube Coral", ""), TUBE_CORAL_BLOCK(-1, -1, 23723, "Tube Coral Block", ""), TUBE_CORAL_FAN(-1, -1, 19929, "Tube Coral Fan", ""), + TUBE_CORAL_WALL_FAN(-1, -1, 25282, "Tube Coral Wall Fan", ""), TURTLE_EGG(-1, -1, 32101, "Turtle Egg", ""), TURTLE_HELMET(-1, -1, 30120, "Turtle Shell", ""), TURTLE_SPAWN_EGG(-1, -1, 17324, "Turtle Spawn Egg", ""), + VEX_SPAWN_EGG(383, 35, 27751, "Spawn Vex", "Vex Spawn Egg"), + VILLAGER_SPAWN_EGG(383, 120, 30348, "Spawn Villager", "Villager Spawn Egg"), + VINDICATOR_SPAWN_EGG(383, 36, 21672, "Spawn Vindicator", "Vindicator Spawn Egg"), VINE(106, 0, 14564, "Vines", "VINE"), - VOID_AIR(0, 0, 13668, "Air", ""), + VOID_AIR(-1, -1, 13668, "Void Air", ""), WALL_SIGN(68, 0, 10644, "Wall Sign", "WALL_SIGN"), WALL_TORCH(50, -1, 25890, "Wall Torch", ""), - FLOWING_WATER(8, 0, 24998, "Flowing Water", "FLOWING_WATER"), - WATER(9, 0, 24998, "Water", "STATIONARY_WATER"), + WATER(8, 0, 24998, "Flowing Water", "FLOWING_WATER"), + WATER_BUCKET(326, 0, 8802, "Water Bucket", ""), WET_SPONGE(19, 1, 9043, "Wet Sponge", ""), - WHEAT(296, 0, 27709, "Wheat", "CROPS"), + WHEAT(59, 0, 27709, "Crops", ""), WHEAT_SEEDS(295, 0, 28742, "Wheat Seeds", "SEEDS"), WHITE_BANNER(425, 15, 17562, "White Banner", ""), + WHITE_BED(355, 0, 8185, "White Bed", "Bed"), WHITE_CARPET(171, 0, 15117, "White Carpet", ""), WHITE_CONCRETE(251, 0, 6281, "White Concrete", ""), WHITE_CONCRETE_POWDER(252, 0, 10363, "White Concrete Powder", ""), @@ -1487,15 +1431,22 @@ public class ItemManager { WHITE_STAINED_GLASS_PANE(160, 0, 10557, "White Stained Glass Pane", ""), WHITE_TERRACOTTA(159, 0, 20975, "White Terracotta", ""), WHITE_TULIP(38, 6, 9742, "White Tulip", ""), - WHITE_WALL_BANNER(425, -1, 15967, "White Banner", ""), + WHITE_WALL_BANNER(425, 15, 15967, "White Banner", ""), WHITE_WOOL(35, 0, 8624, "White Wool", "Wool"), - WITHER_SKELETON_WALL_SKULL(397, -1, 9326, "Wither Skeleton Wall Skull", ""), + WITCH_SPAWN_EGG(383, 66, 11837, "Spawn Witch", "Witch Spawn Egg"), + WITHER_SKELETON_SKULL(397, 1, 31487, "Mob Head (Wither Skeleton)", "Wither Skeleton Skull"), + WITHER_SKELETON_SPAWN_EGG(383, 5, 10073, "Spawn Wither Skeleton", "Wither Skeleton Spawn Egg"), + WITHER_SKELETON_WALL_SKULL(397, 1, 9326, "Wither Skeleton Wall Skull", ""), + WOLF_SPAWN_EGG(383, 95, 21692, "Spawn Wolf", "Wolf Spawn Egg"), WOODEN_AXE(271, 0, 6292, "Wooden Axe", "WOOD_AXE"), WOODEN_HOE(290, 0, 16043, "Wooden Hoe", "WOOD_HOE"), WOODEN_PICKAXE(270, 0, 12792, "Wooden Pickaxe", "WOOD_PICKAXE"), WOODEN_SHOVEL(269, 0, 28432, "Wooden Shovel", "WOOD_SPADE"), WOODEN_SWORD(268, 0, 7175, "Wooden Sword", "WOOD_SWORD"), + WRITABLE_BOOK(386, 0, 13393, "Book and Quill", ""), + WRITTEN_BOOK(387, 0, 24164, "Written Book", ""), YELLOW_BANNER(425, 11, 30382, "Yellow Banner", ""), + YELLOW_BED(355, 4, 30410, "Yellow Bed", "Yellow Bed"), YELLOW_CARPET(171, 4, 18149, "Yellow Carpet", ""), YELLOW_CONCRETE(251, 4, 15722, "Yellow Concrete", ""), YELLOW_CONCRETE_POWDER(252, 4, 10655, "Yellow Concrete Powder", ""), @@ -1504,25 +1455,22 @@ public class ItemManager { YELLOW_STAINED_GLASS(95, 4, 12182, "Yellow Stained Glass", ""), YELLOW_STAINED_GLASS_PANE(160, 4, 20298, "Yellow Stained Glass Pane", ""), YELLOW_TERRACOTTA(159, 4, 32129, "Yellow Terracotta", ""), - YELLOW_WALL_BANNER(425, -1, 32004, "Yellow Banner", ""), + YELLOW_WALL_BANNER(425, 11, 32004, "Yellow Banner", ""), YELLOW_WOOL(35, 4, 29507, "Yellow Wool", ""), - ZOMBIE_WALL_HEAD(397, -1, 16296, "Zombie Wall Head", ""), + ZOMBIE_HEAD(397, 2, 9304, "Mob Head (Zombie)", "Zombie Head"), + ZOMBIE_HORSE_SPAWN_EGG(383, 29, 4275, "Spawn Zombie Horse", "Zombie Horse Spawn Egg"), + ZOMBIE_PIGMAN_SPAWN_EGG(383, 57, 11531, "Spawn Zombie Pigman", "Zombie Pigman Spawn Egg"), + ZOMBIE_SPAWN_EGG(383, 54, 5814, "Spawn Zombie", "Zombie Spawn Egg"), + ZOMBIE_VILLAGER_SPAWN_EGG(383, 27, 10311, "Spawn Zombie Villager", "Zombie Villager Spawn Egg"), + ZOMBIE_WALL_HEAD(397, 2, 16296, "Zombie Wall Head", ""), - BRAIN_CORAL_WALL_FAN(-1, -1, 22685, "Brain Coral Wall Fan"), - BUBBLE_CORAL_WALL_FAN(-1, -1, 20382, "Bubble Coral Wall Fan"), - DEAD_BRAIN_CORAL_FAN(-1, -1, 26150, "Dead Brain Coral Fan"), - DEAD_BRAIN_CORAL_WALL_FAN(-1, -1, 23718, "Dead Brain Coral Wall Fan"), - DEAD_BUBBLE_CORAL_FAN(-1, -1, 17322, "Dead Bubble Coral Fan"), - DEAD_BUBBLE_CORAL_WALL_FAN(-1, -1, 18453, "Dead Bubble Coral Wall Fan"), - DEAD_FIRE_CORAL_FAN(-1, -1, 27073, "Dead Fire Coral Fan"), - DEAD_FIRE_CORAL_WALL_FAN(-1, -1, 23375, "Dead Fire Coral Wall Fan"), - DEAD_HORN_CORAL_FAN(-1, -1, 11387, "Dead Horn Coral Fan"), - DEAD_HORN_CORAL_WALL_FAN(-1, -1, 27550, "Dead Horn Coral Wall Fan"), - DEAD_TUBE_CORAL_FAN(-1, -1, 17628, "Dead Tube Coral Fan"), - DEAD_TUBE_CORAL_WALL_FAN(-1, -1, 5128, "Dead Tube Coral Wall Fan"), - FIRE_CORAL_WALL_FAN(-1, -1, 20100, "Fire Coral Wall Fan"), - HORN_CORAL_WALL_FAN(-1, -1, 28883, "Horn Coral Wall Fan"), - TUBE_CORAL_WALL_FAN(-1, -1, 25282, "Tube Coral Wall Fan"); + // Legacy + LEGACY_STATIONARY_WATER(9, 0, -1, "Stationary Water", ""), + LEGACY_STATIONARY_LAVA(11, 0, -1, "Stationary Lava", ""), + LEGACY_BURNING_FURNACE(62, 0, -1, "Burning Furnace", ""), +// LEGACY_SIGN_POST(63, -1, -1, "Sign Post", ""), + LEGACY_WOODEN_DOOR_BLOCK(64, 0, -1, "LEGACY_WOODEN_DOOR", ""), + LEGACY_IRON_DOOR_BLOCK(71, 0, -1, "LEGACY_IRON_DOOR_BLOCK", ""); private int legacyId; private int legacyData; @@ -1554,7 +1502,7 @@ public class ItemManager { } public int getId() { - if (version.isEqualOrHigher(Version.v1_13_R1)) { + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) { return this.id; } return getLegacyId(); @@ -1575,7 +1523,7 @@ public class ItemManager { } if (mat == null) { for (Material one : Material.class.getEnumConstants()) { - if (!one.name().equalsIgnoreCase(this.name())) + if (!one.name().replace("LEGACY_", "").replace("_", "").equalsIgnoreCase(this.name().replace("_", ""))) continue; mat = one; break; @@ -1583,15 +1531,15 @@ public class ItemManager { } if (mat == null) { for (Material one : Material.class.getEnumConstants()) { - if (!one.name().replace("_", "").equalsIgnoreCase(this.getName().replace(" ", ""))) + if (!one.name().replace("LEGACY_", "").replace("_", "").equalsIgnoreCase(this.getName().replace(" ", ""))) continue; mat = one; break; } } - if (mat == null) { + if (mat == null && !this.getLegacyName().isEmpty()) { for (Material one : Material.class.getEnumConstants()) { - if (!one.name().replace("_", "").equalsIgnoreCase(this.getLegacyName().replace(" ", "").replace("_", ""))) + if (!one.name().replace("LEGACY_", "").replace("_", "").equalsIgnoreCase(this.getLegacyName().replace(" ", "").replace("_", ""))) continue; mat = one; break; @@ -1608,15 +1556,16 @@ public class ItemManager { break; } } - if (version.isEqualOrHigher(Version.v1_13_R1)) { + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) { return new ItemStack(mat == null ? Material.STONE : mat); } return new ItemStack(mat == null ? Material.STONE : mat, 1, (short) this.getLegacyData()); + } @Deprecated public short getData() { - if (version.isEqualOrHigher(Version.v1_13_R1)) { + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) { return 0; } return (short) legacyData; @@ -1688,10 +1637,11 @@ public class ItemManager { if (ids != null) { if (data == null) mat = get(ids); - else + else { mat = get(ids, data); + } } - + if (mat != null) return mat; for (CMIMaterial one : CMIMaterial.values()) { @@ -1746,7 +1696,7 @@ public class ItemManager { CMIMaterial m = get(item.getType().getId(), item.getData().getData()); if (m == null) { - CMIItemStack cm = byBukkitName.get(item.getType().toString()); + CMIItemStack cm = byBukkitName.get(item.getType().toString().toLowerCase().replace("_", "")); if (cm != null) m = cm.getCMIType(); } @@ -1776,9 +1726,11 @@ public class ItemManager { if (cm != null) mat = cm.getCMIType(); - cm = byId.get(id); - if (cm != null) - mat = cm.getCMIType(); + if (mat == null) { + cm = byId.get(id); + if (cm != null) + mat = cm.getCMIType(); + } if (mat == null) { for (CMIMaterial one : CMIMaterial.values()) { @@ -1788,6 +1740,14 @@ public class ItemManager { } } } + if (mat == null) { + for (CMIMaterial one : CMIMaterial.values()) { + if (one.getLegacyId() == id) { + mat = one; + break; + } + } + } if (mat != null) { for (CMIMaterial one : CMIMaterial.values()) { if (one.getId() == mat.getId()) { @@ -1826,30 +1786,273 @@ public class ItemManager { } public static boolean isMonsterEgg(Material mat) { - if (mat == null) + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) return false; - if (mat.toString().contains("_EGG")) - return true; - return false; + return m.isMonsterEgg(); } public boolean isMonsterEgg() { - if (toString().contains("_EGG")) + switch (this) { + case ELDER_GUARDIAN_SPAWN_EGG: + case WITHER_SKELETON_SPAWN_EGG: + case STRAY_SPAWN_EGG: + case HUSK_SPAWN_EGG: + case ZOMBIE_VILLAGER_SPAWN_EGG: + case SKELETON_HORSE_SPAWN_EGG: + case ZOMBIE_HORSE_SPAWN_EGG: + case DONKEY_SPAWN_EGG: + case MULE_SPAWN_EGG: + case EVOKER_SPAWN_EGG: + case VEX_SPAWN_EGG: + case VINDICATOR_SPAWN_EGG: + case CREEPER_SPAWN_EGG: + case SKELETON_SPAWN_EGG: + case SPIDER_SPAWN_EGG: + case ZOMBIE_SPAWN_EGG: + case SLIME_SPAWN_EGG: + case GHAST_SPAWN_EGG: + case ZOMBIE_PIGMAN_SPAWN_EGG: + case ENDERMAN_SPAWN_EGG: + case CAVE_SPIDER_SPAWN_EGG: + case SILVERFISH_SPAWN_EGG: + case BLAZE_SPAWN_EGG: + case MAGMA_CUBE_SPAWN_EGG: + case BAT_SPAWN_EGG: + case WITCH_SPAWN_EGG: + case ENDERMITE_SPAWN_EGG: + case GUARDIAN_SPAWN_EGG: + case SHULKER_SPAWN_EGG: + case PIG_SPAWN_EGG: + case SHEEP_SPAWN_EGG: + case COW_SPAWN_EGG: + case CHICKEN_SPAWN_EGG: + case SQUID_SPAWN_EGG: + case WOLF_SPAWN_EGG: + case MOOSHROOM_SPAWN_EGG: + case OCELOT_SPAWN_EGG: + case HORSE_SPAWN_EGG: + case RABBIT_SPAWN_EGG: + case POLAR_BEAR_SPAWN_EGG: + case LLAMA_SPAWN_EGG: + case PARROT_SPAWN_EGG: + case VILLAGER_SPAWN_EGG: + case COD_SPAWN_EGG: + case DOLPHIN_SPAWN_EGG: + case DRAGON_EGG: + case DROWNED_SPAWN_EGG: + case PHANTOM_SPAWN_EGG: + case PUFFERFISH_SPAWN_EGG: + case SALMON_SPAWN_EGG: + case TROPICAL_FISH_SPAWN_EGG: + case TURTLE_EGG: + case TURTLE_SPAWN_EGG: return true; + default: + break; + } + return false; + } + + public static boolean isBed(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isBed(); + } + + public boolean isBed() { + switch (this) { + case WHITE_BED: + case ORANGE_BED: + case MAGENTA_BED: + case LIGHT_BLUE_BED: + case YELLOW_BED: + case LIME_BED: + case PINK_BED: + case GRAY_BED: + case LIGHT_GRAY_BED: + case CYAN_BED: + case PURPLE_BED: + case BLUE_BED: + case BROWN_BED: + case GREEN_BED: + case RED_BED: + case BLACK_BED: + return true; + default: + break; + } + return false; + } + + public static boolean isBoat(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isBoat(); + } + + public boolean isBoat() { + switch (this) { + case OAK_BOAT: + case ACACIA_BOAT: + case BIRCH_BOAT: + case DARK_OAK_BOAT: + case JUNGLE_BOAT: + case SPRUCE_BOAT: + return true; + default: + break; + } + return false; + } + + public static boolean isSapling(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isSapling(); + } + + public boolean isSapling() { + switch (this) { + case OAK_SAPLING: + case SPRUCE_SAPLING: + case BIRCH_SAPLING: + case JUNGLE_SAPLING: + case ACACIA_SAPLING: + case DARK_OAK_SAPLING: + case POTTED_ACACIA_SAPLING: + case POTTED_BIRCH_SAPLING: + case POTTED_DARK_OAK_SAPLING: + case POTTED_JUNGLE_SAPLING: + case POTTED_OAK_SAPLING: + case POTTED_SPRUCE_SAPLING: + return true; + default: + break; + } + return false; + } + + public static boolean isButton(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isButton(); + } + + public boolean isButton() { + switch (this) { + case ACACIA_BUTTON: + case BIRCH_BUTTON: + case DARK_OAK_BUTTON: + case JUNGLE_BUTTON: + case OAK_BUTTON: + case SPRUCE_BUTTON: + case STONE_BUTTON: + return true; + default: + break; + } + return false; + } + + public static boolean isPlate(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isPlate(); + } + + public boolean isPlate() { + switch (this) { + case ACACIA_PRESSURE_PLATE: + case BIRCH_PRESSURE_PLATE: + case DARK_OAK_PRESSURE_PLATE: + case HEAVY_WEIGHTED_PRESSURE_PLATE: + case JUNGLE_PRESSURE_PLATE: + case LIGHT_WEIGHTED_PRESSURE_PLATE: + case OAK_PRESSURE_PLATE: + case SPRUCE_PRESSURE_PLATE: + case STONE_PRESSURE_PLATE: + return true; + default: + break; + } + return false; + } + + public static boolean isWool(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isWool(); + } + + public boolean isWool() { + switch (this) { + case BLACK_WOOL: + case BLUE_WOOL: + case BROWN_WOOL: + case CYAN_WOOL: + case GRAY_WOOL: + case GREEN_WOOL: + case LIGHT_BLUE_WOOL: + case LIGHT_GRAY_WOOL: + case LIME_WOOL: + case MAGENTA_WOOL: + case ORANGE_WOOL: + case PINK_WOOL: + case PURPLE_WOOL: + case RED_WOOL: + case WHITE_WOOL: + case YELLOW_WOOL: + return true; + default: + break; + } + return false; + } + + public static boolean isShulkerBox(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isShulkerBox(); + } + + public boolean isShulkerBox() { + switch (this) { + case BLACK_SHULKER_BOX: + case BLUE_SHULKER_BOX: + case BROWN_SHULKER_BOX: + case CYAN_SHULKER_BOX: + case GRAY_SHULKER_BOX: + case GREEN_SHULKER_BOX: + case LIGHT_BLUE_SHULKER_BOX: + case LIGHT_GRAY_SHULKER_BOX: + case LIME_SHULKER_BOX: + case MAGENTA_SHULKER_BOX: + case ORANGE_SHULKER_BOX: + case PINK_SHULKER_BOX: + case PURPLE_SHULKER_BOX: + case RED_SHULKER_BOX: + case WHITE_SHULKER_BOX: + case YELLOW_SHULKER_BOX: + return true; + default: + break; + } return false; } public static boolean isAir(Material mat) { - if (mat == null) + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) return false; - switch (mat.getId()) { - case 0: - case 17422: - case 9648: - case 13668: - return true; - } - return false; + return m.isAir(); } public boolean isAir() { @@ -1858,24 +2061,235 @@ public class ItemManager { case CAVE_AIR: case VOID_AIR: return true; + default: + break; } return false; } - public boolean isShulkerBox() { - if (toString().contains("SHULKER_BOX")) + public static boolean isDoor(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isDoor(); + } + + public boolean isDoor() { + switch (this) { + case OAK_DOOR: + case IRON_DOOR: + case ACACIA_DOOR: + case BIRCH_DOOR: + case DARK_OAK_DOOR: + case JUNGLE_DOOR: + case SPRUCE_DOOR: return true; + default: + break; + } return false; } - public static boolean isBed(Material mat) { - if (mat == null) + public static boolean isGate(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) return false; - if (mat.toString().contains("_BED")) + return m.isGate(); + } + + public boolean isGate() { + switch (this) { + case ACACIA_FENCE_GATE: + case BIRCH_FENCE_GATE: + case DARK_OAK_FENCE_GATE: + case END_GATEWAY: + case JUNGLE_FENCE_GATE: + case OAK_FENCE_GATE: + case SPRUCE_FENCE_GATE: return true; + default: + break; + } return false; } + public static boolean isTrapDoor(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isTrapDoor(); + } + + public boolean isTrapDoor() { + switch (this) { + case ACACIA_TRAPDOOR: + case BIRCH_TRAPDOOR: + case DARK_OAK_TRAPDOOR: + case IRON_TRAPDOOR: + case JUNGLE_TRAPDOOR: + case OAK_TRAPDOOR: + case SPRUCE_TRAPDOOR: + return true; + default: + break; + } + return false; + } + + public static boolean isSkull(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isSkull(); + } + + public boolean isSkull() { + switch (this) { + case SKELETON_SKULL: + case WITHER_SKELETON_SKULL: + case SKELETON_WALL_SKULL: + case WITHER_SKELETON_WALL_SKULL: + return true; + default: + break; + } + return false; + } + + public static boolean isDye(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isDye(); + } + + public boolean isDye() { + switch (this) { + case INK_SAC: + case ROSE_RED: + case CACTUS_GREEN: + case COCOA_BEANS: + case LAPIS_LAZULI: + case PURPLE_DYE: + case CYAN_DYE: + case LIGHT_GRAY_DYE: + case GRAY_DYE: + case PINK_DYE: + case LIME_DYE: + case DANDELION_YELLOW: + case LIGHT_BLUE_DYE: + case MAGENTA_DYE: + case ORANGE_DYE: + case BONE_MEAL: + return true; + default: + break; + } + return false; + } + + public static boolean isSlab(Material mat) { + CMIMaterial m = CMIMaterial.get(mat); + if (m == null) + return false; + return m.isSlab(); + } + + public boolean isSlab() { + switch (this) { + case ACACIA_SLAB: + case DARK_OAK_SLAB: + case BIRCH_SLAB: + case BRICK_SLAB: + case COBBLESTONE_SLAB: + case DARK_PRISMARINE_SLAB: + case JUNGLE_SLAB: + case NETHER_BRICK_SLAB: + case OAK_SLAB: + case PETRIFIED_OAK_SLAB: + case PRISMARINE_BRICK_SLAB: + case PRISMARINE_SLAB: + case PURPUR_SLAB: + case QUARTZ_SLAB: + case RED_SANDSTONE_SLAB: + case SANDSTONE_SLAB: + case SPRUCE_SLAB: + case STONE_BRICK_SLAB: + case STONE_SLAB: + return true; + default: + break; + } + return false; + } + + public static SlabType getSlabType(Block block) { + if (!isSlab(block.getType())) + return SlabType.NOTSLAB; + + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_10_R1.v1_13_R1)) { + if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) { + org.bukkit.block.data.type.Slab slab = (org.bukkit.block.data.type.Slab) block.getBlockData(); + switch (slab.getType()) { + case TOP: + return SlabType.TOP; + case BOTTOM: + return SlabType.BOTTOM; + case DOUBLE: + return SlabType.DOUBLE; + } + + } + return SlabType.NOTSLAB; + } + s: if (block.getType().name().contains("STEP")) { + switch (CMIMaterial.get(block).getLegacyId()) { + case 44: + switch (block.getData()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + return SlabType.BOTTOM; + default: + return SlabType.DOUBLE; + } + case 126: + switch (block.getData()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + return SlabType.BOTTOM; + default: + return SlabType.DOUBLE; + } + case 182: + switch (block.getData()) { + case 0: + return SlabType.BOTTOM; + default: + return SlabType.DOUBLE; + } + case 205: + switch (block.getData()) { + case 0: + return SlabType.BOTTOM; + default: + return SlabType.DOUBLE; + } + } + } + + return SlabType.NOTSLAB; + } + public boolean equals(Material mat) { if (getMaterial() == null) return false; @@ -1910,4 +2324,11 @@ public class ItemManager { this.mojangName = mojangName; } } + + public enum SlabType { + TOP, + BOTTOM, + DOUBLE, + NOTSLAB; + } } diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java index fad63a5d..a4df5d25 100644 --- a/src/main/java/com/gamingmesh/jobs/Jobs.java +++ b/src/main/java/com/gamingmesh/jobs/Jobs.java @@ -96,6 +96,7 @@ import com.gamingmesh.jobs.listeners.PistonProtectionListener; import com.gamingmesh.jobs.selection.SelectionManager; import com.gamingmesh.jobs.stuff.ActionBar; import com.gamingmesh.jobs.stuff.CMIScoreboardManager; +import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.Loging; import com.gamingmesh.jobs.stuff.RawMessage; @@ -755,7 +756,7 @@ public class Jobs extends JavaPlugin { versionCheckManager = new VersionChecker(this); ItemManager.load(); - + version = versionCheckManager.getVersion().getShortVersion(); // itemManager = new ItemManager(this); diff --git a/src/main/java/com/gamingmesh/jobs/MythicMobs/MythicMobs4.java b/src/main/java/com/gamingmesh/jobs/MythicMobs/MythicMobs4.java index b08b99df..b2bec8ba 100644 --- a/src/main/java/com/gamingmesh/jobs/MythicMobs/MythicMobs4.java +++ b/src/main/java/com/gamingmesh/jobs/MythicMobs/MythicMobs4.java @@ -62,7 +62,6 @@ public class MythicMobs4 implements MythicMobInterface { @Override public String getDisplayName(String id) { - Debug.D(id); MythicMob mm = MMAPI.getMythicMob(id); if (mm != null) return mm.getDisplayName(); diff --git a/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java b/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java index 268e2ba1..79583ebf 100644 --- a/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java +++ b/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java @@ -21,8 +21,10 @@ package com.gamingmesh.jobs.actions; import org.bukkit.Material; import org.bukkit.block.Block; +import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.container.ActionInfo; import com.gamingmesh.jobs.container.ActionType; +import com.gamingmesh.jobs.stuff.VersionChecker.Version; public class BlockActionInfo extends MaterialActionInfo implements ActionInfo { public BlockActionInfo(Block block, ActionType type) { @@ -30,6 +32,8 @@ public class BlockActionInfo extends MaterialActionInfo implements ActionInfo { } private static byte getData(Block block) { + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) + return 0; @SuppressWarnings("deprecation") byte data = block.getData(); if (block.getType() == Material.COCOA) diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java index 537087da..5b201046 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java @@ -456,7 +456,7 @@ public class editjobs implements Cmd { player.sendMessage(ChatColor.GOLD + "Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration."); player.sendMessage(ChatColor.GOLD + "In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with."); player.sendMessage(ChatColor.GOLD + "In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly."); - material = CMIMaterial.GLOWING_REDSTONE_ORE; + material = CMIMaterial.REDSTONE_ORE; } type = material.toString(); diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 4f0f45b7..924b30e4 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -250,7 +250,7 @@ public class ConfigManager { Jobs.getPluginLogger().warning("Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration."); Jobs.getPluginLogger().warning("In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with."); Jobs.getPluginLogger().warning("In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly."); - material = CMIMaterial.GLOWING_REDSTONE_ORE; + material = CMIMaterial.REDSTONE_ORE; } // END HACK @@ -832,7 +832,7 @@ public class ConfigManager { myKey = myKey.split("-")[0]; } - CMIMaterial material = CMIMaterial.get(myKey); + CMIMaterial material = CMIMaterial.get(myKey + (subType)); if (material == null) material = CMIMaterial.get(myKey.replace(" ", "_").toUpperCase()); @@ -901,7 +901,7 @@ public class ConfigManager { Jobs.getPluginLogger().warning("Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration."); Jobs.getPluginLogger().warning("In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with."); Jobs.getPluginLogger().warning("In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly."); - material = CMIMaterial.GLOWING_REDSTONE_ORE; + material = CMIMaterial.REDSTONE_ORE; } // END HACK @@ -1023,6 +1023,36 @@ public class ConfigManager { } } + switch (actionType) { + case BREED: + case CUSTOMKILL: + case BREW: + case EXPLORE: + case FISH: + case KILL: + case MILK: + case MMKILL: + case SHEAR: + case TAME: + break; + case TNTBREAK: + case SMELT: + case REPAIR: + case PLACE: + case ENCHANT: + case DYE: + case EAT: + case CRAFT: + case BREAK: + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)){ + subType = ""; + meta = ""; + } + break; + default: + break; + } + jobInfo.add(new JobInfo(actionType, id, meta, type + subType, income, incomeEquation, experience, expEquation, pointsEquation, points, fromlevel, untilLevel, section.getCurrentPath(), softIncomeLimit, softExpLimit, softPointsLimit)); } diff --git a/src/main/java/com/gamingmesh/jobs/container/Job.java b/src/main/java/com/gamingmesh/jobs/container/Job.java index d148eb17..0ea6a48e 100644 --- a/src/main/java/com/gamingmesh/jobs/container/Job.java +++ b/src/main/java/com/gamingmesh/jobs/container/Job.java @@ -33,6 +33,7 @@ import org.bukkit.inventory.ItemStack; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.stuff.ChatColor; +import com.gamingmesh.jobs.stuff.Debug; public class Job { // job info @@ -225,6 +226,7 @@ public class Job { } public JobInfo getJobInfo(ActionInfo action, int level) { + for (JobInfo info : getJobInfo(action.getType())) { if (info.getName().equalsIgnoreCase(action.getName()) || info.getName().equalsIgnoreCase(action.getNameWithSub())) { if (!info.isInLevelRange(level)) diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index a8a9a890..1d0dc0dd 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -95,6 +95,7 @@ import com.gamingmesh.jobs.container.ExploreRespond; import com.gamingmesh.jobs.container.FastPayment; import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsPlayer; +import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling.ownershipFeedback; import com.google.common.base.Objects; @@ -248,7 +249,7 @@ public class JobsPaymentListener implements Listener { Player player = jPlayer.getPlayer(); if (!Jobs.getPermissionHandler().hasWorldPermission(player, player.getLocation().getWorld().getName())) - return; + return; ItemStack contents = event.getContents().getIngredient(); @@ -257,7 +258,7 @@ public class JobsPaymentListener implements Listener { Jobs.action(jPlayer, new ItemActionInfo(contents, ActionType.BREW)); } - + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlockBreak(BlockBreakEvent event) { //disabling plugin in world @@ -278,7 +279,7 @@ public class JobsPaymentListener implements Listener { return; // check if in creative - if (player.getGameMode() == GameMode.CREATIVE && !Jobs.getGCManager().payInCreative()) + if (player.getGameMode() == GameMode.CREATIVE && !Jobs.getGCManager().payInCreative()) return; if (!Jobs.getPermissionHandler().hasWorldPermission(player, player.getLocation().getWorld().getName())) @@ -1334,7 +1335,7 @@ public class JobsPaymentListener implements Listener { if (event.isCancelled()) return; - if (CMIMaterial.get(block).equals(CMIMaterial.FURNACE) || CMIMaterial.get(block).equals(CMIMaterial.BURNING_FURNACE)) { + if (CMIMaterial.get(block).equals(CMIMaterial.FURNACE) || CMIMaterial.get(block).equals(CMIMaterial.LEGACY_BURNING_FURNACE)) { ownershipFeedback done = FurnaceBrewingHandling.registerFurnaces(event.getPlayer(), block); if (done.equals(ownershipFeedback.tooMany)) { diff --git a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java index a0ab9a4e..6fae72af 100644 --- a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java +++ b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java @@ -247,7 +247,7 @@ public class FurnaceBrewingHandling { public static ownershipFeedback registerFurnaces(Player player, Block block) { - if (!CMIMaterial.get(block).equals(CMIMaterial.FURNACE) && !CMIMaterial.get(block).equals(CMIMaterial.BURNING_FURNACE)) { + if (!CMIMaterial.get(block).equals(CMIMaterial.FURNACE) && !CMIMaterial.get(block).equals(CMIMaterial.LEGACY_BURNING_FURNACE)) { return ownershipFeedback.invalid; } @@ -345,7 +345,7 @@ public class FurnaceBrewingHandling { if (block == null) continue; - if (!CMIMaterial.get(block).equals(CMIMaterial.FURNACE) && !CMIMaterial.get(block).equals(CMIMaterial.BURNING_FURNACE)) { + if (!CMIMaterial.get(block).equals(CMIMaterial.FURNACE) && !CMIMaterial.get(block).equals(CMIMaterial.LEGACY_BURNING_FURNACE)) { continue; } block.removeMetadata(JobsPaymentListener.furnaceOwnerMetadata, Jobs.getInstance());