update upstream

gommehdnet · Jan 15, 2025 · 6fcebde · 6fcebde
1 parent f60420d
commit 6fcebde
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/build.gradle.kts b/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")
-        }
     }
 }
 

diff --git a/cheetah-api/build.gradle.kts.patch b/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 {

diff --git a/cheetah-server/build.gradle.kts.patch b/cheetah-server/build.gradle.kts.patch
@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -21,6 +_,21 @@
+@@ -21,6 +_,17 @@
      // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
      // gitFilePatches = true
 
@@ -14,10 +14,6 @@
 +    }
 +
 +    activeFork = cheetah
-+
-+    paper {
-+        paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
-+    }
 +
      spigot {
          buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group=net.gommehd.cheetah
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=8e80d4e15852ffbed1a18d1e9b34550191433200
+paperRef=b1b88cd31687c5b3f80c4b0b51fd93a63b3e2498
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true