[+] Fixed sub-commands not executing, and added getSubCommand(String[]) method

Author: damt

src/main/java/xyz/damt/command/command/Command.java

@@ -15,6 +15,7 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -37,6 +38,7 @@ public class Command {
     private final List<CommandParameter> commandParameters = new ArrayList<>();
 
     private boolean player;
+    private boolean subCommand;
     private String permission, permissionMessage;
 
     /**
@@ -64,6 +66,32 @@ public Command(Object object, String name, String[] aliases, Method method, Stri
         this.commandExecutor = new CommandExecutor(this);
     }
 
+    /**
+     * Gets a sub command
+     *
+     * @param args arguments
+     * @return {@link Command}
+     */
+
+    public final Command getSubCommand(String[] args) {
+        for (Command command : subCommands) {
+            String[] commandArg = command.getName().split(" ");
+
+            List<String> strings = new ArrayList<>(Arrays.asList(commandArg));
+            List<String> argsList = new ArrayList<>(Arrays.asList(args));
+
+            strings.removeIf(s -> !argsList.contains(s));
+
+            commandArg = strings.toArray(new String[0]);
+
+            if (commandArg.length != 0 && commandArg[commandArg.length - 1].equalsIgnoreCase(args[args.length - 1])) {
+                return command;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Executes the command
      *
@@ -72,11 +100,11 @@ public Command(Object object, String name, String[] aliases, Method method, Stri
      */
 
     @SneakyThrows
-    public void execute(CommandSender commandSender, String[] args) {
+    public void execute(CommandSender commandSender, String[] args, boolean skip) {
 
         if (async) {
             CommandHandler.getInstance().getJavaPlugin().getServer().getScheduler()
-                    .runTaskAsynchronously(CommandHandler.getInstance().getJavaPlugin(), () -> execute(commandSender, args));
+                    .runTaskAsynchronously(CommandHandler.getInstance().getJavaPlugin(), () -> execute(commandSender, args, skip));
             return;
         }
 
@@ -95,12 +123,36 @@ public void execute(CommandSender commandSender, String[] args) {
             return;
         }
 
+        Command subCommand = getSubCommand(args);
+
+        if (!skip) {
+            if (subCommand == null) {
+                if (helpCommandService == null) {
+                    this.execute(commandSender, args, true);
+                    return;
+                }
+
+                helpCommandService.get(this, getSubCommands()).forEach(commandSender::sendMessage);
+                return;
+            }
+        }
+
         if (args.length < commandParameters.size()) {
             commandSender.sendMessage(ChatColor.RED + "Wrong Usage: " + usage);
             return;
         }
 
         List<Object> objects = new ArrayList<>();
+        List<CommandParameter> commandParameters = this.commandParameters;
+
+        Method method = this.method;
+        Object object = this.object;
+
+        if (!skip) {
+            commandParameters = this.subCommand && subCommand != null ? subCommand.getCommandParameters() : this.commandParameters;
+            method = this.subCommand && subCommand != null ? subCommand.getMethod() : this.method;
+            object = this.subCommand && subCommand != null ? subCommand.getObject() : this.object;
+        }
 
         if (player) {
             Player player = (Player) commandSender;

src/main/java/xyz/damt/command/command/CommandFinder.java

@@ -86,6 +86,8 @@ private final void edit() {
                 return;
 
             List<Command> subCommands = getCommands(args[0]);
+            subCommands.forEach(command1 -> command1.setSubCommand(true));
+
             command.getSubCommands().addAll(subCommands);
         });
     }

src/main/java/xyz/damt/command/complete/impl/DefaultTabCompleter.java

@@ -1,27 +1,21 @@
 package xyz.damt.command.complete.impl;
 
+import org.bukkit.plugin.java.JavaPlugin;
+import xyz.damt.command.CommandHandler;
 import xyz.damt.command.command.Command;
 import xyz.damt.command.complete.TabComplete;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.logging.Level;
 
 public class DefaultTabCompleter implements TabComplete {
 
     @Override
     public List<String> get(Command command, List<Command> subCommands, String[] args) {
-        final List<String> strings = subCommands.stream().map(Command::getName).collect(Collectors.toList());
-
-        for (String string : strings) {
-            final String[] stringArgs = string.split("\\s+");
-            strings.remove(string);
-
-            for (int i = args.length; i < stringArgs.length; i++) {
-                strings.add(stringArgs[i]);
-            }
-        }
-
-        return strings;
+        JavaPlugin javaPlugin = CommandHandler.getInstance().getJavaPlugin();
+        javaPlugin.getLogger().log(Level.SEVERE, "Default Tab Completion Is not created yet, make your own!");
+        return Collections.emptyList();
     }
 
 }

src/main/java/xyz/damt/command/executor/CommandExecutor.java

@@ -41,7 +41,7 @@ public CommandExecutor(Command command) {
 
     @Override
     public boolean execute(CommandSender commandSender, String s, String[] strings) {
-        command.execute(commandSender, strings);
+        command.execute(commandSender, strings, false);
         return false;
     }
 
@@ -64,8 +64,12 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
 
         CommandParameter commandParameter = command.getCommandParameters().get(args.length - 1);
 
-        if (commandParameter == null)
+        if (commandParameter == null) {
+            if (command.getTabComplete() == null)
+                return Collections.emptyList();
+
             return command.getTabComplete().get(command, command.getSubCommands(), args);
+        }
 
         return commandParameter.getCommandProvider().suggestions(commandParameter);
     }