the reform faction has besieged this plugin

zefir-git · zefir-git · commit 40b8f3e9a94b · 2024-02-16T11:22:55.000+02:00
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/Command.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/Command.java
@@ -6,15 +6,19 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
 
+import java.util.List;
+
 public abstract class Command implements TabCompleter, CommandExecutor {
     public static boolean sendMessage(final @NotNull Audience recipient, final @NotNull Component message) {
         recipient.sendMessage(message);
         return true;
     }
 
-    public abstract boolean run(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String[] args);
+    public abstract boolean run(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args);
+    public abstract @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args);
 
     @Override
     public final boolean onCommand(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, @NotNull String @NotNull [] args) {
@@ -23,4 +27,9 @@ public final boolean onCommand(final @NotNull CommandSender sender, final @NotNu
         });
         return true;
     }
+
+    @Override
+    public final @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
+        return tab(sender, label, args);
+    }
 }
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java
@@ -43,7 +43,7 @@ public static boolean unignore(final @NotNull Player player, final @NotNull Offl
     }
 
     @Override
-    public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
+    public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         if (args.length == 1 && sender.hasPermission(Permission.IGNORE) && sender instanceof Player) return null;
         return new ArrayList<>();
     }
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MailCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MailCommand.java
@@ -15,7 +15,7 @@
 public final class MailCommand extends Command {
 
     @Override
-    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {
+    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String @NotNull [] args) {
         if (!sender.hasPermission(Permission.MAIL)) return sendMessage(sender, CloudnodeMSG.getInstance().config().noPermission());
         if (args.length == 0) return help(sender);
         final @NotNull String @NotNull [] subCommandArgs = Arrays.copyOfRange(args, 1, args.length);
@@ -44,7 +44,7 @@ public static boolean send(final @NotNull CommandSender sender, final @NotNull S
     }
 
     @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         return null;
     }
 }
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MainCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MainCommand.java
@@ -40,7 +40,7 @@ private boolean reload(final @NotNull CommandSender sender) {
     }
 
     @Override
-    public @NotNull List<@NotNull String> onTabComplete(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command command, @NotNull String label, @NotNull String @NotNull [] args) {
+    public @NotNull List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         final @NotNull List<@NotNull String> completions = new ArrayList<>();
         if (args.length == 1)
             if (sender.hasPermission(Permission.RELOAD) && "reload".startsWith(args[0].toLowerCase())) completions.add("reload");
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java
@@ -59,7 +59,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
     }
 
     @Override
-    public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
+    public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         if (!sender.hasPermission(Permission.USE)) return new ArrayList<>();
         // `null` works for list of players
         if (args.length == 1) return null;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java
@@ -47,7 +47,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
     }
 
     @Override
-    public @NotNull List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
+    public @NotNull List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         return new ArrayList<>();
     }
 }
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java
@@ -17,7 +17,7 @@
 
 public final class ToggleMessageCommand extends Command {
     @Override
-    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {
+    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String @NotNull [] args) {
         if (!sender.hasPermission(Permission.TOGGLE) || (args.length == 1 && !sender.hasPermission(Permission.TOGGLE_OTHER)))
             return new NoPermissionError().send(sender);
         if (args.length == 1) {
@@ -46,7 +46,7 @@ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNul
     }
 
     @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+    public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         if (sender.hasPermission(Permission.TOGGLE_OTHER))
             return null;
         return new ArrayList<>();
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java
@@ -33,7 +33,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
     }
 
     @Override
-    public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
+    public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         if (args.length == 1 && sender.hasPermission(Permission.IGNORE) && sender instanceof final @NotNull Player player) {
             final @NotNull HashSet<@NotNull UUID> ignored = Message.getIgnored(player);
             final @NotNull Server server = CloudnodeMSG.getInstance().getServer();

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static boolean unignore(final @NotNull Player player, final @NotNull Offl`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {`
	`46`	`+ public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`47`	`47`	`if (args.length == 1 && sender.hasPermission(Permission.IGNORE) && sender instanceof Player) return null;`
`48`	`48`	`return new ArrayList<>();`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`public final class MailCommand extends Command {`
`16`	`16`
`17`	`17`	`@Override`
`18`		`- public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {`
	`18`	`+ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String @NotNull [] args) {`
`19`	`19`	`if (!sender.hasPermission(Permission.MAIL)) return sendMessage(sender, CloudnodeMSG.getInstance().config().noPermission());`
`20`	`20`	`if (args.length == 0) return help(sender);`
`21`	`21`	`final @NotNull String @NotNull [] subCommandArgs = Arrays.copyOfRange(args, 1, args.length);`
`@@ -44,7 +44,7 @@ public static boolean send(final @NotNull CommandSender sender, final @NotNull S`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {`
	`47`	`+ public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`48`	`48`	`return null;`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ private boolean reload(final @NotNull CommandSender sender) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- public @NotNull List<@NotNull String> onTabComplete(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command command, @NotNull String label, @NotNull String @NotNull [] args) {`
	`43`	`+ public @NotNull List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`44`	`44`	`final @NotNull List<@NotNull String> completions = new ArrayList<>();`
`45`	`45`	`if (args.length == 1)`
`46`	`46`	`if (sender.hasPermission(Permission.RELOAD) && "reload".startsWith(args[0].toLowerCase())) completions.add("reload");`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {`
	`62`	`+ public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`63`	`63`	`if (!sender.hasPermission(Permission.USE)) return new ArrayList<>();`
`64`	`64`	// `null` works for list of players
`65`	`65`	`if (args.length == 1) return null;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public @NotNull List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {`
	`50`	`+ public @NotNull List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`51`	`51`	`return new ArrayList<>();`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {`
	`36`	`+ public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {`
`37`	`37`	`if (args.length == 1 && sender.hasPermission(Permission.IGNORE) && sender instanceof final @NotNull Player player) {`
`38`	`38`	`final @NotNull HashSet<@NotNull UUID> ignored = Message.getIgnored(player);`
`39`	`39`	`final @NotNull Server server = CloudnodeMSG.getInstance().getServer();`