misc

PaperMC · Oct 15, 2023 · 9c9eaa7 · 9c9eaa7
1 parent bbac3fb
commit 9c9eaa7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
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
@@ -49,7 +49,7 @@ open class SoftSpoonTasks(
         remapperClasspath.from(macheRemapper)
         paramMappings.from(macheParamMappings)
 
-        outputJar.set(layout.cache.resolve(FINAL_REMAPPED_JAR))
+        outputJar.set(layout.cache.resolve(FINAL_REMAPPED_CODEBOOK_JAR))
     }
 
     val macheDecompileJar by tasks.registering(DecompileJar::class) {

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
@@ -46,8 +46,6 @@ abstract class RemapCBPatches : BaseTask() {
             Path.of("C:\\Users\\Martin\\.m2\\repository\\org\\jetbrains\\annotations\\24.0.1\\annotations-24.0.1.jar")
         )
 
-        println("dum $classpath")
-
         val merc = Mercury()
         merc.classPath.addAll(classpath)
         merc.processors.addAll(
@@ -73,7 +71,7 @@ abstract class RemapCBPatches : BaseTask() {
         val source = sourceRoot.resolve(relativePath)
         val decomp = decompRoot.resolve(relativePath)
 
-        if (!source.exists()  || !decomp.exists()) return 0
+        if (!source.exists() || !decomp.exists()) return 0
 
         val sourceLines = source.readLines(Charsets.UTF_8)
         val decompLines = decomp.readLines(Charsets.UTF_8)
@@ -84,9 +82,9 @@ abstract class RemapCBPatches : BaseTask() {
         }
 
         // remove all non craftbukkit chunks
-        patch.deltas.removeIf {
-            !it.target.lines.any { l -> l.contains("CraftBukkit") }
-        }
+        //patch.deltas.removeIf {
+        //    !it.target.lines.any { line -> line.contains("CraftBukkit") && !line.contains("decompile error") }
+        //}
 
         val unifiedPatch = UnifiedDiffUtils.generateUnifiedDiff(
             "a/$relativePath",

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplyPatches.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplyPatches.kt
@@ -54,13 +54,6 @@ abstract class ApplyPatches: DefaultTask() {
 
         val result = createPatcher().applyPatches(input.get().path, patches.get().path, output.get().path, output.get().path)
 
-        if (result is PatchFailure) {
-            result.failures
-                .map { "Patch failed: ${it.patch.relativeTo(patches.get().path)}: ${it.details}" }
-                .forEach { logger.error(it) }
-            throw Exception("Failed to apply ${result.failures.size} patches")
-        }
-
         // TODO ideally we manage to make a commit with just the patch changes
         val git = Git.init()
             .setDirectory(output.convertToPath().toFile())
@@ -73,6 +66,13 @@ abstract class ApplyPatches: DefaultTask() {
             .setSign(false)
             .call()
         git.tag().setName(PATCHED_TAG).setTagger(macheIdent).setSigned(false).call()
+
+        if (result is PatchFailure) {
+            result.failures
+                .map { "Patch failed: ${it.patch.relativeTo(patches.get().path)}: ${it.details}" }
+                .forEach { logger.error(it) }
+            throw Exception("Failed to apply ${result.failures.size} patches")
+        }
     }
 
     internal open fun createPatcher(): Patcher {

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt
@@ -112,6 +112,7 @@ private const val SETUP_CACHE = "$PAPER_PATH/setupCache"
 private const val TASK_CACHE = "$PAPER_PATH/taskCache"
 
 const val FINAL_REMAPPED_JAR = "$TASK_CACHE/minecraft.jar"
+const val FINAL_REMAPPED_CODEBOOK_JAR = "$TASK_CACHE/codebook-minecraft.jar"
 const val FINAL_FILTERED_REMAPPED_JAR = "$TASK_CACHE/filteredMinecraft.jar"
 const val FINAL_DECOMPILE_JAR = "$TASK_CACHE/decompileJar.jar"
 const val SPIGOT_MACHE_DECOMPILE_JAR = "$TASK_CACHE/macheSpigotDecompileJar.jar"