diff --git a/blockregen-ancient/pom.xml b/blockregen-ancient/pom.xml index b3d2608d..8202e43e 100644 --- a/blockregen-ancient/pom.xml +++ b/blockregen-ancient/pom.xml @@ -5,7 +5,7 @@ BlockRegen nl.aurorion.blockregen - 3.10.6 + 3.10.7 4.0.0 @@ -20,7 +20,7 @@ nl.aurorion.blockregen blockregen-version - 3.10.6 + 3.10.7 compile diff --git a/blockregen-common/pom.xml b/blockregen-common/pom.xml index 80784f77..0d52ceec 100644 --- a/blockregen-common/pom.xml +++ b/blockregen-common/pom.xml @@ -5,7 +5,7 @@ BlockRegen nl.aurorion.blockregen - 3.10.6 + 3.10.7 4.0.0 diff --git a/blockregen-legacy/pom.xml b/blockregen-legacy/pom.xml index 425deb9b..efffd54c 100644 --- a/blockregen-legacy/pom.xml +++ b/blockregen-legacy/pom.xml @@ -5,7 +5,7 @@ BlockRegen nl.aurorion.blockregen - 3.10.6 + 3.10.7 4.0.0 @@ -14,7 +14,7 @@ nl.aurorion.blockregen blockregen-version - 3.10.6 + 3.10.7 compile diff --git a/blockregen-plugin/pom.xml b/blockregen-plugin/pom.xml index cc88e18c..233ff52a 100644 --- a/blockregen-plugin/pom.xml +++ b/blockregen-plugin/pom.xml @@ -5,7 +5,7 @@ BlockRegen nl.aurorion.blockregen - 3.10.6 + 3.10.7 4.0.0 @@ -76,27 +76,34 @@ nl.aurorion.blockregen blockregen-common - 3.10.6 + 3.10.7 compile nl.aurorion.blockregen blockregen-version - 3.10.6 + 3.10.7 compile nl.aurorion.blockregen blockregen-legacy - 3.10.6 + 3.10.7 compile nl.aurorion.blockregen blockregen-ancient - 3.10.6 + 3.10.7 compile + + + org.spigotmc + spigot-api + 1.20.1-R0.1-SNAPSHOT + provided + com.google.code.gson @@ -110,25 +117,18 @@ json-simple 1.1.1 - - - org.spigotmc - spigot-api - 1.17.1-R0.1-SNAPSHOT - provided - com.sk89q.worldedit worldedit-bukkit - 7.2.8 + 7.2.15 provided com.sk89q.worldguard worldguard-bukkit - 7.0.6 + 7.0.8 provided @@ -142,7 +142,7 @@ me.clip placeholderapi - 2.10.9 + 2.11.3 provided diff --git a/blockregen-plugin/src/main/java/nl/aurorion/blockregen/commands/Commands.java b/blockregen-plugin/src/main/java/nl/aurorion/blockregen/commands/Commands.java index 14db19b3..61455e19 100644 --- a/blockregen-plugin/src/main/java/nl/aurorion/blockregen/commands/Commands.java +++ b/blockregen-plugin/src/main/java/nl/aurorion/blockregen/commands/Commands.java @@ -69,7 +69,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N switch (args[0].toLowerCase()) { case "reload": - if (!sender.hasPermission("blockregen.admin")) { + if (!sender.hasPermission("blockregen.reload")) { Message.NO_PERM.send(sender); return false; } @@ -94,12 +94,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N } break; case "check": - if (checkConsole(sender)) + if (checkConsole(sender)) { return false; + } player = (Player) sender; - if (!player.hasPermission("blockregen.datacheck")) { + if (!player.hasPermission("blockregen.check")) { Message.NO_PERM.send(player); return false; } @@ -117,6 +118,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N player = (Player) sender; + if (!player.hasPermission("blockregen.tools")) { + Message.NO_PERM.send(player); + return false; + } + ItemStack shovel = XMaterial.WOODEN_SHOVEL.parseItem(); ItemMeta meta = shovel.getItemMeta(); @@ -148,6 +154,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N player = (Player) sender; + if (!player.hasPermission("blockregen.region")) { + Message.NO_PERM.send(player); + return false; + } + if (args.length > 1) { sender.sendMessage(Message.TOO_MANY_ARGS.get(player) .replace("%help%", String.format("/%s regions", label))); @@ -179,7 +190,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N player = (Player) sender; - if (!player.hasPermission("blockregen.admin")) { + if (!player.hasPermission("blockregen.region")) { player.sendMessage(Message.NO_PERM.get(player)); return false; } @@ -436,6 +447,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N case "regen": { // /blockregen regen -p preset -w world -r region + if (!sender.hasPermission("blockregen.regen")) { + Message.NO_PERM.send(sender); + return false; + } + String[] workArgs = Arrays.copyOfRange(args, 1, args.length); BlockPreset preset = null; @@ -476,6 +492,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N break; } case "debug": + if (!sender.hasPermission("blockregen.debug")) { + Message.NO_PERM.send(sender); + return false; + } + if (!(sender instanceof Player)) { sender.sendMessage(Message.ONLY_PLAYERS.get()); return false; @@ -502,11 +523,16 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N } break; case "discord": + if (!sender.hasPermission("blockregen.admin")) { + Message.NO_PERM.send(sender); + return false; + } + sender.sendMessage(StringUtil.color("&8&m &3 BlockRegen Discord Server" + "\n&6>> &7https://discord.gg/ZCxMca5")); break; case "events": - if (!sender.hasPermission("blockregen.admin")) { + if (!sender.hasPermission("blockregen.events")) { sender.sendMessage(Message.NO_PERM.get()); return false; } @@ -576,8 +602,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N } } break; - default: + default: { sendHelp(sender, label); + } } return false; } diff --git a/blockregen-plugin/src/main/resources/plugin.yml b/blockregen-plugin/src/main/resources/plugin.yml index 43a998b0..e123c809 100644 --- a/blockregen-plugin/src/main/resources/plugin.yml +++ b/blockregen-plugin/src/main/resources/plugin.yml @@ -10,15 +10,35 @@ commands: description: Main plugin command permissions: blockregen.admin: - description: Gives access to admin commands + description: Gives access to admin commands. + default: op + children: + blockregen.tools: true + blockregen.debug: true + blockregen.bypass: true + blockregen.check: true + blockregen.select: true + blockregen.region: true + blockregen.regen: true + blockregen.events: true + + blockregen.tools: + description: Allows player to get tools. + blockregen.debug: + description: Allows player to get tools. blockregen.bypass: - description: Allows player to use the bypass - blockregen.datacheck: - description: Allows player to use the data check - blockregen.block.*: - default: true - description: Gives player the ability to mine ores + description: Allows player to use the bypass. + blockregen.check: + description: Allows player to use the block check. blockregen.select: - description: Allows player to select locations for regions + description: Allows player to select locations for regions. blockregen.region: - description: Allows player to select presets for regions \ No newline at end of file + description: Allows player to select presets for regions. + blockregen.regen: + description: Allows player to regenerate running processes. + blockregen.events: + description: Allows access to event commands. + + blockregen.block.*: + default: true + description: Gives player the ability to mine ores. \ No newline at end of file diff --git a/blockregen-version/pom.xml b/blockregen-version/pom.xml index 6251a2c3..4b1d6596 100644 --- a/blockregen-version/pom.xml +++ b/blockregen-version/pom.xml @@ -7,7 +7,7 @@ BlockRegen nl.aurorion.blockregen - 3.10.6 + 3.10.7 blockregen-version @@ -16,7 +16,7 @@ nl.aurorion.blockregen blockregen-common - 3.10.6 + 3.10.7 compile diff --git a/pom.xml b/pom.xml index 0bb2e925..88e435f3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ nl.aurorion.blockregen BlockRegen - 3.10.6 + 3.10.7 blockregen-version blockregen-common @@ -84,21 +84,20 @@ org.projectlombok lombok - 1.18.24 + 1.18.26 provided org.jetbrains annotations - 23.0.0 + 24.0.1 compile com.github.cryptomorin XSeries - - 8.8.1-SNAPSHOT + 9.4.0 compile