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

Added some new 1.14 materials

Browse Source 
- Added some 1.14 enchantments
- Some permission fixes
- Not check for chunk when the player not found
- Removed non-supported plant age checker
This commit is contained in:
montlikadani 2018-12-13 18:54:38 +01:00
parent 0af1374d07
commit 0592c6da62
8 changed files with 150 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -664,6 +664,7 @@ public class ItemManager {
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_DYE(351, -1, 26753, "Black Dye"),
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"),
@ -679,6 +680,7 @@ public class ItemManager {
BLUE_CARPET(171, 11, 13292, "Blue Carpet"),
BLUE_CONCRETE(251, 11, 18756, "Blue Concrete"),
BLUE_CONCRETE_POWDER(252, 11, 17773, "Blue Concrete Powder"),
BLUE_DYE(351, -1, 12344, "Blue Dye"),
BLUE_GLAZED_TERRACOTTA(246, 0, 23823, "Blue Glazed Terracotta"),
BLUE_ICE(-1, -1, 22449, "Blue Ice"),
BLUE_ORCHID(38, 1, 13432, "Blue Orchid"),
@ -710,6 +712,7 @@ public class ItemManager {
BROWN_CARPET(171, 12, 23352, "Brown Carpet"),
BROWN_CONCRETE(251, 12, 19006, "Brown Concrete"),
BROWN_CONCRETE_POWDER(252, 12, 21485, "Brown Concrete Powder"),
BROWN_DYE(351, -1, 4237, "Brown Dye"),
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"),
@ -1219,44 +1222,50 @@ public class ItemManager {
POTATOES(142, 0, 10879, "Potatoes"),
// Potions
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"),
POTION(373, 0, 24020, "Potion", "POTION_WATER"),
POTION_AWKWARD(373, 16, 24020, "Awkard Potion"),
POTION_FIRE_RESISTANCE_1(373, 8195, 24020, "Fire Resistance Potion"),
POTION_FIRE_RESISTANCE_2(373, 8259, 24020, "Fire Resistance potion 2"),
POTION_HARMING_1(373, 8204, 24020, "Harming Potion"),
POTION_HARMING_2(373, 8236, 24020, "Harming Potion 2"),
POTION_HEALING_1(373, 8197, 24020, "Healing Potion"),
POTION_HEALING_2(373, 8229, 24020, "Healing Potion 2"),
POTION_INVISIBILITY_1(373, 8206, 24020, "Invisibility Potion"),
POTION_INVISIBILITY_2(373, 8270, 24020, "Invisibility Potion 2"),
POTION_LEAPING_1(373, 8267, 24020, "Leaping Potion"),
POTION_LEAPING_2(373, 8235, 24020, "Leaping Potion 2"),
POTION_LUCK(-1, -1, 24020, "Luck Potion"),
POTION_MUNDANE(373, 64, 24020, "Mundane Potion"),
POTION_NIGHT_VISION_1(373, 8198, 24020, "Night Vision Potion"),
POTION_NIGHT_VISION_2(373, 8262, 24020, "Night Vision Potion 2"),
POTION_POISON_1(373, 8196, 24020, "Poison Potion"),
POTION_POISON_2(373, 8228, 24020, "Poison Potion 2"),
POTION_POISON_3(373, 8260, 24020, "Poison Potion 3"),
POTION_POISON_4(373, 8292, 24020, "Poison Potion 4"),
POTION_REGENERATION_1(373, 8193, 24020, "Regeneration Potion"),
POTION_REGENERATION_2(373, 8225, 24020, "Regeneration Potion 2"),
POTION_REGENERATION_3(373, 8257, 24020, "Regeneration Potion 3"),
POTION_REGENERATION_4(373, 8289, 24020, "Regeneration Potion 4"),
POTION_SLOW_FALLING_1(-1, -1, 24020, "Slow Falling Potion"),
POTION_SLOW_FALLING_2(-1, -1, 24020, "Slow Falling Potion 2"),
POTION_SLOWNESS_1(373, 8202, 24020, "Slowness Potion"),
POTION_SLOWNESS_2(373, 8266, 24020, "Slowness Potion 2"),
POTION_STRENGTH_1(373, 8201, 24020, "Strength Potion"),
POTION_STRENGTH_2(373, 8233, 24020, "Strength Potion 2"),
POTION_STRENGTH_3(373, 8265, 24020, "Strength Potion 3"),
POTION_STRENGTH_4(373, 8297, 24020, "Strength Potion 4"),
POTION_SWIFTNESS_1(373, 8194, 24020, "Swiftness Potion"),
POTION_SWIFTNESS_2(373, 8226, 24020, "Swiftness Potion 2"),
POTION_SWIFTNESS_3(373, 8258, 24020, "Swiftness Potion 3"),
POTION_SWIFTNESS_4(373, 8290, 24020, "Swiftness Potion 4"),
POTION_THICK(373, 32, 24020, "Thick Potion"),
POTION_TURTLE_MASTER_1(-1, -1, 24020, "Turtle Master Potion"),
POTION_TURTLE_MASTER_2(-1, -1, 24020, "Turtle Master Potion 2"),
POTION_TURTLE_MASTER_3(-1, -1, 24020, "Turtle Master Potion 3"),
POTION_WATER_BREATHING_1(373, 8205, 24020, "Water Breathing Potion"),
POTION_WATER_BREATHING_2(373, 8269, 24020, "Water Breathing Potion 2"),
POTION_WEAKNESS_1(373, 8200, 24020, "Weakness Potion"),
POTION_WEAKNESS_2(373, 8264, 24020, "Weakness Potion 2"),
POTTED_ACACIA_SAPLING(-1, -1, 14096, "Potted Acacia Sapling"),
POTTED_ALLIUM(-1, -1, 13184, "Potted Allium"),
@ -1411,7 +1420,7 @@ public class ItemManager {
SPRUCE_TRAPDOOR(-1, -1, 10289, "Spruce Trapdoor"),
SPRUCE_WOOD(-1, -1, 32328, "Spruce Wood"),
SQUID_SPAWN_EGG(383, 94, 10682, "Spawn Squid", "Squid Spawn Egg"),
STICK(280, 0, 9773, "Stick", "STICK"),
STICK(280, 0, 9773, "Stick"),
STICKY_PISTON(29, 0, 18127, "Sticky Piston", "PISTON_STICKY_BASE"),
STONE(1, 0, 22948, "Stone"),
STONE_AXE(275, 0, 6338, "Stone Axe"),
@ -1444,6 +1453,8 @@ public class ItemManager {
SUGAR(353, 0, 30638, "Sugar"),
SUGAR_CANE(338, 0, 7726, "Sugar Canes", "Sugar Cane"),
SUNFLOWER(175, 0, 7408, "Sunflower"),
SUSPICIOUS_STEW(-1, -1, 7245, "Suspicious Stew"),
SWEET_BERRIES(-1, -1, 9451, "Sweet Berries"),
TALL_GRASS(31, 1, 21559, "Tall Grass"),
TALL_SEAGRASS(-1, -1, 27189, "Tall Seagrass"),
TERRACOTTA(172, 0, 16544, "Terracotta", "HARD_CLAY"),
@ -1483,6 +1494,7 @@ 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_DYE(351, -1, 5276, "White Dye"),
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"),
@ -1592,7 +1604,7 @@ public class ItemManager {
public int getId() {
if (version.isEqualOrHigher(Version.v1_13_R1)) {
return this.id;
return id;
}
return getLegacyId();
}
@ -2128,43 +2140,49 @@ public class ItemManager {
public boolean isPotion() {
switch (this) {
case POTION:
case AWKWARD_POTION:
case THICK_POTION:
case MUNDANE_POTION:
case REGENERATION_POTION:
case SWIFTNESS_POTION:
case FIRE_RESISTANCE_POTION:
case POISON_POTION:
case HEALING_POTION:
case NIGHT_VISION_POTION:
case WEAKNESS_POTION:
case STRENGTH_POTION:
case SLOWNESS_POTION:
case HARMING_POTION:
case WATER_BREATHING_POTION:
case INVISIBILITY_POTION:
case REGENERATION_POTION2:
case SWIFTNESS_POTION2:
case POISON_POTION2:
case HEALING_POTION2:
case STRENGTH_POTION2:
case LEAPING_POTION2:
case HARMING_POTION2:
case REGENERATION_POTION3:
case SWIFTNESS_POTION3:
case FIRE_RESISTANCE_POTION3:
case POISON_POTION3:
case NIGHT_VISION_POTION2:
case WEAKNESS_POTION2:
case STRENGTH_POTION3:
case SLOWNESS_POTION2:
case LEAPING_POTION3:
case WATER_BREATHING_POTION2:
case INVISIBILITY_POTION2:
case REGENERATION_POTION4:
case SWIFTNESS_POTION4:
case POISON_POTION4:
case STRENGTH_POTION4:
case POTION_AWKWARD:
case POTION_FIRE_RESISTANCE_1:
case POTION_FIRE_RESISTANCE_2:
case POTION_HARMING_1:
case POTION_HARMING_2:
case POTION_HEALING_1:
case POTION_HEALING_2:
case POTION_INVISIBILITY_1:
case POTION_INVISIBILITY_2:
case POTION_LEAPING_1:
case POTION_LEAPING_2:
case POTION_LUCK:
case POTION_MUNDANE:
case POTION_NIGHT_VISION_1:
case POTION_NIGHT_VISION_2:
case POTION_POISON_1:
case POTION_POISON_2:
case POTION_POISON_3:
case POTION_POISON_4:
case POTION_REGENERATION_1:
case POTION_REGENERATION_2:
case POTION_REGENERATION_3:
case POTION_REGENERATION_4:
case POTION_SLOW_FALLING_1:
case POTION_SLOW_FALLING_2:
case POTION_SLOWNESS_1:
case POTION_SLOWNESS_2:
case POTION_STRENGTH_1:
case POTION_STRENGTH_2:
case POTION_STRENGTH_3:
case POTION_STRENGTH_4:
case POTION_SWIFTNESS_1:
case POTION_SWIFTNESS_2:
case POTION_SWIFTNESS_3:
case POTION_SWIFTNESS_4:
case POTION_THICK:
case POTION_TURTLE_MASTER_1:
case POTION_TURTLE_MASTER_2:
case POTION_TURTLE_MASTER_3:
case POTION_WATER_BREATHING_1:
case POTION_WATER_BREATHING_2:
case POTION_WEAKNESS_1:
case POTION_WEAKNESS_2:
return true;
default:
break;
@ -2374,13 +2392,17 @@ public class ItemManager {
case CYAN_DYE:
case LIGHT_GRAY_DYE:
case GRAY_DYE:
case BLACK_DYE:
case PINK_DYE:
case BLUE_DYE:
case BROWN_DYE:
case LIME_DYE:
case DANDELION_YELLOW:
case LIGHT_BLUE_DYE:
case MAGENTA_DYE:
case ORANGE_DYE:
case BONE_MEAL:
case WHITE_DYE:
return true;
default:
break;

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

@ -419,6 +419,12 @@ public class NameTranslatorManager {
c.get("EnchantList.70.Name", "Mending");
c.get("EnchantList.71.MCName", "CURSE_OF_VANISHING");
c.get("EnchantList.71.Name", "Curse Of Vanishing");
c.get("EnchantList.72.MCName", "MULTISHOT");
c.get("EnchantList.72.Name", "Multishot");
c.get("EnchantList.73.MCName", "PIERCING");
c.get("EnchantList.73.Name", "Piercing");
c.get("EnchantList.74.MCName", "QUICK_CHARGE");
c.get("EnchantList.74.Name", "Quick Charge");
// Color list
c.get("ColorList.0-white", "&fWhite");

9
src/main/java/com/gamingmesh/jobs/config/ShopManager.java
View File

@ -30,7 +30,6 @@ import com.gamingmesh.jobs.container.JobProgression;
import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.container.PlayerPoints;
import com.gamingmesh.jobs.container.ShopItem;
import com.gamingmesh.jobs.stuff.Perm;
public class ShopManager {
public List<ShopItem> list = new ArrayList<>();
@ -77,9 +76,9 @@ public class ShopManager {
ShopItem item = ls.get(slot);
PlayerPoints pointsInfo = Jobs.getPlayerManager().getPointsData().getPlayerPointsInfo(player.getUniqueId());
if (!Perm.hasPermission(player, "jobs.items.bypass")) {
if (!player.hasPermission("jobs.items.bypass")) {
for (String onePerm : item.getRequiredPerm()) {
if (!Perm.hasPermission(player, onePerm)) {
if (!player.hasPermission(onePerm)) {
player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.NoPermForItem"));
return;
}
@ -161,7 +160,7 @@ public class ShopManager {
}
if (!Perm.hasPermission(player, "jobs.items.bypass")) {
if (!player.hasPermission("jobs.items.bypass")) {
pointsInfo.takePoints(item.getPrice());
player.sendMessage(Jobs.getLanguage().getMessage("command.shop.info.Paid", "%amount%", item.getPrice()));
}
@ -247,7 +246,7 @@ public class ShopManager {
if (item.isHideWithoutPerm()) {
for (String onePerm : item.getRequiredPerm()) {
if (!Perm.hasPermission(player, onePerm)) {
if (!player.hasPermission(onePerm)) {
mat = CMIMaterial.STONE_BUTTON;
Lore.add(Jobs.getLanguage().getMessage("command.shop.info.NoPermToBuy"));
break;

3
src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -35,7 +35,6 @@ import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling;
import com.gamingmesh.jobs.stuff.Perm;
import com.gamingmesh.jobs.stuff.TimeManage;
public class JobsPlayer {
@ -319,7 +318,7 @@ public class JobsPlayer {
public boolean havePermission(String perm) {
Player player = Bukkit.getPlayer(this.getPlayerUUID());
if (player != null)
return Perm.hasPermission(player, perm);
return player.hasPermission(perm);
return false;
}

18
src/main/java/com/gamingmesh/jobs/container/PlayerPoints.java
View File

@ -18,21 +18,21 @@ public class PlayerPoints {
}
public void addPoints(double points) {
this.current += points;
this.total += points;
current += points;
total += points;
}
public void setPoints(double points) {
this.current = points;
this.total = points;
current = points;
total = points;
}
public void takePoints(double points) {
this.current -= points;
current -= points;
}
public boolean havePoints(double points) {
return this.current >= points;
return current >= points;
}
public double getCurrentPoints() {
@ -46,7 +46,7 @@ public class PlayerPoints {
public boolean isNewEntry() {
return newEntry;
}
public void setNewEntry(boolean newEntry) {
this.newEntry = newEntry;
}

6
src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
View File

@ -729,6 +729,12 @@ public class JobsListener implements Listener {
@EventHandler
public void onChunkChangeMove(PlayerMoveEvent event) {
if (event.isCancelled())
return;
if (event.getPlayer() == null || !event.getPlayer().isOnline())
return;
//disabling plugin in world
if (event.getTo() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getTo().getWorld()))
return;

22
src/main/java/com/gamingmesh/jobs/stuff/Perm.java
View File

@ -1,22 +0,0 @@
package com.gamingmesh.jobs.stuff;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
public class Perm {
public static boolean hasPermission(CommandSender player, String permission) {
if (player instanceof Player)
return hasPermission((Player) player, permission);
return true;
}
public static boolean hasPermission(Player player, String permission) {
if (player == null)
return false;
Permission p = new Permission(permission, PermissionDefault.FALSE);
return player.hasPermission(p);
}
}

55
src/main/resources/jobConfig.yml
View File

@ -244,10 +244,10 @@ Jobs:
POTION:
income: 0.5
experience: 2.0
REGENERATION_POTION2:
POTION_REGENERATION_2:
income: 1.3
experience: 2.0
HEALING_POTION:
POTION_HEALING_1:
income: 1.4
experience: 2.0
# payment for breaking a block with tnt
@ -1838,7 +1838,7 @@ Jobs:
income: 1
points: 1
experience: 1
#old blocks
chorus_plant:
income: 1.5
@ -1852,15 +1852,15 @@ Jobs:
income: 1.5
points: 1.5
experience: 3.0
wheat-7:
wheat:
income: 1.5
points: 1.5
experience: 3.0
carrots-7:
carrots:
income: 1.0
points: 1.0
experience: 1.0
potatoes-7:
potatoes:
income: 1.0
points: 1.0
experience: 1.0
@ -1872,7 +1872,7 @@ Jobs:
income: 0.2
points: 0.2
experience: 0.2
cocoa-2:
cocoa:
income: 4
points: 4
experience: 4.0
@ -1986,24 +1986,24 @@ Jobs:
income: 2
points: 2
experience: 3
#old
wheat-0:
wheat:
income: 1
points: 1
experience: 1
potatoes-0:
potatoes:
income: 1
points: 1
experience: 1
carrots-0:
carrots:
income: 1
points: 1
experience: 1
beetroots-0:
beetroots:
income: 1
points: 1
experience: 1
cocoa-0:
cocoa:
income: 1
points: 1
experience: 1
@ -2012,11 +2012,11 @@ Jobs:
income: -1
points: -1
experience: -1
pumpkin_stem-0:
pumpkin_stem:
income: 1
points: 1
experience: 1
melon_stem-0:
melon_stem:
income: 1
points: 1
experience: 1
@ -3210,7 +3210,6 @@ Jobs:
income: 50.0
points: 50.0
experience: 50.0
#Depth Strider
DEPTH_STRIDER-1:
income: 10.0
points: 10.0
@ -3257,7 +3256,6 @@ Jobs:
income: 30.0
points: 30.0
experience: 30.0
#Fire Aspect
FIRE_ASPECT-1:
income: 10.0
points: 10.0
@ -3266,7 +3264,6 @@ Jobs:
income: 20.0
points: 20.0
experience: 20.0
#Knockback
KNOCKBACK-1:
income: 10.0
points: 10.0
@ -3314,7 +3311,6 @@ Jobs:
income: 35.0
points: 35.0
experience: 30.0
#Lure
LURE-1:
income: 10.0
points: 10.0
@ -3408,7 +3404,6 @@ Jobs:
income: 30.0
points: 30.0
experience: 40.0
#Projectile Protection
PROTECTION_PROJECTILE-1:
income: 10.0
points: 10.0
@ -3425,12 +3420,10 @@ Jobs:
income: 40.0
points: 40.0
experience: 40.0
#Silk Touch
SILK_TOUCH:
income: 100.0
points: 100.0
experience: 300.0
#Thorns
THORNS-1:
income: 10.0
points: 10.0
@ -3449,7 +3442,6 @@ Jobs:
points: 30.0
experience: 100.0
#1.13 enchantments
#Channeling
channeling:
income: 10
points: 10
@ -3507,25 +3499,28 @@ Jobs:
income: 30
points: 30
experience: 30
#Mending
mending:
income: 10
points: 10
experience: 10
#Riptide
riptide:
income: 20
points: 20
experience: 20
#Sweeping Edge
sweeping_edge:
income: 15
points: 15
experience: 15
#1.14 enchantments (coming soon-ish, hopefully)
#Multishot
#Piercing
#Quick Charge
multishot:
income: 5
points: 5
piercing:
income: 7
points: 5
experience: 11
quick_charge:
income: 6
points: 4
None:
fullname: None
shortname: N