Rework the command system

Author: TonimatasDEV

src/main/java/net/tonimatasdev/perworldplugins/PerWorldPlugins.java

@@ -52,7 +52,6 @@ public void onEnable() {
             // Convert listeners and set worlds to commands.
             ListenerManager.convert();
             CommandManager.setWorldsToCommands();
-            CommandManager.clear();
 
             // Send a message on completion of conversion.
             Bukkit.getConsoleSender().sendMessage("[PerWorldPlugins] " + ChatColor.GREEN + "Converted all Listeners correctly.");

src/main/java/net/tonimatasdev/perworldplugins/api/PerWorldCommand.java

@@ -1,16 +1,28 @@
 package net.tonimatasdev.perworldplugins.api;
 
 import net.tonimatasdev.perworldplugins.util.PerWorldUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class PerWorldCommand {
-    private final Plugin plugin;
-    private List<String> disabledWorlds;
+public abstract class PerWorldCommand extends Command {
+    protected Plugin plugin;
+    protected List<String> disabledWorlds;
 
-    public PerWorldCommand(Plugin plugin) {
+    public PerWorldCommand(Command command, Plugin plugin) {
+        // Add all command information.
+        super(command.getName());
+        setAliases(command.getAliases());
+        setDescription(command.getDescription());
+        setLabel(command.getLabel());
+        setName(command.getName());
+        setPermission(command.getPermission());
+        setPermissionMessage(command.getPermissionMessage());
+        setUsage(command.getUsage());
+        // Add plugin and disabled worlds.
         this.plugin = plugin;
         this.disabledWorlds = new ArrayList<>();
     }
@@ -26,4 +38,20 @@ public List<String> getDisabledWorlds() {
     public void setDisabledWorlds() {
         this.disabledWorlds = PerWorldUtils.getDisabledWorlds(plugin);
     }
+
+    public void setPlugin(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public static PerWorldCommand get(Command command, Plugin plugin) {
+        // Create PerWorldCommand.
+        return new PerWorldCommand(command, plugin) {
+            // Use the normal command execute.
+            @Override
+            @SuppressWarnings("NullableProblems")
+            public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+                return command.execute(sender, commandLabel, args);
+            }
+        };
+    }
 }

src/main/java/net/tonimatasdev/perworldplugins/listener/Listeners.java

@@ -4,6 +4,7 @@
 import net.tonimatasdev.perworldplugins.api.PerWorldCommand;
 import net.tonimatasdev.perworldplugins.manager.CommandManager;
 import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -32,16 +33,23 @@ public void enablePlugin(PluginEnableEvent event) {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onCommandPreProcess(PlayerCommandPreprocessEvent event) {
-        // Get command.
+        // Get message.
         String message = event.getMessage().split(" ")[0].replaceFirst("/", "");
-        PerWorldCommand perWorldCommand = CommandManager.commands.get(message.split(":").length > 1 ? message.split(":")[1] : message);
-
+        // Get command string.
+        String commandString = message.split(":").length > 1 ? message.split(":")[1] : message;
+        // Get command.
+        Command command = CommandManager.getCommandMap().getCommand(commandString);
         // Detects if the command is null.
-        if (perWorldCommand == null) return;
-
-        // Get PerWorldCommand and check if the player is in the disabled world.
+        if (command == null) return;
+        // Detects if the command is PerWorldCommand.
+        if (!(command instanceof PerWorldCommand)) return;
+        // Get PerWorldCommand.
+        PerWorldCommand perWorldCommand = (PerWorldCommand) command;
+        // Check if the player is in the disabled world
         if (perWorldCommand.getDisabledWorlds().contains(event.getPlayer().getWorld().getName())) {
+            // Send block message to the player.
             event.getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(PerWorldPlugins.getInstance().getConfig().getString("disabledCommandMessage"))));
+            // Cancel the event.
             event.setCancelled(true);
         }
     }

src/main/java/net/tonimatasdev/perworldplugins/manager/CommandManager.java

@@ -9,33 +9,66 @@
 import org.bukkit.plugin.SimplePluginManager;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 public class CommandManager implements Listener {
-    public static final Map<String, PerWorldCommand> commands = new HashMap<>();
     private static final List<String> defaultCommands = Arrays.asList("version", "timings", "reload", "plugins", "tps", "mspt", "paper", "spigot", "restart", "perworldplugins");
-    private static final List<Command> registered = new ArrayList<>();
 
     public static void addPluginCommands(Plugin plugin) {
-        // Get all commands of server command map.
-        for (Command command : getCommandMap().getCommands()) {
-            // If the command is default, registered or PluginCommand, skip it.
-            if (defaultCommands.contains(command.getName()) || registered.contains(command)) continue;
-            // Put the command to the command map.
-            registered.add(command);
-            commands.put(command.getName(), new PerWorldCommand(plugin));
+        // Create PerWorldCommand list.
+        List<PerWorldCommand> perWorldCommands = new ArrayList<>();
+        // Create key list.
+        List<String> registeredKeys = new ArrayList<>();
+
+        // Get all keys.
+        for (String commandKey : getCommands().keySet()) {
+            // Get the command from the key.
+            Command command = getCommands().get(commandKey);
+            // Check if it is default command, PerWorldCommand or is a registered key.
+            if (defaultCommands.contains(command.getName()) || command instanceof PerWorldCommand || registeredKeys.contains(commandKey)) continue;
+            // Get and add a PerWorldCommand to perWorldCommands list.
+            perWorldCommands.add(PerWorldCommand.get(command, plugin));
+
+            // Add key to registeredKeys list.
+            registeredKeys.add(commandKey);
         }
+
+        // Remove all commands from registeredKeys list.
+        registeredKeys.forEach(key -> getCommands().remove(key));
+        // Register all commands from perWorldCommands list.
+        perWorldCommands.forEach(perWorldCommand -> getCommandMap().register(perWorldCommand.getPlugin().getName(), perWorldCommand));
     }
 
     public static void setWorldsToCommands() {
         // Get all command map values.
-        for (PerWorldCommand command : commands.values()) {
-            // Set disabled worlds to the command.
-            command.setDisabledWorlds();
+        for (Command command : getCommandMap().getCommands()) {
+            // Check if is a PerWorldCommand.
+            if (command instanceof PerWorldCommand) {
+                // Set disabled worlds to the command.
+                ((PerWorldCommand) command).setDisabledWorlds();
+            }
         }
     }
 
-    private static SimpleCommandMap getCommandMap() {
+    @SuppressWarnings("unchecked")
+    public static Map<String, Command> getCommands() {
+        try {
+            // Get "knownCommands" field.
+            Field knownCommandsField = SimpleCommandMap.class.getDeclaredField("knownCommands");
+            // Set accessible.
+            knownCommandsField.setAccessible(true);
+
+            // Return knownCommands field from command map.
+            return (Map<String, Command>) knownCommandsField.get(getCommandMap());
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static SimpleCommandMap getCommandMap() {
         try {
             // Get "commandMap" field.
             Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
@@ -48,8 +81,4 @@ private static SimpleCommandMap getCommandMap() {
             throw new RuntimeException(e);
         }
     }
-
-    public static void clear() {
-        registered.clear();
-    }
 }