Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-26 12:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Correct some material ids

Browse Source
This commit is contained in:
montlikadani 2020-02-15 16:55:57 +01:00
parent c38fe742b4
commit 368417d59e
12 changed files with 52 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/main/java/com/gamingmesh/jobs/CMILib/CMIMaterial.java
View File

@ -12,7 +12,6 @@ import org.bukkit.inventory.ItemStack;
import com.gamingmesh.jobs.CMILib.ItemManager.SlabType; import com.gamingmesh.jobs.CMILib.ItemManager.SlabType;
import com.gamingmesh.jobs.CMILib.VersionChecker.Version; import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
import com.gamingmesh.jobs.stuff.Debug;
public enum CMIMaterial { public enum CMIMaterial {
NONE(null, "None"), NONE(null, "None"),
@ -75,7 +74,7 @@ public enum CMIMaterial {
BLACK_STAINED_GLASS(95, 15, 13941, "Black Stained Glass", "STAINED_GLASS"), 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_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", "STAINED_CLAY"),
BLACK_WALL_BANNER(117, 0, 4919, "Black Banner"), BLACK_WALL_BANNER(177, 0, 4919, "Black Banner"),
BLACK_WOOL(35, 15, 16693, "Black Wool"), BLACK_WOOL(35, 15, 16693, "Black Wool"),
BLAZE_POWDER(377, 0, 18941, "Blaze Powder"), BLAZE_POWDER(377, 0, 18941, "Blaze Powder"),
BLAZE_ROD(369, 0, 8289, "Blaze Rod"), BLAZE_ROD(369, 0, 8289, "Blaze Rod"),
@ -92,7 +91,7 @@ public enum CMIMaterial {
BLUE_STAINED_GLASS(95, 11, 7107, "Blue Stained Glass"), BLUE_STAINED_GLASS(95, 11, 7107, "Blue Stained Glass"),
BLUE_STAINED_GLASS_PANE(160, 11, 28484, "Blue Stained Glass Pane"), BLUE_STAINED_GLASS_PANE(160, 11, 28484, "Blue Stained Glass Pane"),
BLUE_TERRACOTTA(159, 11, 5236, "Blue Terracotta"), BLUE_TERRACOTTA(159, 11, 5236, "Blue Terracotta"),
BLUE_WALL_BANNER(117, 4, 17757, "Blue Banner"), BLUE_WALL_BANNER(177, 4, 17757, "Blue Banner"),
BLUE_WOOL(35, 11, 15738, "Blue Wool"), BLUE_WOOL(35, 11, 15738, "Blue Wool"),
BONE(352, 0, 5686, "Bone"), BONE(352, 0, 5686, "Bone"),
BONE_BLOCK(216, 0, 17312, "Bone Block"), BONE_BLOCK(216, 0, 17312, "Bone Block"),
@ -123,7 +122,7 @@ public enum CMIMaterial {
BROWN_STAINED_GLASS(95, 12, 20945, "Brown Stained Glass"), BROWN_STAINED_GLASS(95, 12, 20945, "Brown Stained Glass"),
BROWN_STAINED_GLASS_PANE(160, 12, 17557, "Brown Stained Glass Pane"), BROWN_STAINED_GLASS_PANE(160, 12, 17557, "Brown Stained Glass Pane"),
BROWN_TERRACOTTA(159, 12, 23664, "Brown Terracotta"), BROWN_TERRACOTTA(159, 12, 23664, "Brown Terracotta"),
BROWN_WALL_BANNER(117, 3, 14731, "Brown Banner"), BROWN_WALL_BANNER(177, 3, 14731, "Brown Banner"),
BROWN_WOOL(35, 12, 32638, "Brown Wool"), BROWN_WOOL(35, 12, 32638, "Brown Wool"),
BUBBLE_COLUMN(13758, "Bubble Column"), BUBBLE_COLUMN(13758, "Bubble Column"),
BUBBLE_CORAL(12464, "Bubble Coral"), BUBBLE_CORAL(12464, "Bubble Coral"),
@ -208,7 +207,7 @@ public enum CMIMaterial {
CYAN_STAINED_GLASS(95, 9, 30604, "Cyan Stained Glass"), CYAN_STAINED_GLASS(95, 9, 30604, "Cyan Stained Glass"),
CYAN_STAINED_GLASS_PANE(160, 9, 11784, "Cyan Stained Glass Pane"), CYAN_STAINED_GLASS_PANE(160, 9, 11784, "Cyan Stained Glass Pane"),
CYAN_TERRACOTTA(159, 9, 25940, "Cyan Terracotta"), CYAN_TERRACOTTA(159, 9, 25940, "Cyan Terracotta"),
CYAN_WALL_BANNER(117, 6, 10889, "Cyan Banner"), CYAN_WALL_BANNER(177, 6, 10889, "Cyan Banner"),
CYAN_WOOL(35, 9, 12221, "Cyan Wool"), CYAN_WOOL(35, 9, 12221, "Cyan Wool"),
DAMAGED_ANVIL(145, 2, 10274, "Damaged Anvil"), DAMAGED_ANVIL(145, 2, 10274, "Damaged Anvil"),
DANDELION(37, 0, 30558, "Dandelion", "YELLOW_FLOWER"), DANDELION(37, 0, 30558, "Dandelion", "YELLOW_FLOWER"),
@ -294,8 +293,8 @@ public enum CMIMaterial {
ENDER_CHEST(130, 0, 32349, "Ender Chest"), ENDER_CHEST(130, 0, 32349, "Ender Chest"),
ENDER_EYE(381, 0, 24860, "Eye of Ender"), ENDER_EYE(381, 0, 24860, "Eye of Ender"),
ENDER_PEARL(368, 0, 5259, "Ender Pearl"), 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_GATEWAY(209, 0, 26605, "End Gateway", "ENDER_GATEWAY"),
END_PORTAL(119, 0, 16782, "End Portal"), END_PORTAL(119, 0, 16782, "End Portal"),
END_PORTAL_FRAME(120, 0, 15480, "End Portal Frame", "ENDER_PORTAL_FRAME"), END_PORTAL_FRAME(120, 0, 15480, "End Portal Frame", "ENDER_PORTAL_FRAME"),
END_ROD(198, 0, 24832, "End Rod"), END_ROD(198, 0, 24832, "End Rod"),
@ -343,7 +342,7 @@ public enum CMIMaterial {
GOLDEN_PICKAXE(285, 0, 10901, "Golden Pickaxe", "GOLD_PICKAXE"), GOLDEN_PICKAXE(285, 0, 10901, "Golden Pickaxe", "GOLD_PICKAXE"),
GOLDEN_SHOVEL(284, 0, 15597, "Golden Shovel", "GOLD_SPADE"), GOLDEN_SHOVEL(284, 0, 15597, "Golden Shovel", "GOLD_SPADE"),
GOLDEN_SWORD(283, 0, 10505, "Golden Sword", "GOLD_SWORD"), GOLDEN_SWORD(283, 0, 10505, "Golden Sword", "GOLD_SWORD"),
GOLD_BLOCK(41, 0, 27392, "Block of Gold", "GOLD_BLOCK"), GOLD_BLOCK(41, 0, 27392, "Block of Gold"),
GOLD_INGOT(266, 0, 28927, "Gold Ingot"), GOLD_INGOT(266, 0, 28927, "Gold Ingot"),
GOLD_NUGGET(371, 0, 28814, "Gold Nugget"), GOLD_NUGGET(371, 0, 28814, "Gold Nugget"),
GOLD_ORE(14, 0, 32625, "Gold Ore"), GOLD_ORE(14, 0, 32625, "Gold Ore"),
@ -363,7 +362,7 @@ public enum CMIMaterial {
GRAY_STAINED_GLASS(95, 7, 29979, "Gray Stained Glass"), GRAY_STAINED_GLASS(95, 7, 29979, "Gray Stained Glass"),
GRAY_STAINED_GLASS_PANE(160, 7, 25272, "Gray Stained Glass Pane"), GRAY_STAINED_GLASS_PANE(160, 7, 25272, "Gray Stained Glass Pane"),
GRAY_TERRACOTTA(159, 7, 18004, "Gray Terracotta"), GRAY_TERRACOTTA(159, 7, 18004, "Gray Terracotta"),
GRAY_WALL_BANNER(117, 8, 24275, "Gray Banner"), GRAY_WALL_BANNER(177, 8, 24275, "Gray Banner"),
GRAY_WOOL(35, 7, 27209, "Gray Wool"), GRAY_WOOL(35, 7, 27209, "Gray Wool"),
GREEN_BANNER(425, 2, 10698, "Green Banner"), GREEN_BANNER(425, 2, 10698, "Green Banner"),
GREEN_BED(355, 13, 13797, "Green Bed"), GREEN_BED(355, 13, 13797, "Green Bed"),
@ -375,11 +374,11 @@ public enum CMIMaterial {
GREEN_STAINED_GLASS(95, 13, 22503, "Green Stained Glass"), GREEN_STAINED_GLASS(95, 13, 22503, "Green Stained Glass"),
GREEN_STAINED_GLASS_PANE(160, 13, 4767, "Green Stained Glass Pane"), GREEN_STAINED_GLASS_PANE(160, 13, 4767, "Green Stained Glass Pane"),
GREEN_TERRACOTTA(159, 13, 4105, "Green Terracotta"), GREEN_TERRACOTTA(159, 13, 4105, "Green Terracotta"),
GREEN_WALL_BANNER(117, 2, 15046, "Green Banner"), GREEN_WALL_BANNER(177, 2, 15046, "Green Banner"),
GREEN_WOOL(35, 13, 25085, "Green Wool"), GREEN_WOOL(35, 13, 25085, "Green Wool"),
GUARDIAN_SPAWN_EGG(383, 68, 20113, "Guardian Spawn Egg", "Spawn Guardian"), GUARDIAN_SPAWN_EGG(383, 68, 20113, "Guardian Spawn Egg", "Spawn Guardian"),
GUNPOWDER(289, 0, 29974, "Gunpowder", "SULPHUR"), 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(11807, "Heart of the Sea"), HEART_OF_THE_SEA(11807, "Heart of the Sea"),
HEAVY_WEIGHTED_PRESSURE_PLATE(148, 0, 16970, "Heavy Weighted Pressure Plate", "IRON_PLATE"), HEAVY_WEIGHTED_PRESSURE_PLATE(148, 0, 16970, "Heavy Weighted Pressure Plate", "IRON_PLATE"),
HOPPER(154, 0, 31974, "Hopper"), HOPPER(154, 0, 31974, "Hopper"),
@ -400,7 +399,7 @@ public enum CMIMaterial {
INK_SAC(351, 0, 7184, "Ink Sac", "Ink Sack"), INK_SAC(351, 0, 7184, "Ink Sac", "Ink Sack"),
IRON_AXE(258, 0, 15894, "Iron Axe"), IRON_AXE(258, 0, 15894, "Iron Axe"),
IRON_BARS(101, 0, 9378, "Iron Bars", "IRON_FENCE"), 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_BOOTS(309, 0, 8531, "Iron Boots"),
IRON_CHESTPLATE(307, 0, 28112, "Iron Chestplate"), IRON_CHESTPLATE(307, 0, 28112, "Iron Chestplate"),
IRON_DOOR(330, 0, 4788, "Iron Door"), IRON_DOOR(330, 0, 4788, "Iron Door"),
@ -416,13 +415,13 @@ public enum CMIMaterial {
IRON_SWORD(267, 0, 10904, "Iron Sword"), IRON_SWORD(267, 0, 10904, "Iron Sword"),
IRON_TRAPDOOR(167, 0, 17095, "Iron Trapdoor"), IRON_TRAPDOOR(167, 0, 17095, "Iron Trapdoor"),
ITEM_FRAME(389, 0, 27318, "Item Frame"), 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(84, 0, 19264, "Jukebox"),
JUNGLE_BOAT(446, 0, 4495, "Jungle Boat", "BOAT_JUNGLE"), JUNGLE_BOAT(446, 0, 4495, "Jungle Boat", "BOAT_JUNGLE"),
JUNGLE_BUTTON(25317, "Jungle Button"), JUNGLE_BUTTON(25317, "Jungle Button"),
JUNGLE_DOOR(429, 0, 28163, "Jungle Door", "JUNGLE_DOOR_ITEM"), JUNGLE_DOOR(429, 0, 28163, "Jungle Door", "JUNGLE_DOOR_ITEM"),
JUNGLE_FENCE(190, 0, 14358, "Jungle Fence"), JUNGLE_FENCE(190, 0, 14358, "Jungle Fence"),
JUNGLE_FENCE_GATE(185, 0, 21360, "Jungle Fence Gate", "JUNGLE_FENCE_GATE"), JUNGLE_FENCE_GATE(185, 0, 21360, "Jungle Fence Gate"),
JUNGLE_LEAVES(18, 3, 5133, "Jungle Leaves"), JUNGLE_LEAVES(18, 3, 5133, "Jungle Leaves"),
JUNGLE_LOG(17, 3, 20721, "Jungle Log"), JUNGLE_LOG(17, 3, 20721, "Jungle Log"),
JUNGLE_PLANKS(5, 3, 26445, "Jungle Wood Plank", "Jungle Planks"), JUNGLE_PLANKS(5, 3, 26445, "Jungle Wood Plank", "Jungle Planks"),
@ -436,18 +435,18 @@ public enum CMIMaterial {
KELP_PLANT(29697, "Kelp Plant"), KELP_PLANT(29697, "Kelp Plant"),
KNOWLEDGE_BOOK(453, 0, 12646, "Knowledge Book"), KNOWLEDGE_BOOK(453, 0, 12646, "Knowledge Book"),
LADDER(65, 0, 23599, "Ladder"), LADDER(65, 0, 23599, "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_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"), LARGE_FERN(175, 3, 30177, "Large Fern", "DOUBLE_PLANT"),
LAVA(10, 0, 8415, "Flowing Lava"), LAVA(10, 0, 8415, "Flowing Lava"),
LAVA_BUCKET(327, 0, 9228, "Lava Bucket"), LAVA_BUCKET(327, 0, 9228, "Lava Bucket"),
LEAD(420, 0, 29539, "Lead", "Leash"), LEAD(420, 0, 29539, "Lead", "Leash"),
LEATHER(334, 0, 16414, "Leather"), LEATHER(334, 0, 16414, "Leather"),
LEATHER_BOOTS(301, 0, 15282, "Leather Boots"), LEATHER_BOOTS(301, 0, 15282, "Leather Boots"),
LEATHER_CHESTPLATE(299, 0, 29275, "Leather Tunic", "LEATHER_CHESTPLATE"), LEATHER_CHESTPLATE(299, 0, 29275, "Leather Tunic"),
LEATHER_HELMET(298, 0, 11624, "Leather Cap", "LEATHER_HELMET"), LEATHER_HELMET(298, 0, 11624, "Leather Cap"),
LEATHER_LEGGINGS(300, 0, 28210, "Leather Pants", "LEATHER_LEGGINGS"), LEATHER_LEGGINGS(300, 0, 28210, "Leather Pants"),
LEVER(69, 0, 15319, "Lever"), LEVER(69, 0, 15319, "Lever"),
LIGHT_BLUE_BANNER(425, 12, 18060, "Light Blue Banner"), LIGHT_BLUE_BANNER(425, 12, 18060, "Light Blue Banner"),
LIGHT_BLUE_BED(355, 3, 20957, "Light Blue Bed"), LIGHT_BLUE_BED(355, 3, 20957, "Light Blue Bed"),
@ -460,7 +459,7 @@ public enum CMIMaterial {
LIGHT_BLUE_STAINED_GLASS(95, 3, 17162, "Light Blue Stained Glass"), 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_STAINED_GLASS_PANE(160, 3, 18721, "Light Blue Stained Glass Pane"),
LIGHT_BLUE_TERRACOTTA(159, 3, 31779, "Light Blue Terracotta"), LIGHT_BLUE_TERRACOTTA(159, 3, 31779, "Light Blue Terracotta"),
LIGHT_BLUE_WALL_BANNER(117, 12, 12011, "Light Blue Banner"), LIGHT_BLUE_WALL_BANNER(177, 12, 12011, "Light Blue Banner"),
LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool"), LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool"),
LIGHT_GRAY_BANNER(425, 7, 11417, "Light Gray Banner"), LIGHT_GRAY_BANNER(425, 7, 11417, "Light Gray Banner"),
LIGHT_GRAY_BED(355, 8, 5090, "Light Gray Bed"), LIGHT_GRAY_BED(355, 8, 5090, "Light Gray Bed"),
@ -473,7 +472,7 @@ public enum CMIMaterial {
LIGHT_GRAY_STAINED_GLASS(95, 8, 5843, "Light Gray Stained Glass"), 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_STAINED_GLASS_PANE(160, 8, 19008, "Light Gray Stained Glass Pane"),
LIGHT_GRAY_TERRACOTTA(159, 8, 26388, "Light Gray Terracotta"), LIGHT_GRAY_TERRACOTTA(159, 8, 26388, "Light Gray Terracotta"),
LIGHT_GRAY_WALL_BANNER(117, 7, 31088, "Light Gray Banner"), LIGHT_GRAY_WALL_BANNER(177, 7, 31088, "Light Gray Banner"),
LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool"), LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool"),
LIGHT_WEIGHTED_PRESSURE_PLATE(147, 0, 14875, "Light Weighted Pressure Plate", "GOLD_PLATE"), LIGHT_WEIGHTED_PRESSURE_PLATE(147, 0, 14875, "Light Weighted Pressure Plate", "GOLD_PLATE"),
LILAC(175, 1, 22837, "Lilac"), LILAC(175, 1, 22837, "Lilac"),
@ -489,7 +488,7 @@ public enum CMIMaterial {
LIME_STAINED_GLASS(95, 5, 24266, "Lime Stained Glass"), LIME_STAINED_GLASS(95, 5, 24266, "Lime Stained Glass"),
LIME_STAINED_GLASS_PANE(160, 5, 10610, "Lime Stained Glass Pane"), LIME_STAINED_GLASS_PANE(160, 5, 10610, "Lime Stained Glass Pane"),
LIME_TERRACOTTA(159, 5, 24013, "Lime Terracotta"), LIME_TERRACOTTA(159, 5, 24013, "Lime Terracotta"),
LIME_WALL_BANNER(117, 10, 21422, "Lime Banner"), LIME_WALL_BANNER(177, 10, 21422, "Lime Banner"),
LIME_WOOL(35, 5, 10443, "Lime Wool"), LIME_WOOL(35, 5, 10443, "Lime Wool"),
LINGERING_POTION(441, 0, 25857, "Lingering Potion"), LINGERING_POTION(441, 0, 25857, "Lingering Potion"),
LLAMA_SPAWN_EGG(383, 103, 23640, "Llama Spawn Egg", "Spawn Llama"), LLAMA_SPAWN_EGG(383, 103, 23640, "Llama Spawn Egg", "Spawn Llama"),
@ -504,7 +503,7 @@ public enum CMIMaterial {
MAGENTA_STAINED_GLASS(95, 2, 26814, "Magenta Stained Glass"), MAGENTA_STAINED_GLASS(95, 2, 26814, "Magenta Stained Glass"),
MAGENTA_STAINED_GLASS_PANE(160, 2, 14082, "Magenta Stained Glass Pane"), MAGENTA_STAINED_GLASS_PANE(160, 2, 14082, "Magenta Stained Glass Pane"),
MAGENTA_TERRACOTTA(159, 2, 25900, "Magenta Terracotta"), MAGENTA_TERRACOTTA(159, 2, 25900, "Magenta Terracotta"),
MAGENTA_WALL_BANNER(117, 13, 23291, "Magenta Banner"), MAGENTA_WALL_BANNER(177, 13, 23291, "Magenta Banner"),
MAGENTA_WOOL(35, 2, 11853, "Magenta Wool"), MAGENTA_WOOL(35, 2, 11853, "Magenta Wool"),
MAGMA_BLOCK(213, 0, 25927, "Magma Block", "MAGMA"), MAGMA_BLOCK(213, 0, 25927, "Magma Block", "MAGMA"),
MAGMA_CREAM(378, 0, 25097, "Magma Cream"), MAGMA_CREAM(378, 0, 25097, "Magma Cream"),
@ -545,12 +544,12 @@ public enum CMIMaterial {
NETHER_BRICKS(112, 0, 27802, "Nether Bricks"), NETHER_BRICKS(112, 0, 27802, "Nether Bricks"),
NETHER_BRICK_FENCE(113, 0, 5286, "Nether Brick Fence", "NETHER_FENCE"), NETHER_BRICK_FENCE(113, 0, 5286, "Nether Brick Fence", "NETHER_FENCE"),
NETHER_BRICK_SLAB(44, 6, 26586, "Nether Brick Slab"), 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_PORTAL(90, 0, 19469, "Nether Portal", "PORTAL"),
NETHER_QUARTZ_ORE(153, 0, 4807, "Nether Quartz Ore", "QUARTZ_ORE"), NETHER_QUARTZ_ORE(153, 0, 4807, "Nether Quartz Ore", "QUARTZ_ORE"),
NETHER_STAR(399, 0, 12469, "Nether Star"), NETHER_STAR(399, 0, 12469, "Nether Star"),
NETHER_WART(372, 0, 29227, "Nether Wart", "NETHER_STALK"), 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"), NOTE_BLOCK(25, 0, 20979, "Note Block", "NOTE_BLOCK"),
OAK_BOAT(333, 0, 17570, "Boat", "Oak Boat"), 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"),
@ -581,7 +580,7 @@ public enum CMIMaterial {
ORANGE_STAINED_GLASS_PANE(160, 1, 21089, "Orange Stained Glass Pane"), ORANGE_STAINED_GLASS_PANE(160, 1, 21089, "Orange Stained Glass Pane"),
ORANGE_TERRACOTTA(159, 1, 18684, "Orange Terracotta"), ORANGE_TERRACOTTA(159, 1, 18684, "Orange Terracotta"),
ORANGE_TULIP(38, 5, 26038, "Orange Tulip"), ORANGE_TULIP(38, 5, 26038, "Orange Tulip"),
ORANGE_WALL_BANNER(117, 114, 9936, "Orange Banner"), ORANGE_WALL_BANNER(177, 114, 9936, "Orange Banner"),
ORANGE_WOOL(35, 1, 23957, "Orange Wool"), ORANGE_WOOL(35, 1, 23957, "Orange Wool"),
OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy"), OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy"),
PACKED_ICE(174, 0, 28993, "Packed Ice"), PACKED_ICE(174, 0, 28993, "Packed Ice"),
@ -605,7 +604,7 @@ public enum CMIMaterial {
PINK_STAINED_GLASS_PANE(160, 6, 24637, "Pink Stained Glass Pane"), PINK_STAINED_GLASS_PANE(160, 6, 24637, "Pink Stained Glass Pane"),
PINK_TERRACOTTA(159, 6, 23727, "Pink Terracotta"), PINK_TERRACOTTA(159, 6, 23727, "Pink Terracotta"),
PINK_TULIP(38, 7, 27319, "Pink Tulip"), PINK_TULIP(38, 7, 27319, "Pink Tulip"),
PINK_WALL_BANNER(117, 9, 9421, "Pink Banner"), PINK_WALL_BANNER(177, 9, 9421, "Pink Banner"),
PINK_WOOL(35, 6, 7611, "Pink Wool"), PINK_WOOL(35, 6, 7611, "Pink Wool"),
PISTON(33, 0, 21130, "Piston", "PISTON_BASE"), PISTON(33, 0, 21130, "Piston", "PISTON_BASE"),
PISTON_HEAD(34, 0, 30226, "Piston Head", "PISTON_EXTENSION"), PISTON_HEAD(34, 0, 30226, "Piston Head", "PISTON_EXTENSION"),
@ -622,47 +621,7 @@ public enum CMIMaterial {
PORKCHOP(319, 0, 30896, "Raw Porkchop"), PORKCHOP(319, 0, 30896, "Raw Porkchop"),
POTATO(392, 0, 21088, "Potato", "Potatoitem"), POTATO(392, 0, 21088, "Potato", "Potatoitem"),
POTATOES(142, 0, 10879, "Potatoes"), POTATOES(142, 0, 10879, "Potatoes"),
// Potions
POTION(373, 0, 24020, "Potion"), POTION(373, 0, 24020, "Potion"),
AWKWARD_POTION(373, 16, 24020, "Awkard Potion"),
THICK_POTION(373, 32, 24020, "Thick Potion"),
MUNDANE_POTION(373, 64, 24020, "Mundane Potion"),
REGENERATION_POTION(373, 8193, 24020, "Regeneration Potion"),
SWIFTNESS_POTION(373, 8194, 24020, "Swiftness Potion"),
FIRE_RESISTANCE_POTION(373, 8195, 24020, "Fire Resistance Potion"),
POISON_POTION(373, 8196, 24020, "Poison Potion"),
HEALING_POTION(373, 8197, 24020, "Healing Potion"),
NIGHT_VISION_POTION(373, 8198, 24020, "Night Vision Potion"),
WEAKNESS_POTION(373, 8200, 24020, "Weakness Potion"),
STRENGTH_POTION(373, 8201, 24020, "Strenght Potion"),
SLOWNESS_POTION(373, 8202, 24020, "Slowness Potion"),
HARMING_POTION(373, 8204, 24020, "Harming Potion"),
WATER_BREATHING_POTION(373, 8205, 24020, "Water Breathing Potion"),
INVISIBILITY_POTION(373, 8206, 24020, "Invisibility Potion"),
REGENERATION_POTION2(373, 8225, 24020, "Regeneration Potion"),
SWIFTNESS_POTION2(373, 8226, 24020, "Swiftness Potion2"),
POISON_POTION2(373, 8228, 24020, "Poison Potion2"),
HEALING_POTION2(373, 8229, 24020, "Healing Potion2"),
STRENGTH_POTION2(373, 8233, 24020, "Strength Potion2"),
LEAPING_POTION2(373, 8235, 24020, "Leaping Potion2"),
HARMING_POTION2(373, 8236, 24020, "Harming Potion2"),
REGENERATION_POTION3(373, 8257, 24020, "Regeneration Potion3"),
SWIFTNESS_POTION3(373, 8258, 24020, "Swiftness Potion3"),
FIRE_RESISTANCE_POTION3(373, 8259, 24020, "Fire Resistance potion3"),
POISON_POTION3(373, 8260, 24020, "Poison Potion3"),
NIGHT_VISION_POTION2(373, 8262, 24020, "Night Vision Potion2"),
WEAKNESS_POTION2(373, 8264, 24020, "Weakness Potion2"),
STRENGTH_POTION3(373, 8265, 24020, "Strength Potion3"),
SLOWNESS_POTION2(373, 8266, 24020, "Slowness Potion2"),
LEAPING_POTION3(373, 8267, 24020, "Leaping Potion3"),
WATER_BREATHING_POTION2(373, 8269, 24020, "Water Breathing Potion2"),
INVISIBILITY_POTION2(373, 8270, 24020, "Invisibility Potion2"),
REGENERATION_POTION4(373, 8289, 24020, "Regeneration Potion4"),
SWIFTNESS_POTION4(373, 8290, 24020, "Swiftness Potion4"),
POISON_POTION4(373, 8292, 24020, "Poison Potion4"),
STRENGTH_POTION4(373, 8297, 24020, "Strength Potion4"),
POTTED_ACACIA_SAPLING(14096, " Acacia Sapling"), POTTED_ACACIA_SAPLING(14096, " Acacia Sapling"),
POTTED_ALLIUM(13184, "Potted Allium"), POTTED_ALLIUM(13184, "Potted Allium"),
POTTED_AZURE_BLUET(8754, "Potted Azure Bluet"), POTTED_AZURE_BLUET(8754, "Potted Azure Bluet"),
@ -711,7 +670,7 @@ public enum CMIMaterial {
PURPLE_STAINED_GLASS(95, 10, 21845, "Purple Stained Glass"), PURPLE_STAINED_GLASS(95, 10, 21845, "Purple Stained Glass"),
PURPLE_STAINED_GLASS_PANE(160, 10, 10948, "Purple Stained Glass Pane"), PURPLE_STAINED_GLASS_PANE(160, 10, 10948, "Purple Stained Glass Pane"),
PURPLE_TERRACOTTA(159, 10, 10387, "Purple Terracotta"), PURPLE_TERRACOTTA(159, 10, 10387, "Purple Terracotta"),
PURPLE_WALL_BANNER(117, 5, 14298, "Purple Banner"), PURPLE_WALL_BANNER(177, 5, 14298, "Purple Banner"),
PURPLE_WOOL(35, 10, 11922, "Purple Wool"), PURPLE_WOOL(35, 10, 11922, "Purple Wool"),
PURPUR_BLOCK(201, 0, 7538, "Purpur Block"), PURPUR_BLOCK(201, 0, 7538, "Purpur Block"),
PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar"), PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar"),
@ -729,19 +688,19 @@ public enum CMIMaterial {
RABBIT_STEW(413, 0, 10611, "Rabbit Stew"), RABBIT_STEW(413, 0, 10611, "Rabbit Stew"),
RAIL(66, 0, 13285, "Rail", "RAILS"), RAIL(66, 0, 13285, "Rail", "RAILS"),
REDSTONE(331, 0, 11233, "Redstone", "Redstone Dust"), 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_LAMP(123, 0, 8217, "Redstone Lamp", "REDSTONE_LAMP_OFF"),
REDSTONE_ORE(73, 0, 10887, "Redstone Ore"), REDSTONE_ORE(73, 0, 10887, "Redstone Ore"),
REDSTONE_TORCH(76, 0, 22547, "Redstone Torch(on)", "REDSTONE_TORCH_ON"), REDSTONE_TORCH(76, 0, 22547, "Redstone Torch(on)", "REDSTONE_TORCH_ON"),
REDSTONE_WALL_TORCH(76, 0, 7595, "Redstone Wall Torch"), 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_BANNER(425, 1, 26961, "Red Banner"),
RED_BED(355, 14, 30910, "Red Bed", "Red Bed"), RED_BED(355, 14, 30910, "Red Bed", "Red Bed"),
RED_CARPET(171, 14, 5424, "Red Carpet"), RED_CARPET(171, 14, 5424, "Red Carpet"),
RED_CONCRETE(251, 14, 8032, "Red Concrete"), RED_CONCRETE(251, 14, 8032, "Red Concrete"),
RED_CONCRETE_POWDER(252, 14, 13286, "Red Concrete Powder"), RED_CONCRETE_POWDER(252, 14, 13286, "Red Concrete Powder"),
RED_GLAZED_TERRACOTTA(249, 0, 24989, "Red Glazed Terracotta"), RED_GLAZED_TERRACOTTA(249, 0, 24989, "Red Glazed Terracotta"),
RED_MUSHROOM(40, 0, 19728, "Red Mushroom", "RED_MUSHROOM"), RED_MUSHROOM(40, 0, 19728, "Red Mushroom"),
RED_MUSHROOM_BLOCK(100, 0, 20766, "Red Mushroom Block", "HUGE_MUSHROOM_2"), 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_NETHER_BRICKS(215, 0, 18056, "Red Nether Bricks", "RED_NETHER_BRICK"),
RED_SAND(12, 1, 16279, "Red Sand"), RED_SAND(12, 1, 16279, "Red Sand"),
@ -753,7 +712,7 @@ public enum CMIMaterial {
RED_STAINED_GLASS_PANE(160, 14, 8630, "Red Stained Glass Pane"), RED_STAINED_GLASS_PANE(160, 14, 8630, "Red Stained Glass Pane"),
RED_TERRACOTTA(159, 14, 5086, "Red Terracotta"), RED_TERRACOTTA(159, 14, 5086, "Red Terracotta"),
RED_TULIP(38, 4, 16781, "Red Tulip"), RED_TULIP(38, 4, 16781, "Red Tulip"),
RED_WALL_BANNER(117, 1, 4378, "Red Banner"), RED_WALL_BANNER(177, 1, 4378, "Red Banner"),
RED_WOOL(35, 14, 11621, "Red Wool"), RED_WOOL(35, 14, 11621, "Red Wool"),
REPEATER(356, 0, 28823, "Redstone Repeater", "Diode"), REPEATER(356, 0, 28823, "Redstone Repeater", "Diode"),
REPEATING_COMMAND_BLOCK(12405, "Repeating Command Block"), REPEATING_COMMAND_BLOCK(12405, "Repeating Command Block"),
@ -799,7 +758,7 @@ public enum CMIMaterial {
SPECTRAL_ARROW(439, 0, 4568, "Spectral Arrow"), SPECTRAL_ARROW(439, 0, 4568, "Spectral Arrow"),
SPIDER_EYE(375, 0, 9318, "Spider Eye"), SPIDER_EYE(375, 0, 9318, "Spider Eye"),
SPIDER_SPAWN_EGG(383, 52, 14984, "Spider Spawn Egg", "Spawn Spider"), SPIDER_SPAWN_EGG(383, 52, 14984, "Spider Spawn Egg", "Spawn Spider"),
SPLASH_POTION(438, 0, 30248, "Splash Potion", "SPLASH_POTION"), SPLASH_POTION(438, 0, 30248, "Splash Potion"),
SPONGE(19, 0, 15860, "Sponge", "SPONGE"), SPONGE(19, 0, 15860, "Sponge", "SPONGE"),
SPRUCE_BOAT(444, 0, 9606, "Spruce Boat", "BOAT_SPRUCE"), SPRUCE_BOAT(444, 0, 9606, "Spruce Boat", "BOAT_SPRUCE"),
SPRUCE_BUTTON(23281, "Spruce Button"), SPRUCE_BUTTON(23281, "Spruce Button"),
@ -853,7 +812,7 @@ public enum CMIMaterial {
TALL_SEAGRASS(27189, "Tall Seagrass"), TALL_SEAGRASS(27189, "Tall Seagrass"),
TERRACOTTA(172, 0, 16544, "Terracotta", "HARD_CLAY"), TERRACOTTA(172, 0, 16544, "Terracotta", "HARD_CLAY"),
TIPPED_ARROW(440, 0, 25164, "Tipped Arrow"), TIPPED_ARROW(440, 0, 25164, "Tipped Arrow"),
TNT(46, 0, 7896, "TNT", "TNT"), TNT(46, 0, 7896, "TNT"),
TNT_MINECART(407, 0, 4277, "Minecart with TNT", "explosiveminecart"), TNT_MINECART(407, 0, 4277, "Minecart with TNT", "explosiveminecart"),
TORCH(50, 0, 6063, "Torch"), TORCH(50, 0, 6063, "Torch"),
TOTEM_OF_UNDYING(449, 0, 10139, "Totem Of Undying", "Totem"), TOTEM_OF_UNDYING(449, 0, 10139, "Totem Of Undying", "Totem"),
@ -1032,10 +991,10 @@ public enum CMIMaterial {
YELLOW_DYE(5952, "Yellow Dye"), YELLOW_DYE(5952, "Yellow Dye"),
COMPOSTER(-4, "Composter"), COMPOSTER(-4, "Composter"),
//1.15 //1.15
BEEHIVE("Beehive"), BEEHIVE("Beehive"),
BEE_NEST("Bee Nest"), BEE_NEST("Bee Nest"),
BEE_SPAWN_EGG("Bee Spawn Egg"), BEE_SPAWN_EGG(383, null, 15434, "Bee Spawn Egg"),
HONEYCOMB("Honeycomb"), HONEYCOMB("Honeycomb"),
HONEYCOMB_BLOCK("Honeycomb Block"), HONEYCOMB_BLOCK("Honeycomb Block"),
HONEY_BLOCK("Honey Block"), HONEY_BLOCK("Honey Block"),
@ -1955,7 +1914,6 @@ public enum CMIMaterial {
} }
public boolean isAir() { public boolean isAir() {
Debug.D(this.toString());
switch (this) { switch (this) {
case AIR: case AIR:
case CAVE_AIR: case CAVE_AIR:

22
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -4,21 +4,19 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe; import org.bukkit.inventory.Recipe;
import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType; import org.bukkit.potion.PotionType;
import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.CMILib.VersionChecker.Version; import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
import com.gamingmesh.jobs.stuff.Util;
public class ItemManager { public class ItemManager {
@ -279,26 +277,16 @@ public class ItemManager {
data = 3; data = 3;
main: if (original.contains(":")) { main: if (original.contains(":")) {
ItemStack old = headCache.get(original); ItemStack old = headCache.get(original);
if (old != null) { if (old != null) {
cm.setItemStack(old); cm.setItemStack(old);
} else { } else {
String d = original.split(":")[1]; String d = original.split(":")[1];
ItemStack skull = CMIMaterial.PLAYER_HEAD.newItemStack(); ItemStack skull = Util.getSkull(d);
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); if (skull == null) {
if (d.length() == 36) { break main;
try {
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(UUID.fromString(d));
skullMeta.setOwningPlayer(offPlayer);
} catch (Exception e) {
break main;
} }
skull.setItemMeta(skullMeta);
} else {
skullMeta.setOwner(d);
skull.setItemMeta(skullMeta);
}
headCache.put(original, skull); headCache.put(original, skull);
cm.setItemStack(skull); cm.setItemStack(skull);
} }

2
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -1009,7 +1009,7 @@ public class Jobs extends JavaPlugin {
if (jobinfo == null) if (jobinfo == null)
continue; continue;
Double income = jobinfo.getIncome(level, numjobs); Double income = jobinfo.getIncome(level, numjobs);
Double pointAmount = jobinfo.getPoints(level, numjobs); Double pointAmount = jobinfo.getPoints(level, numjobs);
Double expAmount = jobinfo.getExperience(level, numjobs); Double expAmount = jobinfo.getExperience(level, numjobs);

1
src/main/java/com/gamingmesh/jobs/actions/MaterialActionInfo.java
View File

@ -22,7 +22,6 @@ import org.bukkit.Material;
import com.gamingmesh.jobs.container.ActionType; import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.BaseActionInfo; import com.gamingmesh.jobs.container.BaseActionInfo;
import com.gamingmesh.jobs.stuff.Debug;
public abstract class MaterialActionInfo extends BaseActionInfo { public abstract class MaterialActionInfo extends BaseActionInfo {
private Material material; private Material material;

5
src/main/java/com/gamingmesh/jobs/commands/list/blockinfo.java
View File

@ -8,7 +8,6 @@ import com.gamingmesh.jobs.CMILib.CMIMaterial;
import com.gamingmesh.jobs.CMILib.VersionChecker.Version; import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
import com.gamingmesh.jobs.commands.Cmd; import com.gamingmesh.jobs.commands.Cmd;
import com.gamingmesh.jobs.commands.JobCommand; import com.gamingmesh.jobs.commands.JobCommand;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.Util; import com.gamingmesh.jobs.stuff.Util;
public class blockinfo implements Cmd { public class blockinfo implements Cmd {
@ -29,10 +28,6 @@ public class blockinfo implements Cmd {
Player player = (Player) sender; Player player = (Player) sender;
Block block = Util.getTargetBlock(player, 15); Block block = Util.getTargetBlock(player, 15);
Debug.D(block.getType(), CMIMaterial.get(block).toString());
if (block == null || CMIMaterial.isAir(block.getType())) if (block == null || CMIMaterial.isAir(block.getType()))
return true; return true;

2
src/main/java/com/gamingmesh/jobs/commands/list/browse.java
View File

@ -19,7 +19,7 @@ public class browse implements Cmd {
@Override @Override
@JobCommand(200) @JobCommand(200)
public boolean perform(Jobs plugin, CommandSender sender, final String[] args) { public boolean perform(Jobs plugin, CommandSender sender, final String[] args) {
if (Jobs.getGCManager().BrowseUseNewLook) { if (Jobs.getGCManager().BrowseUseNewLook) {
List<Job> jobList = new ArrayList<>(Jobs.getJobs()); List<Job> jobList = new ArrayList<>(Jobs.getJobs());

9
src/main/java/com/gamingmesh/jobs/commands/list/gtop.java
View File

@ -42,6 +42,7 @@ public class gtop implements Cmd {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return true; return true;
} }
if (page < 1) if (page < 1)
page = 1; page = 1;
@ -55,16 +56,14 @@ public class gtop implements Cmd {
if (!Jobs.getGCManager().ShowToplistInScoreboard) { if (!Jobs.getGCManager().ShowToplistInScoreboard) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.gtop.output.topline", "%amount%", Jobs.getGCManager().JobsTopAmount)); sender.sendMessage(Jobs.getLanguage().getMessage("command.gtop.output.topline", "%amount%", Jobs.getGCManager().JobsTopAmount));
for (TopList One : FullList) { for (TopList One : FullList) {
if (pi.isBreak()) if (pi.isBreak())
break; break;
if (pi.isContinue()) if (pi.isContinue())
continue; continue;
String PlayerName = One.getPlayerName() != null ? One.getPlayerName() : "Unknown"; String PlayerName = One.getPlayerName();
sender.sendMessage(Jobs.getLanguage().getMessage("command.gtop.output.list", sender.sendMessage(Jobs.getLanguage().getMessage("command.gtop.output.list",
"%number%", pi.getPositionForOutput(), "%number%", pi.getPositionForOutput(),
"%playername%", PlayerName, "%playername%", PlayerName,
@ -74,11 +73,8 @@ public class gtop implements Cmd {
Jobs.getInstance().ShowPagination(sender, pi, "jobs gtop"); Jobs.getInstance().ShowPagination(sender, pi, "jobs gtop");
} else { } else {
List<String> ls = new ArrayList<>(); List<String> ls = new ArrayList<>();
for (TopList one : FullList) { for (TopList one : FullList) {
if (pi.isBreak()) if (pi.isBreak())
break; break;
@ -97,6 +93,7 @@ public class gtop implements Cmd {
Jobs.getInstance().ShowPagination(sender, pi, "jobs gtop"); Jobs.getInstance().ShowPagination(sender, pi, "jobs gtop");
} }
return true; return true;
} }
} }

18
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -1022,6 +1022,12 @@ public class ConfigManager {
ActionType actionType = ActionType.getByName(split[0]); ActionType actionType = ActionType.getByName(split[0]);
String mats = split[1]; String mats = split[1];
String[] co = mats.split(","); String[] co = mats.split(",");
int amount = 1;
if (split.length == 3) {
amount = Integer.parseInt(split[2]);
}
if (co.length > 0) { if (co.length > 0) {
for (String c : co) { for (String c : co) {
KeyValues kv = getKeyValue(c, actionType, jobFullName); KeyValues kv = getKeyValue(c, actionType, jobFullName);
@ -1029,11 +1035,6 @@ public class ConfigManager {
continue; continue;
} }
int amount = 1;
if (split.length == 3) {
amount = Integer.parseInt(split[2]);
}
QuestObjective objective = new QuestObjective(actionType, kv.getId(), kv.getMeta(), QuestObjective objective = new QuestObjective(actionType, kv.getId(), kv.getMeta(),
kv.getType() + kv.getSubType(), amount); kv.getType() + kv.getSubType(), amount);
quest.addObjective(objective); quest.addObjective(objective);
@ -1041,11 +1042,6 @@ public class ConfigManager {
} else { } else {
KeyValues kv = getKeyValue(mats, actionType, jobFullName); KeyValues kv = getKeyValue(mats, actionType, jobFullName);
if (kv != null) { if (kv != null) {
int amount = 1;
if (split.length == 3) {
amount = Integer.parseInt(split[2]);
}
QuestObjective objective = new QuestObjective(actionType, kv.getId(), kv.getMeta(), QuestObjective objective = new QuestObjective(actionType, kv.getId(), kv.getMeta(),
kv.getType() + kv.getSubType(), amount); kv.getType() + kv.getSubType(), amount);
quest.addObjective(objective); quest.addObjective(objective);
@ -1171,7 +1167,7 @@ public class ConfigManager {
continue; continue;
if (material != null && material.getMaterial() != null && material.getMaterial() == Material.AIR) { if (material != null && material.getMaterial() != null && material.getMaterial() == Material.AIR) {
log.warning("Job " + jobKey + " " + actionType.getName() + " cant recognize material! (" + key + ")"); log.warning("Job " + jobKey + " " + actionType.getName() + " cant recognize material! (" + key +")");
continue; continue;
} }

1
src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java
View File

@ -19,7 +19,6 @@ import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.JobInfo; import com.gamingmesh.jobs.container.JobInfo;
import com.gamingmesh.jobs.container.NameList; import com.gamingmesh.jobs.container.NameList;
import com.gamingmesh.jobs.hooks.HookManager; import com.gamingmesh.jobs.hooks.HookManager;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.Util; import com.gamingmesh.jobs.stuff.Util;
public class NameTranslatorManager { public class NameTranslatorManager {

1
src/main/java/com/gamingmesh/jobs/container/Job.java
View File

@ -21,7 +21,6 @@ package com.gamingmesh.jobs.container;
import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.ChatColor; import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

1
src/main/java/com/gamingmesh/jobs/container/JobInfo.java
View File

@ -20,7 +20,6 @@ package com.gamingmesh.jobs.container;
import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.Debug;
public class JobInfo { public class JobInfo {
private ActionType actionType; private ActionType actionType;

2
src/main/java/com/gamingmesh/jobs/stuff/Util.java
View File

@ -7,7 +7,6 @@ import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -30,7 +29,6 @@ import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.util.BlockIterator; import org.bukkit.util.BlockIterator;
import org.jetbrains.annotations.NotNull;
import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.CMILib.CMIMaterial; import com.gamingmesh.jobs.CMILib.CMIMaterial;