[+] Started to add providers and more, not done yet.

Author: damt

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

@@ -5,6 +5,8 @@
 import xyz.damt.command.command.Command;
 import xyz.damt.command.command.CommandFinder;
 import xyz.damt.command.command.CommandRegistery;
+import xyz.damt.command.provider.CommandProvider;
+import xyz.damt.command.provider.CommandProviderHandler;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,6 +19,7 @@ public class CommandHandler {
 
     private final Map<String, Command> commandMap = new HashMap<>();
     private final JavaPlugin javaPlugin;
+    private final CommandProviderHandler commandProviderHandler;
     private final CommandRegistery commandRegistery;
 
     /**
@@ -28,9 +31,24 @@ public class CommandHandler {
 
     public CommandHandler(JavaPlugin javaPlugin) {
         this.javaPlugin = javaPlugin;
+
+        this.commandProviderHandler = new CommandProviderHandler();
         this.commandRegistery = new CommandRegistery(javaPlugin);
     }
 
+    /**
+     * Binds a class to a command provider
+     *
+     * @param clazz class to bind
+     * @param commandProvider command provider
+     * @return {@link CommandHandler}
+     */
+
+    public final CommandHandler bind(Class<?> clazz, CommandProvider<?> commandProvider) {
+        commandProviderHandler.register(clazz, commandProvider);
+        return this;
+    }
+
     /**
      * Gets a command based on it's name
      *
@@ -79,7 +97,7 @@ public final CommandHandler register(Object... objects) {
      */
 
     public final CommandHandler registerCommands() {
-        commandMap.values().forEach(command -> commandRegistery.registerCommand(command));
+        commandMap.values().forEach(commandRegistery::registerCommand);
         return this;
     }
 

src/main/java/xyz/damt/command/annotation/Name.java

@@ -0,0 +1,14 @@
+package xyz.damt.command.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface Name {
+
+    String value();
+
+}

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

@@ -8,6 +8,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import xyz.damt.command.CommandHandler;
+import xyz.damt.command.exception.CommandProviderNullException;
 import xyz.damt.command.executor.CommandExecutor;
 
 import java.lang.reflect.Method;
@@ -27,6 +28,7 @@ public class Command {
 
     private final CommandExecutor commandExecutor;
     private final List<Command> subCommands = new LinkedList<>();
+    private final List<CommandParameter> commandParameters = new LinkedList<>();
 
     private boolean player;
     private String permission, permissionMessage;
@@ -80,11 +82,34 @@ public void execute(CommandSender commandSender, String[] args) {
             return;
         }
 
+        if (args.length < commandParameters.size()) {
+            commandSender.sendMessage(ChatColor.RED + "Wrong Usage: " + usage);
+            return;
+        }
+
+        List<Object> objects = new LinkedList<>();
+
+        commandParameters.forEach(commandParameter -> {
+
+            try {
+                objects.add(commandParameter.getCommandProvider().provide(args[commandParameters.indexOf(commandParameter)]));
+            } catch (CommandProviderNullException e) {
+                if (e.getMessage() == null) {
+                    commandSender.sendMessage(ChatColor.RED + "The argument '" + commandParameter.getName() + "' is null!");
+                    return;
+                }
+
+                commandSender.sendMessage(e.getMessage());
+                return;
+            }
+
+        });
+
         if (player) {
             Player player = (Player) commandSender;
-            method.invoke(object, player, args);
+            method.invoke(object, player, objects.toArray());
         } else {
-            method.invoke(object, commandSender, args);
+            method.invoke(object, commandSender, objects.toArray());
         }
     }
 

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

@@ -104,6 +104,8 @@ private final void init() {
 
                     if (senderAnnotation != null) {
                         command.setPlayer(parameter.getType().equals(Player.class));
+                    } else {
+                        command.getCommandParameters().add(new CommandParameter(command, parameter));
                     }
                 }
 

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

@@ -0,0 +1,36 @@
+package xyz.damt.command.command;
+
+import lombok.Getter;
+import xyz.damt.command.CommandHandler;
+import xyz.damt.command.annotation.Name;
+import xyz.damt.command.provider.CommandProvider;
+
+import java.lang.reflect.Parameter;
+
+@Getter
+public class CommandParameter {
+
+    private final Parameter parameter;
+    private final Command command;
+
+    private CommandProvider<?> commandProvider;
+    private String name;
+
+    public CommandParameter(Command command, Parameter parameter) {
+        this.parameter = parameter;
+        this.command = command;
+
+        this.init();
+    }
+
+    private final void init() {
+        Name name = parameter.getAnnotation(Name.class);
+
+        if (name == null)
+            this.name = parameter.getName();
+        else this.name = name.value();
+
+        this.commandProvider = CommandHandler.getInstance().getCommandProviderHandler().getProvider(parameter);
+    }
+
+}

src/main/java/xyz/damt/command/exception/CommandProviderNullException.java

@@ -0,0 +1,9 @@
+package xyz.damt.command.exception;
+
+public class CommandProviderNullException extends Exception {
+
+    public CommandProviderNullException(String message) {
+        super(message);
+    }
+
+}

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

@@ -3,8 +3,10 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.defaults.BukkitCommand;
 import xyz.damt.command.command.Command;
+import xyz.damt.command.command.CommandParameter;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -58,14 +60,16 @@ public boolean execute(CommandSender commandSender, String s, String[] strings)
 
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
-        final List<String> strings = new LinkedList<>();
+        for (int i = 0; i < args.length; i++) {
+            CommandParameter commandParameter = command.getCommandParameters().get(i);
 
-        command.getSubCommands().forEach(command1 -> {
-            String[] commandSplit = command1.getName().split("\\s+");
-            strings.add(commandSplit[1]);
-        });
+            if (commandParameter == null)
+                return Collections.emptyList();
 
-        return strings;
+            return commandParameter.getCommandProvider().suggestions(commandParameter);
+        }
+
+        return Collections.emptyList();
     }
 
 }

