From fbcc9fe31c48172f309f242766d795ee3092d1cf Mon Sep 17 00:00:00 2001
From: Francisco Solis <imfran@duck.com>
Date: Tue, 28 Mar 2023 13:20:49 -0300
Subject: [PATCH] WIP

---
 .github/workflows/gradle-test.yml             |  4 ++-
 .idea/compiler.xml                            | 18 ++++++------
 .idea/jarRepositories.xml                     | 10 +++++++
 .idea/kotlinc.xml                             |  2 +-
 .idea/misc.xml                                | 15 ++++++++++
 build.gradle.kts                              | 18 +++++++-----
 .../global/module/ModuleHelper.kt             | 29 ++++++++++---------
 .../global/module/ModuleManager.kt            | 18 ++++++++++--
 .../global/module/ModuleHelperTest.kt         |  4 +--
 9 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/gradle-test.yml b/.github/workflows/gradle-test.yml
index aec15815..4218dbeb 100644
--- a/.github/workflows/gradle-test.yml
+++ b/.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:
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index dcfc3147..1ae781a2 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -5,14 +5,14 @@
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-api/3.0.1/4c71619b0dce399c1f64a1974da19fafcefa3e50/velocity-api-3.0.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-api/3.1.1/82f54eae5d50f9390947c2623c6d6fe84e6fb0/velocity-api-3.1.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.moandjiezana.toml/toml4j/0.7.2/a03337911d0bd2c40932aca3946edb30d0e7d0c/toml4j-0.7.2.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-legacy/4.8.1/cf26c70c198632f962f2b5f1027eec55e03d14bb/adventure-text-serializer-legacy-4.8.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-plain/4.8.1/d45e1183eff735e16a227edba829fdb55baf8151/adventure-text-serializer-plain-4.8.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-api/4.8.1/76062b4b2a836bebae09003599b4c032702731f0/adventure-api-4.8.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-key/4.8.1/229c894238d3969b3ae47677557e6a8bf8f4da83/adventure-key-4.8.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-gson/4.8.1/8485dfb54328c94dabe8421c3c65648aa255191d/adventure-text-serializer-gson-4.8.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-gson/3.7.2/431733e80d7dfc62b37962c2723bba5c996548f/configurate-gson-3.7.2.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-legacy/4.9.3/9e7811601e508e0af6d53e35eab3588ee607bff6/adventure-text-serializer-legacy-4.9.3.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-plain/4.9.3/61d39db7e84c11d91be551cb9bc50c1aa7e64983/adventure-text-serializer-plain-4.9.3.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-api/4.9.3/b0054b3a4d144f09962fe72abc746191e7f931a2/adventure-api-4.9.3.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-key/4.9.3/1cf3ecba345cf8b810a00b941c8f14ecc6e5df16/adventure-key-4.9.3.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/adventure-text-serializer-gson/4.9.3/141df0329e00b791bcc8b2921cd715ac7d506bbe/adventure-text-serializer-gson-4.9.3.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.8/431fc3cbc0ff81abdbfde070062741089c3ba874/gson-2.8.8.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-hocon/3.7.2/a5e49f57ae8f5e61dbae48a158a28343e7d6f707/configurate-hocon-3.7.2.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spongepowered/configurate-yaml/3.7.2/a0c3eec370aa9bdec3f450f842edcb03f6d42be2/configurate-yaml-3.7.2.jar" />
@@ -21,16 +21,16 @@
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/30.1-jre/d0c3ce2311c9e36e73228da25a6e99b2ab826f/guava-30.1-jre.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.30/b5a4b6d16ab13e34a88fae84c35cd5d68cac922c/slf4j-api-1.7.30.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.6.1/52ca62b41f68584c4d2de39d6176758e9383d0b6/checker-qual-3.6.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-brigadier/1.0.0-SNAPSHOT/c85456381b9942f529995996793190c091ef57a9/velocity-brigadier-1.0.0-SNAPSHOT.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.velocitypowered/velocity-brigadier/1.0.0-SNAPSHOT/719dd1bda540a9be7f70f23c68fbe1a0e2fc69ca/velocity-brigadier-1.0.0-SNAPSHOT.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.3.4/dac170e4594de319655ffb62f41cbd6dbb5e601e/error_prone_annotations-2.3.4.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/examination-string/1.1.0/9a6f6f9e10ca3ff3ce46db59845aae63f9d16fd8/examination-string-1.1.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/examination-api/1.1.0/d7b5e3f8edda2b64c37bc0059e265cc1f6e08322/examination-api-1.1.0.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.4.0/a8b341fe81552834edc231193afd6f56a96f0eff/config-1.4.0.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.26/a78a8747147d2c5807683e76ec2b633e95c14fe9/snakeyaml-1.26.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/examination-string/1.3.0/6f34afef5c54ccce4996bc321abf77518b55b4bd/examination-string-1.3.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.kyori/examination-api/1.3.0/8a2d185275307f1e2ef2adf7152b9a0d1d44c30b/examination-api-1.3.0.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
         </processorPath>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bfad7a59..64473fd3 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -56,5 +56,15 @@
       <option name="name" value="maven8" />
       <option name="url" value="https://jitpack.io/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://s01.oss.sonatype.org/content/groups/public/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index b1077fbd..0fc31131 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.10" />
+    <option name="version" value="1.8.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1abba6f0..42271fd3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="net.md_5.bungee.event.EventHandler" />
+      <item index="1" class="java.lang.String" itemvalue="com.velocitypowered.api.event.Subscribe" />
+      <item index="2" class="java.lang.String" itemvalue="com.velocitypowered.api.plugin.Plugin" />
+      <item index="3" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
+    </list>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$/../SimpleCore-FilesModule" />
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="zulu-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ed21a396..0528d9a7 100644
--- a/build.gradle.kts
+++ b/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"])
+            }
         }
     }
 }
diff --git a/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelper.kt b/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelper.kt
index 25dcec18..99bc047b 100644
--- a/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelper.kt
+++ b/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
     }
 
     /**
diff --git a/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleManager.kt b/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleManager.kt
index 5db8736a..08b21c7c 100644
--- a/src/main/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleManager.kt
+++ b/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!")
diff --git a/src/test/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelperTest.kt b/src/test/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelperTest.kt
index ef15f9ff..2ffd7151 100644
--- a/src/test/kotlin/xyz/theprogramsrc/simplecoreapi/global/module/ModuleHelperTest.kt
+++ b/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",
         )