Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-02 14:29:07 +01:00
Code Issues Projects Releases Wiki Activity

Item by material, not by CMIMaterial name

Browse Source
This commit is contained in:
Zrips 2018-08-09 13:19:33 +03:00
parent ffa0ad5522
commit 72a7644074
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,7 +755,7 @@ public class ItemManager {
COBWEB(30, 0, 9469, "Cobweb", "WEB"),
COCOA(127, 0, 29709, "Cocoa", ""),
COCOA_BEANS(351, 3, 27381, "Coco Beans", "INK_SACK"),
COD(349, 0, 24691, "Raw Fish", "RAW_FISH"),
COD(349, 0, 24691, "Raw Cod", "RAW_FISH"),
COD_BUCKET(-1, -1, 28601, "Bucket of Cod", ""),
COD_SPAWN_EGG(-1, -1, 27248, "Cod Spawn Egg", ""),
COMMAND_BLOCK(137, 0, 4355, "Command Block", "COMMAND"),
@ -776,7 +776,7 @@ public class ItemManager {
CRAFTING_TABLE(58, 0, 20706, "Crafting Table", "WORKBENCH"),
CREEPER_HEAD(397, 4, 29146, "Mob Head (Creeper)", "Creeper Head"),
CREEPER_SPAWN_EGG(383, 50, 9653, "Spawn Creeper", "Creeper Spawn Egg"),
CREEPER_WALL_HEAD(397, 0, 30123, "Creeper Wall Head", ""),
CREEPER_WALL_HEAD(144, 4, 30123, "Creeper Wall Head", ""),
CUT_RED_SANDSTONE(-1, -1, 26842, "Cut Red Sandstone", ""),
CUT_SANDSTONE(-1, -1, 6118, "Cut Sandstone", ""),
CYAN_BANNER(425, 6, 9839, "Cyan Banner", ""),
@ -852,7 +852,7 @@ public class ItemManager {
DRAGON_BREATH(437, 0, 20154, "Dragon's Breath", ""),
DRAGON_EGG(122, 0, 29946, "Dragon Egg", "DRAGON_EGG"),
DRAGON_HEAD(397, 5, 20084, "Dragon Head", ""),
DRAGON_WALL_HEAD(-1, -1, 19818, "Dragon Wall Head", ""),
DRAGON_WALL_HEAD(144, 5, 19818, "Dragon Wall Head", ""),
DRIED_KELP(-1, -1, 21042, "Dried Kelp", ""),
DRIED_KELP_BLOCK(-1, -1, 12966, "Dried Kelp Block", ""),
DROPPER(158, 0, 31273, "Dropper", "DROPPER"),
@ -1187,7 +1187,7 @@ public class ItemManager {
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"),
PLAYER_WALL_HEAD(-1, -1, 13164, "Player Wall Head", ""),
PLAYER_WALL_HEAD(144, 3, 13164, "Player Wall Head", ""),
PODZOL(3, 2, 24068, "Podzol", ""),
POISONOUS_POTATO(394, 0, 32640, "Poisonous Potato", ""),
POLAR_BEAR_SPAWN_EGG(383, 102, 17015, "Spawn Polar Bear", "Polar Bear Spawn Egg"),
@ -1320,7 +1320,7 @@ public class ItemManager {
SKELETON_HORSE_SPAWN_EGG(383, 28, 21356, "Spawn Skeleton Horse", "Skeleton Horse Spawn Egg"),
SKELETON_SKULL(397, 0, 13270, "Mob Head (Skeleton)", "Skeleton Skull"),
SKELETON_SPAWN_EGG(383, 51, 15261, "Spawn Skeleton", "Skeleton Spawn Egg"),
SKELETON_WALL_SKULL(397, 0, 31650, "Skeleton Wall Skull", ""),
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_SPAWN_EGG(383, 55, 6550, "Spawn Slime", "Slime Spawn Egg"),
@ -1398,7 +1398,7 @@ public class ItemManager {
TRIDENT(-1, -1, 7534, "Trident", ""),
TRIPWIRE(132, 0, 8810, "Tripwire", ""),
TRIPWIRE_HOOK(131, 0, 8130, "Tripwire Hook", ""),
TROPICAL_FISH(-1, -1, 12795, "Tropical Fish", ""),
TROPICAL_FISH(349, 2, 12795, "Tropical Fish", ""),
TROPICAL_FISH_BUCKET(-1, -1, 30390, "Bucket of Tropical Fish", ""),
TROPICAL_FISH_SPAWN_EGG(-1, -1, 19713, "Tropical Fish Spawn Egg", ""),
TUBE_CORAL(-1, -1, 23048, "Tube Coral", ""),
@ -1436,7 +1436,7 @@ public class ItemManager {
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"),
WITHER_SKELETON_WALL_SKULL(397, 1, 9326, "Wither Skeleton Wall Skull", ""),
WITHER_SKELETON_WALL_SKULL(144, 1, 9326, "Wither Skeleton Wall Skull", ""),
WOLF_SPAWN_EGG(383, 95, 21692, "Spawn Wolf", "Wolf Spawn Egg"),
WOODEN_AXE(271, 0, 6292, "Wooden Axe", "Wood Axe"),
WOODEN_HOE(290, 0, 16043, "Wooden Hoe", "Wood Hoe"),
@ -1462,16 +1462,17 @@ public class ItemManager {
ZOMBIE_PIGMAN_SPAWN_EGG(383, 57, 11531, "Spawn Zombie Pigman", "Zombie Pigman Spawn Egg"),
ZOMBIE_SPAWN_EGG(383, 54, 5814, "Spawn Zombie", "Zombie Spawn Egg"),
ZOMBIE_VILLAGER_SPAWN_EGG(383, 27, 10311, "Spawn Zombie Villager", "Zombie Villager Spawn Egg"),
ZOMBIE_WALL_HEAD(397, 2, 16296, "Zombie Wall Head", ""),
ZOMBIE_WALL_HEAD(144, 2, 16296, "Zombie Wall Head", ""),
// Legacy
LEGACY_STATIONARY_WATER(9, 0, -1, "Stationary Water", ""),
LEGACY_STATIONARY_LAVA(11, 0, -1, "Stationary Lava", ""),
LEGACY_BURNING_FURNACE(62, 0, -1, "Burning Furnace", ""),
// LEGACY_SIGN_POST(63, -1, -1, "Sign Post", ""),
LEGACY_WOODEN_DOOR_BLOCK(64, 0, -1, "LEGACY_WOODEN_DOOR", ""),
LEGACY_IRON_DOOR_BLOCK(71, 0, -1, "LEGACY_IRON_DOOR_BLOCK", ""),
LEGACY_GLOWING_REDSTON_ORE(74, 0, -1, "Glowing Redstone Ore", "");
LEGACY_GLOWING_REDSTON_ORE(74, 0, -1, "Glowing Redstone Ore", ""),
LEGACY_RAW_FISH(349, 0, -1, "Raw Fish", ""),
LEGACY_SKULL(144, 0, -1, "Skull", "");
private int legacyId;
private int legacyData;

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

@ -1003,6 +1003,7 @@ public class Jobs extends JavaPlugin {
} else {
for (JobProgression prog : progression) {
int level = prog.getLevel();
JobInfo jobinfo = prog.getJob().getJobInfo(info, level);
checkDailyQuests(jPlayer, prog.getJob(), info);

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

@ -906,7 +906,7 @@ public class ConfigManager {
}
// END HACK
type = material.toString();
type = material.getMaterial().toString();
id = material.getId();
} else if (actionType == ActionType.KILL || actionType == ActionType.TAME || actionType == ActionType.BREED || actionType == ActionType.MILK) {

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

@ -226,7 +226,6 @@ public class Job {
}
public JobInfo getJobInfo(ActionInfo action, int level) {
for (JobInfo info : getJobInfo(action.getType())) {
if (info.getName().equalsIgnoreCase(action.getName()) || info.getName().equalsIgnoreCase(action.getNameWithSub())) {
if (!info.isInLevelRange(level))

2
src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: Jobs
description: Jobs Plugin for the BukkitAPI
main: com.gamingmesh.jobs.Jobs
version: 4.6.2
version: 4.7.0
api-version: 1.13
website: https://www.spigotmc.org/resources/jobs-reborn.4216/
author: phrstbrn