Fixed the class stuff

Author: RealMangorage

src/main/java/org/mangorage/bootstrap/Bootstrap.java

@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.List;
 
 import static org.mangorage.bootstrap.internal.Util.*;
 
@@ -26,7 +27,14 @@ public static void main(String[] args) throws IOException {
         final var cl = cfg.constructClassloaders();
         Thread.currentThread().setContextClassLoader(cl);
 
-        final var moduleLayer = ModuleLayer.boot().defineModulesWithOneLoader(moduleCfg, cl);
-        callMain(cfg.getMainClass(), args, cl, moduleLayer);
+        final var moduleLayer = ModuleLayer.boot().defineModules(moduleCfg, s -> {
+            if (s.startsWith("org.mangorage") & !s.contains("scanner")) {
+                return cl;
+            } else {
+                return cl.getParent();
+            }
+        });
+
+        callMain(cfg.getMainClass(), args, cl);
     }
 }

src/main/java/org/mangorage/bootstrap/internal/Config.java

@@ -94,7 +94,7 @@ public ClassLoader constructClassloaders() {
         }
 
         String[] folderNames = classloaderPath.split(":");
-        ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader().getParent();
+        ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader();
         URLClassLoader currentClassLoader = null;
 
         for (String folderName : folderNames) {
@@ -146,7 +146,7 @@ public Configuration constructModuleConfiguration() {
                     .configuration()
                     .resolveAndBind(
                             moduleFinder,
-                            ModuleFinder.of(),
+                            ModuleFinder.ofSystem(),
                             rootPaths.length != 0 ? Util.getModuleNames(rootPaths[0]) : Set.of()
                     );
         } else {

src/main/java/org/mangorage/bootstrap/internal/Util.java

@@ -86,9 +86,9 @@ public static String getModuleName(File jarFile) {
         return null; // Jar was either not modular or you're just unlucky
     }
 
-    public static void callMain(String className, String[] args, ClassLoader classLoader, ModuleLayer moduleLayer) {
+    public static void callMain(String className, String[] args, ClassLoader classLoader) {
         try {
-            Class<?> clazz = Class.forName(moduleLayer.findModule("org.mangorage.mangobotcore").get(), className);
+            Class<?> clazz = Class.forName(className, false, classLoader);
             Method mainMethod = clazz.getMethod("main", String[].class);
 
             // Make sure it's static and public
@@ -98,7 +98,7 @@ public static void callMain(String className, String[] args, ClassLoader classLo
 
             // Invoke the main method with a godawful cast
             mainMethod.invoke(null, (Object) args);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
             throw new RuntimeException("Couldn't reflectively call main because something exploded.", e);
         }