Update upstream and paperweight

Author: jpenilla

build.gradle.kts

@@ -2,8 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    java // TODO java launcher tasks
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.13"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
 
 paperweight {
@@ -26,11 +25,6 @@ paperweight {
             patchesDir = file("forky-api/paper-patches")
             outputDir = file("paper-api")
         }
-        patchRepo("paperApiGenerator") {
-            upstreamPath = "paper-api-generator"
-            patchesDir = file("forky-api-generator/paper-patches")
-            outputDir = file("paper-api-generator")
-        }
         patchDir("forkApi") {
             upstreamPath = "fork-api"
             excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")

forky-server/build.gradle.kts.patch

@@ -1,13 +1,5 @@
 --- a/fork-server/build.gradle.kts
 +++ b/fork-server/build.gradle.kts
-@@ -22,6 +_,7 @@
-     // gitFilePatches = true
- 
-     val fork = forks.register("fork") {
-+        rootDirectory = upstreamsDirectory().map { it.dir("fork") }
-         upstream.patchDir("paperServer") {
-             upstreamPath = "paper-server"
-             excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
 @@ -30,7 +_,22 @@
          }
      }
@@ -30,9 +22,9 @@
 +
 +    activeFork = forky
 
-     paper {
-         paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
-@@ -120,10 +_,14 @@
+     spigot {
+         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
+@@ -116,10 +_,14 @@
      main {
          java { srcDir("../paper-server/src/main/java") }
          resources { srcDir("../paper-server/src/main/resources") }
@@ -47,7 +39,7 @@
      }
  }
 
-@@ -147,7 +_,7 @@
+@@ -143,7 +_,7 @@
  }
 
  dependencies {

gradle.properties

@@ -1,7 +1,7 @@
 group=fork.test
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-forkRef=a59bc0c041103fec827afa8df3b45586b49e812c
+forkRef=a4955854a414d436e1e378dc3626b6a86bfbbc04
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true