Added MissingSubcommandException, plus some more internal changes

Author: prokopyl

src/main/java/fr/zcraft/quartzlib/components/commands/CommandGroup.java

@@ -1,15 +1,17 @@
 package fr.zcraft.quartzlib.components.commands;
 
 import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
+import fr.zcraft.quartzlib.components.commands.exceptions.MissingSubcommandException;
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Nullable;
 
-class CommandGroup extends CommandNode {
+public class CommandGroup extends CommandNode {
     private final Class<?> commandGroupClass;
 
     @Nullable
@@ -52,7 +54,7 @@ private CommandGroup(
         DiscoveryUtils.getSubCommands(this, typeCollection).forEach(this::addSubCommand);
     }
 
-    public Iterable<CommandNode> getSubCommands() {
+    public Collection<CommandNode> getSubCommands() {
         return this.subCommands.values();
     }
 
@@ -91,6 +93,10 @@ void run(Object parentInstance, CommandSender sender, String[] args) throws Comm
     }
 
     private void runSelf(Object instance, CommandSender sender, String[] args) throws CommandException {
+        if (args.length == 0) {
+            throw new MissingSubcommandException(this);
+        }
+
         String commandName = args[0];
         CommandNode subCommand = subCommands.get(commandName);
         // TODO: handle null

src/main/java/fr/zcraft/quartzlib/components/commands/CommandMethod.java

@@ -29,7 +29,7 @@ class CommandMethod {
             if (parameter.isAnnotationPresent(Sender.class)) { // TODO: check for multiple sender arguments
                 senderArgument = new CommandMethodSenderArgument(parameter, i, typeCollection);
             } else {
-                arguments.add(new CommandMethodArgument(parameter, i, typeCollection));
+                arguments.add(new CommandMethodArgument(this, parameter, i, typeCollection));
             }
         }
 
@@ -69,4 +69,8 @@ private Object[] parseArguments(CommandSender sender, String[] args)
     public CommandMethodArgument[] getArguments() {
         return arguments;
     }
+
+    public Method getMethod() {
+        return method;
+    }
 }

src/main/java/fr/zcraft/quartzlib/components/commands/CommandMethodArgument.java

@@ -1,17 +1,24 @@
 package fr.zcraft.quartzlib.components.commands;
 
 import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
+import fr.zcraft.quartzlib.components.commands.exceptions.UnknownArgumentTypeException;
 import java.lang.reflect.Parameter;
 
 public class CommandMethodArgument {
     private final Parameter parameter;
     private final int position;
     private final ArgumentTypeWrapper<?> typeHandler;
 
-    public CommandMethodArgument(Parameter parameter, int position, TypeCollection typeCollection) {
+    public CommandMethodArgument(
+            CommandMethod parent,
+            Parameter parameter,
+            int position,
+            TypeCollection typeCollection
+    ) {
         this.parameter = parameter;
         this.position = position;
-        this.typeHandler = typeCollection.findArgumentType(parameter.getType()).get(); // FIXME: handle unknown types
+        this.typeHandler = typeCollection.findArgumentType(parameter.getType())
+            .orElseThrow(() -> new UnknownArgumentTypeException(parent.getMethod(), parameter.getType()));
     }
 
     public Object parse(String raw) throws ArgumentParseException {

src/main/java/fr/zcraft/quartzlib/components/commands/CommandNode.java

@@ -4,7 +4,7 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Nullable;
 
-abstract class CommandNode {
+public abstract class CommandNode {
     private final String name;
     @Nullable private final CommandGroup parent;
 

src/main/java/fr/zcraft/quartzlib/components/commands/ExecutionContext.java

@@ -0,0 +1,13 @@
+package fr.zcraft.quartzlib.components.commands;
+
+import org.bukkit.command.CommandSender;
+
+public class ExecutionContext {
+    private final CommandSender sender;
+    private final String[] fullArgs;
+
+    public ExecutionContext(CommandSender sender, String[] fullArgs) {
+        this.sender = sender;
+        this.fullArgs = fullArgs;
+    }
+}

src/main/java/fr/zcraft/quartzlib/components/commands/QuartzCommandExecutor.java

@@ -1,6 +1,7 @@
 package fr.zcraft.quartzlib.components.commands;
 
 import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
+import fr.zcraft.quartzlib.tools.text.RawMessage;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -19,7 +20,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         try {
             group.run(sender, args);
         } catch (CommandException e) {
-            throw new RuntimeException(e); // TODO
+            RawMessage.send(sender, e.display(sender).build());
         }
         return true;
     }

src/main/java/fr/zcraft/quartzlib/components/commands/TypeCollection.java

@@ -62,6 +62,8 @@ private void registerNativeTypes() {
         register(new ArgumentTypeWrapper<>(Integer.class, new IntegerArgumentType()));
         register(new ArgumentTypeWrapper<>(String.class, s -> s));
 
+        register(new ArgumentTypeWrapper<>(int.class, new IntegerArgumentType()));
+
         // Generic types
         register(new EnumArgumentType());
 

src/main/java/fr/zcraft/quartzlib/components/commands/exceptions/ArgumentParseException.java

@@ -1,4 +1,11 @@
 package fr.zcraft.quartzlib.components.commands.exceptions;
 
+import fr.zcraft.quartzlib.components.rawtext.RawText;
+import org.bukkit.command.CommandSender;
+
 public class ArgumentParseException extends CommandException {
+    @Override
+    public RawText display(CommandSender sender) {
+        return null;
+    }
 }

src/main/java/fr/zcraft/quartzlib/components/commands/exceptions/CommandException.java

@@ -1,4 +1,8 @@
 package fr.zcraft.quartzlib.components.commands.exceptions;
 
+import fr.zcraft.quartzlib.components.rawtext.RawText;
+import org.bukkit.command.CommandSender;
+
 public abstract class CommandException extends Exception {
+    public abstract RawText display(CommandSender sender);
 }

src/main/java/fr/zcraft/quartzlib/components/commands/exceptions/InvalidSenderException.java

@@ -1,4 +1,11 @@
 package fr.zcraft.quartzlib.components.commands.exceptions;
 
+import fr.zcraft.quartzlib.components.rawtext.RawText;
+import org.bukkit.command.CommandSender;
+
 public class InvalidSenderException extends CommandException {
+    @Override
+    public RawText display(CommandSender sender) {
+        return null;
+    }
 }