Updated Command Exceptions

Author: ZeroMemes

src/main/java/me/zero/client/api/command/exception/CommandException.java

@@ -1,5 +1,7 @@
 package me.zero.client.api.command.exception;
 
+import me.zero.client.api.command.Command;
+
 /**
  * Superclass for all exceptions in the
  * {@code me.zero.client.api.exception.command} package.
@@ -9,13 +11,29 @@
  */
 public class CommandException extends Exception {
 
-    public CommandException() {}
+    /**
+     * Command that encountered an exception
+     */
+    private final Command command;
+
+    public CommandException(Command command) {
+        this.command = command;
+    }
 
-    public CommandException(String message) {
+    public CommandException(Command command, String message) {
         super(message);
+        this.command = command;
     }
 
-    public CommandException(String message, Object... args) {
+    public CommandException(Command command, String message, Object... args) {
         super(String.format(message, args));
+        this.command = command;
+    }
+
+    /**
+     * @return The command that encountered an exception
+     */
+    public final Command getCommand() {
+        return this.command;
     }
 }

src/main/java/me/zero/client/api/command/exception/CommandInitException.java

@@ -1,5 +1,7 @@
 package me.zero.client.api.command.exception;
 
+import me.zero.client.api.command.Command;
+
 /**
  * Called when the initialization of a {@code Command}
  * fails.c
@@ -9,7 +11,7 @@
  */
 public final class CommandInitException extends CommandException {
 
-    public CommandInitException(String message) {
-        super(message);
+    public CommandInitException(Command command, String message) {
+        super(command, message);
     }
 }

src/main/java/me/zero/client/api/command/exception/InvalidArgumentException.java

@@ -0,0 +1,55 @@
+package me.zero.client.api.command.exception;
+
+import me.zero.client.api.command.Command;
+
+/**
+ * @author Brady
+ * @since 6/7/2017 9:34 AM
+ */
+public final class InvalidArgumentException extends CommandException {
+
+    /**
+     * Array of inputted arguments
+     */
+    private final String[] args;
+
+    /**
+     * Index of the bag argument
+     */
+    private final int badArg;
+
+    /**
+     * Expected type
+     */
+    private final Class<?> expected;
+
+    public InvalidArgumentException(Command command, String[] args, int badArg, Class<?> expected) {
+        super(command);
+        this.args = args;
+        this.badArg = badArg;
+        this.expected = expected;
+    }
+
+    /**
+     * @return Array of inputted arguments
+     */
+    public final String[] getArgs() {
+        return this.args;
+    }
+
+    /**
+     * @return Index of the bad argument
+     */
+    public final int getBadArg() {
+        return this.badArg;
+    }
+
+    /**
+     * Returns the expected class type of the given argument.
+     *
+     * @return The expected type
+     */
+    public Class<?> getExpectedType() {
+        return this.expected;
+    }
+}

src/main/java/me/zero/client/api/command/exception/InvalidSyntaxException.java

@@ -11,20 +11,7 @@
  */
 public final class InvalidSyntaxException extends CommandException {
 
-    /**
-     * The command that had invalid syntax provided
-     */
-    private final Command command;
-
     public InvalidSyntaxException(Command command) {
-        super("Invalid Command Syntax");
-        this.command = command;
-    }
-
-    /**
-     * @return The command that had invalid syntax provided
-     */
-    public final Command getCommand() {
-        return this.command;
+        super(command, "Invalid Command Syntax");
     }
 }