Additional Module and Command constructors

Parameters that would be passed through an annotation can now be passed through a constructor for both Modules and Commands

Author: ZeroMemes

src/main/java/me/zero/client/api/command/Command.java

@@ -17,25 +17,37 @@
 package me.zero.client.api.command;
 
 import me.zero.client.api.command.exception.CommandInitException;
+import me.zero.client.api.util.ClientUtils;
 
 /**
  * @author Brady
  * @since 5/31/2017 8:55 AM
  */
 public abstract class Command implements ICommand {
 
-    private final String[] headers;
-    private final String description;
-    private final String[] syntax;
+    private String[] headers;
+    private String description;
+    private String[] syntax;
 
     public Command() {
         if (!this.getClass().isAnnotationPresent(Cmd.class))
-            throw new RuntimeException(new CommandInitException(this, "@Cmd annotation not found!"));
+            throw new RuntimeException(new CommandInitException(this, "@Cmd annotation must be present if required parameters aren't passed through constructor"));
 
-        Cmd cmd = this.getClass().getAnnotation(Cmd.class);
-        this.headers = cmd.headers();
-        this.description = cmd.description();
-        this.syntax = cmd.syntax();
+        Cmd data = this.getClass().getAnnotation(Cmd.class);
+        setup(data.headers(), data.description(), data.syntax());
+    }
+
+    public Command(String[] headers, String description, String[] syntax) {
+        setup(headers, description, syntax);
+    }
+
+    private void setup(String[] headers, String description, String[] syntax) {
+        this.headers = headers;
+        this.description = description;
+        this.syntax = syntax;
+
+        if (ClientUtils.containsNull(headers, description, syntax))
+            throw new NullPointerException("One or more Command members were null!");
     }
 
     @Override

src/main/java/me/zero/client/api/module/Module.java

@@ -20,8 +20,10 @@
 import me.zero.client.api.event.defaults.ModuleStateEvent;
 import me.zero.client.api.exception.ActionNotSupportedException;
 import me.zero.client.api.manage.Node;
+import me.zero.client.api.module.exception.ModuleInitException;
 import me.zero.client.api.util.ClientUtils;
 import me.zero.client.api.util.keybind.Keybind;
+import org.lwjgl.input.Keyboard;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,10 +44,15 @@
  */
 public abstract class Module extends Node implements IModule {
 
+    /**
+     * Reference to self-class
+     */
+    private final Class<? extends Module> self = this.getClass();
+
     /**
      * The type/category of the module
      */
-    private final Class<?> type;
+    private Class<?> type;
 
     /**
      * The Keybind of this Module
@@ -68,19 +75,30 @@ public abstract class Module extends Node implements IModule {
     private ModuleMode mode;
 
     public Module() {
-        Class<? extends Module> c = this.getClass();
-        if (c.isAnnotationPresent(Mod.class)) {
-            Mod data = c.getAnnotation(Mod.class);
+        if (!self.isAnnotationPresent(Mod.class))
+            throw new ModuleInitException("@Mod annotation must be present if required parameters aren't passed through constructor");
 
-            this.name = data.name();
-            this.description = data.description();
+        Mod data = self.getAnnotation(Mod.class);
+        setup(data.name(), data.description(), data.bind());
+    }
 
-            this.bind = new Keybind(Keybind.Type.TOGGLE, data.bind(), type -> {
-                if (type == CLICK) Module.this.toggle();
-            });
-        }
+    public Module(String name, String description) {
+        this(name, description, Keyboard.KEY_NONE);
+    }
+
+    public Module(String name, String description, int bind) {
+        setup(name, description, bind);
+    }
+
+    private void setup(String name, String description, int bind) {
+        this.name = name;
+        this.description = description;
+
+        this.bind = new Keybind(Keybind.Type.TOGGLE, bind, type -> {
+            if (type == CLICK) Module.this.toggle();
+        });
 
-        this.type = Arrays.stream(c.getInterfaces())
+        this.type = Arrays.stream(self.getInterfaces())
                 .filter(clazz -> clazz.isAnnotationPresent(Category.class))
                 .findFirst().orElse(Category.Default.class);
 

src/main/java/me/zero/client/api/module/exception/ModuleInitException.java

@@ -0,0 +1,12 @@
+package me.zero.client.api.module.exception;
+
+/**
+ * @author Brady
+ * @since 6/29/2017 3:05 PM
+ */
+public final class ModuleInitException extends RuntimeException {
+
+    public ModuleInitException(String message) {
+        super(message);
+    }
+}