Make mods initialize in the correct order, but effectively disabling …

…multithreading on mod init
KiltMC · Jan 12, 2025 · 0c81791 · 0c81791
1 parent 21b0ca5
commit 0c81791
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/kotlin/xyz/bluspring/kilt/loader/KiltLoader.kt b/src/main/kotlin/xyz/bluspring/kilt/loader/KiltLoader.kt
@@ -619,14 +619,15 @@ class KiltLoader {
 
         runBlocking {
             launch(Dispatchers.Default) {
-                modLoadingQueue.asFlow().concurrent().onEach { mod ->
+                // TODO: Need to make sure to group mods together so they load in the correct order from each other
+                modLoadingQueue.forEach { mod ->
                     try {
                         if (!mod.shouldScan) {
                             mod.scanData = ModFileScanData()
                             mods.add(mod)
                             exceptions.addAll(registerAnnotations(mod, mod.scanData))
 
-                            return@onEach
+                            return@forEach
                         }
 
                         val scanData = ModFileScanData()
@@ -658,7 +659,7 @@ class KiltLoader {
                         e.printStackTrace()
                         exceptions.add(e)
                     }
-                }.launchIn(this).join()
+                }
             }.join()
         }