From e5e6ff61a05473c1e4f680ee7de15ac9dd9f685f Mon Sep 17 00:00:00 2001 From: LogGits Date: Tue, 9 Oct 2018 05:08:50 +1000 Subject: [PATCH 1/8] Updated a bunch of variables --- .../gamingmesh/jobs/CMILib/ItemManager.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index f4d3a9c3..3e657b9b 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -676,7 +676,7 @@ public class ItemManager { BLAZE_SPAWN_EGG(383, 61, 4759, "Spawn Blaze", "Blaze Spawn Egg"), BLUE_BANNER(245, 4, 18481, "Blue Banner", ""), BLUE_BED(355, 11, 12714, "Blue Bed", "Blue Bed"), - BLUE_CARPET(171, 11, 13292, "Blue Carpet", ""), + BLUE_CARPET(171, 11, 13292, "Blue Carpet", "CARPET"), BLUE_CONCRETE(251, 11, 18756, "Blue Concrete", ""), BLUE_CONCRETE_POWDER(252, 11, 17773, "Blue Concrete Powder", ""), BLUE_GLAZED_TERRACOTTA(246, 0, 23823, "Blue Glazed Terracotta", ""), @@ -707,7 +707,7 @@ public class ItemManager { BRICK_STAIRS(108, 0, 21534, "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_CARPET(171, 12, 23352, "Brown Carpet", "CARPET"), BROWN_CONCRETE(251, 12, 19006, "Brown Concrete", ""), BROWN_CONCRETE_POWDER(252, 12, 21485, "Brown Concrete Powder", ""), BROWN_GLAZED_TERRACOTTA(247, 0, 5655, "Brown Glazed Terracotta", ""), @@ -793,7 +793,7 @@ public class ItemManager { 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_CARPET(171, 9, 31495, "Cyan Carpet", "CARPET"), CYAN_CONCRETE(251, 9, 26522, "Cyan Concrete", ""), CYAN_CONCRETE_POWDER(252, 9, 15734, "Cyan Concrete Powder", ""), CYAN_DYE(351, 6, 8043, "Cyan Dye", ""), @@ -948,7 +948,7 @@ public class ItemManager { 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_CARPET(171, 7, 26991, "Gray Carpet", "CARPET"), GRAY_CONCRETE(251, 7, 13959, "Gray Concrete", ""), GRAY_CONCRETE_POWDER(252, 7, 13031, "Gray Concrete Powder", ""), GRAY_DYE(351, 8, 9184, "Gray Dye", ""), @@ -961,7 +961,7 @@ public class ItemManager { 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_CARPET(171, 13, 7780, "Green Carpet", "CARPET"), GREEN_CONCRETE(251, 13, 17949, "Green Concrete", ""), GREEN_CONCRETE_POWDER(252, 13, 6904, "Green Concrete Powder", ""), GREEN_GLAZED_TERRACOTTA(248, 0, 6958, "Green Glazed Terracotta", ""), @@ -1045,7 +1045,7 @@ public class ItemManager { 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_CARPET(171, 3, 21194, "Light Blue Carpet", "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", ""), @@ -1058,7 +1058,7 @@ public class ItemManager { LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool", ""), LIGHT_GRAY_BANNER(425, 7, 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_CARPET(171, 8, 11317, "Light Gray Carpet", "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", ""), @@ -1074,7 +1074,7 @@ public class ItemManager { 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_CARPET(171, 5, 15443, "Lime Carpet", "CARPET"), LIME_CONCRETE(251, 5, 5863, "Lime Concrete", ""), LIME_CONCRETE_POWDER(252, 5, 28859, "Lime Concrete Powder", ""), LIME_DYE(351, 10, 6147, "Lime Dye", ""), @@ -1089,7 +1089,7 @@ public class ItemManager { 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_CARPET(171, 2, 6180, "Magenta Carpet", "CARPET"), MAGENTA_CONCRETE(251, 2, 20591, "Magenta Concrete", ""), MAGENTA_CONCRETE_POWDER(252, 2, 8272, "Magenta Concrete Powder", ""), MAGENTA_DYE(351, 13, 11788, "Magenta Dye", ""), @@ -1165,7 +1165,7 @@ public class ItemManager { 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_CARPET(171, 1, 24752, "Orange Carpet", "CARPET"), ORANGE_CONCRETE(251, 1, 19914, "Orange Concrete", ""), ORANGE_CONCRETE_POWDER(252, 1, 30159, "Orange Concrete Powder", ""), ORANGE_DYE(351, 14, 13866, "Orange Dye", ""), @@ -1189,7 +1189,7 @@ public class ItemManager { 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_CARPET(171, 6, 30186, "Pink Carpet", "CARPET"), PINK_CONCRETE(251, 6, 5227, "Pink Concrete", ""), PINK_CONCRETE_POWDER(252, 6, 6421, "Pink Concrete Powder", ""), PINK_DYE(351, 9, 31151, "Pink Dye", ""), @@ -1296,7 +1296,7 @@ public class ItemManager { PUMPKIN_STEM(104, 0, 19021, "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_CARPET(171, 10, 5574, "Purple Carpet", "CARPET"), PURPLE_CONCRETE(251, 10, 20623, "Purple Concrete", ""), PURPLE_CONCRETE_POWDER(252, 10, 26808, "Purple Concrete Powder", ""), PURPLE_DYE(351, 5, 6347, "Purple Dye", ""), @@ -1331,7 +1331,7 @@ public class ItemManager { REDSTONE_WIRE(55, 0, 25984, "Redstone Dust", ""), RED_BANNER(425, 1, 26961, "Red Banner", ""), RED_BED(355, 14, 30910, "Red Bed", "Red Bed"), - RED_CARPET(171, 14, 5424, "Red Carpet", ""), + RED_CARPET(171, 14, 5424, "Red Carpet", "CARPET"), RED_CONCRETE(251, 14, 8032, "Red Concrete", ""), RED_CONCRETE_POWDER(252, 14, 13286, "Red Concrete Powder", ""), RED_GLAZED_TERRACOTTA(249, 0, 24989, "Red Glazed Terracotta", ""), @@ -1479,7 +1479,7 @@ public class ItemManager { 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_CARPET(171, 0, 15117, "White Carpet", "CARPET"), WHITE_CONCRETE(251, 0, 6281, "White Concrete", ""), WHITE_CONCRETE_POWDER(252, 0, 10363, "White Concrete Powder", ""), WHITE_GLAZED_TERRACOTTA(235, 0, 11326, "White Glazed Terracotta", ""), @@ -1504,7 +1504,7 @@ public class ItemManager { 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_CARPET(171, 4, 18149, "Yellow Carpet", "CARPET"), YELLOW_CONCRETE(251, 4, 15722, "Yellow Concrete", ""), YELLOW_CONCRETE_POWDER(252, 4, 10655, "Yellow Concrete Powder", ""), YELLOW_GLAZED_TERRACOTTA(239, 0, 10914, "Yellow Glazed Terracotta", ""), From a6eb9a35ee21e0d4e3a497e4822d51a608523714 Mon Sep 17 00:00:00 2001 From: LogGits Date: Tue, 9 Oct 2018 05:26:22 +1000 Subject: [PATCH 2/8] Updated buttons and pressure plates --- .../gamingmesh/jobs/CMILib/ItemManager.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 3e657b9b..a457db55 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -611,14 +611,14 @@ public class ItemManager { public static enum CMIMaterial { NONE(-1, -1, -1, "None"), ACACIA_BOAT(447, 0, 27326, "Acacia Boat", "BOAT_ACACIA"), - ACACIA_BUTTON(-1, -1, 13993, "Acacia Button", ""), + ACACIA_BUTTON(143, 0, 13993, "Acacia Button", "wooden_button"), ACACIA_DOOR(430, 0, 23797, "Acacia Door", "ACACIA_DOOR_ITEM"), ACACIA_FENCE(192, 0, 4569, "Acacia Fence", ""), ACACIA_FENCE_GATE(187, 0, 14145, "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_PRESSURE_PLATE(72, 0, 17586, "Acacia Pressure Plate", "Wooden_Presure_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", ""), @@ -646,14 +646,14 @@ public class ItemManager { 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_BUTTON(143, 0, 26934, "Birch Button", "wooden_button"), BIRCH_DOOR(428, 0, 14759, "Birch Door", "BIRCH_DOOR_ITEM"), BIRCH_FENCE(189, 0, 17347, "Birch Fence", ""), BIRCH_FENCE_GATE(184, 0, 6322, "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_PRESSURE_PLATE(72, 0, 9664, "Birch Pressure Plate", "Wooden_Presure_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"), @@ -731,9 +731,9 @@ public class ItemManager { 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", ""), + CARVED_PUMPKIN(86, 0, 25833, "Carved Pumpkin", "PUMPKIN"), CAULDRON(380, 0, 26531, "Cauldron", "CAULDRON_ITEM"), - CAVE_AIR(-1, -1, 17422, "Air", ""), + CAVE_AIR(0, 0, 17422, "Air", "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", ""), @@ -755,10 +755,10 @@ public class ItemManager { CHORUS_PLANT(199, 0, 28243, "Chorus Plant", ""), CLAY(82, 0, 27880, "Clay", "Clay Block"), CLAY_BALL(337, 0, 24603, "Clay Ball"), - CLOCK(347, 0, 14980, "Clock", "watch"), + CLOCK(347, 0, 14980, "Clock", "WATCH"), COAL(263, 0, 29067, "Coal", ""), COAL_BLOCK(173, 0, 27968, "Block of Coal", ""), - COAL_ORE(16, 0, 30965, "Coal Ore", ""), + 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", ""), @@ -768,7 +768,7 @@ public class ItemManager { COCOA(127, 0, 29709, "Cocoa", ""), COCOA_BEANS(351, 3, 27381, "Coco Beans", "INK_SACK"), COD(349, 0, 24691, "Raw Cod", "RAW_FISH"), - COD_BUCKET(-1, -1, 28601, "Bucket of Cod", ""), + COD_BUCKET(326, 0, 28601, "Bucket of Cod", "WATER_BUCKET"), 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", ""), @@ -808,14 +808,14 @@ public class ItemManager { 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_BUTTON(143, 0, 6214, "Dark Oak Button", "wooden_button"), 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_GATE(186, 0, 10679, "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_PRESSURE_PLATE(72, 0, 31375, "Dark Oak Pressure Plate", "Wooden_Presure_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", ""), @@ -1013,14 +1013,14 @@ public class ItemManager { JACK_O_LANTERN(91, 0, 31612, "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_BUTTON(143, 0, 25317, "Jungle Button", "wooden_button"), JUNGLE_DOOR(429, 0, 28163, "Jungle Door", "JUNGLE_DOOR_ITEM"), JUNGLE_FENCE(190, 0, 14358, "Jungle Fence", ""), JUNGLE_FENCE_GATE(185, 0, 21360, "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_PRESSURE_PLATE(72, 0, 11376, "Jungle Pressure Plate", "Wooden_Presure_Plate"), 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"), @@ -1147,7 +1147,7 @@ public class ItemManager { NETHER_WART_BLOCK(214, 0, 15486, "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_BUTTON(143, 0, 13510, "Oak Button", "wooden_button"), OAK_DOOR(324, 0, 20341, "Wooden Door", "Wood Door"), OAK_FENCE(85, 0, 6442, "Oak Fence", "FENCE"), OAK_FENCE_GATE(107, 0, 16689, "Oak Fence Gate", "FENCE_GATE"), @@ -1396,14 +1396,14 @@ public class ItemManager { SPLASH_POTION(438, 0, 30248, "Splash Potion", ""), SPONGE(19, 0, 15860, "Sponge", ""), SPRUCE_BOAT(444, 0, 9606, "Spruce Boat", "BOAT_SPRUCE"), - SPRUCE_BUTTON(-1, -1, 23281, "Spruce Button", ""), + SPRUCE_BUTTON(143, 0, 23281, "Spruce Button", "wooden_button"), SPRUCE_DOOR(427, 0, 10642, "Spruce Door", "SPRUCE_DOOR_ITEM"), SPRUCE_FENCE(188, 0, 25416, "Spruce Fence", ""), SPRUCE_FENCE_GATE(183, 0, 26423, "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_PRESSURE_PLATE(72, 0, 15932, "Spruce Pressure Plate", "Wooden_Presure_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"), From c6c86f5c005461fc82c6a4bf253a9f1ebb71a9fd Mon Sep 17 00:00:00 2001 From: LogGits Date: Sat, 13 Oct 2018 11:22:04 +1000 Subject: [PATCH 3/8] Resolved Wooden_Pressure_Plate --- .../java/com/gamingmesh/jobs/CMILib/ItemManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index a457db55..7bfb4132 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -618,7 +618,7 @@ public class ItemManager { 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(72, 0, 17586, "Acacia Pressure Plate", "Wooden_Presure_Plate"), + ACACIA_PRESSURE_PLATE(72, 0, 17586, "Acacia Pressure Plate", "Wooden_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", ""), @@ -653,7 +653,7 @@ public class ItemManager { 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(72, 0, 9664, "Birch Pressure Plate", "Wooden_Presure_Plate"), + BIRCH_PRESSURE_PLATE(72, 0, 9664, "Birch Pressure Plate", "Wooden_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"), @@ -815,7 +815,7 @@ public class ItemManager { 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(72, 0, 31375, "Dark Oak Pressure Plate", "Wooden_Presure_Plate"), + DARK_OAK_PRESSURE_PLATE(72, 0, 31375, "Dark Oak Pressure Plate", "Wooden_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", ""), @@ -1020,7 +1020,7 @@ public class ItemManager { 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(72, 0, 11376, "Jungle Pressure Plate", "Wooden_Presure_Plate"), + JUNGLE_PRESSURE_PLATE(72, 0, 11376, "Jungle Pressure Plate", "Wooden_Pressure_Plate"), 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"), @@ -1154,7 +1154,7 @@ public class ItemManager { 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_PRESSURE_PLATE(72, 0, 20108, "Oak Pressure Plate", "Wooden_Pressure_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"), @@ -1403,7 +1403,7 @@ public class ItemManager { 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(72, 0, 15932, "Spruce Pressure Plate", "Wooden_Presure_Plate"), + SPRUCE_PRESSURE_PLATE(72, 0, 15932, "Spruce Pressure Plate", "Wooden_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"), From 6cf59f64a1956ef22852d5fca037c05550defeeb Mon Sep 17 00:00:00 2001 From: LogGits Date: Sat, 13 Oct 2018 11:27:54 +1000 Subject: [PATCH 4/8] Resolves CARVED_PUMPKIN --- src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 7bfb4132..86a666de 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -731,7 +731,7 @@ public class ItemManager { 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(86, 0, 25833, "Carved Pumpkin", "PUMPKIN"), + CARVED_PUMPKIN(91, 0, 25833, "Carved Pumpkin", "JACK_O_LANTERN"), CAULDRON(380, 0, 26531, "Cauldron", "CAULDRON_ITEM"), CAVE_AIR(0, 0, 17422, "Air", "AIR"), CAVE_SPIDER_SPAWN_EGG(383, 59, 23341, "Spawn Cave Spider", "Cave Spider Spawn Egg"), From 05e72927894bd298775af9385194bfd42513c688 Mon Sep 17 00:00:00 2001 From: LogGits Date: Sat, 13 Oct 2018 11:29:51 +1000 Subject: [PATCH 5/8] Removed COAL_ORE string --- src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 86a666de..5aa2c1e5 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -758,7 +758,7 @@ public class ItemManager { CLOCK(347, 0, 14980, "Clock", "WATCH"), COAL(263, 0, 29067, "Coal", ""), COAL_BLOCK(173, 0, 27968, "Block of Coal", ""), - COAL_ORE(16, 0, 30965, "Coal Ore", "COAL_ORE"), + COAL_ORE(16, 0, 30965, "Coal Ore", ""), COARSE_DIRT(3, 1, 15411, "Coarse Dirt", ""), COBBLESTONE(4, 0, 32147, "Cobblestone", ""), COBBLESTONE_SLAB(44, 3, 6340, "Cobblestone Slab", ""), From 4d77e81e033402cc946cd458f7e166a30c6ff159 Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 14 Oct 2018 16:52:55 +1000 Subject: [PATCH 6/8] Removed wood/button id additions. --- .../gamingmesh/jobs/CMILib/ItemManager.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 5aa2c1e5..28e7eac1 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -611,14 +611,14 @@ public class ItemManager { public static enum CMIMaterial { NONE(-1, -1, -1, "None"), ACACIA_BOAT(447, 0, 27326, "Acacia Boat", "BOAT_ACACIA"), - ACACIA_BUTTON(143, 0, 13993, "Acacia Button", "wooden_button"), + ACACIA_BUTTON(-1, -1, 13993, "Acacia Button", ""), ACACIA_DOOR(430, 0, 23797, "Acacia Door", "ACACIA_DOOR_ITEM"), ACACIA_FENCE(192, 0, 4569, "Acacia Fence", ""), ACACIA_FENCE_GATE(187, 0, 14145, "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(72, 0, 17586, "Acacia Pressure Plate", "Wooden_Pressure_Plate"), + 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", ""), @@ -646,14 +646,14 @@ public class ItemManager { 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(143, 0, 26934, "Birch Button", "wooden_button"), + BIRCH_BUTTON(-1, -1, 26934, "Birch Button", ""), BIRCH_DOOR(428, 0, 14759, "Birch Door", "BIRCH_DOOR_ITEM"), BIRCH_FENCE(189, 0, 17347, "Birch Fence", ""), BIRCH_FENCE_GATE(184, 0, 6322, "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(72, 0, 9664, "Birch Pressure Plate", "Wooden_Pressure_Plate"), + 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"), @@ -731,7 +731,7 @@ public class ItemManager { 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(91, 0, 25833, "Carved Pumpkin", "JACK_O_LANTERN"), + CARVED_PUMPKIN(-1, -1, 25833, "Carved Pumpkin", ""), CAULDRON(380, 0, 26531, "Cauldron", "CAULDRON_ITEM"), CAVE_AIR(0, 0, 17422, "Air", "AIR"), CAVE_SPIDER_SPAWN_EGG(383, 59, 23341, "Spawn Cave Spider", "Cave Spider Spawn Egg"), @@ -808,14 +808,14 @@ public class ItemManager { 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(143, 0, 6214, "Dark Oak Button", "wooden_button"), + DARK_OAK_BUTTON(-1, -1, 6214, "Dark Oak Button", ""), 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_GATE(186, 0, 10679, "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(72, 0, 31375, "Dark Oak Pressure Plate", "Wooden_Pressure_Plate"), + 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", ""), @@ -863,7 +863,7 @@ public class ItemManager { DIAMOND_SWORD(276, 0, 27707, "Diamond Sword", ""), DIORITE(1, 3, 24688, "Diorite", ""), DIRT(3, 0, 10580, "Dirt", ""), - DISPENSER(23, 0, 20871, "Dispenser", "DISPENSER"), + DISPENSER(23, 0, 20871, "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", ""), @@ -872,7 +872,7 @@ public class ItemManager { DRAGON_WALL_HEAD(144, 5, 19818, "Dragon Wall Head", ""), DRIED_KELP(-1, -1, 21042, "Dried Kelp", ""), DRIED_KELP_BLOCK(-1, -1, 12966, "Dried Kelp Block", ""), - DROPPER(158, 0, 31273, "Dropper", "DROPPER"), + DROPPER(158, 0, 31273, "Dropper", ""), DROWNED_SPAWN_EGG(-1, -1, 19368, "Drowned Spawn Egg", ""), EGG(344, 0, 21603, "Egg", ""), ELDER_GUARDIAN_SPAWN_EGG(383, 4, 11418, "Spawn Elder Guardian", "Elder Guardian Spawn Egg"), @@ -1013,14 +1013,14 @@ public class ItemManager { JACK_O_LANTERN(91, 0, 31612, "Jack o'Lantern", ""), JUKEBOX(84, 0, 19264, "Jukebox", "JUKEBOX"), JUNGLE_BOAT(446, 0, 4495, "Jungle Boat", "BOAT_JUNGLE"), - JUNGLE_BUTTON(143, 0, 25317, "Jungle Button", "wooden_button"), + JUNGLE_BUTTON(-1, -1, 25317, "Jungle Button", ""), JUNGLE_DOOR(429, 0, 28163, "Jungle Door", "JUNGLE_DOOR_ITEM"), JUNGLE_FENCE(190, 0, 14358, "Jungle Fence", ""), JUNGLE_FENCE_GATE(185, 0, 21360, "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(72, 0, 11376, "Jungle Pressure Plate", "Wooden_Pressure_Plate"), + JUNGLE_PRESSURE_PLATE(-1, -1, 11376, "Jungle Pressure Plate", ""), 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"), @@ -1396,14 +1396,14 @@ public class ItemManager { SPLASH_POTION(438, 0, 30248, "Splash Potion", ""), SPONGE(19, 0, 15860, "Sponge", ""), SPRUCE_BOAT(444, 0, 9606, "Spruce Boat", "BOAT_SPRUCE"), - SPRUCE_BUTTON(143, 0, 23281, "Spruce Button", "wooden_button"), + SPRUCE_BUTTON(-1, -1, 23281, "Spruce Button", ""), SPRUCE_DOOR(427, 0, 10642, "Spruce Door", "SPRUCE_DOOR_ITEM"), SPRUCE_FENCE(188, 0, 25416, "Spruce Fence", ""), SPRUCE_FENCE_GATE(183, 0, 26423, "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(72, 0, 15932, "Spruce Pressure Plate", "Wooden_Pressure_Plate"), + 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"), From ae2f9e61aebc09296189ab0c6433bfba501cfbdb Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 14 Oct 2018 16:54:13 +1000 Subject: [PATCH 7/8] Removed cave_air id. --- src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 28e7eac1..c0074bdc 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -733,7 +733,7 @@ public class ItemManager { CARROT_ON_A_STICK(398, 0, 27809, "Carrot on a Stick", "carrotstick"), CARVED_PUMPKIN(-1, -1, 25833, "Carved Pumpkin", ""), CAULDRON(380, 0, 26531, "Cauldron", "CAULDRON_ITEM"), - CAVE_AIR(0, 0, 17422, "Air", "AIR"), + 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", ""), From bccf89cc77a608b4c79ba8319d0a4916d622aadd Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 14 Oct 2018 16:55:07 +1000 Subject: [PATCH 8/8] Removed COD_BUCKET id:data. --- src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index c0074bdc..4576f157 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -768,7 +768,7 @@ public class ItemManager { COCOA(127, 0, 29709, "Cocoa", ""), COCOA_BEANS(351, 3, 27381, "Coco Beans", "INK_SACK"), COD(349, 0, 24691, "Raw Cod", "RAW_FISH"), - COD_BUCKET(326, 0, 28601, "Bucket of Cod", "WATER_BUCKET"), + 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", ""),