WIP

.github/workflows/gradle-test.yml

@@ -1,6 +1,8 @@
 name: "Test"
 # Only execute this workflow when a PR is opened or when something is pushed to the master branch
-on: [pull_request]
+on:
+  pull_request:
+    branches: [ master ]
 jobs:
   testBuilds:
     strategy:

build.gradle.kts

@@ -15,7 +15,7 @@ val env = project.rootProject.file(".env").let { file ->
     if(file.exists()) file.readLines().filter { it.isNotBlank() && !it.startsWith("#") && it.split("=").size == 2 }.associate { it.split("=")[0] to it.split("=")[1] } else emptyMap()
 }.toMutableMap().apply { putAll(System.getenv()) }
 
-val projectVersion = env["VERSION"] ?: "0.6.2-SNAPSHOT"
+val projectVersion = env["VERSION"] ?: "0.6.3.11-SNAPSHOT"
 
 group = "xyz.theprogramsrc"
 version = projectVersion.replaceFirst("v", "").replace("/", "")
@@ -183,14 +183,16 @@ publishing {
     }
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+if(env["ENV"] == "prod") {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+                snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
 
-            username.set(env["SONATYPE_USERNAME"])
-            password.set(env["SONATYPE_PASSWORD"])
+                username.set(env["SONATYPE_USERNAME"])
+                password.set(env["SONATYPE_PASSWORD"])
+            }
         }
     }
 }

src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelper.kt

@@ -46,23 +46,26 @@ object ModuleHelper {
      * @return List of the sorted modules to load
      */
     fun sortModuleDependencies(dependencies: Map<String, Collection<String>>): List<String> {
-        val sorted = mutableListOf<String>()
-        // First add the modules that don't have dependencies
-        sorted.addAll(dependencies.filter { it.value.isEmpty() }.keys)
+        val visited = mutableSetOf<String>()
+        val result = mutableListOf<String>()
 
-        // Now add the modules that have dependencies
-        dependencies.filter { !sorted.contains(it.key) }.forEach { (moduleName, moduleDepends) ->
-            moduleDepends.forEach { dependency ->
-                if(sorted.contains(dependency) && sorted.indexOf(moduleName) > sorted.indexOf(dependency)) {
-                    sorted.remove(dependency)
-                    sorted.add(sorted.indexOf(moduleName), dependency)
-                }else if(!sorted.contains(dependency)){
-                    sorted.add(dependency)
+        fun dfs(node: String) {
+            visited.add(node)
+            for (neighbor in dependencies[node] ?: emptySet()) {
+                if (!visited.contains(neighbor)) {
+                    dfs(neighbor)
                 }
             }
-            if(!sorted.contains(moduleName)) sorted.add(moduleName)
+            result.add(node)
         }
-        return sorted.filter { it.isNotBlank() && it.isNotEmpty() }
+
+        for (node in dependencies.keys) {
+            if (!visited.contains(node)) {
+                dfs(node)
+            }
+        }
+
+        return result
     }
 
     /**

src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleManager.kt

@@ -10,6 +10,7 @@ import java.io.FileInputStream
 import java.io.IOException
 import java.net.URLClassLoader
 import java.util.*
+import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.jar.JarInputStream
 
@@ -99,7 +100,7 @@ class ModuleManager(private val logger: ILogger) {
 
         // Now we load and save all the module descriptions from the available modules
         val updatedModules = mutableListOf<String>()
-        files.map { file ->
+        files.mapNotNull { file ->
             try {
                 // Validate that this file is a module
                 val props = loadDescription(file) ?: throw InvalidModuleDescriptionException("Failed to load module description for " + file!!.name)
@@ -131,7 +132,7 @@ class ModuleManager(private val logger: ILogger) {
                 e.printStackTrace()
                 null
             }
-        }.filterNotNull().filter { !(it.second.disableStandalone && StandaloneLoader.isRunning) }.forEach { // Filter not null descriptions and filter to only run available modules
+        }.filter { !(it.second.disableStandalone && StandaloneLoader.isRunning) }.forEach { // Filter not null descriptions and filter to only run available modules
             val file = it.first
             val description = it.second
 
@@ -255,6 +256,19 @@ class ModuleManager(private val logger: ILogger) {
     private fun loadIntoClasspath(loader: URLClassLoader, file: File, description: ModuleDescription) {
         try {
             JarInputStream(FileInputStream(file)).use {
+                logger.info("Loading classes for module ${description.name} v${description.version}")
+                var entry: JarEntry? = it.nextJarEntry
+                while (entry != null) {
+                    if (!entry.isDirectory && !entry.name.startsWith("META-INF") && entry.name.endsWith(".class")) {
+                        val name = entry.name.replace('/', '.').replace('\\', '.').substring(0, entry.name.length - 6)
+                        if (name != description.mainClass) {
+                            loader.loadClass(name)
+                            logger.info("Loaded class $name")
+                        }
+                    }
+                    entry = it.nextJarEntry
+                }
+
                 val mainClass = loader.loadClass(description.mainClass)
                 if(!Module::class.java.isAssignableFrom(mainClass)){
                     throw InvalidModuleException("The class ${description.mainClass} must be extended to the Module class!")

src/test/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelperTest.kt

@@ -26,13 +26,11 @@ internal class ModuleHelperTest {
         )
 
         val expectedOrder = listOf(
-            // First modules without dependencies (in order of appearance)
             "filesmodule",
-            "tasksmodule",
-            // Then modules with dependencies (in order so other modules can depend on them)
             "configmodule",
             "loggingmodule",
             "translationsmodule",
+            "tasksmodule",
             "uismodule",
         )