Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fa0dd15d add missed nullability annotations
PaperMC/Paper@b6d70a9c Generators
PaperMC/Paper@b92137c1 load the PDC for new block entities
PaperMC/Paper@06a26ec2 update legacy test
PaperMC/Paper@c4f0b2b0 update more test
PaperMC/Paper@77382fcb fix unbreakable shields
PaperMC/Paper@9e08de6e Re-add old SmithingTrimRecipe constructors
PaperMC/Paper@d2afd149 Bump some more numbers to 1.21.5
PaperMC/Paper@cf1455e5 Ignore private methods in MaterialReroutingTest
PaperMC/Paper@ce91a8ca Move out unapplied feature patches
This commit is contained in:
granny
2025-03-27 16:40:47 -07:00
parent 73e0e17b6d
commit 4907125796
18 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
purpur-server/build.gradle.kts.patch
View File

@@ -1,9 +1,10 @@
--- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
@@ -24,6 +_,16 @@
@@ -28,6 +_,18 @@
// oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
//}
+ // Purpur start - Rebrand
+ val purpur = forks.register("purpur") {
+ upstream.patchDir("paperServer") {
+ upstreamPath = "paper-server"
@@ -13,16 +14,17 @@
+ }
+ }
+ activeFork = purpur
+ // Purpur end - Rebrand
+
spigot {
buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc"
packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
@@ -104,7 +_,21 @@
packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment
@@ -108,7 +_,21 @@
}
}
-val log4jPlugins = sourceSets.create("log4jPlugins")
+
+// Purpur start - Rebrand
+sourceSets {
+ main {
+ java { srcDir("../paper-server/src/main/java") }
@@ -33,23 +35,23 @@
+ resources { srcDir("../paper-server/src/test/resources") }
+ }
+}
+
+val log4jPlugins = sourceSets.create("log4jPlugins") {
+ java { srcDir("../paper-server/src/log4jPlugins/java") }
+}
+// Purpur end - Rebrand
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
extendsFrom(configurations.compileClasspath.get())
}
@@ -122,7 +_,7 @@
@@ -130,7 +_,7 @@
}
dependencies {
- implementation(project(":paper-api"))
+ implementation(project(":purpur-api"))
+ implementation(project(":purpur-api")) // Purpur
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
@@ -153,6 +_,10 @@
@@ -162,6 +_,10 @@
runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
runtimeOnly("com.lmax:disruptor:3.4.4")
@@ -60,23 +62,23 @@
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
@@ -192,14 +_,14 @@
@@ -201,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 "Purpur",
+ "Implementation-Title" to "Purpur", // Purpur
"Implementation-Version" to implementationVersion,
"Implementation-Vendor" to date,
- "Specification-Title" to "Paper",
+ "Specification-Title" to "Purpur",
+ "Specification-Title" to "Purpur", // Purpur
"Specification-Version" to project.version,
- "Specification-Vendor" to "Paper Team",
- "Brand-Id" to "papermc:paper",
- "Brand-Name" to "Paper",
+ "Specification-Vendor" to "Purpur Team",
+ "Brand-Id" to "purpurmc:purpur",
+ "Brand-Name" to "Purpur",
+ "Specification-Vendor" to "Purpur Team", // Purpur
+ "Brand-Id" to "purpurmc:purpur", // Purpur
+ "Brand-Name" to "Purpur", // Purpur
"Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch,