Some logging and todo changes

This might be completely wrong. Awaiting jmp.

Author: lynxplay

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt

@@ -201,15 +201,15 @@ abstract class PaperweightCore : Plugin<Project> {
                         "$OLD_PAPER_PATH/${coreExt.updatingMinecraft.oldPaperCommit.get()}/paper-server/src/minecraft/java"
                     ).absolutePathString()
                 }
+
+                PatchRouletteTasks(
+                    target,
+                    "paper",
+                    coreExt.minecraftVersion,
+                    coreExt.paper.rejectsDir,
+                    layout.projectDirectory.dir("src/minecraft/java"),
+                )
             }
-            // TODO move into above 'if'
-            PatchRouletteTasks(
-                target,
-                "paper",
-                coreExt.minecraftVersion,
-                coreExt.paper.sourcePatchDir, // TODO use reject dir
-                layout.projectDirectory.dir("src/minecraft/java"),
-            )
         }
     }
 }

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

@@ -98,13 +98,17 @@ abstract class PatchRouletteApply : AbstractPatchRouletteTask() {
 
     private fun applyPatch(patch: String) {
         val git = Git(targetDir.path)
-        git(
+        val responseCode = git(
             "-c",
             "rerere.enabled=false",
             "apply",
             "--3way",
             patchDir.path.resolve(patch).relativeTo(targetDir.path).invariantSeparatorsPathString
         ).runOut()
+        if (responseCode > 0) {
+            logger.error("Check above ^^^, Something when wrong while applying $patch")
+            logger.error("You might need to apply manually or check the target repo state.")
+        }
         logger.lifecycle("Finish the patch apply and rebuild, then run the finish task (or cancel with the cancel task)")
     }