diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
index 84a2ef65..09dafd7a 100644
--- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
+++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
@@ -610,18 +610,18 @@ public class ItemManager {
 	ACACIA_BOAT(447, 0, 27326, "Acacia Boat", "BOAT_ACACIA"),
 	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"),
-	ACACIA_FENCE_GATE(187, 0, 14145, "Acacia Fence Gate", "ACACIA_FENCE_GATE"),
+	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_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_STAIRS(163, 0, 17453, "Acacia Stairs", ""),
 	ACACIA_TRAPDOOR(-1, -1, 18343, "Acacia Trapdoor", ""),
 	ACACIA_WOOD(-1, -1, 21861, "Acacia Wood", "Acacia Log"),
-	ACTIVATOR_RAIL(157, 0, 5834, "Activator Rail", "ACTIVATOR_RAIL"),
+	ACTIVATOR_RAIL(157, 0, 5834, "Activator Rail", ""),
 	AIR(0, 0, 9648, "Unknown", "Air"),
 	ALLIUM(38, 2, 6871, "Allium", "RED_ROSE"),
 	ANDESITE(1, 5, 25975, "Andesite", ""),
@@ -633,9 +633,9 @@ public class ItemManager {
 	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"),
+	BARRIER(166, 0, 26453, "Barrier", ""),
 	BAT_SPAWN_EGG(383, 65, 14607, "Spawn Bat", "Bat Spawn Egg"),
-	BEACON(138, 0, 6608, "Beacon", "BEACON"),
+	BEACON(138, 0, 6608, "Beacon", ""),
 	BEDROCK(7, 0, 23130, "Bedrock", ""),
 	BEEF(363, 0, 4803, "Raw Beef", ""),
 	BEETROOT(434, 0, 23305, "Beetroot", ""),
@@ -645,8 +645,8 @@ public class ItemManager {
 	BIRCH_BOAT(445, 0, 28104, "Birch Boat", "BOAT_BIRCH"),
 	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"),
-	BIRCH_FENCE_GATE(184, 0, 6322, "Birch Fence Gate", "BIRCH_FENCE_GATE"),
+	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"),
@@ -661,37 +661,37 @@ public class ItemManager {
 	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"),
-	BLACK_GLAZED_TERRACOTTA(250, 0, 29678, "Black Glazed Terracotta", "BLACK_GLAZED_TERRACOTTA"),
-	BLACK_SHULKER_BOX(234, 0, 24076, "Black Shulker Box", "BLACK_SHULKER_BOX"),
+	BLACK_GLAZED_TERRACOTTA(250, 0, 29678, "Black Glazed Terracotta", ""),
+	BLACK_SHULKER_BOX(234, 0, 24076, "Black Shulker Box", ""),
 	BLACK_STAINED_GLASS(95, 15, 13941, "Black Stained Glass", "STAINED_GLASS"),
 	BLACK_STAINED_GLASS_PANE(160, 15, 13201, "Black Stained Glass Pane", "STAINED_GLASS_PANE"),
-	BLACK_TERRACOTTA(159, 15, 26691, "Black Terracotta", "STAINED_CLAY"),
+	BLACK_TERRACOTTA(159, 15, 26691, "Black Terracotta", ""),
 	BLACK_WALL_BANNER(117, 0, 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_BANNER(245, 4, 18481, "Blue Banner", ""),
 	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", ""),
-	BLUE_GLAZED_TERRACOTTA(246, 0, 23823, "Blue Glazed Terracotta", "BLUE_GLAZED_TERRACOTTA"),
+	BLUE_GLAZED_TERRACOTTA(246, 0, 23823, "Blue Glazed Terracotta", ""),
 	BLUE_ICE(-1, -1, 22449, "Blue Ice", ""),
 	BLUE_ORCHID(38, 1, 13432, "Blue Orchid", ""),
-	BLUE_SHULKER_BOX(230, 0, 11476, "Blue Shulker Box", "BLUE_SHULKER_BOX"),
+	BLUE_SHULKER_BOX(230, 0, 11476, "Blue Shulker Box", ""),
 	BLUE_STAINED_GLASS(95, 11, 7107, "Blue Stained Glass", ""),
 	BLUE_STAINED_GLASS_PANE(160, 11, 28484, "Blue Stained Glass Pane", ""),
 	BLUE_TERRACOTTA(159, 11, 5236, "Blue Terracotta", ""),
 	BLUE_WALL_BANNER(117, 4, 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_BLOCK(216, 0, 17312, "Bone Block", ""),
 	BONE_MEAL(351, 15, 32458, "Bone Meal", ""),
 	BOOK(340, 0, 23097, "Book", ""),
-	BOOKSHELF(47, 0, 10069, "Bookshelf", "BOOKSHELF"),
+	BOOKSHELF(47, 0, 10069, "Bookshelf", ""),
 	BOW(261, 0, 8745, "Bow", "BOW"),
-	BOWL(281, 0, 32661, "Bowl", "BOWL"),
+	BOWL(281, 0, 32661, "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", ""),
@@ -701,16 +701,16 @@ public class ItemManager {
 	BRICK(336, 0, 6820, "Brick", "claybrick"),
 	BRICKS(45, 0, 14165, "Bricks", ""),
 	BRICK_SLAB(44, 4, 26333, "Brick Slab", "STEP"),
-	BRICK_STAIRS(108, 0, 21534, "Brick Stairs", "BRICK_STAIRS"),
+	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_CONCRETE(251, 12, 19006, "Brown Concrete", ""),
 	BROWN_CONCRETE_POWDER(252, 12, 21485, "Brown Concrete Powder", ""),
-	BROWN_GLAZED_TERRACOTTA(247, 0, 5655, "Brown Glazed Terracotta", "BROWN_GLAZED_TERRACOTTA"),
-	BROWN_MUSHROOM(39, 0, 9665, "Brown Mushroom", "BROWN_MUSHROOM"),
+	BROWN_GLAZED_TERRACOTTA(247, 0, 5655, "Brown Glazed Terracotta", ""),
+	BROWN_MUSHROOM(39, 0, 9665, "Brown Mushroom", ""),
 	BROWN_MUSHROOM_BLOCK(99, 0, 6291, "Brown Mushroom Block", "HUGE_MUSHROOM_1"),
-	BROWN_SHULKER_BOX(231, 0, 24230, "Brown Shulker Box", "BROWN_SHULKER_BOX"),
+	BROWN_SHULKER_BOX(231, 0, 24230, "Brown Shulker Box", ""),
 	BROWN_STAINED_GLASS(95, 12, 20945, "Brown Stained Glass", ""),
 	BROWN_STAINED_GLASS_PANE(160, 12, 17557, "Brown Stained Glass Pane", ""),
 	BROWN_TERRACOTTA(159, 12, 23664, "Brown Terracotta", ""),
@@ -722,7 +722,7 @@ public class ItemManager {
 	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"),
+	CACTUS(81, 0, 12191, "Cactus", ""),
 	CACTUS_GREEN(351, 2, 17296, "Cactus Green", ""),
 	CAKE(354, 0, 27048, "Cake", ""),
 	CARROT(391, 0, 22824, "Carrot", "Carrotitem"),
@@ -733,9 +733,9 @@ public class ItemManager {
 	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"),
+	CHAINMAIL_CHESTPLATE(303, 0, 23602, "Chainmail Chestplate", ""),
+	CHAINMAIL_HELMET(302, 0, 26114, "Chainmail Helmet", ""),
+	CHAINMAIL_LEGGINGS(304, 0, 19087, "Chainmail Leggings", ""),
 	CHAIN_COMMAND_BLOCK(-1, -1, 26798, "Chain Command Block", ""),
 	CHARCOAL(263, 1, 5390, "Charcoal", "COAL"),
 	CHEST(54, 0, 22969, "Chest", "CHEST"),
@@ -747,19 +747,19 @@ public class ItemManager {
 	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_FLOWER(200, 0, 28542, "Chorus Flower", ""),
 	CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""),
-	CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"),
+	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"),
 	COAL(263, 0, 29067, "Coal", ""),
-	COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"),
-	COAL_ORE(16, 0, 30965, "Coal Ore", "COAL_ORE"),
+	COAL_BLOCK(173, 0, 27968, "Block of Coal", ""),
+	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", ""),
-	COBBLESTONE_STAIRS(67, 0, 24715, "Cobblestone Stairs", "COBBLESTONE_STAIRS"),
+	COBBLESTONE_STAIRS(67, 0, 24715, "Cobblestone Stairs", ""),
 	COBBLESTONE_WALL(139, 0, 12616, "Cobblestone Wall", "COBBLE_WALL"),
 	COBWEB(30, 0, 9469, "Cobweb", "WEB"),
 	COCOA(127, 0, 29709, "Cocoa", ""),
@@ -794,8 +794,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(244, 0, 9550, "Cyan Glazed Terracotta", ""),
+	CYAN_SHULKER_BOX(228, 0, 28123, "Cyan Shulker Box", ""),
 	CYAN_STAINED_GLASS(95, 9, 30604, "Cyan Stained Glass", ""),
 	CYAN_STAINED_GLASS_PANE(160, 9, 11784, "Cyan Stained Glass Pane", ""),
 	CYAN_TERRACOTTA(159, 9, 25940, "Cyan Terracotta", ""),
@@ -807,21 +807,21 @@ public class ItemManager {
 	DARK_OAK_BOAT(448, 0, 28618, "Dark Oak Boat", "BOAT_DARK_OAK"),
 	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"),
-	DARK_OAK_FENCE_GATE(186, 0, 10679, "Dark Oak Fence Gate", "DARK_OAK_FENCE_GATE"),
+	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_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_STAIRS(164, 0, 22921, "Dark Oak Stairs", ""),
 	DARK_OAK_TRAPDOOR(-1, -1, 10355, "Dark Oak Trapdoor", ""),
 	DARK_OAK_WOOD(-1, -1, 16995, "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"),
+	DAYLIGHT_DETECTOR(151, 0, 8864, "Daylight Detector", ""),
 	DEAD_BRAIN_CORAL(-1, -1, 9116, "Dead Brain Coral", ""),
 	DEAD_BRAIN_CORAL_BLOCK(-1, -1, 12979, "Dead Brain Coral Block", ""),
 	DEAD_BRAIN_CORAL_FAN(-1, -1, 26150, "Dead Brain Coral Fan", ""),
@@ -844,20 +844,20 @@ public class ItemManager {
 	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"),
+	DETECTOR_RAIL(28, 0, 13475, "Detector Rail", ""),
+	DIAMOND(264, 0, 20865, "Diamond", ""),
+	DIAMOND_AXE(279, 0, 27277, "Diamond Axe", ""),
+	DIAMOND_BLOCK(57, 0, 5944, "Block of Diamond", ""),
 	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_HOE(293, 0, 24050, "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_ORE(56, 0, 9292, "Diamond Ore", ""),
+	DIAMOND_PICKAXE(278, 0, 24291, "Diamond Pickaxe", ""),
 	DIAMOND_SHOVEL(277, 0, 25415, "Diamond Shovel", "DIAMOND_SPADE"),
-	DIAMOND_SWORD(276, 0, 27707, "Diamond Sword", "DIAMOND_SWORD"),
+	DIAMOND_SWORD(276, 0, 27707, "Diamond Sword", ""),
 	DIORITE(1, 3, 24688, "Diorite", ""),
 	DIRT(3, 0, 10580, "Dirt", ""),
 	DISPENSER(23, 0, 20871, "Dispenser", "DISPENSER"),
@@ -886,10 +886,10 @@ public class ItemManager {
 	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_GATEWAY(209, 0, 26605, "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_ROD(198, 0, 24832, "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, 21271, "Spawn Evoker", "Evoker Spawn Egg"),
@@ -909,18 +909,18 @@ public class ItemManager {
 	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"),
+	FLINT_AND_STEEL(259, 0, 28620, "Flint and Steel", ""),
 	FLOWER_POT(390, 0, 30567, "Flower Pot", "FLOWER_POT_ITEM"),
-	FROSTED_ICE(212, 0, 21814, "Frosted Ice", "FROSTED_ICE"),
+	FROSTED_ICE(212, 0, 21814, "Frosted Ice", ""),
 	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(20, 0, 6195, "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(89, 0, 32713, "Glowstone", ""),
 	GLOWSTONE_DUST(348, 0, 6665, "Glowstone Dust", ""),
 	GOLDEN_APPLE(322, 0, 27732, "Golden Apple", "Gold apple"),
 	GOLDEN_AXE(286, 0, 4878, "Golden Axe", "Gold Axe"),
@@ -934,14 +934,14 @@ public class ItemManager {
 	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_BLOCK(41, 0, 27392, "Block of Gold", ""),
+	GOLD_INGOT(266, 0, 28927, "Gold Ingot", ""),
 	GOLD_NUGGET(371, 0, 28814, "Gold Nugget", ""),
-	GOLD_ORE(14, 0, 32625, "Gold Ore", "GOLD_ORE"),
+	GOLD_ORE(14, 0, 32625, "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"),
+	GRASS_PATH(208, 0, 8604, "Grass Path", ""),
 	GRAVEL(13, 0, 7804, "Gravel", "GRAVEL"),
 	GRAY_BANNER(425, 8, 12053, "Gray Banner", ""),
 	GRAY_BED(355, 7, 15745, "Gray Bed", "Gray Bed"),
@@ -949,8 +949,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(242, 0, 6256, "Gray Glazed Terracotta", ""),
+	GRAY_SHULKER_BOX(226, 0, 12754, "Gray Shulker Box", ""),
 	GRAY_STAINED_GLASS(95, 7, 29979, "Gray Stained Glass", ""),
 	GRAY_STAINED_GLASS_PANE(160, 7, 25272, "Gray Stained Glass Pane", ""),
 	GRAY_TERRACOTTA(159, 7, 18004, "Gray Terracotta", ""),
@@ -961,8 +961,8 @@ public class ItemManager {
 	GREEN_CARPET(171, 13, 7780, "Green 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", "GREEN_GLAZED_TERRACOTTA"),
-	GREEN_SHULKER_BOX(232, 0, 9377, "Green Shulker Box", "GREEN_SHULKER_BOX"),
+	GREEN_GLAZED_TERRACOTTA(248, 0, 6958, "Green Glazed Terracotta", ""),
+	GREEN_SHULKER_BOX(232, 0, 9377, "Green Shulker Box", ""),
 	GREEN_STAINED_GLASS(95, 13, 22503, "Green Stained Glass", ""),
 	GREEN_STAINED_GLASS_PANE(160, 13, 4767, "Green Stained Glass Pane", ""),
 	GREEN_TERRACOTTA(159, 13, 4105, "Green Terracotta", ""),
@@ -970,7 +970,7 @@ public class ItemManager {
 	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"),
+	HAY_BLOCK(170, 0, 17461, "Hay Bale", ""),
 	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"),
@@ -989,31 +989,31 @@ public class ItemManager {
 	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_AXE(258, 0, 15894, "Iron Axe", ""),
 	IRON_BARS(101, 0, 9378, "Iron Bars", "IRON_FENCE"),
-	IRON_BLOCK(42, 0, 24754, "Block of Iron", "IRON_BLOCK"),
+	IRON_BLOCK(42, 0, 24754, "Block of Iron", ""),
 	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_HOE(292, 0, 11339, "Iron Hoe", ""),
 	IRON_HORSE_ARMOR(417, 0, 30108, "Iron Horse Armor", "Iron_barding"),
-	IRON_INGOT(265, 0, 24895, "Iron Ingot", "IRON_INGOT"),
+	IRON_INGOT(265, 0, 24895, "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_ORE(15, 0, 19834, "Iron Ore", ""),
+	IRON_PICKAXE(257, 0, 8842, "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"),
+	IRON_SWORD(267, 0, 10904, "Iron Sword", ""),
+	IRON_TRAPDOOR(167, 0, 17095, "Iron Trapdoor", ""),
 	ITEM_FRAME(389, 0, 27318, "Item Frame", ""),
-	JACK_O_LANTERN(91, 0, 31612, "Jack o'Lantern", "JACK_O_LANTERN"),
+	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_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_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"),
@@ -1027,18 +1027,18 @@ public class ItemManager {
 	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_BLOCK(22, 0, 14485, "Lapis Lazuli Block", ""),
 	LAPIS_LAZULI(351, 4, 11075, "Lapis Lazuli", ""),
-	LAPIS_ORE(21, 0, 22934, "Lapis Lazuli Ore", "LAPIS_ORE"),
+	LAPIS_ORE(21, 0, 22934, "Lapis Lazuli Ore", ""),
 	LARGE_FERN(175, 3, 30177, "Large Fern", "DOUBLE_PLANT"),
 	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"),
+	LEATHER_BOOTS(301, 0, 15282, "Leather Boots", ""),
+	LEATHER_CHESTPLATE(299, 0, 29275, "Leather Tunic", ""),
+	LEATHER_HELMET(298, 0, 11624, "Leather Cap", ""),
+	LEATHER_LEGGINGS(300, 0, 28210, "Leather Pants", ""),
 	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"),
@@ -1046,8 +1046,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(238, 0, 4336, "Light Blue Glazed Terracotta", ""),
+	LIGHT_BLUE_SHULKER_BOX(222, 0, 18226, "Light Blue Shulker Box", ""),
 	LIGHT_BLUE_STAINED_GLASS(95, 3, 17162, "Light Blue Stained Glass", ""),
 	LIGHT_BLUE_STAINED_GLASS_PANE(160, 3, 18721, "Light Blue Stained Glass Pane", ""),
 	LIGHT_BLUE_TERRACOTTA(159, 3, 31779, "Light Blue Terracotta", ""),
@@ -1075,8 +1075,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(240, 0, 13861, "Lime Glazed Terracotta", ""),
+	LIME_SHULKER_BOX(224, 0, 28360, "Lime Shulker Box", ""),
 	LIME_STAINED_GLASS(95, 5, 24266, "Lime Stained Glass", ""),
 	LIME_STAINED_GLASS_PANE(160, 5, 10610, "Lime Stained Glass Pane", ""),
 	LIME_TERRACOTTA(159, 5, 24013, "Lime Terracotta", ""),
@@ -1090,8 +1090,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(237, 0, 8067, "Magenta Glazed Terracotta", ""),
+	MAGENTA_SHULKER_BOX(221, 0, 21566, "Magenta Shulker Box", ""),
 	MAGENTA_STAINED_GLASS(95, 2, 26814, "Magenta Stained Glass", ""),
 	MAGENTA_STAINED_GLASS_PANE(160, 2, 14082, "Magenta Stained Glass Pane", ""),
 	MAGENTA_TERRACOTTA(159, 2, 25900, "Magenta Terracotta", ""),
@@ -1104,11 +1104,11 @@ public class ItemManager {
 	MELON(103, 0, 25172, "Melon", "Melon_Block"),
 	MELON_SEEDS(362, 0, 18340, "Melon Seeds", ""),
 	MELON_SLICE(360, 0, 5347, "Melon Slice", ""),
-	MELON_STEM(105, 0, 8247, "Melon Stem", "MELON_STEM"),
+	MELON_STEM(105, 0, 8247, "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(48, 0, 21900, "Mossy Cobblestone", ""),
 	MOSSY_COBBLESTONE_WALL(139, 1, 11536, "Mossy Cobblestone Wall", ""),
 	MOSSY_STONE_BRICKS(98, 1, 16415, "Mossy Stone Bricks", ""),
 	MOVING_PISTON(36, 0, 13831, "Piston Moving Piece", ""),
@@ -1131,17 +1131,17 @@ public class ItemManager {
 	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"),
+	NETHERRACK(87, 0, 23425, "Netherrack", ""),
 	NETHER_BRICK(112, 0, 27802, "Nether Brick", ""),
 	NETHER_BRICKS(405, 0, 19996, "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_BRICK_STAIRS(114, 0, 12085, "Nether Brick Stairs", ""),
 	NETHER_PORTAL(90, 0, 19469, "Nether Portal", "PORTAL"),
 	NETHER_QUARTZ_ORE(153, 0, 4807, "Nether Quartz Ore", "QUARTZ_ORE"),
 	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"),
+	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"),
@@ -1166,8 +1166,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(236, 0, 27451, "Orange Glazed Terracotta", ""),
+	ORANGE_SHULKER_BOX(220, 0, 21673, "Orange Shulker Box", ""),
 	ORANGE_STAINED_GLASS(95, 1, 25142, "Orange Stained Glass", ""),
 	ORANGE_STAINED_GLASS_PANE(160, 1, 21089, "Orange Stained Glass Pane", ""),
 	ORANGE_TERRACOTTA(159, 1, 18684, "Orange Terracotta", ""),
@@ -1175,7 +1175,7 @@ public class ItemManager {
 	ORANGE_WALL_BANNER(117, 114, 9936, "Orange Banner", ""),
 	ORANGE_WOOL(35, 1, 23957, "Orange Wool", ""),
 	OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy", ""),
-	PACKED_ICE(174, 0, 28993, "Packed Ice", "PACKED_ICE"),
+	PACKED_ICE(174, 0, 28993, "Packed Ice", ""),
 	PAINTING(321, 0, 23945, "Painting", ""),
 	PAPER(339, 0, 9923, "Paper", ""),
 	PARROT_SPAWN_EGG(383, 105, 23614, "Spawn Parrot", "Parrot Spawn Egg"),
@@ -1190,8 +1190,8 @@ public class ItemManager {
 	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_GLAZED_TERRACOTTA(241, 0, 10260, "Pink Glazed Terracotta", ""),
+	PINK_SHULKER_BOX(225, 0, 24968, "Pink Shulker Box", ""),
 	PINK_STAINED_GLASS(95, 6, 16164, "Pink Stained Glass", ""),
 	PINK_STAINED_GLASS_PANE(160, 6, 24637, "Pink Stained Glass Pane", ""),
 	PINK_TERRACOTTA(159, 6, 23727, "Pink Terracotta", ""),
@@ -1275,7 +1275,7 @@ public class ItemManager {
 	POTTED_RED_TULIP(-1, -1, 28594, "Potted Red Tulip", ""),
 	POTTED_SPRUCE_SAPLING(-1, -1, 29498, "Potted Spruce Sapling", ""),
 	POTTED_WHITE_TULIP(-1, -1, 24330, "Potted White Tulip", ""),
-	POWERED_RAIL(27, 0, 11064, "Powered Rail", "POWERED_RAIL"),
+	POWERED_RAIL(27, 0, 11064, "Powered Rail", ""),
 	PRISMARINE(168, 0, 7539, "Prismarine", ""),
 	PRISMARINE_BRICKS(168, 1, 29118, "Prismarine Bricks", ""),
 	PRISMARINE_BRICK_SLAB(-1, -1, 26672, "Prismarine Brick Slab", ""),
@@ -1290,7 +1290,7 @@ public class ItemManager {
 	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"),
+	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", ""),
@@ -1298,21 +1298,21 @@ public class ItemManager {
 	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_SHULKER_BOX(229, 0, 10373, "Purple Shulker Box", ""),
 	PURPLE_STAINED_GLASS(95, 10, 21845, "Purple Stained Glass", ""),
 	PURPLE_STAINED_GLASS_PANE(160, 10, 10948, "Purple Stained Glass Pane", ""),
 	PURPLE_TERRACOTTA(159, 10, 10387, "Purple Terracotta", ""),
 	PURPLE_WALL_BANNER(117, 5, 14298, "Purple Banner", ""),
 	PURPLE_WOOL(35, 10, 11922, "Purple Wool", ""),
-	PURPUR_BLOCK(201, 0, 7538, "Purpur Block", "PURPUR_BLOCK"),
-	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"),
+	PURPUR_BLOCK(201, 0, 7538, "Purpur Block", ""),
+	PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar", ""),
+	PURPUR_SLAB(205, 0, 11487, "Purpur Slab", ""),
+	PURPUR_STAIRS(203, 0, 8921, "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"),
+	QUARTZ_STAIRS(156, 0, 24079, "Quartz Stairs", ""),
 	RABBIT(411, 0, 23068, "Raw Rabbit", ""),
 	RABBIT_FOOT(414, 0, 13864, "Rabbit's Foot", ""),
 	RABBIT_HIDE(415, 0, 12467, "Rabbit Hide", ""),
@@ -1320,26 +1320,26 @@ public class ItemManager {
 	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_BLOCK(152, 0, 19496, "Block of Redstone", ""),
 	REDSTONE_LAMP(123, 0, 8217, "Redstone Lamp", "REDSTONE_LAMP_OFF"),
 	REDSTONE_ORE(73, 0, 10887, "Redstone Ore"),
 	REDSTONE_TORCH(76, 0, 22547, "Redstone Torch(on)", "REDSTONE_TORCH_ON"),
 	REDSTONE_WALL_TORCH(76, 0, 7595, "Redstone Wall Torch", ""),
-	REDSTONE_WIRE(55, 0, 25984, "Redstone Dust", "REDSTONE_WIRE"),
+	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_CONCRETE(251, 14, 8032, "Red Concrete", ""),
 	RED_CONCRETE_POWDER(252, 14, 13286, "Red Concrete Powder", ""),
-	RED_GLAZED_TERRACOTTA(249, 0, 24989, "Red Glazed Terracotta", "RED_GLAZED_TERRACOTTA"),
-	RED_MUSHROOM(40, 0, 19728, "Red Mushroom", "RED_MUSHROOM"),
+	RED_GLAZED_TERRACOTTA(249, 0, 24989, "Red Glazed Terracotta", ""),
+	RED_MUSHROOM(40, 0, 19728, "Red Mushroom", ""),
 	RED_MUSHROOM_BLOCK(100, 0, 20766, "Red Mushroom Block", "HUGE_MUSHROOM_2"),
 	RED_NETHER_BRICKS(215, 0, 18056, "Red Nether Bricks", "RED_NETHER_BRICK"),
 	RED_SAND(12, 1, 16279, "Red Sand", "SAND"),
 	RED_SANDSTONE(179, 0, 9092, "Red Sandstone", ""),
 	RED_SANDSTONE_SLAB(182, 0, 17550, "Red Sandstone Slab", "STONE_SLAB2"),
-	RED_SANDSTONE_STAIRS(180, 0, 25466, "Red Sandstone Stairs", "RED_SANDSTONE_STAIRS"),
-	RED_SHULKER_BOX(233, 0, 32448, "Red Shulker Box", "RED_SHULKER_BOX"),
+	RED_SANDSTONE_STAIRS(180, 0, 25466, "Red Sandstone Stairs", ""),
+	RED_SHULKER_BOX(233, 0, 32448, "Red Shulker Box", ""),
 	RED_STAINED_GLASS(95, 14, 9717, "Red Stained Glass", ""),
 	RED_STAINED_GLASS_PANE(160, 14, 8630, "Red Stained Glass Pane", ""),
 	RED_TERRACOTTA(159, 14, 5086, "Red Terracotta", ""),
@@ -1361,13 +1361,13 @@ public class ItemManager {
 	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_LANTERN(169, 0, 16984, "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_SHELL(450, 0, 27848, "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"),
@@ -1376,7 +1376,7 @@ public class ItemManager {
 	SKELETON_SPAWN_EGG(383, 51, 15261, "Spawn Skeleton", "Skeleton Spawn Egg"),
 	SKELETON_WALL_SKULL(144, 0, 31650, "Skeleton Wall Skull", ""),
 	SLIME_BALL(341, 0, 5242, "Slimeball", ""),
-	SLIME_BLOCK(165, 0, 31892, "Slime Block", "SLIME_BLOCK"),
+	SLIME_BLOCK(165, 0, 31892, "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", ""),
@@ -1384,19 +1384,19 @@ public class ItemManager {
 	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"),
+	SNOW_BLOCK(80, 0, 19913, "Snow Block", ""),
+	SOUL_SAND(88, 0, 16841, "Soul Sand", ""),
 	SPAWNER(52, 90, 7018, "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"),
+	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_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_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"),
@@ -1410,19 +1410,19 @@ public class ItemManager {
 	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_AXE(275, 0, 6338, "Stone Axe", ""),
 	STONE_BRICKS(98, 0, 6962, "Stone Bricks", ""),
 	STONE_BRICK_SLAB(44, 5, 19676, "Stone Brick Slab", ""),
 	STONE_BRICK_STAIRS(109, 0, 27032, "Stone Brick Stairs", "SMOOTH_STAIRS"),
-	STONE_BUTTON(77, 0, 12279, "Stone Button", "STONE_BUTTON"),
-	STONE_HOE(291, 0, 22855, "Stone Hoe", "STONE_HOE"),
-	STONE_PICKAXE(274, 0, 14611, "Stone Pickaxe", "STONE_PICKAXE"),
+	STONE_BUTTON(77, 0, 12279, "Stone Button", ""),
+	STONE_HOE(291, 0, 22855, "Stone Hoe", ""),
+	STONE_PICKAXE(274, 0, 14611, "Stone Pickaxe", ""),
 	STONE_PRESSURE_PLATE(70, 0, 22591, "Stone Pressure Plate", "STONE_PLATE"),
 	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"),
+	STONE_SWORD(272, 0, 25084, "Stone Sword", ""),
 	STRAY_SPAWN_EGG(383, 6, 30153, "Spawn Stray", "Stray Spawn Egg"),
-	STRING(287, 0, 12806, "String", "STRING"),
+	STRING(287, 0, 12806, "String", ""),
 	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"),
@@ -1435,8 +1435,8 @@ public class ItemManager {
 	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"),
+	STRUCTURE_BLOCK(255, 0, 26831, "Structure Block", ""),
+	STRUCTURE_VOID(217, 0, 30806, "Structure Void", ""),
 	SUGAR(353, 0, 30638, "Sugar", ""),
 	SUGAR_CANE(338, 0, 7726, "Sugar Canes", "Sugar Cane"),
 	SUNFLOWER(175, 0, 7408, "Sunflower", ""),
@@ -1448,7 +1448,7 @@ public class ItemManager {
 	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"),
+	TRAPPED_CHEST(146, 0, 18970, "Trapped Chest", ""),
 	TRIDENT(-1, -1, 7534, "Trident", ""),
 	TRIPWIRE(132, 0, 8810, "Tripwire", ""),
 	TRIPWIRE_HOOK(131, 0, 8130, "Tripwire Hook", ""),
@@ -1467,7 +1467,7 @@ public class ItemManager {
 	VINDICATOR_SPAWN_EGG(383, 36, 25324, "Spawn Vindicator", "Vindicator Spawn Egg"),
 	VINE(106, 0, 14564, "Vines", "VINE"),
 	VOID_AIR(-1, -1, 13668, "Void Air", ""),
-	WALL_SIGN(68, 0, 10644, "Wall Sign", "WALL_SIGN"),
+	WALL_SIGN(68, 0, 10644, "Wall Sign", ""),
 	WALL_TORCH(50, 0, 25890, "Wall Torch", ""),
 	WATER(8, 0, 24998, "Flowing Water", "FLOWING_WATER"),
 	WATER_BUCKET(326, 0, 8802, "Water Bucket", ""),
@@ -1479,8 +1479,8 @@ public class ItemManager {
 	WHITE_CARPET(171, 0, 15117, "White 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", "WHITE_GLAZED_TERRACOTTA"),
-	WHITE_SHULKER_BOX(219, 0, 31750, "White Shulker Box", "WHITE_SHULKER_BOX"),
+	WHITE_GLAZED_TERRACOTTA(235, 0, 11326, "White Glazed Terracotta", ""),
+	WHITE_SHULKER_BOX(219, 0, 31750, "White Shulker Box", ""),
 	WHITE_STAINED_GLASS(95, 0, 31190, "White Stained Glass", ""),
 	WHITE_STAINED_GLASS_PANE(160, 0, 10557, "White Stained Glass Pane", ""),
 	WHITE_TERRACOTTA(159, 0, 20975, "White Terracotta", ""),
@@ -1504,8 +1504,8 @@ public class ItemManager {
 	YELLOW_CARPET(171, 4, 18149, "Yellow 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", "YELLOW_GLAZED_TERRACOTTA"),
-	YELLOW_SHULKER_BOX(223, 0, 28700, "Yellow Shulker Box", "YELLOW_SHULKER_BOX"),
+	YELLOW_GLAZED_TERRACOTTA(239, 0, 10914, "Yellow Glazed Terracotta", ""),
+	YELLOW_SHULKER_BOX(223, 0, 28700, "Yellow Shulker Box", ""),
 	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", ""),
diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java
index 034ee8d4..40f5e6a7 100644
--- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java
+++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java
@@ -9,11 +9,9 @@ import java.lang.reflect.Method;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gamingmesh.jobs.Jobs;
-import com.gamingmesh.jobs.stuff.VersionChecker.Version;
 
 public class ItemReflection {
 
@@ -168,11 +166,11 @@ public class ItemReflection {
 	return CraftServer;
     }
 
-    public ItemStack getItemInOffHand(Player player) {
+/*    public ItemStack getItemInOffHand(Player player) {
 	if (Jobs.getVersionCheckManager().getVersion().isLower(Version.v1_9_R1))
 	    return null;
 	return player.getInventory().getItemInOffHand();
-    }
+    }*/
 
     public void setEndermiteActive(Entity ent, boolean state) {
 
diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
index f276bced..62026a96 100644
--- a/src/main/java/com/gamingmesh/jobs/Jobs.java
+++ b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -161,7 +161,6 @@ public class Jobs extends JavaPlugin {
     private static NMS nms = null;
 
     private static ActionBar actionbar = null;
-    private static boolean running = false;
 
     protected static VersionChecker versionCheckManager = null;
 
@@ -748,7 +747,6 @@ public class Jobs extends JavaPlugin {
     public void onEnable() {
 
 	instance = this;
-	running = true;
 	this.setEnabled(true);
 
 	versionCheckManager = new VersionChecker(this);
@@ -765,14 +763,12 @@ public class Jobs extends JavaPlugin {
 	    if (NMS.class.isAssignableFrom(nmsClass)) {
 		setNms((NMS) nmsClass.getConstructor().newInstance());
 	    } else {
-		System.out.println("Something went wrong, please note down version and contact author v:" + version);
-		running = false;
+		System.out.println("Something went wrong, please note down version and contact author, version: " + version);
 		this.setEnabled(false);
 	    }
 	} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
 	    | SecurityException e) {
 	    System.out.println("Your server version is not compatible with this plugins version! Plugin will be disabled: " + version);
-	    running = false;
 	    this.setEnabled(false);
 	    e.printStackTrace();
 	    return;
@@ -850,8 +846,6 @@ public class Jobs extends JavaPlugin {
 	} catch (Exception e) {
 		e.printStackTrace();
 	    System.out.println("There was some issues when starting plugin. Please contact dev about this. Plugin will be disabled.");
-	    getServer().getPluginManager().disablePlugin(this);
-	    running = false;
 	    this.setEnabled(false);
 	}
     }
@@ -867,7 +861,6 @@ public class Jobs extends JavaPlugin {
 
 	shutdown();
 	consoleMsg("&e[Jobs] &2Plugin has been disabled succesfully.");
-	running = false;
 	this.setEnabled(false);
     }
 
@@ -1342,8 +1335,4 @@ public class Jobs extends JavaPlugin {
 	if (pageCount != 0)
 	    rm.show(sender);
     }
-
-    public static boolean isRunning() {
-    	return running;
-    }
 }
diff --git a/src/main/java/com/gamingmesh/jobs/NMS.java b/src/main/java/com/gamingmesh/jobs/NMS.java
index 47dda3f8..e6bc4672 100644
--- a/src/main/java/com/gamingmesh/jobs/NMS.java
+++ b/src/main/java/com/gamingmesh/jobs/NMS.java
@@ -15,5 +15,5 @@ public interface NMS {
 
     public ItemStack getItemInMainHand(Player player);
 
-    void setItemInMainHand(Player player, ItemStack item);
+    public void setItemInMainHand(Player player, ItemStack item);
 }
diff --git a/src/main/java/com/gamingmesh/jobs/PlayerManager.java b/src/main/java/com/gamingmesh/jobs/PlayerManager.java
index e86007ce..372eb8c6 100644
--- a/src/main/java/com/gamingmesh/jobs/PlayerManager.java
+++ b/src/main/java/com/gamingmesh/jobs/PlayerManager.java
@@ -720,7 +720,7 @@ public class PlayerManager {
 	}
     }
 
-    HashMap<UUID, HashMap<Job, ItemBonusCache>> cache = new HashMap<>();
+    private HashMap<UUID, HashMap<Job, ItemBonusCache>> cache = new HashMap<>();
 
     public void resetiItemBonusCache(UUID uuid) {
 	cache.remove(uuid);
@@ -789,7 +789,7 @@ public class PlayerManager {
 		continue;
 
 	    if (oneItem.getName() != null && name != null)
-		if (!org.bukkit.ChatColor.translateAlternateColorCodes('&', oneItem.getName()).equalsIgnoreCase(name))
+		if (!oneItem.getName().replaceAll("&", "§").equalsIgnoreCase(name))
 		    continue;
 
 	    for (String onelore : oneItem.getLore()) {
diff --git a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
index 2274666a..60300bc8 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
@@ -464,7 +464,7 @@ public class JobsCommands implements CommandExecutor {
 
 	    message.append(Jobs.getLanguage().getMessage("command.info.help.material", "%material%", materialName));
 	    if (prog != null && !info.isInLevelRange(prog.getLevel()))
-		message.append(org.bukkit.ChatColor.RED + " -> ");
+		message.append(ChatColor.RED + " -> ");
 	    else
 		message.append(" -> ");
 
diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
index 9c21fe4a..e0b9dbd7 100644
--- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
@@ -665,9 +665,9 @@ public class GeneralConfigManager {
 	}
 	c.getW().addComment("Economy.Limit.Money.TimeLimit", "Time in seconds: 60 = 1min, 3600 = 1 hour, 86400 = 24 hours");
 	limit.setTimeLimit(c.get("Economy.Limit.Money.TimeLimit", 3600));
-	c.getW().addComment("Economy.Limit.Money.AnnouncmentDelay", "Delay between announcements about reached money limit",
+	c.getW().addComment("Economy.Limit.Money.AnnouncementDelay", "Delay between announcements about reached money limit",
 	    "Keep this from 30 to 5 min (300), as players can get annoyed of constant message displaying");
-	limit.setAnnouncmentDelay(c.get("Economy.Limit.Money.AnnouncmentDelay", 30));
+	limit.setAnnouncementDelay(c.get("Economy.Limit.Money.AnnouncementDelay", 30));
 	currencyLimitUse.put(CurrencyType.MONEY, limit);
 
 	// Point limit
@@ -699,9 +699,9 @@ public class GeneralConfigManager {
 	}
 	c.getW().addComment("Economy.Limit.Point.TimeLimit", "Time in seconds: 60 = 1min, 3600 = 1 hour, 86400 = 24 hours");
 	limit.setTimeLimit(c.get("Economy.Limit.Point.TimeLimit", 3600));
-	c.getW().addComment("Economy.Limit.Point.AnnouncmentDelay", "Delay between announcements about reached limit",
+	c.getW().addComment("Economy.Limit.Point.AnnouncementDelay", "Delay between announcements about reached limit",
 	    "Keep this from 30 to 5 min (300), as players can get annoyed of constant message displaying");
-	limit.setAnnouncmentDelay(c.get("Economy.Limit.Point.AnnouncmentDelay", 30));
+	limit.setAnnouncementDelay(c.get("Economy.Limit.Point.AnnouncementDelay", 30));
 	currencyLimitUse.put(CurrencyType.POINTS, limit);
 
 	// Exp limit
@@ -733,9 +733,9 @@ public class GeneralConfigManager {
 	}
 	c.getW().addComment("Economy.Limit.Exp.TimeLimit", "Time in seconds: 60 = 1min, 3600 = 1 hour, 86400 = 24 hours");
 	limit.setTimeLimit(c.get("Economy.Limit.Exp.TimeLimit", 3600));
-	c.getW().addComment("Economy.Limit.Exp.AnnouncmentDelay", "Delay between announcements about reached Exp limit",
+	c.getW().addComment("Economy.Limit.Exp.AnnouncementDelay", "Delay between announcements about reached Exp limit",
 	    "Keep this from 30 to 5 min (300), as players can get annoyed of constant message displaying");
-	limit.setAnnouncmentDelay(c.get("Economy.Limit.Exp.AnnouncmentDelay", 30));
+	limit.setAnnouncementDelay(c.get("Economy.Limit.Exp.AnnouncementDelay", 30));
 	currencyLimitUse.put(CurrencyType.EXP, limit);
 
 	c.getW().addComment("Economy.Repair.PayForRenaming", "Do you want to give money for only renaming items in anvil",
diff --git a/src/main/java/com/gamingmesh/jobs/container/CurrencyLimit.java b/src/main/java/com/gamingmesh/jobs/container/CurrencyLimit.java
index aaceef56..2e870d68 100644
--- a/src/main/java/com/gamingmesh/jobs/container/CurrencyLimit.java
+++ b/src/main/java/com/gamingmesh/jobs/container/CurrencyLimit.java
@@ -9,14 +9,14 @@ public class CurrencyLimit {
     private boolean enabled;
     private List<CurrencyType> stopWith;
     private int timeLimit;
-    private int announcmentDelay;
+    private int announcementDelay;
     private Parser maxEquation;
 
-    public CurrencyLimit(boolean enabled, List<CurrencyType> stopWith, int timeLimit, int announcmentDelay, Parser maxEquation) {
+    public CurrencyLimit(boolean enabled, List<CurrencyType> stopWith, int timeLimit, int announcementDelay, Parser maxEquation) {
 	this.enabled = enabled;
 	this.stopWith = stopWith;
 	this.timeLimit = timeLimit;
-	this.announcmentDelay = announcmentDelay;
+	this.announcementDelay = announcementDelay;
 	this.maxEquation = maxEquation;
     }
 
@@ -47,12 +47,12 @@ public class CurrencyLimit {
 	this.timeLimit = timeLimit;
     }
 
-    public int getAnnouncmentDelay() {
-	return announcmentDelay;
+    public int getAnnouncementDelay() {
+	return announcementDelay;
     }
 
-    public void setAnnouncmentDelay(int announcmentDelay) {
-	this.announcmentDelay = announcmentDelay;
+    public void setAnnouncementDelay(int announcementDelay) {
+	this.announcementDelay = announcementDelay;
     }
 
     public Parser getMaxEquation() {
diff --git a/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java b/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
index 182a892c..15885702 100644
--- a/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
+++ b/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
@@ -105,8 +105,8 @@ public class JobsPlayer {
 	return i;
     }
 
-    public void setPaymentLimit(PaymentData limits) {
-	paymentLimits = limits;
+    public void setPaymentLimit(PaymentData paymentLimits) {
+	this.paymentLimits = paymentLimits;
     }
 
     public PaymentData getPaymentLimit() {
@@ -135,7 +135,7 @@ public class JobsPlayer {
 		player.sendMessage(Jobs.getLanguage().getMessage("command.limit.output.reached" + type.getName().toLowerCase() + "limit2"));
 		data.setInformed();
 	    }
-	    if (data.IsAnnounceTime(limit.getAnnouncmentDelay()) && player.isOnline()) {
+	    if (data.IsAnnounceTime(limit.getAnnouncementDelay()) && player.isOnline()) {
 		Jobs.getActionBar().send(player, Jobs.getLanguage().getMessage("command.limit.output." + type.getName().toLowerCase() + "time", "%time%", TimeManage.to24hourShort(data.GetLeftTime(type))));
 	    }
 	    if (data.isReseted())
@@ -159,7 +159,7 @@ public class JobsPlayer {
     }
 
     public synchronized void clearUpdateBossBarFor() {
-	this.updateBossBarFor.clear();
+	updateBossBarFor.clear();
     }
 
     public synchronized List<BossBarInfo> getBossBarInfo() {
@@ -176,12 +176,12 @@ public class JobsPlayer {
 	return logList;
     }
 
-    public void setLog(HashMap<String, Log> l) {
-	this.logList = l;
+    public void setLog(HashMap<String, Log> logList) {
+	this.logList = logList;
     }
 
-    public void setUserId(int id) {
-	this.userid = id;
+    public void setUserId(int userid) {
+	this.userid = userid;
     }
 
     public int getUserId() {
diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
index d0d8a991..b65eef5e 100644
--- a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
+++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
@@ -42,8 +42,6 @@ public class BufferedEconomy {
     private OfflinePlayer ServerAccount = null;
     private OfflinePlayer ServerTaxesAccount = null;
 
-    PaymentData PaymentData = new PaymentData();
-
     public BufferedEconomy(Jobs plugin, Economy economy) {
 	this.plugin = plugin;
 	this.economy = economy;
diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
index 75c47cfa..01e71dca 100644
--- a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
+++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
@@ -176,7 +176,7 @@ public class JobsListener implements Listener {
 	}
 
 	if (Jobs.getSelectionManager().hasPlacedBoth(player)) {
-	    JobsAreaSelectionEvent jobsAreaSelectionEvent = new JobsAreaSelectionEvent(event.getPlayer(), Jobs.getSelectionManager().getSelectionCuboid(player));
+	    JobsAreaSelectionEvent jobsAreaSelectionEvent = new JobsAreaSelectionEvent(player, Jobs.getSelectionManager().getSelectionCuboid(player));
 	    Bukkit.getServer().getPluginManager().callEvent(jobsAreaSelectionEvent);
 	}
 
diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
index 5619883e..2b8ad9a4 100644
--- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
+++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
@@ -458,7 +458,7 @@ public class JobsPaymentListener implements Listener {
 	Player player = event.getPlayer();
 
 	// check if in creative
-	if (event.getPlayer().getGameMode().equals(GameMode.CREATIVE) && !Jobs.getGCManager().payInCreative())
+	if (player.getGameMode().equals(GameMode.CREATIVE) && !Jobs.getGCManager().payInCreative())
 	    return;
 
 	if (!Jobs.getPermissionHandler().hasWorldPermission(player, player.getLocation().getWorld().getName()))