Merge branch 'main' into develop

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt

@@ -646,7 +646,6 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
 
         // run patcher after evaluate
         (mcPatcher as AbstractMinecraftTransformer).afterEvaluate()
-
     }
 
     fun getMcDevFile(): Path {

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/reindev/ReIndevProvider.kt

@@ -19,21 +19,10 @@ class ReIndevProvider(project: Project, sourceSet: SourceSet) : MinecraftProvide
     init {
         // Required for the following [2.9.4+legacyfabric.8,) dependency
         project.unimined.legacyFabricMaven()
-        minecraftLibraries.resolutionStrategy.eachDependency {
-            val group = it.requested.group
-            val name = it.requested.name
-            val module = "$group:$name"
-            if (module == "org.ow2.asm:asm-all") {
-                // Upgrades the class compatibility level to Java 8 to match ReIndev
-                it.useVersion("5.2")
-            } else if (group.startsWith("org.lwjgl")) {
-                // Fixes several bugs, including failure to launch on Linux
-                it.useVersion("[2.9.4+legacyfabric.8,)")
-            } else if (module == "net.java.jinput:jinput") {
-                // Upgrading the JInput version to the latest fixes minor bugs like incompatible version notices
-                it.useVersion("[${it.requested.version},2.0.9]")
-            }
-        }
+
+        replaceLibraryVersion("org.ow2.asm", "asm-all", version = "5.2")
+        replaceLibraryVersion("org.lwjgl", version = "2.9.4+legacyfabric.8")
+        replaceLibraryVersion("net.java.jinput", "jinput", version = "2.0.9")
 
         mappings.devNamespace = Namespace("official")
     }

src/runs/kotlin/xyz/wagyourtail/unimined/internal/runs/RunsProvider.kt

@@ -1,8 +1,10 @@
 package xyz.wagyourtail.unimined.internal.runs
 
+import org.gradle.TaskExecutionRequest
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.TaskProvider
+import org.gradle.internal.DefaultTaskExecutionRequest
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
 import xyz.wagyourtail.unimined.api.runs.RunConfig
 import xyz.wagyourtail.unimined.api.runs.RunsConfig
@@ -123,13 +125,21 @@ class RunsProvider(val project: Project, val minecraft: MinecraftConfig): RunsCo
             task
         }
         //TODO: vscode/eclipse support
+        scheduleTaskAfterIDEASync(genIntellijRunsTask.name)
+    }
 
-        if (System.getProperty("idea.sync.active", "false").lowercase() == "true") {
-            project.afterEvaluate {
-                for (value in runTasks.values) {
-                    value.get().createIdeaRunConfig()
-                }
-            }
-        }
+    private fun scheduleTaskAfterIDEASync(taskName: String) {
+        if (isIdeaSync()) modifyGradleStartParameters(taskName)
+    }
+
+    private fun modifyGradleStartParameters(taskName: String) {
+        val startParameter = project.gradle.startParameter
+        val taskRequests: MutableList<TaskExecutionRequest> = ArrayList(startParameter.taskRequests)
+        taskRequests.add(DefaultTaskExecutionRequest(listOf(taskName)))
+        startParameter.setTaskRequests(taskRequests)
+    }
+
+    private fun isIdeaSync(): Boolean {
+        return System.getProperty("idea.sync.active", "false").toBoolean()
     }
 }