From ab4661e19fe34589cb15f99bfef546aea3c92707 Mon Sep 17 00:00:00 2001 From: Jendrik Eggers Date: Sun, 5 Jan 2025 16:35:02 +0100 Subject: [PATCH] migrated pre-hard-fork patch 0001-Build-changes.patch --- cheetah-server/build.gradle.kts.patch | 20 ++++++ .../craftbukkit/util/Versioning.java.patch | 11 ++++ patches/server/0001-Build-changes.patch | 61 ------------------- 3 files changed, 31 insertions(+), 61 deletions(-) create mode 100644 cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch delete mode 100644 patches/server/0001-Build-changes.patch diff --git a/cheetah-server/build.gradle.kts.patch b/cheetah-server/build.gradle.kts.patch index 935fea1..75a41c5 100644 --- a/cheetah-server/build.gradle.kts.patch +++ b/cheetah-server/build.gradle.kts.patch @@ -52,3 +52,23 @@ implementation("ca.spottedleaf:concurrentutil:0.0.2") 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 @@ + val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() + attributes( + "Main-Class" to "org.bukkit.craftbukkit.Main", +- "Implementation-Title" to "Paper", ++ "Implementation-Title" to "Cheetah", // Cheetah - Build changes + "Implementation-Version" to implementationVersion, + "Implementation-Vendor" to date, +- "Specification-Title" to "Paper", ++ "Specification-Title" to "Cheetah", // Cheetah - Build changes + "Specification-Version" to project.version, +- "Specification-Vendor" to "Paper Team", +- "Brand-Id" to "papermc:paper", +- "Brand-Name" to "Paper", ++ "Specification-Vendor" to "Cheetah Team", // Cheetah - Build changes ++ "Brand-Id" to "gommehdnet:cheetah", // Cheetah - Build changes ++ "Brand-Name" to "Cheetah", // Cheetah - Build changes + "Build-Number" to (build ?: ""), + "Build-Time" to buildTime.toString(), + "Git-Branch" to gitBranch, diff --git a/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch b/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch new file mode 100644 index 0000000..f76d75b --- /dev/null +++ b/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch @@ -0,0 +1,11 @@ +--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +@@ -11,7 +_,7 @@ + public static String getBukkitVersion() { + String result = "Unknown-Version"; + +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties"); ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.gommehd.cheetah/cheetah-api/pom.properties"); // Cheetah - Build changes + Properties properties = new Properties(); + + if (stream != null) { diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch deleted file mode 100644 index 0df66f3..0000000 --- a/patches/server/0001-Build-changes.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MiniDigger -Date: Sat, 12 Jun 2021 16:40:34 +0200 -Subject: [PATCH] Build changes - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 2da91ed6363c0851e4c459188f5e8ef5475e0c97..edbe0313184cd099c8b47d0d34af4dcaf6b3d516 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { - // Paper end - configure mockito agent that is needed in newer java versions - - dependencies { -- implementation(project(":paper-api")) -+ implementation(project(":cheetah-api")) // Cheetah - Build changes - implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency - // Paper start - implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ -@@ -100,14 +100,14 @@ tasks.jar { - val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper - attributes( - "Main-Class" to "org.bukkit.craftbukkit.Main", -- "Implementation-Title" to "Paper", -+ "Implementation-Title" to "Cheetah", // Cheetah - Build changes - "Implementation-Version" to implementationVersion, - "Implementation-Vendor" to date, // Paper -- "Specification-Title" to "Paper", -+ "Specification-Title" to "Cheetah", // Cheetah - Build changes - "Specification-Version" to project.version, -- "Specification-Vendor" to "Paper Team", -- "Brand-Id" to "papermc:paper", -- "Brand-Name" to "Paper", -+ "Specification-Vendor" to "Cheetah Team", // Cheetah - Build changes -+ "Brand-Id" to "gommehdnet:cheetah", // Cheetah - Build changes -+ "Brand-Name" to "Cheetah", // Cheetah - Build changes - "Build-Number" to (build ?: ""), - "Build-Time" to Instant.now().toString(), - "Git-Branch" to gitBranch, // Paper -@@ -173,7 +173,7 @@ fun TaskContainer.registerRunTask( - name: String, - block: JavaExec.() -> Unit - ): TaskProvider = register(name) { -- group = "paper" -+ group = "paperweight" - mainClass.set("org.bukkit.craftbukkit.Main") - standardInput = System.`in` - workingDir = rootProject.layout.projectDirectory -diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 774556a62eb240da42e84db4502e2ed43495be17..b6c77b5e233ca817fec83f20b66cb40405daf63c 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -@@ -11,7 +11,7 @@ public final class Versioning { - public static String getBukkitVersion() { - String result = "Unknown-Version"; - -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties"); -+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.gommehd.cheetah/cheetah-api/pom.properties"); // Cheetah - Build changes - Properties properties = new Properties(); - - if (stream != null) {