src/main/java/xyz/damt/command/provider/CommandProvider.java

@@ -0,0 +1,14 @@
+package xyz.damt.command.provider;
+
+import xyz.damt.command.command.CommandParameter;
+import xyz.damt.command.exception.CommandProviderNullException;
+
+import java.util.List;
+
+public interface CommandProvider<T> {
+
+    T provide(String s) throws CommandProviderNullException;
+
+    List<String> suggestions(CommandParameter commandParameter);
+
+}

src/main/java/xyz/damt/command/provider/CommandProviderHandler.java

@@ -0,0 +1,23 @@
+package xyz.damt.command.provider;
+
+import java.lang.reflect.Parameter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommandProviderHandler {
+
+    private final Map<Class<?>, CommandProvider<?>> commandProviderMap = new HashMap<>();
+
+    public final void register(Class<?> clazz, CommandProvider<?> commandProvider) {
+        commandProviderMap.put(clazz, commandProvider);
+    }
+
+    public final CommandProvider<?> getProvider(Class<?> clazz) {
+        return commandProviderMap.get(clazz);
+    }
+
+    public final CommandProvider<?> getProvider(Parameter parameter) {
+        return commandProviderMap.get(parameter.getType());
+    }
+
+}

src/main/java/xyz/damt/command/provider/impl/bukkit/OfflinePlayerProvider.java

@@ -0,0 +1,38 @@
+package xyz.damt.command.provider.impl.bukkit;
+
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import xyz.damt.command.command.CommandParameter;
+import xyz.damt.command.exception.CommandProviderNullException;
+import xyz.damt.command.provider.CommandProvider;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class OfflinePlayerProvider implements CommandProvider<OfflinePlayer> {
+
+    private final JavaPlugin javaPlugin;
+
+    public OfflinePlayerProvider(JavaPlugin javaPlugin) {
+        this.javaPlugin = javaPlugin;
+    }
+
+    @Override
+    public OfflinePlayer provide(String s) throws CommandProviderNullException {
+        final OfflinePlayer player = javaPlugin.getServer().getOfflinePlayer(s);
+
+        if (!player.hasPlayedBefore() || player == null)
+            throw new CommandProviderNullException(ChatColor.RED + "The player you specified never logged on the server before!");
+
+        return player;
+    }
+
+    @Override
+    public List<String> suggestions(CommandParameter commandParameter) {
+        return javaPlugin.getServer().getOnlinePlayers().stream().map(HumanEntity::getName).collect(Collectors.toList());
+    }
+
+}