changes

It is named changes for the sake of spiting people as a joke.

Hit CTRL + ALT + L on all files to format everything uniformly per IDEA defaults.

Config Refactor:
- ConfigDefaults renamed even tho it has nothing in it yet!
- Lots of stuff moved out of Config and into more appropriate classes.

Locale:
- Code looked like it was trying to be a Singleton so I made it a Singleton.

Tab Complete:
- All SubCommands now support a SimpleNickPermission, used pretty much only for command autocomplete. Overkill? Maybe.
- Set now has TabComplete.
- Base Command now has TabComplete.

Author: Peashooter101

README.md

@@ -13,16 +13,41 @@ Mini-Message comes prepackaged with Paper and all forks of Paper support Mini-Me
 `/nick set <nickname> [player]`
 
 - Sets the nickname of the player.
-- Supports Mini-Message Tags such as `<gray>` and `<gradient:red:green>`
-- Allows admins to change the nickname of another player using the optional [player] argument.
+- Uses Mini-Message Tags such as `<gray>` and `<gradient:red:green>`
+- Allows users with permission `simplenick.admin` to change the nickname of another player using the optional [player] argument.
 
 `/nick reset [player]`
 
 - Sets the nickname of the player back to the original username, unformatted.
-- Allows admins to reset the nickname of another player using the optional [player] argument.
+- Allows users with permission `simplenick.admin` to reset the nickname of another player using the optional [player] argument.
+
+`/nick reload` (TODO)
+
+- Reloads the configuration and locale.
+
+`/nick help`
+
+- Provides help text.
 
 ## Permissions
 
-`simplenicks.admin`
+`simplenick.admin`
+
+- Allows the player to change other player's nicknames.
+
+`simplenicks.nick.<tag>` (TODO)
+
+- Allows for the use of those Mini-Message tags.
+- Valid Tags are: `color`, `gradient`, `rainbow`, `underline`, `italic`, `strikethrough`, `bold`, `obsfucated`.
+- All Formatting Tags work using `simplenick.nick.format`.
+
+`simplenicks.reload` (TODO)
+
+- Allows the player to reload the plugin configuration and locale.
+
+## TODO
 
-- Admin Permission to change other player's nicknames.
+- Provide Config Option for TabList Changing and implement logic for TabList Update.
+- Create a `/nick whois` or similar command to determine "who is the player(s) with this nickname".
+- Add the option to change the regex check for display names (with a "potentially unsafe" warning).
+- Add the option to change the character limit on the fully parsed name.

src/main/java/adhdmc/simplenicks/LoginListener.java

