mirror of
https://github.com/Zrips/Jobs.git
synced 2025-01-20 07:01:22 +01:00
Updated to Bukkit/Spigot 1.13.1 version
Other: - Fixes a lot of item recognizon bugs
This commit is contained in:
montlikadani
parent
1547505a96
commit
c700d07c17
@ -655,7 +655,7 @@ public class ItemManager {
|
||||
BIRCH_SLAB(126, 2, 13807, "Birch Slab", ""),
|
||||
BIRCH_STAIRS(135, 0, 7657, "Birch Wood Stairs", "Birch Stairs"),
|
||||
BIRCH_TRAPDOOR(-1, -1, 32585, "Birch Trapdoor", ""),
|
||||
BIRCH_WOOD(-1, -1, 7924, "Birch Wood", ""),
|
||||
BIRCH_WOOD(-1, -1, 20913, "Birch Wood", ""),
|
||||
BLACK_BANNER(425, 0, 9365, "Banner", "Black Banner"),
|
||||
BLACK_BED(355, 15, 20490, "Black Bed", "Black Bed"),
|
||||
BLACK_CARPET(171, 15, 6056, "Black Carpet", "CARPET"),
|
||||
@ -817,24 +817,29 @@ public class ItemManager {
|
||||
DARK_OAK_SLAB(126, 5, 28852, "Dark Oak Wood Slab", "Dark Oak Slab"),
|
||||
DARK_OAK_STAIRS(164, 0, 22921, "Dark Oak Stairs", "DARK_OAK_STAIRS"),
|
||||
DARK_OAK_TRAPDOOR(-1, -1, 10355, "Dark Oak Trapdoor", ""),
|
||||
DARK_OAK_WOOD(-1, -1, 7871, "Dark Oak Wood", ""),
|
||||
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"),
|
||||
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", ""),
|
||||
DEAD_BRAIN_CORAL_WALL_FAN(-1, -1, 23718, "Dead Brain Coral Wall Fan", ""),
|
||||
DEAD_BUBBLE_CORAL(-1, -1, 30583, "Dead Bubble Coral", ""),
|
||||
DEAD_BUBBLE_CORAL_BLOCK(-1, -1, 28220, "Dead Bubble Coral Block", ""),
|
||||
DEAD_BUBBLE_CORAL_FAN(-1, -1, 17322, "Dead Bubble Coral Fan", ""),
|
||||
DEAD_BUBBLE_CORAL_WALL_FAN(-1, -1, 18453, "Dead Bubble Coral Wall Fan", ""),
|
||||
DEAD_BUSH(32, 0, 22888, "Dead Bush", "DEAD_BUSH"),
|
||||
DEAD_FIRE_CORAL(-1, -1, 8365, "Dead Fire Coral", ""),
|
||||
DEAD_FIRE_CORAL_BLOCK(-1, -1, 5307, "Dead Fire Coral Block", ""),
|
||||
DEAD_FIRE_CORAL_FAN(-1, -1, 27073, "Dead Fire Coral Fan", ""),
|
||||
DEAD_FIRE_CORAL_WALL_FAN(-1, -1, 23375, "Dead Fire Coral Wall Fan", ""),
|
||||
DEAD_HORN_CORAL(-1, -1, 5755, "Dead Horn Coral"),
|
||||
DEAD_HORN_CORAL_BLOCK(-1, -1, 15103, "Dead Horn Coral Block", ""),
|
||||
DEAD_HORN_CORAL_FAN(-1, -1, 11387, "Dead Horn Coral Fan", ""),
|
||||
DEAD_HORN_CORAL_WALL_FAN(-1, -1, 27550, "Dead Horn Coral Wall Fan", ""),
|
||||
DEAD_TUBE_CORAL(-1, -1, 18028, "Dead Tube Coral", ""),
|
||||
DEAD_TUBE_CORAL_BLOCK(-1, -1, 28350, "Dead Tube Coral Block", ""),
|
||||
DEAD_TUBE_CORAL_FAN(-1, -1, 17628, "Dead Tube Coral Fan", ""),
|
||||
DEAD_TUBE_CORAL_WALL_FAN(-1, -1, 5128, "Dead Tube Coral Wall Fan", ""),
|
||||
@ -887,7 +892,7 @@ public class ItemManager {
|
||||
END_ROD(198, 0, 24832, "End Rod", "END_ROD"),
|
||||
END_STONE(121, 0, 29686, "End Stone", "ENDER_STONE"),
|
||||
END_STONE_BRICKS(206, 0, 20314, "End Stone Bricks", "END_BRICKS"),
|
||||
EVOKER_SPAWN_EGG(383, 34, 19365, "Spawn Evoker", "Evoker Spawn Egg"),
|
||||
EVOKER_SPAWN_EGG(383, 34, 21271, "Spawn Evoker", "Evoker Spawn Egg"),
|
||||
EXPERIENCE_BOTTLE(384, 0, 12858, "Bottle o' Enchanting", "expbottle"),
|
||||
FARMLAND(60, 0, 31166, "Farmland", "SOIL"),
|
||||
FEATHER(288, 0, 30548, "Feather", "FEATHER"),
|
||||
@ -1017,7 +1022,7 @@ public class ItemManager {
|
||||
JUNGLE_SLAB(43, 0, 19117, "Double Stone Slab", ""),
|
||||
JUNGLE_STAIRS(136, 0, 20636, "Jungle Wood Stairs", "Jungle Stairs"),
|
||||
JUNGLE_TRAPDOOR(-1, -1, 8626, "Jungle Trapdoor", ""),
|
||||
JUNGLE_WOOD(-1, -1, 30228, "Jungle Wood", ""),
|
||||
JUNGLE_WOOD(-1, -1, 10341, "Jungle Wood", ""),
|
||||
KELP(-1, -1, 21916, "Kelp", ""),
|
||||
KELP_PLANT(-1, -1, 29697, "Kelp Plant", ""),
|
||||
KNOWLEDGE_BOOK(453, 0, 12646, "Knowledge Book", ""),
|
||||
@ -1132,7 +1137,7 @@ public class ItemManager {
|
||||
NETHER_BRICK_FENCE(113, 0, 5286, "Nether Brick Fence", "NETHER_FENCE"),
|
||||
NETHER_BRICK_SLAB(44, 6, 26586, "Nether Brick Slab", ""),
|
||||
NETHER_BRICK_STAIRS(114, 0, 12085, "Nether Brick Stairs", "NETHER_BRICK_STAIRS"),
|
||||
NETHER_PORTAL(90, 0, 19085, "Nether Portal", "PORTAL"),
|
||||
NETHER_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"),
|
||||
@ -1151,7 +1156,7 @@ public class ItemManager {
|
||||
OAK_SLAB(126, 0, 12002, "Oak Slab", "Wood step"),
|
||||
OAK_STAIRS(53, 0, 5449, "Oak Stairs", "WOOD_STAIRS"),
|
||||
OAK_TRAPDOOR(96, 0, 16927, "Oak Trapdoor", "Trapdoor"),
|
||||
OAK_WOOD(-1, -1, 23286, "Oak Wood", ""),
|
||||
OAK_WOOD(-1, -1, 7378, "Oak Wood", ""),
|
||||
OBSERVER(218, 0, 10726, "Observer", "OBSERVER"),
|
||||
OBSIDIAN(49, 0, 32723, "Obsidian", "OBSIDIAN"),
|
||||
OCELOT_SPAWN_EGG(383, 98, 30080, "Spawn Ocelot", "Ocelot Spawn Egg"),
|
||||
@ -1203,7 +1208,7 @@ public class ItemManager {
|
||||
POLISHED_ANDESITE(1, 6, 8335, "Polished Andesite", ""),
|
||||
POLISHED_DIORITE(1, 4, 31615, "Polished Diorite", ""),
|
||||
POLISHED_GRANITE(1, 2, 5477, "Polished Granite", ""),
|
||||
POPPED_CHORUS_FRUIT(433, 0, 16880, "Popped Chorus Fruit", ""),
|
||||
POPPED_CHORUS_FRUIT(433, 0, 27844, "Popped Chorus Fruit", ""),
|
||||
POPPY(38, 0, 12851, "Poppy", ""),
|
||||
PORKCHOP(319, 0, 30896, "Raw Porkchop", ""),
|
||||
POTATO(392, 0, 21088, "Potato", "Potatoitem"),
|
||||
@ -1341,7 +1346,7 @@ public class ItemManager {
|
||||
SNOWBALL(332, 0, 19487, "Snowball", ""),
|
||||
SNOW_BLOCK(80, 0, 19913, "Snow Block", "SNOW_BLOCK"),
|
||||
SOUL_SAND(88, 0, 16841, "Soul Sand", "SOUL_SAND"),
|
||||
SPAWNER(52, 90, 25500, "Spawner", "MOB_SPAWNER"),
|
||||
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"),
|
||||
@ -1360,7 +1365,7 @@ public class ItemManager {
|
||||
SPRUCE_SLAB(126, 1, 4348, "Spruce Slab", ""),
|
||||
SPRUCE_STAIRS(134, 0, 11192, "Spruce Wood Stairs", "Spruce Stairs"),
|
||||
SPRUCE_TRAPDOOR(-1, -1, 10289, "Spruce Trapdoor", ""),
|
||||
SPRUCE_WOOD(-1, -1, 22538, "Spruce Wood", ""),
|
||||
SPRUCE_WOOD(-1, -1, 32328, "Spruce Wood", ""),
|
||||
SQUID_SPAWN_EGG(383, 94, 10682, "Spawn Squid", "Squid Spawn Egg"),
|
||||
STICK(280, 0, 9773, "Stick", "STICK"),
|
||||
STICKY_PISTON(29, 0, 18127, "Sticky Piston", "PISTON_STICKY_BASE"),
|
||||
@ -1407,8 +1412,8 @@ public class ItemManager {
|
||||
TRIDENT(-1, -1, 7534, "Trident", ""),
|
||||
TRIPWIRE(132, 0, 8810, "Tripwire", ""),
|
||||
TRIPWIRE_HOOK(131, 0, 8130, "Tripwire Hook", ""),
|
||||
TROPICAL_FISH(349, 2, 12795, "Tropical Fish", ""),
|
||||
TROPICAL_FISH_BUCKET(-1, -1, 30390, "Bucket of Tropical Fish", ""),
|
||||
TROPICAL_FISH(349, 2, 24879, "Tropical Fish", ""),
|
||||
TROPICAL_FISH_BUCKET(-1, -1, 29995, "Bucket of Tropical Fish", ""),
|
||||
TROPICAL_FISH_SPAWN_EGG(-1, -1, 19713, "Tropical Fish Spawn Egg", ""),
|
||||
TUBE_CORAL(-1, -1, 23048, "Tube Coral", ""),
|
||||
TUBE_CORAL_BLOCK(-1, -1, 23723, "Tube Coral Block", ""),
|
||||
@ -1419,7 +1424,7 @@ public class ItemManager {
|
||||
TURTLE_SPAWN_EGG(-1, -1, 17324, "Turtle Spawn Egg", ""),
|
||||
VEX_SPAWN_EGG(383, 35, 27751, "Spawn Vex", "Vex Spawn Egg"),
|
||||
VILLAGER_SPAWN_EGG(383, 120, 30348, "Spawn Villager", "Villager Spawn Egg"),
|
||||
VINDICATOR_SPAWN_EGG(383, 36, 21672, "Spawn Vindicator", "Vindicator Spawn Egg"),
|
||||
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"),
|
||||
|
||||
@ -76,7 +76,7 @@ public class QuestProgression {
|
||||
givenReward = true;
|
||||
|
||||
jPlayer.addDoneQuest();
|
||||
|
||||
|
||||
List<String> cmds = quest.getRewardCmds();
|
||||
for (String one : cmds) {
|
||||
ServerCommandEvent ev = new ServerCommandEvent(Bukkit.getConsoleSender(), one.replace("[playerName]", jPlayer.getUserName()));
|
||||
@ -85,7 +85,7 @@ public class QuestProgression {
|
||||
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ev.getCommand().startsWith("/") ? ev.getCommand().substring(1) : ev.getCommand());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user