diff --git a/libs/Vault.jar b/libs/Vault.jar deleted file mode 100644 index 63fc0427..00000000 Binary files a/libs/Vault.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 45e7b33b..9c8d2774 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Jobs jobs - 4.9.0 + 4.9.1 Jobs http://maven.apache.org @@ -16,7 +16,7 @@ org.spigotmc spigot-api - 1.13.1-R0.1-SNAPSHOT + 1.13.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index 0b0a04c3..ea80762e 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -322,12 +322,12 @@ public class ItemManager { White(0, "White"), Orange(1, "Orange"), Magenta(2, "Magenta"), - LIGHT_BLUE(3, "Light Blue"), + LIGHT_BLUE(3, "Light Blue"), // TODO: Not work, github issue: #267 Yellow(4, "Yellow"), - LIME_GREEN(5, "Lime Green"), + LIME_GREEN(5, "Lime Green"), // TODO: Not work, github issue: #267 Pink(6, "Pink"), Gray(7, "Gray"), - LIGHT_GRAY(8, "Light Gray"), + LIGHT_GRAY(8, "Light Gray"), // TODO: Not work, github issue: #267 Cyan(9, "Cyan"), Purple(10, "Purple"), Blue(11, "Blue"), @@ -662,33 +662,33 @@ public class ItemManager { BIRCH_WOOD(-1, -1, 20913, "Birch Wood"), BLACK_BANNER(425, 0, 9365, "Banner", "Black Banner"), BLACK_BED(355, 15, 20490, "Black Bed"), - BLACK_CARPET(171, 15, 6056, "Black Carpet", "CARPET"), + BLACK_CARPET(171, 15, 6056, "Black 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_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_STAINED_GLASS(95, 15, 13941, "Black Stained Glass"), + BLACK_STAINED_GLASS_PANE(160, 15, 13201, "Black Stained Glass Pane"), BLACK_TERRACOTTA(159, 15, 26691, "Black Terracotta"), BLACK_WALL_BANNER(117, 0, 4919, "Black Banner"), - BLACK_WOOL(35, 15, 16693, "Black Wool", "WOOL"), + 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"), BLUE_BED(355, 11, 12714, "Blue Bed"), - BLUE_CARPET(171, 11, 13292, "Blue Carpet", "CARPET"), + 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_ICE(-1, -1, 22449, "Blue Ice"), BLUE_ORCHID(38, 1, 13432, "Blue Orchid"), BLUE_SHULKER_BOX(230, 0, 11476, "Blue Shulker Box"), - BLUE_STAINED_GLASS(95, 11, 7107, "Blue Stained Glass", "STAINED_GLASS"), - BLUE_STAINED_GLASS_PANE(160, 11, 28484, "Blue Stained Glass Pane", "STAINED_GLASS_PANE"), + 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", "WOOL"), + BLUE_WOOL(35, 11, 15738, "Blue Wool"), BONE(352, 0, 5686, "Bone"), BONE_BLOCK(216, 0, 17312, "Bone Block"), BONE_MEAL(351, 15, 32458, "Bone Meal"), @@ -700,7 +700,7 @@ public class ItemManager { 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"), + BREAD(297, 0, 32049, "Bread"), BREWING_STAND(379, 0, 14539, "Brewing Stand", "BREWING_STAND_ITEM"), BRICK(336, 0, 6820, "Brick", "claybrick"), BRICKS(45, 0, 14165, "Bricks"), @@ -708,18 +708,18 @@ 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_CARPET(171, 12, 23352, "Brown Carpet", "CARPET"), + 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_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_STAINED_GLASS(95, 12, 20945, "Brown Stained Glass", "STAINED_GLASS"), - BROWN_STAINED_GLASS_PANE(160, 12, 17557, "Brown Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), BROWN_WALL_BANNER(117, 3, 14731, "Brown Banner"), - BROWN_WOOL(35, 12, 32638, "Brown Wool", "WOOL"), + BROWN_WOOL(35, 12, 32638, "Brown Wool"), BUBBLE_COLUMN(-1, -1, 13758, "Bubble Column"), BUBBLE_CORAL(-1, -1, 12464, "Bubble Coral"), BUBBLE_CORAL_BLOCK(-1, -1, 15437, "Bubble Coral Block"), @@ -761,9 +761,9 @@ public class ItemManager { 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(4, 0, 32147, "Cobblestone", "COBBLE"), + COBBLESTONE_SLAB(44, 3, 6340, "Cobblestone Slab", "COBBLE_SLAB"), + COBBLESTONE_STAIRS(67, 0, 24715, "Cobblestone Stairs", "COBBLE_STAIRS"), COBBLESTONE_WALL(139, 0, 12616, "Cobblestone Wall", "COBBLE_WALL"), COBWEB(30, 0, 9469, "Cobweb", "WEB"), COCOA(127, 0, 29709, "Cocoa"), @@ -794,17 +794,17 @@ 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_CARPET(171, 9, 31495, "Cyan Carpet", "CARPET"), + 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_SHULKER_BOX(228, 0, 28123, "Cyan Shulker Box"), - CYAN_STAINED_GLASS(95, 9, 30604, "Cyan Stained Glass", "STAINED_GLASS"), - CYAN_STAINED_GLASS_PANE(160, 9, 11784, "Cyan Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), CYAN_WALL_BANNER(117, 6, 10889, "Cyan Banner"), - CYAN_WOOL(35, 9, 12221, "Cyan Wool", "WOOL"), + 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"), @@ -890,7 +890,7 @@ public class ItemManager { 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_CRYSTAL(426, 0, 19090, "End Crystal", "ENDER_CRYSTAL"), 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"), @@ -950,29 +950,29 @@ public class ItemManager { GRAVEL(13, 0, 7804, "Gravel"), GRAY_BANNER(425, 8, 12053, "Gray Banner"), GRAY_BED(355, 7, 15745, "Gray Bed"), - GRAY_CARPET(171, 7, 26991, "Gray Carpet", "CARPET"), + 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_SHULKER_BOX(226, 0, 12754, "Gray Shulker Box"), - GRAY_STAINED_GLASS(95, 7, 29979, "Gray Stained Glass", "STAINED_GLASS"), - GRAY_STAINED_GLASS_PANE(160, 7, 25272, "Gray Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), GRAY_WALL_BANNER(117, 8, 24275, "Gray Banner"), - GRAY_WOOL(35, 7, 27209, "Gray Wool", "WOOL"), + GRAY_WOOL(35, 7, 27209, "Gray Wool"), GREEN_BANNER(425, 2, 10698, "Green Banner"), GREEN_BED(355, 13, 13797, "Green Bed"), - GREEN_CARPET(171, 13, 7780, "Green Carpet", "CARPET"), + 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_SHULKER_BOX(232, 0, 9377, "Green Shulker Box"), - GREEN_STAINED_GLASS(95, 13, 22503, "Green Stained Glass", "STAINED_GLASS"), - GREEN_STAINED_GLASS_PANE(160, 13, 4767, "Green Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), GREEN_WALL_BANNER(117, 2, 15046, "Green Banner"), - GREEN_WOOL(35, 13, 25085, "Green Wool", "WOOL"), + 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"), @@ -1013,7 +1013,7 @@ public class ItemManager { IRON_TRAPDOOR(167, 0, 17095, "Iron Trapdoor"), ITEM_FRAME(389, 0, 27318, "Item Frame"), JACK_O_LANTERN(91, 0, 31612, "Jack o'Lantern"), - JUKEBOX(84, 0, 19264, "Jukebox", "JUKEBOX"), + JUKEBOX(84, 0, 19264, "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"), @@ -1047,61 +1047,61 @@ 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_CARPET(171, 3, 21194, "Light Blue Carpet", "CARPET"), + 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_SHULKER_BOX(222, 0, 18226, "Light Blue Shulker Box"), - LIGHT_BLUE_STAINED_GLASS(95, 3, 17162, "Light Blue Stained Glass", "STAINED_GLASS"), - LIGHT_BLUE_STAINED_GLASS_PANE(160, 3, 18721, "Light Blue Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), LIGHT_BLUE_WALL_BANNER(117, 12, 12011, "Light Blue Banner"), - LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool", "WOOL"), + 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_CARPET(171, 8, 11317, "Light Gray Carpet", "CARPET"), + 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", "STAINED_GLASS"), - LIGHT_GRAY_STAINED_GLASS_PANE(160, 8, 19008, "Light Gray Stained Glass Pane", "STAINED_GLASS_PANE"), + LIGHT_GRAY_STAINED_GLASS(95, 8, 5843, "Light Gray Stained Glass"), + LIGHT_GRAY_STAINED_GLASS_PANE(160, 8, 19008, "Light Gray Stained Glass Pane"), LIGHT_GRAY_TERRACOTTA(159, 8, 26388, "Light Gray Terracotta"), LIGHT_GRAY_WALL_BANNER(117, 7, 31088, "Light Gray Banner"), - LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool", "WOOL"), + LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool"), LIGHT_WEIGHTED_PRESSURE_PLATE(147, 0, 14875, "Light Weighted Pressure Plate", "GOLD_PLATE"), 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_CARPET(171, 5, 15443, "Lime Carpet", "CARPET"), + 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_SHULKER_BOX(224, 0, 28360, "Lime Shulker Box"), - LIME_STAINED_GLASS(95, 5, 24266, "Lime Stained Glass", "STAINED_GLASS"), - LIME_STAINED_GLASS_PANE(160, 5, 10610, "Lime Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), LIME_WALL_BANNER(117, 10, 21422, "Lime Banner"), - LIME_WOOL(35, 5, 10443, "Lime Wool", "WOOL"), + 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_CARPET(171, 2, 6180, "Magenta Carpet", "CARPET"), + 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_SHULKER_BOX(221, 0, 21566, "Magenta Shulker Box"), - MAGENTA_STAINED_GLASS(95, 2, 26814, "Magenta Stained Glass", "STAINED_GLASS"), - MAGENTA_STAINED_GLASS_PANE(160, 2, 14082, "Magenta Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), MAGENTA_WALL_BANNER(117, 13, 23291, "Magenta Banner"), - MAGENTA_WOOL(35, 2, 11853, "Magenta Wool", "WOOL"), + MAGENTA_WOOL(35, 2, 11853, "Magenta Wool"), MAGMA_BLOCK(213, 0, 25927, "Magma Block", "MAGMA"), MAGMA_CREAM(378, 0, 25097, "Magma Cream"), MAGMA_CUBE_SPAWN_EGG(383, 62, 26638, "Spawn Magma Cube", "Magma Cube Spawn Egg"), @@ -1167,18 +1167,18 @@ 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_CARPET(171, 1, 24752, "Orange Carpet", "CARPET"), + 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_SHULKER_BOX(220, 0, 21673, "Orange Shulker Box"), - ORANGE_STAINED_GLASS(95, 1, 25142, "Orange Stained Glass", "STAINED_GLASS"), - ORANGE_STAINED_GLASS_PANE(160, 1, 21089, "Orange Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), ORANGE_TULIP(38, 5, 26038, "Orange Tulip"), ORANGE_WALL_BANNER(117, 114, 9936, "Orange Banner"), - ORANGE_WOOL(35, 1, 23957, "Orange Wool", "WOOL"), + ORANGE_WOOL(35, 1, 23957, "Orange Wool"), OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy"), PACKED_ICE(174, 0, 28993, "Packed Ice"), PAINTING(321, 0, 23945, "Painting"), @@ -1191,18 +1191,18 @@ 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_CARPET(171, 6, 30186, "Pink Carpet", "CARPET"), + 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_SHULKER_BOX(225, 0, 24968, "Pink Shulker Box"), - PINK_STAINED_GLASS(95, 6, 16164, "Pink Stained Glass", "STAINED_GLASS"), - PINK_STAINED_GLASS_PANE(160, 6, 24637, "Pink Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), PINK_TULIP(38, 7, 27319, "Pink Tulip"), PINK_WALL_BANNER(117, 9, 9421, "Pink Banner"), - PINK_WOOL(35, 6, 7611, "Pink Wool", "WOOL"), + 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"), @@ -1292,23 +1292,23 @@ public class ItemManager { 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(86, 0, 19170, "Pumpkin"), PUMPKIN_PIE(400, 0, 28725, "Pumpkin Pie"), PUMPKIN_SEEDS(361, 0, 28985, "Pumpkin Seeds"), PUMPKIN_STEM(104, 0, 19021, "Pumpkin Stem"), PURPLE_BANNER(425, 5, 29027, "Purple Banner"), PURPLE_BED(355, 10, 29755, "Purple Bed"), - PURPLE_CARPET(171, 10, 5574, "Purple Carpet", "CARPET"), + 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_STAINED_GLASS(95, 10, 21845, "Purple Stained Glass", "STAINED_GLASS"), - PURPLE_STAINED_GLASS_PANE(160, 10, 10948, "Purple Stained Glass Pane", "STAINED_GLASS_PANE"), + 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", "WOOL"), + PURPLE_WOOL(35, 10, 11922, "Purple Wool"), PURPUR_BLOCK(201, 0, 7538, "Purpur Block"), PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar"), PURPUR_SLAB(205, 0, 11487, "Purpur Slab"), @@ -1333,7 +1333,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_CARPET(171, 14, 5424, "Red Carpet", "CARPET"), + 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"), @@ -1345,12 +1345,12 @@ public class ItemManager { RED_SANDSTONE_SLAB(182, 0, 17550, "Red Sandstone Slab", "STONE_SLAB2"), 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", "STAINED_GLASS"), - RED_STAINED_GLASS_PANE(160, 14, 8630, "Red Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), RED_TULIP(38, 4, 16781, "Red Tulip"), RED_WALL_BANNER(117, 1, 4378, "Red Banner"), - RED_WOOL(35, 14, 11621, "Red Wool", "WOOL"), + RED_WOOL(35, 14, 11621, "Red Wool"), REPEATER(356, 0, 28823, "Redstone Repeater"), REPEATING_COMMAND_BLOCK(-1, -1, 12405, "Repeating Command Block"), ROSE_BUSH(175, 4, 6080, "Rose Bush"), @@ -1387,7 +1387,7 @@ public class ItemManager { 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"), + SNOW(78, 0, 14146, "Snow"), SNOWBALL(332, 0, 19487, "Snowball"), SNOW_BLOCK(80, 0, 19913, "Snow Block"), SOUL_SAND(88, 0, 16841, "Soul Sand"), @@ -1470,7 +1470,7 @@ public class ItemManager { 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, 25324, "Spawn Vindicator", "Vindicator Spawn Egg"), - VINE(106, 0, 14564, "Vines", "VINE"), + VINE(106, 0, 14564, "Vines"), VOID_AIR(-1, -1, 13668, "Void Air"), WALL_SIGN(68, 0, 10644, "Wall Sign"), WALL_TORCH(50, 0, 25890, "Wall Torch"), @@ -1481,17 +1481,17 @@ 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", "CARPET"), + 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_SHULKER_BOX(219, 0, 31750, "White Shulker Box"), - WHITE_STAINED_GLASS(95, 0, 31190, "White Stained Glass", "STAINED_GLASS"), - WHITE_STAINED_GLASS_PANE(160, 0, 10557, "White Stained Glass Pane", "STAINED_GLASS_PANE"), + 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"), WHITE_TULIP(38, 6, 9742, "White Tulip"), WHITE_WALL_BANNER(425, 15, 15967, "White Banner"), - WHITE_WOOL(35, 0, 8624, "White Wool", "WOOL"), + WHITE_WOOL(35, 0, 8624, "White Wool"), 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"), @@ -1506,16 +1506,16 @@ 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_CARPET(171, 4, 18149, "Yellow Carpet", "CARPET"), + 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_SHULKER_BOX(223, 0, 28700, "Yellow Shulker Box"), - YELLOW_STAINED_GLASS(95, 4, 12182, "Yellow Stained Glass", "STAINED_GLASS"), - YELLOW_STAINED_GLASS_PANE(160, 4, 20298, "Yellow Stained Glass Pane", "STAINED_GLASS_PANE"), + 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, 11, 32004, "Yellow Banner"), - YELLOW_WOOL(35, 4, 29507, "Yellow Wool", "WOOL"), + YELLOW_WOOL(35, 4, 29507, "Yellow Wool"), 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"), diff --git a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java index 443f63ad..80f41aad 100644 --- a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java +++ b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java @@ -144,8 +144,7 @@ public class GuiManager { if (job.getMaxSlots() != null) Lore.add(Jobs.getLanguage().getMessage("command.info.gui.leftSlots") + ((job.getMaxSlots() - Jobs.getUsedSlots(job)) > 0 ? (job.getMaxSlots() - Jobs - .getUsedSlots( - job)) : 0)); + .getUsedSlots(job)) : 0)); Lore.add(Jobs.getLanguage().getMessage("command.info.gui.actions")); for (ActionType actionType : ActionType.values()) { diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 09cc78de..0e433a47 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -685,7 +685,7 @@ public class ConfigManager { String node = permissionKey.toLowerCase(); if (permissionSection == null) { - Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid permission key" + permissionKey + "!"); + Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid permission key " + permissionKey + "!"); continue; } boolean value = permissionSection.getBoolean("value", true); diff --git a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java index 10fa7182..df035bd4 100644 --- a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java @@ -88,16 +88,20 @@ public class LanguageManager { e1.printStackTrace(); } - for (String lang : languages) { - YmlMaker langFile = new YmlMaker(plugin, "locale" + File.separator + "messages_" + lang + ".yml"); - langFile.saveDefaultConfig(); - } + String ls = Jobs.getGCManager().localeString; + + if (ls == null || ls.equals("")) + return; + + YmlMaker langFile = new YmlMaker(plugin, "locale" + File.separator + "messages_" + ls + ".yml"); + langFile.saveDefaultConfig(); + languages.clear(); languages.add("en"); - File customLocaleFile = new File(plugin.getDataFolder(), "locale" + File.separator + "messages_" + Jobs.getGCManager().localeString + ".yml"); - if (!customLocaleFile.exists() && !Jobs.getGCManager().localeString.equalsIgnoreCase("en")) - languages.add(Jobs.getGCManager().localeString); + File customLocaleFile = new File(plugin.getDataFolder(), "locale" + File.separator + "messages_" + ls + ".yml"); + if (!customLocaleFile.exists() && !ls.equalsIgnoreCase("en")) + languages.add(ls); for (String lang : languages) { File f = new File(plugin.getDataFolder(), "locale" + File.separator + "messages_" + lang + ".yml"); @@ -372,7 +376,7 @@ public class LanguageManager { c.get("command.info.output.fish.none", "%jobname% does not get money from fishing."); c.get("command.info.output.craft.info", "&eCraft"); c.get("command.info.output.craft.none", "%jobname% does not get money from crafting."); - c.get("command.info.output.drink.info", "&eDrink"); + c.get("command.info.output.drink.info", "&eDrink"); c.get("command.info.output.drink.none", "%jobname% does not get money for drinking."); c.get("command.info.output.smelt.info", "&eSmelt"); c.get("command.info.output.smelt.none", "%jobname% does not get money from smelting."); diff --git a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java index e0bc5d20..f4d4fd8a 100644 --- a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java @@ -224,15 +224,21 @@ public class NameTranslatorManager { } synchronized void load() { + String ls = Jobs.getGCManager().localeString; + + if (ls == null || ls.equals("")) + return; File file = new File(plugin.getDataFolder(), "TranslatableWords.yml"); - File file2 = new File(plugin.getDataFolder(), "TranslatableWords" + File.separator + "Words_" + Jobs.getGCManager().localeString + ".yml"); + File file2 = new File(plugin.getDataFolder(), "TranslatableWords" + File.separator + "Words_" + ls + ".yml"); if (file.exists()) file.renameTo(file2); // Just copying default language files, except en, that one will be generated List languages = new ArrayList<>(); + languages.clear(); + try { languages.addAll(LanguageManager.getClassesFromPackage("TranslatableWords", "Words_")); } catch (ClassNotFoundException e1) { @@ -246,9 +252,9 @@ public class NameTranslatorManager { languages.addAll(Jobs.getLanguageManager().getLanguages()); - File customLocaleFile = new File(plugin.getDataFolder(), "TranslatableWords" + File.separator + "Words_" + Jobs.getGCManager().localeString + ".yml"); - if (!customLocaleFile.exists() && !Jobs.getGCManager().localeString.equalsIgnoreCase("en")) - languages.add(Jobs.getGCManager().localeString); + File customLocaleFile = new File(plugin.getDataFolder(), "TranslatableWords" + File.separator + "Words_" + ls + ".yml"); + if (!customLocaleFile.exists() && !ls.equalsIgnoreCase("en")) + languages.add(ls); for (String lang : languages) { diff --git a/src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java b/src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java index 95669983..247df5fe 100644 --- a/src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java @@ -23,9 +23,9 @@ public class RestrictedBlockManager { */ public synchronized void load() { // No file create/load when boolean is false - if (!Jobs.getGCManager().useBlockProtection) { + if (!Jobs.getGCManager().useBlockProtection) return; - } + ConfigReader cfg = null; try { cfg = new ConfigReader("restrictedBlocks.yml"); @@ -82,7 +82,7 @@ public class RestrictedBlockManager { } } - if (restrictedBlocksTimer.size() != 0) + if (restrictedBlocksTimer.size() > 0) Jobs.consoleMsg("&e[Jobs] Loaded " + this.restrictedBlocksTimer.size() + " protected blocks timers!"); cfg.save(); } diff --git a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java index b34ea6a6..87b3d80c 100644 --- a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java +++ b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java @@ -30,10 +30,6 @@ public class FurnaceBrewingHandling { static HashMap> brewingMap = new HashMap<>(); public static void load() { - // No file creating when the boolean is false - if (!Jobs.getGCManager().isFurnacesReassign() || !Jobs.getGCManager().isBrewingStandsReassign()) - return; - YmlMaker f = new YmlMaker(Jobs.getInstance(), "furnaceBrewingStands.yml"); if (!f.exists()) return; @@ -122,17 +118,14 @@ public class FurnaceBrewingHandling { } if (totalf > 0 || totalb > 0) - Jobs.consoleMsg("&e[Jobs] Loaded " + totalf + " furnaces and " + totalb + " brewing stands for reassigning"); + Jobs.consoleMsg("&e[Jobs] Loaded " + totalf + " furnaces and " + totalb + " brewing stands for reassigning."); } public static void save() { - // No file saving when the boolean is false - if (!Jobs.getGCManager().isFurnacesReassign() || !Jobs.getGCManager().isBrewingStandsReassign()) - return; - YmlMaker f = new YmlMaker(Jobs.getInstance(), "furnaceBrewingStands.yml"); - f.createNewFile(); + if (!f.exists()) + f.createNewFile(); f.saveDefaultConfig(); FileConfiguration config = f.getConfig(); diff --git a/src/main/resources/jobConfig.yml b/src/main/resources/jobConfig.yml index ea00c04c..c3abd17d 100644 --- a/src/main/resources/jobConfig.yml +++ b/src/main/resources/jobConfig.yml @@ -44,7 +44,7 @@ Jobs: slots: 1 # [OPTIONAL] Soft limits will allow to stop income/exp/point payment increase at some particular level but allow further general leveling. # In example if player is level 70, he will get paid as he would be at level 50, exp gain will be as he would be at lvl 40 and point gain will be as at level 60 - # This only aplies after players level is higher than provided particular limit. + # This only applies after players level is higher than provided particular limit. softIncomeLimit: 50 softExpLimit: 40 softPointsLimit: 60 @@ -81,7 +81,7 @@ Jobs: Gui: # name of the block Item: LOG:2 - # If you want to use this instaed of Item name. + # If you want to use this instead of Item name. # id of block # Id: 17 # data of block, usually its 0, but in example Diorite will have id of 1 and data of 3 @@ -334,7 +334,7 @@ Jobs: Light_blue: income: 2.0 experience: 5.0 - Lime: + 'Lime Green': income: 2.0 experience: 5.0 Magenta: @@ -352,7 +352,7 @@ Jobs: Red: income: 2.0 experience: 5.0 - Silver: + 'Light Gray': income: 2.0 experience: 5.0 White: @@ -783,8 +783,7 @@ Jobs: experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01)) rejoinCooldown: 10 Gui: - Id: 108 - Data: 0 + Item: BRICK_STAIRS Place: STONE-2: income: 1.3 @@ -1160,8 +1159,7 @@ Jobs: experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01)) rejoinCooldown: 10 Gui: - Id: 290 - Data: 0 + Item: WOODEN_HOE Tame: Wolf: income: 5.0 @@ -1348,7 +1346,7 @@ Jobs: points: 1 experience: 1.0 Place: - WHEAT-0: + CROPS-0: income: 3.0 points: 3 experience: 3.0 @@ -1550,8 +1548,7 @@ Jobs: experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01)) rejoinCooldown: 10 Gui: - Id: 61 - Data: 0 + Item: CRAFTING_TABLE Craft: '280': income: 0.1 @@ -1797,8 +1794,7 @@ Jobs: experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01)) rejoinCooldown: 10 Gui: - Id: 346 - Data: 0 + Item: FISHING_ROD Fish: '349-0': income: 15.0