Update upstream

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("cheetah-api/paper-patches")
             outputDir = file("paper-api")
         }
-        patchDir("paperApiGenerator") {
-            upstreamPath = "paper-api-generator"
-            patchesDir = file("cheetah-api-generator/paper-patches")
-            outputDir = file("paper-api-generator")
-        }
     }
 }
 

cheetah-api/build.gradle.kts.patch

@@ -1,5 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
+@@ -93,7 +_,7 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+
+-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+ idea {
+     module {
+         generatedSourceDirs.add(generatedApiPath.toFile())
 @@ -103,6 +_,18 @@
      main {
          java {

cheetah-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -21,8 +_,19 @@
+@@ -21,6 +_,17 @@
      // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
      // gitFilePatches = true
 
@@ -15,13 +15,10 @@
 +
 +    activeFork = cheetah
 +
-     paper {
--        reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny")
-+        paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
-     }
-
      spigot {
-@@ -105,7 +_,20 @@
+         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
+         packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
+@@ -101,7 +_,20 @@
      }
  }
 
@@ -43,7 +40,7 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -123,7 +_,7 @@
+@@ -119,7 +_,7 @@
  }
 
  dependencies {
@@ -52,7 +49,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -192,14 +_,14 @@
+@@ -188,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",

gradle.properties

@@ -1,7 +1,7 @@
 group=net.gommehd.cheetah
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=1bb3677651770f274404b2a245c9b51cb82b776a
+paperRef=b1b88cd31687c5b3f80c4b0b51fd93a63b3e2498
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true