diff --git a/pom.xml b/pom.xml index ffc26e92..fc7e094f 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,16 @@ com.sk89q worldguard 6.1 + + + com.sk89q + commandbook + + + org.bukkit + bukkit + + @@ -97,6 +107,18 @@ bukkit-classloader-check org.sk89q.bukkit + + com.sk89q + commandbook + + + org.bstats + bstats-bukkit + + + io.papermc + paperlib + @@ -105,20 +127,30 @@ worldedit-bukkit 7.1.0-SNAPSHOT - - bukkit - org.bukkit - bukkit-classloader-check org.sk89q.bukkit + + org.bstats + bstats-bukkit + + + io.papermc + paperlib + + + + com.sk89q.worldedit.worldedit-libs + + bukkit + me.clip placeholderapi - 2.10.4 + 2.10.5 provided diff --git a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java index c7b7e21a..df573013 100644 --- a/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java +++ b/src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java @@ -22,7 +22,6 @@ import com.gamingmesh.jobs.CMILib.ConfigReader; import com.gamingmesh.jobs.CMILib.VersionChecker.Version; import com.gamingmesh.jobs.container.Job; import com.gamingmesh.jobs.container.TopList; -import com.gamingmesh.jobs.stuff.Debug; public class SignUtil { diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 273c886a..ad3b2b36 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -263,6 +263,9 @@ public class ConfigManager { cfg.addComment(pt + ".Break.gravel.income", "you can use minuses to take away money if the player break this block"); cfg.get(pt + ".Break.gravel.income", -1D); + cfg.addComment(pt + ".permissions.firstNode.permission", "The permission node"); + cfg.get(pt + ".permissions.firstNode.permission", "aaaaaatest.node"); + cfg.save(); } @@ -863,7 +866,7 @@ public class ConfigManager { continue; } - String node = permissionKey.toLowerCase().replace('_', '.'); + String node = permissionSection.getString("permission"); boolean value = permissionSection.getBoolean("value", true); int levelRequirement = permissionSection.getInt("level", 0); jobPermissions.add(new JobPermission(node, value, levelRequirement)); diff --git a/src/main/java/com/gamingmesh/jobs/container/Job.java b/src/main/java/com/gamingmesh/jobs/container/Job.java index 4322cffd..df884abf 100644 --- a/src/main/java/com/gamingmesh/jobs/container/Job.java +++ b/src/main/java/com/gamingmesh/jobs/container/Job.java @@ -21,7 +21,6 @@ package com.gamingmesh.jobs.container; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.resources.jfep.Parser; import com.gamingmesh.jobs.stuff.ChatColor; -import com.gamingmesh.jobs.stuff.Debug; import org.bukkit.block.Block; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/gamingmesh/jobs/container/Quest.java b/src/main/java/com/gamingmesh/jobs/container/Quest.java index 2a4acf6f..1c41fd9f 100644 --- a/src/main/java/com/gamingmesh/jobs/container/Quest.java +++ b/src/main/java/com/gamingmesh/jobs/container/Quest.java @@ -9,7 +9,6 @@ import java.util.Map.Entry; import java.util.Set; import com.gamingmesh.jobs.Jobs; -import com.gamingmesh.jobs.stuff.Debug; public class Quest { diff --git a/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java b/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java index 6fcfa23b..b05f2f20 100644 --- a/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java +++ b/src/main/java/com/gamingmesh/jobs/container/QuestProgression.java @@ -7,7 +7,6 @@ import org.bukkit.Bukkit; import org.bukkit.event.server.ServerCommandEvent; import com.gamingmesh.jobs.Jobs; -import com.gamingmesh.jobs.stuff.Debug; public class QuestProgression { diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index 9a0774e5..93a757f8 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -36,7 +36,6 @@ import com.gamingmesh.jobs.container.PlayerPoints; import com.gamingmesh.jobs.container.TopList; import com.gamingmesh.jobs.dao.JobsManager.DataBaseType; import com.gamingmesh.jobs.economy.PaymentData; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.TimeManage; import com.gamingmesh.jobs.stuff.Util; diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java index b02630fa..a088082b 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java @@ -83,7 +83,6 @@ import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsArmorChangeEvent; import com.gamingmesh.jobs.container.JobsArmorChangeEvent.EquipMethod; import com.gamingmesh.jobs.container.JobsPlayer; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.Util; public class JobsListener implements Listener {