initial windows support, use start-patches endpoint instead of loop

Author: MiniDigger

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

@@ -220,9 +220,10 @@ abstract class SetupMinecraftSources : JavaLauncherTask() {
         oldPaperGit.reset().setMode(ResetCommand.ResetType.HARD).setRef(oldPaperCommit.get()).call()
         oldPaperGit.close()
 
+        val isWindows = System.getProperty("os.name").lowercase().contains("win")
         oldPaperLog.outputStream().use { logOut ->
             val processBuilder = ProcessBuilder(
-                "./gradlew",
+                "./gradlew" + if (isWindows) ".bat" else "",
                 "applyPatches",
                 "--console",
                 "plain",

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, minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(SetPatches(paths.normalisePathSeparators(), minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/set-patches"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -156,13 +156,13 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
         logger.lifecycle("Cleared patches for ${minecraftVersion.get()}")
     }
 
-    data class PatchInfo(val path: String, val minecraftVersion: String)
+    data class PatchesInfo(val paths: List<String>, val minecraftVersion: String)
 
-    fun startPatch(path: String) {
+    fun startPatches(paths: List<String>): List<String> {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path, minecraftVersion.get()))))
-                .uri(URI.create(endpoint.get() + "/start-patch"))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchesInfo(paths.normalisePathSeparators(), minecraftVersion.get()))))
+                .uri(URI.create(endpoint.get() + "/start-patches"))
                 .auth()
                 .contentTypeApplicationJson()
                 .build(),
@@ -171,13 +171,17 @@ abstract class AbstractPatchRouletteTask : BaseTask() {
         if (response.statusCode() != 200) {
             throw PaperweightException("Response status code: ${response.statusCode()}, body: ${response.body()}")
         }
-        logger.lifecycle("Started patch $path")
+        val startedPatches = gson.fromJson<List<String>>(response.body(), typeToken<List<String>>())
+        logger.lifecycle("Started patches $startedPatches")
+        return startedPatches
     }
 
+    data class PatchInfo(val path: String, val minecraftVersion: String)
+
     fun completePatch(path: String) {
         val response = httpClient().send(
             HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path, minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path.normalisePathSeparators(), minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/complete-patch"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -193,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, minecraftVersion.get()))))
+                .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(PatchInfo(path.normalisePathSeparators(), minecraftVersion.get()))))
                 .uri(URI.create(endpoint.get() + "/cancel-patch"))
                 .auth()
                 .contentTypeApplicationJson()
@@ -206,3 +210,6 @@ 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

@@ -123,22 +123,16 @@ abstract class PatchRouletteApply : AbstractPatchRouletteTask() {
                 continue
             }
 
-            val startedPatches = mutableListOf<Path>()
             try {
-                patches.forEach {
-                    startPatch(it.pathString)
-                    startedPatches.add(it)
-                }
+                val startedPatches = startPatches(patches.map { it.pathString })
                 this.config.path.writeText(gson.toJson(config.copy(currentPatches = patches)))
+                applyPatches(git, startedPatches.map { Path(it) })
                 break
             } catch (e: PaperweightException) {
-                logger.lifecycle("Patch could not be started: ${e.message}, retrying...")
-                startedPatches.forEach { cancelPatch(it.pathString) }
+                logger.lifecycle("Patches could not be started: ${e.message}, retrying...")
                 tries--
             }
         }
-
-        applyPatches(git, patches)
     }
 
     private fun applyPatches(git: Git, patches: List<Path>) {