chore: optimized main class grabbing

Co-authored-by: @ScaredDev

Author: JonasDevDE

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.interguess'
-version '1.0-beta'
+version '1.0.1-beta'
 
 repositories {
     mavenCentral()

src/main/java/de/interguess/javamoduleloader/module/Module.java

@@ -1,5 +1,6 @@
 package de.interguess.javamoduleloader.module;
 
+import de.interguess.javamoduleloader.exception.ModuleLoadException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,7 +45,7 @@ public interface Module<T> {
      * @param requiredSuperClass the required superclass of the main class
      * @param mainClass          the name of the main class
      * @return the main class of the module
-     * @throws ClassNotFoundException if the main class could not be found
+     * @throws ModuleLoadException if there was an error loading or verifying the main class
      */
-    @NotNull Class<T> getMainClassByName(@NotNull Class<T> requiredSuperClass, @NotNull String mainClass) throws ClassNotFoundException;
+    @NotNull Class<T> getMainClassByName(@NotNull Class<T> requiredSuperClass, @NotNull String mainClass) throws ModuleLoadException;
 }

src/main/java/de/interguess/javamoduleloader/module/SimpleModule.java

@@ -50,15 +50,17 @@ public SimpleModule(File file) throws ModuleLoadException {
     }
 
     @Override
-    public @NotNull Class<T> getMainClassByName(@NotNull Class<T> requiredSuperClass, @NotNull String mainClass) throws ClassNotFoundException {
-        Class<?> clazz = classLoader.loadClass(mainClass);
+    public @NotNull Class<T> getMainClassByName(@NotNull Class<T> requiredSuperClass, @NotNull String mainClass) throws ModuleLoadException {
+        try {
+            Class<?> clazz = classLoader.loadClass(mainClass);
+
+            if (!requiredSuperClass.isAssignableFrom(clazz)) {
+                throw new ModuleLoadException("Class " + mainClass + " does not extend or implement " + requiredSuperClass.getName());
+            }
 
-        if (clazz == null) {
-            throw new ClassNotFoundException("Class not found: " + mainClass);
-        } else if (!clazz.getSuperclass().equals(requiredSuperClass)) {
-            throw new ClassNotFoundException("Class " + mainClass + " does not implement " + requiredSuperClass.getName());
-        } else {
             return (Class<T>) clazz;
+        } catch (ClassNotFoundException e) {
+            throw new ModuleLoadException("Class not found: " + mainClass, e);
         }
     }
 }