Dev bundle <=v5: only count AT file as input for AT action, not entire dev bundle

Author: jpenilla

paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt

@@ -344,6 +344,8 @@ interface InputStreamProvider {
                 return op(input)
             }
         }
+
+        fun string(value: String) = wrap(value.byteInputStream())
     }
 }
 

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/action/WorkGraph.kt

@@ -142,7 +142,7 @@ class WorkGraph(
             terminalInputHash
         } else {
             val inputHashes = node.registration.inputs.hash(hashCache)
-            inputHashes.map { InputStreamProvider.wrap(it.byteInputStream()) }
+            inputHashes.map(InputStreamProvider::string)
                 .hash(HashingAlgorithm.SHA256)
                 .asHexString()
         }

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/action/values.kt

@@ -154,8 +154,32 @@ fun javaLauncherValue(javaLauncher: JavaLauncher): Value<JavaLauncher> = object
             javaLauncher.metadata.vendor,
             javaLauncher.metadata.languageVersion.asInt().toString(),
         ).joinToString("\n")
-        return listOf(InputStreamProvider.wrap(jdkMetadata.byteInputStream()))
+        return listOf(InputStreamProvider.string(jdkMetadata))
     }
 
     override fun toString(): String = "javaLauncherValue('$javaLauncher')"
 }
+
+class ZippedFileValue(
+    val zipFile: Path,
+    val path: String,
+) : Value<Unit> {
+    override fun get() = Unit
+
+    fun extractTo(target: Path, overwrite: Boolean = false) {
+        useEntry { it.copyTo(target.createParentDirectories(), overwrite) }
+    }
+
+    fun <R> useEntry(op: (Path) -> R): R = zipFile.openZipSafe().use { fs ->
+        val path = fs.getPath("/").resolve(path)
+        return op(path)
+    }
+
+    override fun bytes(): List<InputStreamProvider> = listOf(
+        object : InputStreamProvider {
+            override fun <T> use(op: (InputStream) -> T): T = useEntry { it.inputStream().use(op) }
+        }
+    )
+
+    override fun toString(): String = "ZippedFileValue(zipFile='$zipFile', path='$path')"
+}

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/action/AccessTransformMinecraftAction.kt

@@ -26,9 +26,9 @@ import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.userdev.internal.action.FileValue
 import io.papermc.paperweight.userdev.internal.action.Input
 import io.papermc.paperweight.userdev.internal.action.Output
-import io.papermc.paperweight.userdev.internal.action.StringValue
 import io.papermc.paperweight.userdev.internal.action.Value
 import io.papermc.paperweight.userdev.internal.action.WorkDispatcher
+import io.papermc.paperweight.userdev.internal.action.ZippedFileValue
 import io.papermc.paperweight.util.*
 import kotlin.io.path.*
 import org.gradle.jvm.toolchain.JavaLauncher
@@ -37,17 +37,13 @@ import org.gradle.workers.WorkerExecutor
 class AccessTransformMinecraftAction(
     @Input private val javaLauncher: Value<JavaLauncher>,
     private val workerExecutor: WorkerExecutor,
-    @Input private val bundleZip: FileValue,
-    @Input val atPath: StringValue,
+    @Input val at: ZippedFileValue,
     @Input private val inputJar: FileValue,
     @Output val outputJar: FileValue,
 ) : WorkDispatcher.Action {
     override fun execute() {
         val atTmp = outputJar.get().resolveSibling("tmp.at").cleanFile()
-        bundleZip.get().openZipSafe().use { fs ->
-            val at = fs.getPath(atPath.get())
-            at.copyTo(atTmp)
-        }
+        at.extractTo(atTmp)
         try {
             applyAccessTransform(
                 inputJarPath = inputJar.get(),

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/v2/SetupHandlerImplV2.kt

@@ -150,13 +150,12 @@ class SetupHandlerImplV2(
             AccessTransformMinecraftAction(
                 javaLauncher,
                 context.workerExecutor,
-                bundleZip,
-                StringValue(bundle.config.buildData.accessTransformFile),
+                ZippedFileValue(bundle.zip, bundle.config.buildData.accessTransformFile),
                 fix.outputJar,
                 dispatcher.outputFile("output.jar"),
             )
         )
-        dispatcher.provided(at.atPath)
+        dispatcher.provided(at.at)
 
         val decompile = dispatcher.register(
             "decompileMinecraftServer",
@@ -206,7 +205,7 @@ class SetupHandlerImplV2(
                 applyPaperclip.outputJar,
                 dispatcher.outputFile("output.jar"),
                 value(bundle.config.buildData.relocations) {
-                    listOf(InputStreamProvider.wrap(gson.toJson(it).byteInputStream()))
+                    listOf(InputStreamProvider.string(gson.toJson(it)))
                 },
             )
         )

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/v5/SetupHandlerImplV5.kt

@@ -26,6 +26,7 @@ import io.papermc.paperweight.userdev.PaperweightUserExtension
 import io.papermc.paperweight.userdev.internal.action.FileCollectionValue
 import io.papermc.paperweight.userdev.internal.action.StringValue
 import io.papermc.paperweight.userdev.internal.action.WorkDispatcher
+import io.papermc.paperweight.userdev.internal.action.ZippedFileValue
 import io.papermc.paperweight.userdev.internal.action.fileValue
 import io.papermc.paperweight.userdev.internal.action.javaLauncherValue
 import io.papermc.paperweight.userdev.internal.action.stringListValue
@@ -145,13 +146,12 @@ class SetupHandlerImplV5(
             AccessTransformMinecraftAction(
                 javaLauncher,
                 context.workerExecutor,
-                bundleZip,
-                StringValue(bundle.config.buildData.accessTransformFile),
+                ZippedFileValue(bundle.zip, bundle.config.buildData.accessTransformFile),
                 fix.outputJar,
                 dispatcher.outputFile("output.jar"),
             )
         )
-        dispatcher.provided(at.atPath)
+        dispatcher.provided(at.at)
 
         val decompile = dispatcher.register(
             "decompileMinecraftServer",