Rename props and fix file separators properly

Author: jpenilla

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

@@ -200,7 +200,7 @@ abstract class PaperweightCore : Plugin<Project> {
                     additionalRemote = layout.cache.resolve(
                         "$OLD_PAPER_PATH/${coreExt.updatingMinecraft.oldPaperCommit.get()}/paper-server/src/minecraft/java"
                     ).absolutePathString()
-                    rejectsForDiffPatches = false
+                    emitRejects = false
                 }
 
                 PatchRouletteTasks(

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

@@ -82,7 +82,7 @@ class MinecraftPatchingTasks(
             output.set(outputSrc)
         }
         patches.set(sourcePatchDir.fileExists(project))
-        rejects.set(rejectsDir)
+        rejectsDir.set(rejectsDir)
         gitFilePatches.set(this@MinecraftPatchingTasks.gitFilePatches)
         identifier = configName
     }

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

@@ -67,7 +67,7 @@ class PatchingTasks(
             output.set(outputDir)
         }
         patches.set(filePatchDir.fileExists(project))
-        rejects.set(rejectsDir)
+        rejectsDir.set(rejectsDir)
         gitFilePatches.set(this@PatchingTasks.gitFilePatches)
         baseRef.set("base")
         identifier = "$forkName $patchSetName"

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatches.kt

@@ -64,7 +64,7 @@ abstract class ApplyFilePatches : BaseTask() {
     abstract val patches: DirectoryProperty
 
     @get:Internal
-    abstract val rejects: DirectoryProperty
+    abstract val rejectsDir: DirectoryProperty
 
     @get:Optional
     @get:Input
@@ -90,15 +90,15 @@ abstract class ApplyFilePatches : BaseTask() {
     abstract val moveFailedGitPatchesToRejects: Property<Boolean>
 
     @get:Internal
-    abstract val rejectsForDiffPatches: Property<Boolean>
+    abstract val emitRejects: Property<Boolean>
 
     init {
         run {
             verbose.convention(false)
             gitFilePatches.convention(false)
             additionalRemoteName.convention("old")
             moveFailedGitPatchesToRejects.convention(false)
-            rejectsForDiffPatches.convention(true)
+            emitRejects.convention(true)
         }
     }
 
@@ -171,7 +171,7 @@ abstract class ApplyFilePatches : BaseTask() {
     private fun applyWithGit(outputPath: Path): Int {
         val git = Git(outputPath)
         val patchFiles = patches.path.filesMatchingRecursive("*.patch")
-        if (moveFailedGitPatchesToRejects.get() && rejects.isPresent) {
+        if (moveFailedGitPatchesToRejects.get() && rejectsDir.isPresent) {
             patchFiles.forEach { patch ->
                 val patchPathFromGit = outputPath.relativize(patch)
                 val responseCode =
@@ -193,7 +193,7 @@ abstract class ApplyFilePatches : BaseTask() {
                             git("restore", failedFile.pathString).executeSilently(silenceOut = !verbose.get(), silenceErr = !verbose.get())
                         }
 
-                        val rejectFile = rejects.path.resolve(relativePatch)
+                        val rejectFile = rejectsDir.path.resolve(relativePatch)
                         patch.moveTo(rejectFile.createParentDirectories(), overwrite = true)
                     }
                 }
@@ -223,8 +223,8 @@ abstract class ApplyFilePatches : BaseTask() {
             .summary(verbose.get())
             .lineEnding("\n")
             .ignorePrefix(".git")
-        if (rejects.isPresent && rejectsForDiffPatches.get()) {
-            builder.rejectsPath(rejects.path)
+        if (rejectsDir.isPresent && emitRejects.get()) {
+            builder.rejectsPath(rejectsDir.path)
         }
 
         val result = builder.build().operate()

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

@@ -127,7 +127,7 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
     fun setPatches(paths: List<String>) {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(SetPatches(paths.normalisePathSeparators(), minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(SetPatches(paths, minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/set-patches"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -161,7 +161,7 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
     fun startPatches(paths: List<String>): List<String> {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchesInfo(paths.normalisePathSeparators(), minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchesInfo(paths, minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/start-patches"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -181,7 +181,7 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
     fun completePatch(path: String) {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path.normalisePathSeparators(), minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path, minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/complete-patch"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -197,7 +197,7 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
     fun cancelPatch(path: String) {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path.normalisePathSeparators(), minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path, minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/cancel-patch"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -210,6 +210,3 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
         logger.lifecycle("Cancelled patch $path")
     }
 }
-
-private fun String.normalisePathSeparators(): String = replace("\\", "/")
-private fun List<String>.normalisePathSeparators(): List<String> = map { it.replace("\\", "/") }

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

@@ -124,7 +124,7 @@ abstract class PatchRouletteApply : AbstractPatchRouletteTask() {
             }
 
             try {
-                val startedPatches = startPatches(patches.map { it.pathString })
+                val startedPatches = startPatches(patches.map { it.invariantSeparatorsPathString })
                 this.config.path.writeText(gson.toJson(config.copy(currentPatches = patches)))
                 applyPatches(git, startedPatches.map { Path(it) })
                 break

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

@@ -52,15 +52,17 @@ abstract class PatchRouletteCancel : AbstractPatchRouletteTask() {
             throw PaperweightException("No current patch in config")
         }
 
-        val patchesToCancel = if (!patch.isPresent) config.currentPatches else {
+        val patchesToCancel = if (!patch.isPresent) {
+            config.currentPatches
+        } else {
             if (!config.currentPatches.contains(Path(patch.get()))) {
                 throw PaperweightException("Cannot cancel patch ${patch.get()} as it isn't currently being worked on!")
             }
 
             listOf(Path(patch.get()))
         }
 
-        patchesToCancel.forEach { cancelPatch(it.pathString) }
+        patchesToCancel.forEach { cancelPatch(it.invariantSeparatorsPathString) }
         this.config.path.writeText(gson.toJson(config.copy(currentPatches = (config.currentPatches - patchesToCancel.toSet()))))
     }
 }

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

@@ -63,7 +63,7 @@ abstract class PatchRouletteFinish : AbstractPatchRouletteTask() {
 
         // TODO: Do we want to fixup file patches & rebuild here as well?
         config.currentPatches.forEach {
-            completePatch(it.pathString)
+            completePatch(it.invariantSeparatorsPathString)
             patchDir.path.resolve(it).deleteIfExists() // todo git rm
         }
         this.config.path.writeText(gson.toJson(config.copy(currentPatches = listOf())))

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

@@ -45,7 +45,7 @@ abstract class ShowPatchRouletteList : AbstractPatchRouletteTask() {
     abstract val pathFilter: Property<String>
 
     override fun run() {
-        var results = 0;
+        var results = 0
 
         logger.lifecycle("| Status    | User                 | Path ")
         getAllPatches().forEach { patch ->