Use JST for ATs

Author: jpenilla

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ lorenz = "0.5.8"
 hypo = "1.2.4"
 serialize = "1.5.1"
 feather = "1.1.0"
-restamp = "1.2.0"
+jst = "1.0.68-inheritance-SNAPSHOT"
 
 [libraries]
 asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
@@ -40,7 +40,8 @@ diffpatch = "codechicken:DiffPatch:1.5.0.30"
 serialize-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialize" }
 serialize-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialize" }
 
-restamp = {module = "io.papermc.restamp:restamp", version.ref = "restamp" }
+jst = { module = "io.papermc.jst:jst-cli-bundle", version.ref = "jst" }
+# jst = { module = "net.neoforged.jst:jst-cli-bundle", version.ref = "jst" }
 
 # test
 mockk = "io.mockk:mockk:1.13.8"

paperweight-core/build.gradle.kts

@@ -3,15 +3,9 @@ plugins {
     `config-publish`
 }
 
-val restamp: Configuration by configurations.creating
-configurations.implementation {
-    extendsFrom(restamp)
-}
-
 dependencies {
     shade(projects.paperweightLib)
     shade(project(projects.paperweightLib.path, "sharedRuntime"))
-    restamp(project(projects.paperweightLib.path, "restampRuntime"))
 
     implementation(libs.bundles.kotson)
     implementation(libs.coroutines)
@@ -27,9 +21,6 @@ gradlePlugin {
 val finalJar = tasks.register("finalJar", Zip::class) {
     archiveExtension.set("jar")
     from(zipTree(tasks.shadowJar.flatMap { it.archiveFile }))
-    from(zipTree(restamp.elements.map { it.single() })) {
-        exclude("META-INF/MANIFEST.MF")
-    }
 }
 tasks.assemble {
     dependsOn(finalJar)

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

@@ -23,7 +23,6 @@
 package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.core.ext
-import io.papermc.paperweight.restamp.RestampVersion
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.tasks.mache.DecompileJar
 import io.papermc.paperweight.tasks.mache.RemapJar
@@ -74,9 +73,10 @@ open class SoftSpoonTasks(
     val macheMinecraftLibraries by project.configurations.registering
     val mappedJarOutgoing = project.configurations.consumable("mappedJarOutgoing") // For source generator modules
     val macheMinecraft by project.configurations.registering
-    val restampConfig = project.configurations.register(RESTAMP_CONFIG) {
+    val jstConfig = project.configurations.register(JST_CONFIG) {
         defaultDependencies {
-            add(project.dependencies.create("io.papermc.restamp:restamp:${RestampVersion.VERSION}"))
+            // add(project.dependencies.create("net.neoforged.jst:jst-cli-bundle:${JSTVersion.VERSION}"))
+            add(project.dependencies.create("io.papermc.jst:jst-cli-bundle:${JSTVersion.VERSION}"))
         }
     }
 
@@ -131,7 +131,6 @@ open class SoftSpoonTasks(
 
         mache.from(project.configurations.named(MACHE_CONFIG))
         macheOld.set(project.ext.macheOldPath)
-        minecraftClasspath.from(macheMinecraftLibraries)
         inputFile.set(macheDecompileJar.flatMap { it.outputJar })
         predicate.set { Files.isRegularFile(it) && it.toString().endsWith(".java") }
     }
@@ -140,9 +139,11 @@ open class SoftSpoonTasks(
         description = "Setup vanilla source dir (applying mache patches and paper ATs)."
         configureSetupMacheSources()
         libraryImports.set(importLibraryFiles.flatMap { it.outputDir })
-        ats.set(mergeCollectedAts.flatMap { it.outputFile })
         outputDir.set(layout.cache.resolve(BASE_PROJECT).resolve("sources"))
-        restamp.from(restampConfig)
+
+        atFile.set(mergeCollectedAts.flatMap { it.outputFile })
+        ats.jstClasspath.from(macheMinecraftLibraries)
+        ats.jst.from(jstConfig)
     }
 
     val setupMacheSourcesForDevBundle by tasks.registering(SetupVanilla::class) {
@@ -216,16 +217,15 @@ open class SoftSpoonTasks(
         group = "softspoon"
         description = "Rebuilds patches to the vanilla sources"
 
-        minecraftClasspath.from(macheMinecraft)
-        atFile.set(project.ext.paper.additionalAts.fileExists(project))
-        atFileOut.set(project.ext.paper.additionalAts.fileExists(project))
-
         base.set(layout.cache.resolve(BASE_PROJECT).resolve("sources"))
         input.set(layout.projectDirectory.dir("src/vanilla/java"))
         patches.set(project.ext.paper.sourcePatchDir)
         gitFilePatches.set(project.ext.gitFilePatches)
 
-        restamp.from(restampConfig)
+        ats.jstClasspath.from(macheMinecraft)
+        ats.jst.from(jstConfig)
+        atFile.set(project.ext.paper.additionalAts.fileExists(project))
+        atFileOut.set(project.ext.paper.additionalAts.fileExists(project))
     }
 
     val rebuildResourcePatches by tasks.registering(RebuildFilePatches::class) {

paperweight-lib/build.gradle.kts

@@ -15,22 +15,15 @@ val sharedJar by tasks.creating(Jar::class) {
 tasks.jar {
     from(shared.output)
 }
-val restamp = sourceSets.create("restamp") {
+sourceSets.main {
     blossom {
         kotlinSources {
-            properties.put("restamp_version", libs.versions.restamp)
+            properties.put("jst_version", libs.versions.jst)
         }
     }
 }
-val restampJar by tasks.creating(Jar::class) {
-    archiveClassifier = "restamp"
-    from(restamp.output)
-}
 
 configurations {
-    consumable("restampRuntime") {
-        outgoing.artifact(restampJar)
-    }
     consumable("sharedRuntime") {
         outgoing.artifact(sharedJar)
     }
@@ -42,14 +35,6 @@ dependencies {
     compileOnly(shared.output)
     testImplementation(shared.output)
 
-    restamp.implementationConfigurationName(libs.restamp)
-    restamp.implementationConfigurationName(shared.output)
-    restamp.compileOnlyConfigurationName(gradleApi())
-    restamp.compileOnlyConfigurationName(gradleKotlinDsl())
-    compileOnly(restamp.output)
-    testImplementation(restamp.output)
-    testImplementation(libs.restamp)
-
     implementation(libs.httpclient)
     implementation(libs.bundles.kotson)
     implementation(libs.coroutines)

…aperweight/restamp/RestampVersion.kt.peb …permc/paperweight/util/JSTVersion.kt.pebpaperweight-lib/src/restamp/kotlin-templates/io/papermc/paperweight/restamp/RestampVersion.kt.peb renamed to paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/JSTVersion.kt.peb paperweight-lib/src/restamp/kotlin-templates/io/papermc/paperweight/restamp/RestampVersion.kt.peb renamed to paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/JSTVersion.kt.peb

@@ -20,8 +20,8 @@
  * USA
  */
 
-package io.papermc.paperweight.restamp
+package io.papermc.paperweight.util
 
-object RestampVersion {
-    const val VERSION: String = "{{ restamp_version }}"
+object JSTVersion {
+    const val VERSION: String = "{{ jst_version }}"
 }

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/SetupVanilla.kt

@@ -25,9 +25,8 @@ package io.papermc.paperweight.tasks.mache
 import codechicken.diffpatch.cli.PatchOperation
 import codechicken.diffpatch.util.LoggingOutputStream
 import codechicken.diffpatch.util.archiver.ArchiveFormat
-import io.papermc.paperweight.restamp.SetupVanillaRestampWorker
-import io.papermc.paperweight.restamp.setSnappyTempDir
 import io.papermc.paperweight.tasks.*
+import io.papermc.paperweight.tasks.softspoon.ApplySourceATs
 import io.papermc.paperweight.util.*
 import java.nio.file.Path
 import java.util.function.Predicate
@@ -58,19 +57,10 @@ abstract class SetupVanilla : JavaLauncherTask() {
     @get:OutputDirectory
     abstract val outputDir: DirectoryProperty
 
-    @get:Optional
-    @get:InputFile
-    @get:PathSensitive(PathSensitivity.NONE)
-    abstract val ats: RegularFileProperty
-
     @get:Optional
     @get:InputDirectory
     abstract val libraryImports: DirectoryProperty
 
-    @get:Optional
-    @get:CompileClasspath
-    abstract val minecraftClasspath: ConfigurableFileCollection
-
     @get:Optional
     @get:Classpath
     abstract val mache: ConfigurableFileCollection
@@ -82,8 +72,12 @@ abstract class SetupVanilla : JavaLauncherTask() {
     @get:Inject
     abstract val workerExecutor: WorkerExecutor
 
-    @get:CompileClasspath
-    abstract val restamp: ConfigurableFileCollection
+    @get:Nested
+    val ats: ApplySourceATs = objects.newInstance()
+
+    @get:InputFile
+    @get:Optional
+    abstract val atFile: RegularFileProperty
 
     @TaskAction
     fun run() {
@@ -165,27 +159,22 @@ abstract class SetupVanilla : JavaLauncherTask() {
             logger.lifecycle("Applied ${result.summary.changedFiles} mache patches")
         }
 
-        if (ats.isPresent) {
-            val classPath = minecraftClasspath.files.map { it.toPath() }.toMutableList()
-            classPath.add(outputPath)
-
+        if (atFile.isPresent) {
             println("Applying access transformers...")
-
-            val queue = workerExecutor.processIsolation {
-                forkOptions {
-                    maxHeapSize = "2G"
-                    executable(launcher.get().executablePath.path.absolutePathString())
-                    classpath.from(restamp)
-                    setSnappyTempDir(temporaryDir)
-                }
-            }
-            queue.submit(SetupVanillaRestampWorker::class) {
-                this.ats.set(this@SetupVanilla.ats.pathOrNull)
-                this.outputPath.set(outputPath)
-                this.classpath.from(classPath)
+            // TODO - No way to tell JST to ignore the .git dir
+            val gitTmp = outputPath.resolveSibling(outputPath.name + "_.git_tmp")
+            outputPath.resolve(".git").moveTo(gitTmp)
+            try {
+                ats.run(
+                    launcher.get(),
+                    outputPath,
+                    outputPath,
+                    atFile.path,
+                    temporaryDir.toPath(),
+                )
+            } finally {
+                gitTmp.moveTo(outputPath.resolve(".git"))
             }
-            queue.await()
-
             commitAndTag(git, "ATs")
         }