update for paperweight changes

2025-01-02 20:47:37 +00:00 · 2024-12-15 13:01:18 -07:00 · 2024-12-15 13:01:18 -07:00 · 3850c8fe78
commit 3850c8fe78
parent 0d49617843
2 changed files with 4 additions and 7 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -20,15 +20,13 @@ paperweight {
            outputFile = file("fork-api/build.gradle.kts")
            patchFile = file("fork-api/build.gradle.kts.patch")
        }
-        patchDir {
-            name = "paperApi"
+        patchDir("paperApi") {
            upstreamPath = "paper-api"
            excludes = setOf("build.gradle.kts")
            patchesDir = file("fork-api/paper-patches")
            outputDir = file("paper-api")
        }
-        patchDir {
-            name = "paperApiGenerator"
+        patchDir("paperApiGenerator") {
            upstreamPath = "paper-api-generator"
            patchesDir = file("fork-api-generator/paper-patches")
            outputDir = file("paper-api-generator")
--- a/fork-server/build.gradle.kts.patch
+++ b/fork-server/build.gradle.kts.patch
@ -7,13 +7,12 @@
 import io.papermc.paperweight.util.*
 import java.time.Instant
 
-@@ -22,25 +_,38 @@
+@@ -22,25 +_,37 @@
     // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
     // gitFilePatches = true
 
 +    val fork = forks.register("fork") {
-+        upstream.patchDir {
-+            name = "paperServer"
+        upstream.patchDir("paperServer") {
 +            upstreamPath = "paper-server"
 +            excludes = setOf("src/vanilla", "patches", "build.gradle.kts")
 +            patchesDir = rootDirectory.dir("fork-server/paper-patches")