Replace AT task dependency workaround

Tuinity · Oct 1, 2024 · 803b737 · 803b737
1 parent 25298dc
commit 803b737
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ def getGitCommit = { ->
     return stdout.toString().trim()
 }
 
-Aw2AtTask.configureDefault(
+def aw2at = Aw2AtTask.configureDefault(
     getProject(),
     layout.projectDirectory.file("src/main/resources/moonrise.accesswidener").getAsFile(),
     sourceSets.main
@@ -28,10 +28,7 @@ Aw2AtTask.configureDefault(
 neoForge {
     neoFormVersion = "1.21.1-20240808.144430"
     validateAccessTransformers = true
-}
-
-tasks.named("createMinecraftArtifacts") {
-    dependsOn("copyAt")
+    accessTransformers.files.setFrom(aw2at.flatMap { t -> t.getOutputFile() })
 }
 
 dependencies {

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-Aw2AtTask.configureDefault(
+def aw2at = Aw2AtTask.configureDefault(
     getProject(),
     rootProject.layout.projectDirectory.file("src/main/resources/moonrise.accesswidener").getAsFile(),
     sourceSets.main
@@ -23,6 +23,7 @@ Aw2AtTask.configureDefault(
 neoForge {
     version = rootProject.neoforge_version
     validateAccessTransformers = true
+    accessTransformers.files.setFrom(aw2at.flatMap { t -> t.getOutputFile() })
     runs {
         client {
             client()
@@ -35,10 +36,6 @@ neoForge {
     }
 }
 
-tasks.named("createMinecraftArtifacts") {
-    dependsOn("copyAt")
-}
-
 configurations.implementation {
     extendsFrom(configurations.shadow)
 }