From 3850c8fe78ec8b4fcbad3d0763047fe957c98ba1 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 15 Dec 2024 13:01:18 -0700
Subject: [PATCH] update for paperweight changes

---
 build.gradle.kts                   | 6 ++----
 fork-server/build.gradle.kts.patch | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e166751..09d9f94 100644
--- 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")
diff --git a/fork-server/build.gradle.kts.patch b/fork-server/build.gradle.kts.patch
index dfbc9dc..2a9237a 100644
--- 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")