[+] Added providers, and made the api actually better pog

Author: wabuein

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

@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@Getter
 public class CommandHandler {
 
     @Getter
@@ -30,16 +29,17 @@ public class CommandHandler {
      */
 
     public CommandHandler(JavaPlugin javaPlugin) {
+        instance = this;
         this.javaPlugin = javaPlugin;
 
-        this.commandProviderHandler = new CommandProviderHandler();
+        this.commandProviderHandler = new CommandProviderHandler(this);
         this.commandRegistery = new CommandRegistery(javaPlugin);
     }
 
     /**
      * Binds a class to a command provider
      *
-     * @param clazz class to bind
+     * @param clazz           class to bind
      * @param commandProvider command provider
      * @return {@link CommandHandler}
      */
@@ -69,7 +69,7 @@ public final Command getCommand(String name) {
      */
 
     public final CommandHandler register(Object object, String name) {
-        commandMap.put(name, new CommandFinder(object).getCommand(name));
+        commandMap.put(name, new CommandFinder(object, commandProviderHandler).getCommand(name));
         return this;
     }
 
@@ -83,7 +83,7 @@ public final CommandHandler register(Object object, String name) {
 
     public final CommandHandler register(Object... objects) {
         for (Object object : objects) {
-            CommandFinder commandFinder = new CommandFinder(object);
+            CommandFinder commandFinder = new CommandFinder(object, commandProviderHandler);
             commandFinder.getCommands().forEach(command -> commandMap.put(command.getName(), command));
         }
         return this;
@@ -101,4 +101,13 @@ public final CommandHandler registerCommands() {
         return this;
     }
 
+    /**
+     * Gets the java plugin
+     *
+     * @return {@link JavaPlugin}
+     */
+
+    public JavaPlugin getJavaPlugin() {
+        return javaPlugin;
+    }
 }

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

@@ -3,6 +3,7 @@
 import org.bukkit.entity.Player;
 import xyz.damt.command.annotation.Permission;
 import xyz.damt.command.annotation.Sender;
+import xyz.damt.command.provider.CommandProviderHandler;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -13,6 +14,7 @@
 public class CommandFinder {
 
     private final Object object;
+    private final CommandProviderHandler commandProviderHandler;
     private final List<Command> commands = new ArrayList<>();
 
     /**
@@ -22,8 +24,9 @@ public class CommandFinder {
      * @param object {@link Object}
      */
 
-    public CommandFinder(Object object) {
+    public CommandFinder(Object object, CommandProviderHandler commandProviderHandler) {
         this.object = object;
+        this.commandProviderHandler = commandProviderHandler;
 
         this.init();
         this.edit();
@@ -105,7 +108,7 @@ private final void init() {
                     if (senderAnnotation != null) {
                         command.setPlayer(parameter.getType().equals(Player.class));
                     } else {
-                        command.getCommandParameters().add(new CommandParameter(command, parameter));
+                        command.getCommandParameters().add(new CommandParameter(command, parameter, commandProviderHandler));
                     }
                 }
 

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

@@ -1,9 +1,11 @@
 package xyz.damt.command.command;
 
 import lombok.Getter;
-import xyz.damt.command.CommandHandler;
+import lombok.SneakyThrows;
 import xyz.damt.command.annotation.Name;
+import xyz.damt.command.exception.CommandParameterException;
 import xyz.damt.command.provider.CommandProvider;
+import xyz.damt.command.provider.CommandProviderHandler;
 
 import java.lang.reflect.Parameter;
 
@@ -12,25 +14,32 @@ public class CommandParameter {
 
     private final Parameter parameter;
     private final Command command;
+    private final CommandProviderHandler commandProviderHandler;
 
     private CommandProvider<?> commandProvider;
     private String name;
 
-    public CommandParameter(Command command, Parameter parameter) {
+    @SneakyThrows
+    public CommandParameter(Command command, Parameter parameter, CommandProviderHandler commandProviderHandler) {
         this.parameter = parameter;
         this.command = command;
+        this.commandProviderHandler = commandProviderHandler;
 
         this.init();
     }
 
-    private final void init() {
+    private final void init() throws CommandParameterException {
         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);
+        this.commandProvider = commandProviderHandler.getProvider(parameter);
+
+        if (commandProvider == null)
+            throw new CommandParameterException("The command parameter '" + parameter.getType().getSimpleName() + "' for command " + command
+            .getName() + " does not exist!");
     }
 
 }

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

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

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

@@ -7,7 +7,6 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 public class CommandExecutor extends BukkitCommand {

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

@@ -3,12 +3,16 @@
 import xyz.damt.command.command.CommandParameter;
 import xyz.damt.command.exception.CommandProviderNullException;
 
+import java.util.Collections;
 import java.util.List;
 
 public interface CommandProvider<T> {
 
+
     T provide(String s) throws CommandProviderNullException;
 
-    List<String> suggestions(CommandParameter commandParameter);
+    default List<String> suggestions(CommandParameter commandParameter) {
+        return Collections.emptyList();
+    }
 
 }

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

@@ -1,21 +1,76 @@
 package xyz.damt.command.provider;
 
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import xyz.damt.command.CommandHandler;
+import xyz.damt.command.provider.impl.bukkit.OfflinePlayerCommandProvider;
+import xyz.damt.command.provider.impl.bukkit.PlayerCommandProvider;
+import xyz.damt.command.provider.impl.normal.*;
+
 import java.lang.reflect.Parameter;
 import java.util.HashMap;
 import java.util.Map;
 
 public class CommandProviderHandler {
 
     private final Map<Class<?>, CommandProvider<?>> commandProviderMap = new HashMap<>();
+    private final CommandHandler commandHandler;
+
+    /**
+     * Handles all command providers, and insures nothing goes wrong
+     *
+     * @param commandHandler instance of {@link CommandHandler}
+     */
+
+    public CommandProviderHandler(CommandHandler commandHandler) {
+        this.commandHandler = commandHandler;
+        this.init();
+    }
+
+    /**
+     * Registers all default and spigot providers
+     */
+
+    private final void init() {
+        this.register(Integer.class, new IntegerCommandProvider());
+        this.register(String.class, new StringCommandProvider());
+        this.register(Float.class, new FloatCommandProvider());
+        this.register(Boolean.class, new BooleanCommandProvider());
+        this.register(Double.class, new DoubleCommandProvider());
+
+        this.register(Player.class, new PlayerCommandProvider(commandHandler.getJavaPlugin()));
+        this.register(OfflinePlayer.class, new OfflinePlayerCommandProvider(commandHandler.getJavaPlugin()));
+    }
+
+    /**
+     * Registers a provider
+     *
+     * @param clazz class of the provider
+     * @param commandProvider command provider of the provider
+     */
 
     public final void register(Class<?> clazz, CommandProvider<?> commandProvider) {
         commandProviderMap.put(clazz, commandProvider);
     }
 
+    /**
+     * Gets a provider from it's class
+     *
+     * @param clazz class to get the provider of
+     * @return {@link CommandProvider}
+     */
+
     public final CommandProvider<?> getProvider(Class<?> clazz) {
         return commandProviderMap.get(clazz);
     }
 
+    /**
+     * Gets a provider from a parameter
+     *
+     * @param parameter parameter to get the provider from
+     * @return {@link CommandProvider}
+     */
+
     public final CommandProvider<?> getProvider(Parameter parameter) {
         return commandProviderMap.get(parameter.getType());
     }

…r/impl/bukkit/OfflinePlayerProvider.java …bukkit/OfflinePlayerCommandProvider.javasrc/main/java/xyz/damt/command/provider/impl/bukkit/OfflinePlayerProvider.java renamed to src/main/java/xyz/damt/command/provider/impl/bukkit/OfflinePlayerCommandProvider.java src/main/java/xyz/damt/command/provider/impl/bukkit/OfflinePlayerProvider.java renamed to src/main/java/xyz/damt/command/provider/impl/bukkit/OfflinePlayerCommandProvider.java

@@ -3,7 +3,6 @@
 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;
@@ -12,11 +11,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class OfflinePlayerProvider implements CommandProvider<OfflinePlayer> {
+public class OfflinePlayerCommandProvider implements CommandProvider<OfflinePlayer> {
 
     private final JavaPlugin javaPlugin;
 
-    public OfflinePlayerProvider(JavaPlugin javaPlugin) {
+    public OfflinePlayerCommandProvider(JavaPlugin javaPlugin) {
         this.javaPlugin = javaPlugin;
     }
 

…provider/impl/bukkit/PlayerProvider.java …r/impl/bukkit/PlayerCommandProvider.javasrc/main/java/xyz/damt/command/provider/impl/bukkit/PlayerProvider.java renamed to src/main/java/xyz/damt/command/provider/impl/bukkit/PlayerCommandProvider.java src/main/java/xyz/damt/command/provider/impl/bukkit/PlayerProvider.java renamed to src/main/java/xyz/damt/command/provider/impl/bukkit/PlayerCommandProvider.java

@@ -11,11 +11,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class PlayerProvider implements CommandProvider<Player> {
+public class PlayerCommandProvider implements CommandProvider<Player> {
 
     private final JavaPlugin javaPlugin;
 
-    public PlayerProvider(JavaPlugin javaPlugin) {
+    public PlayerCommandProvider(JavaPlugin javaPlugin) {
         this.javaPlugin = javaPlugin;
     }
 

src/main/java/xyz/damt/command/provider/impl/normal/BooleanCommandProvider.java

@@ -0,0 +1,21 @@
+package xyz.damt.command.provider.impl.normal;
+
+import org.bukkit.ChatColor;
+import xyz.damt.command.exception.CommandProviderNullException;
+import xyz.damt.command.provider.CommandProvider;
+
+public class BooleanCommandProvider implements CommandProvider<Boolean> {
+
+    @Override
+    public Boolean provide(String s) throws CommandProviderNullException {
+        if (s.equalsIgnoreCase("true"))
+            return true;
+
+        if (s.equalsIgnoreCase("false"))
+            return false;
+
+        throw new CommandProviderNullException(ChatColor.RED + "Please input a valid boolean!");
+    }
+
+
+}