feat: expose configuration to fail on invalid ATs, closes #344

Author: Toffikk

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/PaperweightCoreExtension.kt

@@ -79,4 +79,6 @@ abstract class PaperweightCoreExtension @Inject constructor(objects: ObjectFacto
     fun updatingMinecraft(action: Action<UpdatingMinecraftExtension>) {
         action.execute(updatingMinecraft)
     }
+
+    val validateAts: Property<Boolean> = objects.property<Boolean>().convention(false)
 }

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/CoreTasks.kt

@@ -101,6 +101,7 @@ class CoreTasks(
         oldPaperCommit.convention(project.coreExt.updatingMinecraft.oldPaperCommit)
         inputFile.set(macheDecompileJar.flatMap { it.outputJar })
         predicate.set { Files.isRegularFile(it) && it.toString().endsWith(".java") }
+        validateAts.set(project.coreExt.validateAts)
     }
 
     val setupMacheSources by tasks.registering(SetupMinecraftSources::class) {

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/MinecraftPatchingTasks.kt

@@ -30,6 +30,7 @@ import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatchesFuzzy
 import io.papermc.paperweight.core.tasks.patching.FixupFilePatches
 import io.papermc.paperweight.core.tasks.patching.RebuildFilePatches
+import io.papermc.paperweight.core.util.coreExt
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*
@@ -171,6 +172,7 @@ class MinecraftPatchingTasks(
             atFile.set(mergeCollectedAts.flatMap { it.outputFile })
             ats.jst.from(project.configurations.named(JST_CONFIG))
             ats.jstClasspath.from(project.configurations.named(MACHE_MINECRAFT_LIBRARIES_CONFIG))
+            validateAts.set(project.coreExt.validateAts)
         }
 
         applySourcePatches.configure {

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupForkMinecraftSources.kt

@@ -59,6 +59,9 @@ abstract class SetupForkMinecraftSources : JavaLauncherTask() {
     @get:Optional
     abstract val atFile: RegularFileProperty
 
+    @get:Input
+    abstract val validateAts: Property<Boolean>
+
     @get:Optional
     @get:InputDirectory
     abstract val libraryImports: DirectoryProperty
@@ -86,6 +89,7 @@ abstract class SetupForkMinecraftSources : JavaLauncherTask() {
                 outputDir.path,
                 atFile.path,
                 atWorkingDir.path,
+                validate = validateAts.get(),
             )
             commitAndTag(git, "ATs", "${identifier.get()} ATs")
         }

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupMinecraftSources.kt

@@ -69,6 +69,9 @@ abstract class SetupMinecraftSources : JavaLauncherZippedTask() {
     @get:Input
     abstract val oldPaperCommit: Property<String>
 
+    @get:Input
+    abstract val validateAts: Property<Boolean>
+
     @get:Nested
     val ats: ApplySourceATs = objects.newInstance()
 
@@ -182,6 +185,7 @@ abstract class SetupMinecraftSources : JavaLauncherZippedTask() {
                 outputPath,
                 atFile.path,
                 atWorkingDir.path,
+                validate = validateAts.get(),
             )
             if (!oldPaperCommit.isPresent) {
                 commitAndTag(git, "ATs", "paper ATs")

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/RebuildFilePatches.kt

@@ -258,6 +258,7 @@ abstract class RebuildFilePatches : JavaLauncherTask() {
             at,
             temporaryDir.toPath().resolve("jst_work"),
             singleFile = true,
+            validate = false,
         )
         println("NEW: " + decomp.readText())
     }

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/util/ApplySourceATs.kt

@@ -53,6 +53,7 @@ abstract class ApplySourceATs {
         atFile: Path,
         workDir: Path,
         singleFile: Boolean = false,
+        validate: Boolean,
     ) {
         workDir.deleteRecursive()
         workDir.createDirectories()
@@ -61,7 +62,7 @@ abstract class ApplySourceATs {
             workDir,
             workDir.resolve("log.txt"),
             jvmArgs = listOf("-Xmx${memory.get()}"),
-            args = jstArgs(input, output, atFile, singleFile).toTypedArray()
+            args = jstArgs(input, output, atFile, singleFile, validate).toTypedArray()
         )
     }
 
@@ -70,16 +71,18 @@ abstract class ApplySourceATs {
         outputDir: Path,
         atFile: Path,
         singleFile: Boolean = false,
+        validate: Boolean,
     ): List<String> {
         val format = if (singleFile) "FILE" else "FOLDER"
+        val validation = if (validate) "ERROR" else "LOG"
         return listOf(
             "--in-format=$format",
             "--out-format=$format",
             "--enable-accesstransformers",
             "--access-transformer=$atFile",
             "--access-transformer-inherit-method=true",
             "--hidden-prefix=.git",
-            // "--access-transformer-validation=ERROR",
+            "--access-transformer-validation=$validation",
             *jstClasspath.files.map { "--classpath=${it.absolutePath}" }.toTypedArray(),
             inputDir.absolutePathString(),
             outputDir.absolutePathString(),