Updated command completions, fixed message spam when warp points set in rain

Brambles-c · Brambles-c · commit 622132a449db · 2024-08-19T12:28:36.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-Plugin now updated for Minecraft 1.21, also I'm open to any suggestions on what to add or change
+Plugin now updated for Minecraft 1.21
+
+I lost my other mc account so I'm not fully able to test everything here, so please lmk if you find bugs or have any feedback or suggestions :)
 
 () indicate placeholder values, | is meant as 'or'
 
@@ -24,10 +26,10 @@ Permissions:
  - set_warps - Needed to set warp points
  - remove_warps - Needed to remove existing warp points
  - list_warps - Needed to use /listwarps to see a list of all warp points
+ - use_warps - Needed to teleport to warp points via chorus fruits
 
 ### Known issues:
 - Chorus fruit available area check interferes with ability to go to warp points
-- Message spam when warp point set in rain
 - Permissions break if manual edits in the plugin data file leave !permission and permission together
 
 ### To Do: (by priority)
diff --git a/src/main/java/com/brambles/acf/PluginData.java b/src/main/java/com/brambles/acf/PluginData.java
@@ -68,10 +68,33 @@ public static void writeData() {
         } catch (IOException e) { e.printStackTrace(); }
     }
 
-    public static List<String> getPermissions(UUID playerId) {
-        List<String> permissions = dataInstance.playerPermissions.get(playerId);
+    public static List<String> getPermissions(Player player) {
+        if (player.isOp())
+            return dataInstance.defaultPermissions.stream().map(
+                    permission -> permission.startsWith("!") ? permission.substring(1) : permission
+            ).toList();
 
-        return permissions != null ? permissions : dataInstance.defaultPermissions;
+        List<String> playerPermissions = dataInstance.playerPermissions.get(player.getUniqueId());
+
+        if (playerPermissions == null)
+            return new ArrayList<>(dataInstance.defaultPermissions);
+
+        List<String> playerPermissionsCopy = new ArrayList<>(playerPermissions);
+
+        dataInstance.defaultPermissions.forEach(permission -> {
+            if (playerPermissions.stream().noneMatch(playerPermission -> playerPermission.endsWith(permission.substring(1))))
+                playerPermissionsCopy.add(permission);
+        });
+
+        return playerPermissionsCopy;
+    }
+
+    public static boolean playerHasPermission(Player player, PluginPermission permission) {
+        if (player.isOp()) return true;
+
+        List<String> permissions = getPermissions(player);
+
+        return permissions.contains(permission.id());
     }
 
     public static List<String> getPermissions() { return dataInstance.defaultPermissions; }
@@ -92,17 +115,6 @@ public static void updatePermissions(UUID playerId, PluginPermission permission,
         currentPermissions.add(permission.id());
         currentPermissions.remove(allowed ? "!" + permission.id() : permission.id());
     }
-    
-    public static boolean playerHasPermission(Player player, PluginPermission permission) {
-        if (player.isOp()) return true;
-
-        List<String> permissions = dataInstance.playerPermissions.get(player.getUniqueId());
-        
-        if (permissions == null)
-            return dataInstance.defaultPermissions.contains(permission.id());
-
-        return permissions.contains(permission.id()) || (!permissions.contains("!" + permission.id()) && dataInstance.defaultPermissions.contains(permission.id()));
-    }
 
     public static void resetPermissions(UUID playerId) {
         dataInstance.playerPermissions.remove(playerId);
diff --git a/src/main/java/com/brambles/acf/commands/ListWarps.java b/src/main/java/com/brambles/acf/commands/ListWarps.java
@@ -1,5 +1,7 @@
 package com.brambles.acf.commands;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -8,11 +10,12 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
 import static com.brambles.acf.AdvancedChorusFruit.PluginPermission;
 
-public class ListWarps implements CommandExecutor {
+public class ListWarps implements CommandExecutor, TabCompleter {
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
@@ -60,4 +63,19 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
         return true;
     }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+
+        if (args.length != 1) return new ArrayList<>();
+
+        List<String> completions = new ArrayList<>();
+        completions.add("overworld");
+        completions.add("nether");
+        completions.add("end");
+
+        String currentArg = args[args.length - 1];
+        completions.removeIf(str -> !str.startsWith(currentArg));
+        return completions;
+    }
 }
diff --git a/src/main/java/com/brambles/acf/commands/Permission.java b/src/main/java/com/brambles/acf/commands/Permission.java
@@ -9,6 +9,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.brambles.acf.AdvancedChorusFruit.PluginPermission;
@@ -26,13 +27,16 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         if (playerTarget == null && !args[0].equalsIgnoreCase("default")) { sender.sendMessage("Player not found"); return false; }
 
         String targetName = playerTarget != null ? playerTarget.getName() : "Default";
-        targetPermissions = playerTarget != null ? PluginData.getPermissions(playerTarget.getUniqueId()) : PluginData.getPermissions();
+        targetPermissions = playerTarget != null ? PluginData.getPermissions(playerTarget) : PluginData.getPermissions();
 
         if (args.length < 2) return false;
 
         if (args[1].equalsIgnoreCase("list")) {
             StringBuilder builder = new StringBuilder(targetName).append(" permissions:");
-            for(String permission : targetPermissions) builder.append("\n - ").append(permission);
+
+            for(String permission : targetPermissions)
+                builder.append("\n - ").append(permission);
+
             sender.sendMessage(builder.toString());
             return true;
         }
@@ -44,32 +48,63 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         if (permission == null) { sender.sendMessage("Permission \"" + args[1] + "\" doesn't exist"); return false; }
         if (args.length < 3) { sender.sendMessage("Incomplete command"); return false; }
 
-        boolean allowed = args[2].equalsIgnoreCase("allow");
-        
-        if (!allowed && !args[2].equalsIgnoreCase("disallow")) { sender.sendMessage("Invalid argument \"" + args[2] + "\""); return false; }
-
-        if (playerTarget != null)
-            PluginData.updatePermissions(playerTarget.getUniqueId(), permission, allowed);
-        else
-            PluginData.updateDefaultPermission(permission, allowed);
+        switch (args[2].toLowerCase()) {
+            case "allow":
+                updatePermission(playerTarget, permission, true);
+                break;
+            case "disallow":
+                updatePermission(playerTarget, permission, false);
+                break;
+            case "reset":
+                if (playerTarget == null) {
+                    sender.sendMessage("Resetting is only for player permissions");
+                    return false;
+                }
+                PluginData.resetPermissions(playerTarget.getUniqueId());
+                break;
+            default:
+                sender.sendMessage("Invalid argument \"" + args[2] + "\"");
+                return false;
+        }
 
         sender.sendMessage(playerTarget != null ? "Permissions for " + playerTarget.getName() + " updated" : "Default permissions updated");
         return true;
     }
 
