Fix: Reflections (doesn't work everywhere)

please end my suffering that is of multiplatform minecraft mod

Author: emyfops

common/src/main/kotlin/com/lambda/Loader.kt

@@ -27,4 +27,4 @@ object Loader {
 
         LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
     }
-}
+}

common/src/main/kotlin/com/lambda/command/CommandManager.kt

@@ -116,7 +116,17 @@ object CommandManager : Configurable(LambdaConfig), Loadable {
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                .setUrls(ClasspathHelper.forPackage("com.lambda.command.commands"))
+                // Let's hope the maintainer of the library releases a new version soon
+                // because this is horrible, it takes multiple SECONDS to scan the classpath,
+                // and it's not even that big
+                //
+                // The culprit may be due to [ClasspathHelper.forClassLoader()] loading
+                // the classes from the main thread while we are in a different thread.
+                // If this is the case I wish the maintainer a very bad day.
+                .addUrls(ClasspathHelper.forJavaClassPath())
+                .addUrls(ClasspathHelper.forClassLoader())
+                .filterInputsBy { it.contains("lambda") }
+                .forPackage("com.lambda.module.modules")
                 .setScanners(Scanners.SubTypes)
         ).getSubTypesOf(LambdaCommand::class.java).forEach { commandClass ->
             commandClass.declaredFields.find {
@@ -131,4 +141,4 @@ object CommandManager : Configurable(LambdaConfig), Loadable {
 
         return "Registered ${commands.size} commands"
     }
-}
+}

common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt

@@ -7,6 +7,8 @@ import org.reflections.scanners.Scanners
 import org.reflections.util.ClasspathHelper
 import org.reflections.util.ConfigurationBuilder
 
+
+
 /**
  * The [ModuleRegistry] object is responsible for managing all [Module] instances in the system.
  *
@@ -21,8 +23,18 @@ object ModuleRegistry : Loadable {
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                .setUrls(ClasspathHelper.forPackage("com.lambda.module.modules"))
-                .setScanners(Scanners.SubTypes)
+                // Let's hope the maintainer of the library releases a new version soon
+                // because this is horrible, it takes multiple SECONDS to scan the classpath,
+                // and it's not even that big
+                //
+                // The culprit may be due to [ClasspathHelper.forClassLoader()] loading
+                // the classes from the main thread while we are in a different thread.
+                // If this is the case I wish the maintainer a very bad day.
+                .addUrls(ClasspathHelper.forJavaClassPath())
+                .addUrls(ClasspathHelper.forClassLoader())
+                .filterInputsBy { it.contains("lambda") }
+                .forPackage("com.lambda.module.modules")
+                .addScanners(Scanners.SubTypes)
         ).getSubTypesOf(Module::class.java).forEach { moduleClass ->
             moduleClass.declaredFields.find {
                 it.name == "INSTANCE"
@@ -36,4 +48,4 @@ object ModuleRegistry : Loadable {
 
         return "Registered ${modules.size} modules with ${modules.sumOf { it.settings.size }} settings"
     }
-}
+}

fabric/build.gradle.kts

@@ -51,7 +51,7 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
-    includeLib("org.javassist:javassist:3.27.0-GA")
+    includeLib("org.javassist:javassist:3.28.0-GA")
 
     // Add mods to the mod jar
     // includeMod(...)

forge/build.gradle.kts

@@ -1,5 +1,4 @@
 val forgeVersion = property("forge_version").toString()
-val kotlinVersion = property("kotlin_version").toString()
 val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 val architecturyVersion = property("architectury_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
@@ -58,10 +57,12 @@ fun DependencyHandlerScope.setupConfigurations() {
     includeMod.dependencies.forEach {
         implementation(it)
         forgeRuntimeLibrary(it)
+        include(it)
     }
 
     shadowInclude.dependencies.forEach {
         implementation(it)
+        forgeRuntimeLibrary(it)
         shadowCommon(it)
     }
 }
@@ -75,13 +76,12 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
-    includeLib("org.javassist:javassist:3.30.0-GA")
+    includeLib("org.javassist:javassist:3.28.0-GA")
 
     // Add mods to the mod jar
     // includeMod(...)
 
     // Add Kotlin
-    shadowInclude("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
     shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 
     // MixinExtras

forge/src/main/resources/META-INF/mods.toml

@@ -1,7 +1,7 @@
 modLoader = "javafml"
 loaderVersion = "[48,)"
 license = "GNU General Public License v3.0"
-issueTrackerURL = "https://github.com/lambda-client/lambda/issues
+issueTrackerURL = "https://github.com/lambda-client/lambda/issues"
 
 [[mods]]
     modId = "lambda"
@@ -30,5 +30,5 @@ issueTrackerURL = "https://github.com/lambda-client/lambda/issues
     modId = "architectury"
     mandatory = true
     versionRange = "[11.0.7,)"
-    ordering = "NONE"
+    ordering = "AFTER"
     side = "CLIENT"

neoforge/build.gradle.kts

@@ -31,16 +31,19 @@ val shadowInclude: Configuration by configurations.creating
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
         implementation(it)
+        forgeRuntimeLibrary(it)
         include(it)
     }
 
     includeMod.dependencies.forEach {
         modImplementation(it)
+        forgeRuntimeLibrary(it)
         include(it)
     }
 
     shadowInclude.dependencies.forEach {
         implementation(it)
+        forgeRuntimeLibrary(it)
         shadowCommon(it)
     }
 }
@@ -54,13 +57,15 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     includeLib("org.reflections:reflections:0.10.2")
-    includeLib("org.javassist:javassist:3.30.0-GA")
+    includeLib("org.javassist:javassist:3.28.0-GA")
 
     // Add mods to the mod jar
     // includeMod(...)
 
     // Add Kotlin
-    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    shadowInclude("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
+        exclude("org.jetbrains", "annotations")
+    }
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
@@ -84,6 +89,11 @@ tasks {
         }
     }
 
+    shadowJar {
+        relocate("kotlin", "com.lambda.kotlin")
+        relocate("kotlinx", "com.lambda.kotlinx")
+    }
+
     remapJar {
         atAccessWideners.add("lambda.accesswidener")
     }

neoforge/src/main/resources/META-INF/mods.toml

@@ -1,7 +1,7 @@
 modLoader = "javafml"
 loaderVersion = "[2,)"
 license = "GNU General Public License v3.0"
-issueTrackerURL = "https://github.com/lambda-client/lambda/issues
+issueTrackerURL = "https://github.com/lambda-client/lambda/issues"
 #updateJSONURL = "https://raw.githubusercontent.com/lambda-client/lambda/main/update.json"
 
 [[mods]]
@@ -34,7 +34,7 @@ issueTrackerURL = "https://github.com/lambda-client/lambda/issues
     mandatory = true
     type = "required"
     versionRange = "[11.0.7,)"
-    ordering = "NONE"
+    ordering = "AFTER"
     side = "CLIENT"
 
 [[mixins]]