@@ -6,18 +6,17 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
 public class LoginListener implements Listener {
     //Basic save handling
     @EventHandler
-    public void onPlayerLogin(PlayerJoinEvent joinEvent){
+    public void onPlayerLogin(PlayerJoinEvent joinEvent) {
         Player player = joinEvent.getPlayer();
         PersistentDataContainer playerPDC = player.getPersistentDataContainer();
         String pdcName = playerPDC.get(Set.nickNameSave, PersistentDataType.STRING);
-        if (pdcName != null){
+        if (pdcName != null) {
             Component savedName = SimpleNicks.getMiniMessage().deserialize(pdcName);
             player.displayName(savedName);
         }

src/main/java/adhdmc/simplenicks/SimpleNicks.java

@@ -2,11 +2,8 @@
 
 import adhdmc.simplenicks.commands.CommandHandler;
 import adhdmc.simplenicks.commands.SubCommand;
-import adhdmc.simplenicks.commands.subcommands.Help;
-import adhdmc.simplenicks.commands.subcommands.Set;
-import adhdmc.simplenicks.config.ConfigDefaults;
+import adhdmc.simplenicks.commands.subcommands.*;
 import adhdmc.simplenicks.config.Locale;
-import adhdmc.simplenicks.commands.subcommands.Reset;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -36,35 +33,31 @@ public final class SimpleNicks extends JavaPlugin {
     public void onEnable() {
         instance = this;
         registerSubCommands();
-        locale = new Locale(this);
-        locale.getLocaleConfig();
-        ConfigDefaults.localeDefaults();
-        ConfigDefaults.setFormatPerms();
-        locale.saveConfig();
-        ConfigDefaults.loadLocaleMessages();
+        locale = Locale.getInstance();
         this.getCommand("nick").setExecutor(new CommandHandler());
         instance.getServer().getPluginManager().registerEvents(new LoginListener(), this);
     }
 
-    public static MiniMessage getMiniMessage(){
+    public static MiniMessage getMiniMessage() {
         return miniMessage;
     }
 
-    public static Plugin getInstance(){
+    public static Plugin getInstance() {
         return instance;
     }
 
-    public static Map<String, SubCommand> getSubCommands(){
+    public static Map<String, SubCommand> getSubCommands() {
         return Collections.unmodifiableMap(subCommands);
     }
 
-    public static Locale getLocale(){
+    public static Locale getLocale() {
         return locale;
     }
 
-    private void registerSubCommands(){
+    private void registerSubCommands() {
         subCommands.put("reset", new Reset());
         subCommands.put("help", new Help());
         subCommands.put("set", new Set());
+        subCommands.put("reload", new Reload());
     }
 }

src/main/java/adhdmc/simplenicks/commands/CommandHandler.java

@@ -1,37 +1,57 @@
 package adhdmc.simplenicks.commands;
 
 import adhdmc.simplenicks.SimpleNicks;
-import adhdmc.simplenicks.config.ConfigDefaults;
+import adhdmc.simplenicks.config.Locale.Message;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.*;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 
-public class CommandHandler implements CommandExecutor {
+public class CommandHandler implements CommandExecutor, TabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
         MiniMessage miniMessage = SimpleNicks.getMiniMessage();
 
         // Arguments Check
         if (args.length == 0) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.INVALID_COMMAND.getMessage())); // Invalid Arguments
+            sender.sendMessage(miniMessage.deserialize(Message.INVALID_COMMAND.getMessage())); // Invalid Arguments
             return true;
         }
 
         // Execute Command
         SubCommand subCommand = SimpleNicks.getSubCommands().getOrDefault(args[0].toLowerCase(Locale.ENGLISH), null);
         if (subCommand == null) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.INVALID_COMMAND.getMessage())); // Invalid SubCommand
+            sender.sendMessage(miniMessage.deserialize(Message.INVALID_COMMAND.getMessage())); // Invalid SubCommand
             return true;
         }
         subCommand.execute(sender, Arrays.copyOfRange(args, 1, args.length));
         return true;
     }
+
+
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        ArrayList<String> tabComplete = new ArrayList<>();
+        if (args.length == 1) {
+            for (SubCommand subCommand : SimpleNicks.getSubCommands().values()) {
+                if (sender.hasPermission(subCommand.getPermission()) && subCommand.getName().startsWith(args[0].toLowerCase(Locale.ENGLISH))) {
+                    tabComplete.add(subCommand.getName());
+                }
+            }
+        }
+        else {
+            SubCommand subCommand = SimpleNicks.getSubCommands().getOrDefault(args[0].toLowerCase(Locale.ENGLISH), null);
+            if (subCommand == null) { return tabComplete; }
+            if (sender.hasPermission(subCommand.getPermission())) {
+                return subCommand.getSubcommandArguments(sender, Arrays.copyOfRange(args, 1, args.length));
+            }
+        }
+        return tabComplete;
+    }
 }
 

src/main/java/adhdmc/simplenicks/commands/SubCommand.java

@@ -1,5 +1,6 @@
 package adhdmc.simplenicks.commands;
 
+import adhdmc.simplenicks.util.SimpleNickPermission;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
@@ -9,11 +10,13 @@ public abstract class SubCommand {
     private final String name;
     private final String description;
     private final String syntax;
+    private final SimpleNickPermission permission;
 
-    public SubCommand(String name, String description, String syntax) {
+    public SubCommand(String name, String description, String syntax, SimpleNickPermission permission) {
         this.name = name;
         this.description = description;
         this.syntax = syntax;
+        this.permission = permission;
     }
 
     public String getName() {
@@ -28,6 +31,14 @@ public String getSyntax() {
         return syntax;
     }
 
+    public SimpleNickPermission getSimpleNickPermission() {
+        return permission;
+    }
+
+    public String getPermission() {
+        return permission.getPermission();
+    }
+
     public abstract void execute(CommandSender sender, String[] args);
 
     public abstract List<String> getSubcommandArguments(CommandSender sender, String[] args);

src/main/java/adhdmc/simplenicks/commands/subcommands/Help.java

@@ -1,13 +1,14 @@
 package adhdmc.simplenicks.commands.subcommands;
 
 import adhdmc.simplenicks.commands.SubCommand;
+import adhdmc.simplenicks.util.SimpleNickPermission;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public class Help extends SubCommand {
     public Help() {
-        super("help", "Help command for SimpleNicks", "/nick help");
+        super("help", "Help command for SimpleNicks", "/nick help", SimpleNickPermission.NICK_COMMAND);
     }
 
     @Override

src/main/java/adhdmc/simplenicks/commands/subcommands/Reload.java

@@ -1,13 +1,14 @@
 package adhdmc.simplenicks.commands.subcommands;
 
 import adhdmc.simplenicks.commands.SubCommand;
+import adhdmc.simplenicks.util.SimpleNickPermission;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public class Reload extends SubCommand {
-    public Reload(String name, String description, String syntax) {
-        super(name, description, syntax);
+    public Reload() {
+        super("reload", "Reloads SimpleNicks Config and Locale", "/nick reload", SimpleNickPermission.NICK_RELOAD);
     }
 
     @Override

src/main/java/adhdmc/simplenicks/commands/subcommands/Reset.java

@@ -2,7 +2,8 @@
 
 import adhdmc.simplenicks.SimpleNicks;
 import adhdmc.simplenicks.commands.SubCommand;
-import adhdmc.simplenicks.config.ConfigDefaults;
+import adhdmc.simplenicks.config.Locale.Message;
+import adhdmc.simplenicks.util.SimpleNickPermission;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,7 +13,7 @@
 
 public class Reset extends SubCommand {
     public Reset() {
-        super("reset", "Resets a nickname", "/nick reset");
+        super("reset", "Resets a nickname", "/nick reset", SimpleNickPermission.NICK_RESET);
     }
 
     @Override
@@ -21,33 +22,34 @@ public void execute(CommandSender sender, String[] args) {
 
         // Player Check
         if (!(sender instanceof Player)) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.CONSOLE_CANNOT_RUN.getMessage())); // Invalid Usage (Not a Player)
+            sender.sendMessage(miniMessage.deserialize(Message.CONSOLE_CANNOT_RUN.getMessage())); // Invalid Usage (Not a Player)
             return;
         }
         // Arguments Check
         if (args.length > 1) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.TOO_MANY_ARGUMENTS.getMessage())); // Too Many Arguments
+            sender.sendMessage(miniMessage.deserialize(Message.TOO_MANY_ARGUMENTS.getMessage())); // Too Many Arguments
             return;
         }
         // TODO: Pull permissions from a common place.
-        if (args.length == 1 && !sender.hasPermission(ConfigDefaults.SimpleNickPermission.NICK_ADMIN.getPermission())) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.NO_PERMISSION.getMessage())); // No Permission
+        if (args.length == 1 && !sender.hasPermission(SimpleNickPermission.NICK_ADMIN.getPermission())) {
+            sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage())); // No Permission
             return;
         }
         // Valid Player Check
         Player player = (args.length == 0) ? (Player) sender : SimpleNicks.getInstance().getServer().getPlayer(args[0]);
         if (player == null) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.INVALID_PLAYER.getMessage())); // Invalid Player
+            sender.sendMessage(miniMessage.deserialize(Message.INVALID_PLAYER.getMessage())); // Invalid Player
             return;
         }
-        if (sender == player && !sender.hasPermission(ConfigDefaults.SimpleNickPermission.NICK_RESET.getPermission())) {
-            sender.sendMessage(miniMessage.deserialize(ConfigDefaults.Message.TOO_MANY_ARGUMENTS.getMessage())); // No Permission
+        if (sender == player && !sender.hasPermission(SimpleNickPermission.NICK_RESET.getPermission())) {
+            sender.sendMessage(miniMessage.deserialize(Message.TOO_MANY_ARGUMENTS.getMessage())); // No Permission
             return;
         }
         // Set Nickname
         // TODO: Save to Player
         String playerPDCString = player.getPersistentDataContainer().get(Set.nickNameSave, PersistentDataType.STRING);
-        if (playerPDCString != null) player.getPersistentDataContainer().remove(Set.nickNameSave); //held name for temp saving option
+        if (playerPDCString != null)
+            player.getPersistentDataContainer().remove(Set.nickNameSave); //held name for temp saving option
         player.displayName(miniMessage.deserialize(player.getName()));
     }