+    private static void updatePermission(Player target, PluginPermission permission, boolean allowed) {
+        if (target != null)
+            PluginData.updatePermissions(target.getUniqueId(), permission, allowed);
+        else
+            PluginData.updateDefaultPermission(permission, allowed);
+    }
+
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
         List<String> completions = new ArrayList<>();
 
-        if (args.length == 1) {
-            completions.add("edit");
-            completions.add("remove");
-            completions.add("list");
-        } else if (args.length == 2) {
-            Bukkit.getOnlinePlayers().forEach(player -> completions.add(player.getName()));
-        } else if (args.length == 3) {
-            for (PluginPermission permission : PluginPermission.values()) completions.add(permission.id());
+        switch (args.length) {
+            case 1:
+                completions.add("default");
+                Bukkit.getOnlinePlayers().forEach(player -> completions.add(player.getName()));
+                break;
+            case 2:
+                completions.add("list");
+                Arrays.stream(PluginPermission.values()).forEach(permission -> completions.add(permission.id()));
+                break;
+            case 3:
+                if (args[1].equalsIgnoreCase("list"))
+                    return completions;
+
+                completions.add("allow");
+                completions.add("disallow");
+
+                if (!args[0].equalsIgnoreCase("default"))
+                    completions.add("reset");
+                break;
+            default:
+                return completions;
         }
+
         String currentArg = args[args.length - 1];
         completions.removeIf(str -> !str.startsWith(currentArg));
         return completions;
diff --git a/src/main/java/com/brambles/acf/commands/RemoveWarp.java b/src/main/java/com/brambles/acf/commands/RemoveWarp.java
@@ -1,5 +1,7 @@
 package com.brambles.acf.commands;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import com.brambles.acf.AdvancedChorusFruit;
@@ -8,9 +10,10 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-public class RemoveWarp implements CommandExecutor {
+public class RemoveWarp implements CommandExecutor, TabCompleter {
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         Environment env;
 
@@ -40,20 +43,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 return false;
             }
 
-            String dimensionName = args[0].toLowerCase();
-            switch(dimensionName) {
-                case "overworld":
-                    env = Environment.NORMAL;
-                    break;
-                case "nether":
-                    env = Environment.NETHER;
-                    break;
-                case "end":
-                    env = Environment.THE_END;
-                    break;
-                default:
-                    sender.sendMessage("No data found for dimension \"" + args[0] + "\"");
-                    return false;
+            env = getEnvironment(args[0]);
+
+            if (env == null) {
+                sender.sendMessage("No data found for dimension \"" + args[0] + "\"");
+                return false;
             }
 
             ++extraArgs;
@@ -75,4 +69,30 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         sender.sendMessage("No warp point found with name \"" + warpPointName + "\"");
         return false;
     }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+        List<String> completions = new ArrayList<>();
+
+        boolean isPlayer = sender instanceof Player;
+
+        if (args.length != (isPlayer ? 1 : 2)) return completions;
+
+        Environment env = isPlayer ? ((Player) sender).getWorld().getEnvironment() : getEnvironment(args[0]);
+
+        PluginData.getWarpPoints(env).forEach((pointName, location) -> completions.add(pointName));
+
+        String currentArg = args[isPlayer ? 0 : 1];
+        completions.removeIf(str -> !str.startsWith(currentArg));
+        return completions;
+    }
+
+    private Environment getEnvironment(String envName) {
+        return switch(envName.toLowerCase()) {
+            case "overworld" -> Environment.NORMAL;
+            case "nether" -> Environment.NETHER;
+            case "end" -> Environment.THE_END;
+            default -> null;
+        };
+    }
 }
