Cleanup run config logic, fix task dependencies

terrarium-earth · Nov 30, 2024 · a70510b · a70510b
1 parent 0d0a84d
commit a70510b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 27 deletions.
diff --git a/...ic/src/main/kotlin/net/msrandom/minecraftcodev/fabric/runs/FabricRunsDefaultsContainer.kt b/...ic/src/main/kotlin/net/msrandom/minecraftcodev/fabric/runs/FabricRunsDefaultsContainer.kt
@@ -58,13 +58,12 @@ open class FabricRunsDefaultsContainer(private val defaults: RunConfigurationDef
 
             val extractNativesTask =
                 sourceSet.flatMap {
-                    project.tasks.withType(ExtractNatives::class.java)
-                        .named(it.extractNativesTaskName)
+                    project.tasks.named(it.extractNativesTaskName, ExtractNatives::class.java)
                 }
 
             val downloadAssetsTask =
                 sourceSet.flatMap {
-                    project.tasks.withType(DownloadAssets::class.java).named(it.downloadAssetsTaskName)
+                    project.tasks.named(it.downloadAssetsTaskName, DownloadAssets::class.java)
                 }
 
             val nativesDirectory = extractNativesTask.flatMap(ExtractNatives::destinationDirectory)

diff --git a/...orge/src/main/kotlin/net/msrandom/minecraftcodev/forge/runs/ForgeRunsDefaultsContainer.kt b/...orge/src/main/kotlin/net/msrandom/minecraftcodev/forge/runs/ForgeRunsDefaultsContainer.kt
@@ -100,7 +100,7 @@ open class ForgeRunsDefaultsContainer(
         when (template) {
             "asset_index" -> manifest.assets
             "assets_root" -> {
-                val task = project.tasks.withType(DownloadAssets::class.java).named(downloadAssetsName)
+                val task = project.tasks.named(downloadAssetsName, DownloadAssets::class.java)
 
                 beforeRun.add(task)
 
@@ -230,7 +230,7 @@ open class ForgeRunsDefaultsContainer(
             }
 
             "natives" -> {
-                val task = project.tasks.withType(ExtractNatives::class.java).named(extractNativesName)
+                val task = project.tasks.named(extractNativesName, ExtractNatives::class.java)
 
                 beforeRun.add(task)
 
@@ -248,7 +248,6 @@ open class ForgeRunsDefaultsContainer(
         minecraftVersion: Provider<String>,
         data: ForgeRunConfigurationData,
         runType: (UserdevConfig.Runs) -> UserdevConfig.Run?,
-        addLwjglNatives: Boolean = false,
     ) {
         val configProvider = getUserdevData(data.patches)
 
@@ -359,12 +358,6 @@ open class ForgeRunsDefaultsContainer(
                 compileArguments(jvmArguments)
             },
         )
-
-        if (addLwjglNatives) {
-            val natives = project.tasks.withType(ExtractNatives::class.java).named(extractNativesTaskName)
-
-            jvmArguments.add(compileArgument("-Dorg.lwjgl.librarypath=", natives.flatMap(ExtractNatives::destinationDirectory)))
-        }
     }
 
     fun client(
@@ -378,7 +371,7 @@ open class ForgeRunsDefaultsContainer(
 
             action?.execute(data)
 
-            addData(::client.name, minecraftVersion, data, UserdevConfig.Runs::client, true)
+            addData(::client.name, minecraftVersion, data, UserdevConfig.Runs::client)
         }
 
     fun server(

diff --git a/...v-forge/src/main/kotlin/net/msrandom/minecraftcodev/forge/task/ResolvePatchedMinecraft.kt b/...v-forge/src/main/kotlin/net/msrandom/minecraftcodev/forge/task/ResolvePatchedMinecraft.kt
@@ -81,15 +81,15 @@ abstract class ResolvePatchedMinecraft : CachedMinecraftTask() {
         output.convention(
             project.layout.file(
                 version.map {
-                    temporaryDir.resolve("forge-$it.jar")
+                    temporaryDir.resolve("minecraft-$it-patched.jar")
                 },
             ),
         )
 
         clientExtra.convention(
             project.layout.file(
                 version.map {
-                    temporaryDir.resolve("forge-$it-client-extra.zip")
+                    temporaryDir.resolve("minecraft-$it-patched-client-extra.zip")
                 },
             ),
         )

diff --git a/...t-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt b/...t-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt
@@ -81,10 +81,6 @@ class MinecraftCodevRunsPlugin<T : PluginAware> : Plugin<T> {
                     )
 
                     javaExec.dependsOn(configuration.sourceSet.map(SourceSet::getClassesTaskName))
-
-                    javaExec.dependsOn(configuration.environment)
-                    javaExec.dependsOn(configuration.arguments)
-                    javaExec.dependsOn(configuration.jvmArguments)
                 }
             }
         }

diff --git a/...-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftRunConfiguration.kt b/...-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftRunConfiguration.kt
@@ -35,11 +35,11 @@ abstract class MinecraftRunConfiguration @Inject constructor(val project: Projec
         @Input
         get
 
-    abstract val arguments: SetProperty<String>
+    abstract val arguments: ListProperty<String>
         @Input
         get
 
-    abstract val jvmArguments: SetProperty<String>
+    abstract val jvmArguments: ListProperty<String>
         @Input
         get
 

diff --git a/...uns/src/main/kotlin/net/msrandom/minecraftcodev/runs/RunConfigurationDefaultsContainer.kt b/...uns/src/main/kotlin/net/msrandom/minecraftcodev/runs/RunConfigurationDefaultsContainer.kt
@@ -34,16 +34,12 @@ abstract class RunConfigurationDefaultsContainer : ExtensionAware {
 
             val extractNativesTask =
                 sourceSet.flatMap {
-                    project.tasks
-                        .withType(ExtractNatives::class.java)
-                        .named(it.extractNativesTaskName)
+                    project.tasks.named(it.extractNativesTaskName, ExtractNatives::class.java)
                 }
 
             val downloadAssetsTask =
                 sourceSet.flatMap {
-                    project.tasks
-                        .withType(DownloadAssets::class.java)
-                        .named(it.downloadAssetsTaskName)
+                    project.tasks.named(it.downloadAssetsTaskName, DownloadAssets::class.java)
                 }
 
             beforeRun.add(extractNativesTask)