From d565e23a8494edd997e888648ce0c978f45b1057 Mon Sep 17 00:00:00 2001 From: Jendrik Eggers Date: Tue, 14 Jan 2025 20:53:12 +0100 Subject: [PATCH 1/3] update upstream --- cheetah-server/build.gradle.kts.patch | 17 +++++++++-------- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cheetah-server/build.gradle.kts.patch b/cheetah-server/build.gradle.kts.patch index cd8adb4..3f30284 100644 --- 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,8 +_,19 @@ +@@ -21,6 +_,21 @@ // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java") // gitFilePatches = true @@ -15,13 +15,14 @@ + + activeFork = cheetah + - paper { -- reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny") ++ paper { + 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 +44,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { extendsFrom(configurations.compileClasspath.get()) } -@@ -123,7 +_,7 @@ +@@ -119,7 +_,7 @@ } dependencies { @@ -52,7 +53,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", diff --git a/gradle.properties b/gradle.properties index 368275c..7d6ceb2 100644 --- 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=1bb3677651770f274404b2a245c9b51cb82b776a +paperRef=8e80d4e15852ffbed1a18d1e9b34550191433200 org.gradle.configuration-cache=true org.gradle.caching=true From f60420dc43f1aca7bd5a1517e3e6c72341d3e58f Mon Sep 17 00:00:00 2001 From: Jendrik Eggers Date: Tue, 14 Jan 2025 20:56:33 +0100 Subject: [PATCH 2/3] add missing patch --- .../files/src/main/resources/data/.paperassetsroot.patch | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 cheetah-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch diff --git a/cheetah-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch b/cheetah-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch deleted file mode 100644 index b41d58b..0000000 --- a/cheetah-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch +++ /dev/null @@ -1,3 +0,0 @@ ---- a/src/main/resources/data/.paperassetsroot -+++ b/src/main/resources/data/.paperassetsroot -@@ -1,0 +_,0 @@ From 6fcebdeb53aae1f0e9f512d471ee94c4aedeb80c Mon Sep 17 00:00:00 2001 From: Jendrik Eggers Date: Wed, 15 Jan 2025 23:26:16 +0100 Subject: [PATCH 3/3] update upstream --- build.gradle.kts | 8 +------- cheetah-api/build.gradle.kts.patch | 9 +++++++++ cheetah-server/build.gradle.kts.patch | 6 +----- gradle.properties | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8f59e76..87e7319 100644 --- 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 index 4fe51fc..0313e40 100644 --- 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 index 3f30284..b71cbc2 100644 --- 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 index 7d6ceb2..9b1d6ae 100644 --- 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