Merge pull request #2660 from IntellectualSites/feature/v4/wildcards-player-args

Improve "everyone" args and update a few command messages

Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java

@@ -33,7 +33,7 @@ public abstract class Argument<T> {
         }
     };
     public static final Argument<String> PlayerName =
-        new Argument<String>("PlayerName", "<player>") {
+        new Argument<String>("PlayerName", "<player|*>") {
             @Override public String parse(String in) {
                 return in.length() <= 16 ? in : null;
             }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java

@@ -18,8 +18,8 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 @CommandDeclaration(command = "add",
-    description = "Allow a user to build in a plot while you are online",
+    description = "Allow a user to build in a plot while the plot owner is online.",
-    usage = "/plot add <player>", category = CommandCategory.SETTINGS, permission = "plots.add",
+    usage = "/plot add <player|*>", category = CommandCategory.SETTINGS, permission = "plots.add",
     requiredType = RequiredType.PLAYER) public class Add extends Command {
 
     public Add() {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java

@@ -46,7 +46,7 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
         switch (args[0].toLowerCase()) {
             case "set":
                 if (args.length != 2) {
-                    Captions.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+                    Captions.COMMAND_SYNTAX.send(player, getUsage());
                     return false;
                 }
 
@@ -74,7 +74,7 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 
     private boolean setAlias(PlotPlayer player, Plot plot, String alias) {
         if (alias.isEmpty()) {
-            Captions.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         if (alias.length() >= 50) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java

@@ -18,7 +18,7 @@ import com.google.common.primitives.Ints;
 
 @CommandDeclaration(command = "claim", aliases = "c",
     description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
+    requiredType = RequiredType.PLAYER, permission = "plots.claim", usage = "/plot claim")
 public class Claim extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java

@@ -16,7 +16,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 
 import java.util.concurrent.CompletableFuture;
 
-@CommandDeclaration(command = "clear", description = "Clear the plot you stand on",
+@CommandDeclaration(command = "clear", description = "Clear the plot you stand on", requiredType = RequiredType.NONE,
     permission = "plots.clear", category = CommandCategory.APPEARANCE, usage = "/plot clear",
     aliases = "reset", confirmation = true) public class Clear extends Command {
 

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java

@@ -10,7 +10,7 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
 @CommandDeclaration(command = "createroadschematic", aliases = {"crs"},
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.PLAYER,
     permission = "plots.createroadschematic",
     description = "Add a road schematic to your world using the roads around your current plot",
     usage = "/plot createroadschematic") public class CreateRoadSchematic extends SubCommand {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java

@@ -19,7 +19,7 @@ import java.util.Set;
 import java.util.UUID;
 
 @CommandDeclaration(command = "deny", aliases = {"d", "ban"},
-    description = "Deny a user from a plot", usage = "/plot deny <player>",
+    description = "Deny a user from entering a plot", usage = "/plot deny <player|*>",
     category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) public class Deny
     extends SubCommand {
 

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java

@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 @CommandDeclaration(command = "kick", aliases = "k", description = "Kick a player from your plot",
-    permission = "plots.kick", usage = "/plot kick <player>", category = CommandCategory.TELEPORT,
+    permission = "plots.kick", usage = "/plot kick <player|*>", category = CommandCategory.TELEPORT,
     requiredType = RequiredType.PLAYER) public class Kick extends SubCommand {
 
     public Kick() {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java

@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 @CommandDeclaration(command = "remove", aliases = {"r", "untrust", "ut", "undeny", "unban", "ud"},
-    description = "Remove a player from a plot", usage = "/plot remove <player>",
+    description = "Remove a player from a plot", usage = "/plot remove <player|*>",
     category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE,
     permission = "plots.remove") public class Remove extends SubCommand {
 

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java

@@ -18,8 +18,8 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 @CommandDeclaration(command = "trust", aliases = {"t"}, requiredType = RequiredType.PLAYER,
-    usage = "/plot trust <player>",
+    usage = "/plot trust <player|*>",
-    description = "Allow a user to build in a plot and use WorldEdit while you are offline",
+    description = "Allow a user to build in a plot and use WorldEdit while the plot owner is offline.",
     category = CommandCategory.SETTINGS) public class Trust extends Command {
 
     public Trust() {