Fix permissions... Add admin perms instead of relying on OP

Author: jules-party

README.md

@@ -16,7 +16,7 @@ Waypoints Plugin for Minecraft (Paper)
 ## Permissions:
 
 - **zoink.waypoints**: Allow the user to use the personal waypoints.
-- Server Operator for some commands.
+- **zoink.waypoints.admin**: Allow admins to configure/setup plugin through `wconfig` or `wsetup`
 
 ## Config.yml
 ### For Lazy People

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>zoink.jule</groupId>
     <artifactId>Waypoints</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>Waypoints</name>

src/main/java/zoink/jule/waypoints/Commands/WConfig.java

@@ -7,6 +7,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import zoink.jule.waypoints.Utils.Permissions;
 import zoink.jule.waypoints.Waypoints;
 
 import java.io.File;
@@ -26,7 +27,7 @@ public WConfig(Waypoints plugin) {
     public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd, @NotNull String label, String[] args) {
         if(!(cmdSender instanceof Player)) {
             return true;
-        } else if(!cmdSender.isOp()) {
+        } else if(!cmdSender.hasPermission(Permissions.ADMIN.permission)) {
             sendMessage((Player)cmdSender, "<red>You are not a server operator!</red>");
             return true;
         }

src/main/java/zoink/jule/waypoints/Commands/WDelete.java

@@ -20,7 +20,7 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
             return true;
 
         Player player = (Player)cmdSender;
-        checkPermissions(player);
+        if(!checkPermissions(player)) return false;
 
         if (args.length < 1) {
             sendMessage(player, "<red>No name given!</red>");

src/main/java/zoink/jule/waypoints/Commands/WHome.java

@@ -19,7 +19,7 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
         Player player = (Player)cmdSender;
         Location playerSpawn;
 
-        checkPermissions(player);
+        if(!checkPermissions(player)) return false;
 
         if (args.length > 1) {
             sendMessage(player, "<red>This command does not accept arguments!</red>");

src/main/java/zoink/jule/waypoints/Commands/WList.java

@@ -30,7 +30,7 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
         plugin.reloadConfig();
         Player player = (Player) cmdSender;
         FileConfiguration config = plugin.getConfig();
-        checkPermissions(player);
+        if(!checkPermissions(player)) return false;
 
         File waypointFile = new File("waypoints/" + player.getUniqueId() + ".yml");
         FileConfiguration waypoints = YamlConfiguration.loadConfiguration(waypointFile);

src/main/java/zoink/jule/waypoints/Commands/WSave.java

@@ -30,7 +30,7 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
             return true;
 
         Player player = (Player) cmdSender;
-        checkPermissions(player);
+        if(!checkPermissions(player)) return false;
 
         if (args.length < 1) {
             sendMessage(player, "<red>No name given!</red>");

src/main/java/zoink/jule/waypoints/Commands/WSetup.java

@@ -10,6 +10,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import zoink.jule.waypoints.Utils.Permissions;
 import zoink.jule.waypoints.Waypoints;
 
 import java.io.File;
@@ -31,7 +32,7 @@ public WSetup(Waypoints plugin) {
     public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd, @NotNull String label, String[] args) {
         if(!(cmdSender instanceof Player)) {
             return true;
-        } else if(!cmdSender.isOp()) {
+        } else if(!cmdSender.hasPermission(Permissions.ADMIN.permission)) {
             sendMessage((Player)cmdSender, "<red>You are not a server operator!</red>");
             return true;
         }

src/main/java/zoink/jule/waypoints/Commands/WSpawn.java

@@ -12,8 +12,8 @@
 import zoink.jule.waypoints.Utils.TeleportUtils;
 import zoink.jule.waypoints.Waypoints;
 import java.util.Objects;
-import static zoink.jule.waypoints.Waypoints.CHAT_PREFIX;
-import static zoink.jule.waypoints.Waypoints.sendMessage;
+
+import static zoink.jule.waypoints.Waypoints.*;
 
 public class WSpawn implements CommandExecutor {
     private final Waypoints plugin;
@@ -27,11 +27,14 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
         if (!(cmdSender instanceof Player))
             return true;
 
+
         plugin.reloadConfig();
         FileConfiguration config = plugin.getConfig();
         Player player = (Player)cmdSender;
         World world = Bukkit.getWorld(Objects.requireNonNull(config.getString("spawn.world")));
 
+        if(!checkPermissions(player)) return false;
+
         if (!config.getBoolean("spawn.enabled")) {
             sendMessage(player, "<red>This command is not enabled on this server!</red>");
             return true;

src/main/java/zoink/jule/waypoints/Commands/WTp.java

@@ -32,7 +32,7 @@ public boolean onCommand(@NotNull CommandSender cmdSender, @NotNull Command cmd,
         Player player = (Player)cmdSender;
         World world;
 
-        checkPermissions(player);
+        if(!checkPermissions(player)) return false;
 
         if (args.length < 1) {
             sendMessage(player, "<red>No name given!</red>");