Move Client API initialization into ClientAPI class

Author: ZeroMemes

src/main/java/clientapi/ClientAPI.java

@@ -16,10 +16,20 @@
 
 package clientapi;
 
+import clientapi.config.ClientConfiguration;
+import clientapi.config.JsonConfiguration;
 import clientapi.event.ClientAPIEventManager;
+import clientapi.event.handle.KeybindEventHandler;
+import clientapi.load.ClientInitException;
+import clientapi.util.render.gl.GLUtils;
+import net.minecraft.client.Minecraft;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
 /**
  * Contains some constants that are used throughout the API.
  *
@@ -42,4 +52,55 @@ private ClientAPI() {}
      * Instance of the API logger.
      */
     public static final Logger LOGGER = LogManager.getLogger("ClientAPI");
+
+    /**
+     * Called after the game has initialized. This method is responsible
+     * for initializing any core Client API classes and the discovered
+     * Client API mod.
+     *
+     * @see Minecraft#init()
+     */
+    public static void start() {
+        InputStream stream = ClientAPI.class.getResourceAsStream("/client.json");
+        if (stream == null) {
+            throw new ClientInitException("Unable to locate Client Configuration");
+        }
+
+        // Construct a ClientConfiguration object from the client json using GSON
+        ClientConfiguration clientConfig = JsonConfiguration.loadConfiguration(stream, ClientConfiguration.class);
+        if (clientConfig == null) {
+            throw new ClientInitException("Unable to create Client Configuration from client.json");
+        }
+
+        // Attempt to instantiate the main class from the client configuration
+        Client client;
+        try {
+            Class<?> clientClass = Class.forName(clientConfig.getMainClass());
+            if (clientClass == null) {
+                throw new ClientInitException("Unable to find the main class (%s)", clientConfig.getMainClass());
+            }
+
+            if (!clientClass.getSuperclass().equals(Client.class)) {
+                throw new ClientInitException("Main class does not inheit clientapi.Client");
+            }
+
+            Constructor<?> constructor = clientClass.getConstructor(ClientConfiguration.class);
+
+            client = (Client) constructor.newInstance(clientConfig);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new ClientInitException("Unable to instantiate main client class", e);
+        } catch (ClassNotFoundException e) {
+            throw new ClientInitException("Unable to find client class");
+        } catch (NoSuchMethodException e) {
+            throw new ClientInitException("Unable to find a suitable main class constructor");
+        }
+
+        // Init GLUtils
+        GLUtils.init();
+
+        // Init client
+        client.init();
+
+        ClientAPI.EVENT_BUS.subscribe(KeybindEventHandler.INSTANCE);
+    }
 }

…lientapi/event/handle/ClientHandler.java …pi/event/handle/KeybindEventHandler.javasrc/main/java/clientapi/event/handle/ClientHandler.java renamed to src/main/java/clientapi/event/handle/KeybindEventHandler.java src/main/java/clientapi/event/handle/ClientHandler.java renamed to src/main/java/clientapi/event/handle/KeybindEventHandler.java

@@ -35,7 +35,7 @@
  * @author Brady
  * @since 2/9/2017
  */
-public enum ClientHandler implements Listenable, MinecraftAccessible {
+public enum KeybindEventHandler implements Listenable, MinecraftAccessible {
 
     INSTANCE;
 

src/main/java/clientapi/load/ClientInitException.java

@@ -32,4 +32,8 @@ public ClientInitException(String message) {
     public ClientInitException(String message, Object... args) {
         this(String.format(message, args));
     }
+
+    public ClientInitException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }

src/main/java/clientapi/load/mixin/MixinMinecraft.java

@@ -16,18 +16,12 @@
 
 package clientapi.load.mixin;
 
-import clientapi.Client;
 import clientapi.ClientAPI;
-import clientapi.config.ClientConfiguration;
-import clientapi.config.JsonConfiguration;
 import clientapi.event.defaults.game.core.*;
 import clientapi.event.defaults.game.render.GuiDisplayEvent;
 import clientapi.event.defaults.game.world.WorldEvent;
-import clientapi.event.handle.ClientHandler;
-import clientapi.load.ClientInitException;
 import clientapi.load.mixin.extension.IMinecraft;
 import clientapi.util.io.MouseKeyTracker;
-import clientapi.util.render.gl.GLUtils;
 import me.zero.alpine.event.EventState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
@@ -45,9 +39,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import javax.annotation.Nullable;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 
 import static clientapi.event.defaults.game.core.ClickEvent.MouseButton.*;
 
@@ -152,42 +143,7 @@ private void onMouseEvent(CallbackInfo info) {
             at = @At("RETURN")
     )
     private void init(CallbackInfo ci) {
-        InputStream stream = this.getClass().getResourceAsStream("/client.json");
-
-        if (stream == null)
-            throw new ClientInitException("Unable to locate Client Configuration");
-
-        // Construct a ClientConfiguration object from the client json using GSON
-        ClientConfiguration clientConfig = JsonConfiguration.loadConfiguration(stream, ClientConfiguration.class);
-
-        if (clientConfig == null)
-            throw new ClientInitException("Unable to create Client Configuration from client.json");
-
-        // Attempt to instantiate the specified class from the client configuration
-        Client client;
-        try {
-            Class<?> clientClass = Class.forName(clientConfig.getMainClass());
-            Constructor<?> constructor;
-            if (clientClass != null && clientClass.getSuperclass().equals(Client.class) && (constructor = clientClass.getConstructor(ClientConfiguration.class)) != null) {
-                client = (Client) constructor.newInstance(clientConfig);
-            } else {
-                throw new ClientInitException("Client class is null or the superclass is not Client type");
-            }
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new ClientInitException("Unable to instantiate main client class");
-        } catch (ClassNotFoundException e) {
-            throw new ClientInitException("Unable to find client class");
-        } catch (NoSuchMethodException e) {
-            throw new ClientInitException("Unable to find constructor with valid parameters");
-        }
-
-        // Init GLUtils
-        GLUtils.init();
-
-        // Init client
-        client.init();
-
-        ClientAPI.EVENT_BUS.subscribe(ClientHandler.INSTANCE);
+        ClientAPI.start();
     }
 
     @ModifyVariable(