diff --git a/src/main/java/com/brambles/acf/listeners/EntityBurn.java b/src/main/java/com/brambles/acf/listeners/EntityBurn.java
@@ -32,6 +32,8 @@ public void onItemBurn(EntityCombustByBlockEvent event) {
 
             if (dropper == null) return;
 
+            item.getItemStack().setAmount(0);
+
             if (!PluginData.playerHasPermission(dropper, PluginPermission.SET_WARPS)) {
                 dropper.sendMessage("Couldn't set warp point; Missing Permissions");
                 return;
@@ -54,7 +56,8 @@ public void onItemBurn(EntityCombustByBlockEvent event) {
                                 + " Z:"
                                 + item.getLocation().getBlockZ()
                 );
-            } else {
+            }
+            else {
                 warpPoints.put(displayName, Math.floor(entityLoc.getX()) + 0.5 + "|" + Math.floor(entityLoc.getY()) + "|" + (Math.floor(entityLoc.getZ()) + 0.5));
                 Bukkit.broadcastMessage(
                         "New warp location \""
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -14,4 +14,5 @@ commands:
       Modifies players ability to use certain parts of the plugin
       set_warps - Needed for setting warp points
       remove_warps - Needed for removing existing warp points with the /removewarp command
-      Listing - Needed for running /listwarps to see a list of all warp points
+      list_warps - Needed for running /listwarps to see a list of all warp points
+      use_warps - Needed for teleporting to warp points via chorus fruit
