update restamp to make cb patch remap work again

PaperMC · Jan 14, 2024 · a1590bf · a1590bf
1 parent 5ceb230
commit a1590bf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,4 @@ ehthumbs_vista.db
 !gradle-wrapper.ja
 
 /test/
+/testpaper/
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,8 +21,8 @@ cadix-lorenz-asm = { module = "org.cadixdev:lorenz-asm", version.ref = "lorenz"
 cadix-lorenz-proguard = { module = "org.cadixdev:lorenz-io-proguard", version.ref = "lorenz" }
 cadix-atlas = "org.cadixdev:atlas:0.2.1"
 cadix-at = "org.cadixdev:at:0.1.0-rc1"
-# cadix-mercury = "org.cadixdev:mercury:0.1.1-paperweight-local-SNAPSHOT" todo local mods for patch remapping
-cadix-mercury = "org.cadixdev:mercury:0.1.1-paperweight-SNAPSHOT"
+cadix-mercury = "org.cadixdev:mercury:0.1.1-paperweight-local-SNAPSHOT" # todo local mods for patch remapping
+#cadix-mercury = "org.cadixdev:mercury:0.1.1-paperweight-SNAPSHOT"
 cadix-bombe-jar = "org.cadixdev:bombe-jar:0.4.4"
 
 hypo-model = { module = "dev.denwav.hypo:hypo-model", version.ref = "hypo" }
@@ -46,7 +46,7 @@ serialize-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json",
 
 codebook = "io.papermc.codebook:codebook:1.0.8"
 
-restamp = "io.papermc.restamp:restamp:1.0.0"
+restamp = "io.papermc.restamp:restamp:1.1.0"
 
 # test
 mockk = "io.mockk:mockk:1.13.8"

diff --git a/...rweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt b/...rweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt
@@ -241,7 +241,7 @@ open class SoftSpoonTasks(
         // craftBukkit.set(allTasks.patchCraftBukkit.flatMap { it.outputDir })
         craftBukkit.set(project.layout.cache.resolve("paperweight/taskCache/patchCraftBukkit.repo"))
         outputPatchDir.set(project.layout.projectDirectory.dir("patches/remapped-cb"))
-        // mappingsFile.set(allTasks.patchMappings.flatMap { it.outputMappings })
+        // mappingsFile.set(generatePatchRemapMappings.flatMap { it.patchRemapMappings })
         mappingsFile.set(layout.cache.resolve(SPIGOT_MOJANG_PARCHMENT_MAPPINGS))
     }
 

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/SetupVanilla.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/SetupVanilla.kt
@@ -169,7 +169,7 @@ abstract class SetupVanilla : BaseTask() {
             val configuration = RestampContextConfiguration.builder()
                 .accessTransformers(ats.convertToPath(), AccessTransformFormats.FML)
                 .sourceRoot(outputPath)
-                .sourceFilesFromAccessTransformers()
+                .sourceFilesFromAccessTransformers(false)
                 .classpath(classPath)
                 .executionContext(InMemoryExecutionContext { it.printStackTrace() })
                 .failWithNotApplicableAccessTransformers()

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremapv2/RemapCBPatches.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremapv2/RemapCBPatches.kt
@@ -62,11 +62,11 @@ abstract class RemapCBPatches : BaseTask() {
         val mappings = MappingFormats.TINY.read(mappingsFile.convertToPath(), SPIGOT_NAMESPACE, NEW_DEOBF_NAMESPACE)
 
         val configFiles = project.project(":paper-server").configurations["runtimeClasspath"].resolve().map { it.toPath() }
-        val classpath = configFiles + listOf(
+        val classpath = (configFiles + listOf(
             project.project(":paper-api").projectDir.toPath().resolve("src/main/java"),
             project.file(".gradle/caches/paperweight/taskCache/spigotRemapJar.jar").toPath(),
             Path.of("C:\\Users\\Martin\\.m2\\repository\\org\\jetbrains\\annotations\\24.0.1\\annotations-24.0.1.jar")
-        )
+        )).filter { it.exists() }
 
         val merc = Mercury()
         merc.classPath.addAll(classpath)
@@ -75,13 +75,14 @@ abstract class RemapCBPatches : BaseTask() {
                 MercuryRemapper.create(mappings)
             )
         )
+        merc.sourceCompatibility = "17"
         merc.isGracefulClasspathChecks = true
         merc.rewrite(craftBukkit.convertToPath().resolve("src/main/java"), workDir)
 
         val inputDir = workDir
-        val baseDir = Path.of("D:\\IdeaProjects\\Paper\\.gradle\\caches\\paperweight\\mache\\dum")
+        val baseDir = base.convertToPath()
 
-        val patchesCreated = baseDir.walk()
+        val patchesCreated = baseDir.walk().filter { it.isRegularFile() && it.name.endsWith(".java") }
             .sumOf {
                 diffFile(inputDir, baseDir, it.relativeTo(baseDir).toString().replace("\\", "/"), patches)
             }