minor improvements

Author: zefir-git

README.md

@@ -65,7 +65,7 @@ Run the command again to disable the message channel.
 ***
 
 ### `/ignore <player>`
-Ignore a player—you will stop seeing all of their private messages to you.
+Ignore a player—you will stop seeing all of their messages (including public chat messages).
 
 <dl>
     <dt>Aliases:</dt> <dd><code>/block</code></dd>
@@ -75,7 +75,7 @@ Ignore a player—you will stop seeing all of their private messages to you.
 ***
 
 ### `/unignore <player>`
-You will stop ignoring the player and will be able to receive their private messages again.
+You will stop ignoring the player and will be able to see their messages again.
 
 <dl>
     <dt>Aliases:</dt> <dd><code>/unblock</code></dd>

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/Command.java

@@ -14,7 +14,7 @@ public static boolean sendMessage(final @NotNull Audience recipient, final @NotN
         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);
 
     @Override
     public final boolean onCommand(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, final @NotNull String label, @NotNull String @NotNull [] args) {

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> onTabComplete(final @NotNull CommandSender sender, final @NotNull org.bukkit.command.Command command, 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");

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java

@@ -26,9 +26,8 @@ public final class MessageCommand extends Command {
     @Override
     public boolean run(final @NotNull CommandSender sender, final @NotNull String label, @NotNull String @NotNull [] args) {
         if (!sender.hasPermission(Permission.USE)) return new NoPermissionError().send(sender);
-        if (args.length == 0) {
+        if (args.length == 0)
             return sendMessage(sender, CloudnodeMSG.getInstance().config().usage(label, sender instanceof Player ? usage : usageConsole));
-        }
         if (args.length == 1 && !(sender instanceof Player)) return sendMessage(sender, CloudnodeMSG.getInstance().config()
                     .usage(label, usageConsole.replace("<player>", args[0])));
 

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/TeamMessageCommand.java

@@ -10,21 +10,20 @@
 import pro.cloudnode.smp.cloudnodemsg.Message;
 import pro.cloudnode.smp.cloudnodemsg.Permission;
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
+import pro.cloudnode.smp.cloudnodemsg.error.NotInTeamError;
 import pro.cloudnode.smp.cloudnodemsg.error.NotPlayerError;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
 public class TeamMessageCommand extends Command {
     @Override
-    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {
+    public boolean run(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
         if (!sender.hasPermission(Permission.USE_TEAM)) return new NoPermissionError().send(sender);
-        if (!(sender instanceof Player player)) return new NotPlayerError().send(sender);
+        if (!(sender instanceof final @NotNull Player player)) return new NotPlayerError().send(sender);
         final @NotNull Optional<@NotNull Team> team = Optional.ofNullable(player.getScoreboard().getPlayerTeam(player));
-        if (team.isEmpty()) return sendMessage(player, CloudnodeMSG.getInstance().config().notInTeam());
+        if (team.isEmpty()) return new NotInTeamError().send(player);
         if (args.length == 0) {
             if (Message.hasTeamChannel(player)) {
                 Message.exitTeamChannel(player);
@@ -39,7 +38,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 label, @NotNull String[] args) {
+    public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final org.bukkit.command.@NotNull Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
         return new ArrayList<>();
     }
 

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java

@@ -18,7 +18,7 @@
 
 public final class ToggleMessageCommand extends Command {
     @Override
-    public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {
+    public boolean run(final @NotNull CommandSender sender, final @NotNull String label, final @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) {
@@ -47,7 +47,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> onTabComplete(final @NotNull CommandSender sender, final org.bukkit.command.@NotNull Command command, final @NotNull String s, final @NotNull String @NotNull [] strings) {
         if (sender.hasPermission(Permission.TOGGLE_OTHER))
             return null;
         return new ArrayList<>();

src/main/java/pro/cloudnode/smp/cloudnodemsg/error/NotInTeamError.java

@@ -3,11 +3,11 @@
 import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
 
 /**
- * Only players can use this command
+ * You are not in a team
  */
 public final class NotInTeamError extends Error {
     /**
-     * Only players can use this command
+     * You are not in a team
      */
     public NotInTeamError() {
         super(CloudnodeMSG.getInstance().config().notInTeam());

src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java

@@ -15,6 +15,7 @@
 import pro.cloudnode.smp.cloudnodemsg.Permission;
 import pro.cloudnode.smp.cloudnodemsg.command.TeamMessageCommand;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
+import pro.cloudnode.smp.cloudnodemsg.error.NotInTeamError;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -27,11 +28,11 @@ public void ignore(final @NotNull AsyncChatEvent event) {
         final @NotNull Set<@NotNull Audience> audience = event.viewers();
         final @NotNull Iterator<@NotNull Audience> iterator = audience.iterator();
         final @NotNull Player sender = event.getPlayer();
+        final @NotNull Server server = CloudnodeMSG.getInstance().getServer();
 
         while (iterator.hasNext()) {
             final @NotNull Audience a = iterator.next();
             if (a instanceof final @NotNull Player player) {
-                final @NotNull Server server = CloudnodeMSG.getInstance().getServer();
                 final @NotNull HashSet<@NotNull OfflinePlayer> ignored = Message.getIgnored(player).stream().map(server::getOfflinePlayer).collect(HashSet::new, HashSet::add, HashSet::addAll);
 
                 if (ignored.contains(sender) && !sender.hasPermission(Permission.IGNORE_BYPASS)) iterator.remove();
@@ -61,7 +62,7 @@ public void teamChannel(final @NotNull AsyncChatEvent event) {
         final @NotNull Optional<@NotNull Team> team = Optional.ofNullable(sender.getScoreboard().getPlayerTeam(sender));
         if (team.isEmpty()) {
             Message.exitTeamChannel(sender);
-            sender.sendMessage(CloudnodeMSG.getInstance().config().notInTeam());
+            new NotInTeamError().send(sender);
             return;
         }
         TeamMessageCommand.sendTeamMessage(sender, team.get(), event.message());

src/main/resources/plugin.yml

@@ -6,28 +6,34 @@ author: Cloudnode
 commands:
     message:
         description: Send a private message
-        usage: /<command> <player> <message>
+        usage: /<command> <player> [message]
         aliases: [ "msg", "tell", "t", "whisper", "dm", "m", "pm" ]
+        permission: cloudnodemsg.use
     reply:
-        description: Reply to a private message
+        description: Privately reply to the last message your received
         usage: /<command> <message>
         aliases: [ "r", "re" ]
+        permission: cloudnodemsg.use
     cloudnodemsg:
         description: CloudnodeMSG
         usage: /<command>
     ignore:
         description: Ignore a player
         usage: /<command> <player>
         aliases: [ "block" ]
+        permission: cloudnodemsg.ignore
     unignore:
         description: Unignore a player
         usage: /<command> <player>
         aliases: [ "unblock" ]
+        permission: cloudnodemsg.ignore
     togglemsg:
-        description: Toggles private messages from a player
-        usage: /<command> <player>
+        description: Toggle receiving private messages
+        usage: /<command> [player]
         aliases: [ "toggledms", "togglepms" ]
+        permission: cloudnodemsg.toggle
     teammsg:
         description: Send a private message to your teammates
-        usage: /<command> <message>
+        usage: /<command> [message]
         aliases: [ "tmsg", "teamchat" , "tm" ]
+        permission: cloudnodemsg.use.team