twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move cb version definition to gradle patch

Browse Source
This commit is contained in:
Jason Penilla
2024-04-27 14:02:33 -07:00
parent e20beef9c7
commit bf6862b141
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/server/Build-system-changes.patch
View File

@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
"Specification-Vendor" to "Bukkit Team", "Specification-Vendor" to "Bukkit Team",
+ "Git-Branch" to gitBranch, // Paper + "Git-Branch" to gitBranch, // Paper
+ "Git-Commit" to gitHash, // Paper + "Git-Commit" to gitHash, // Paper
+ "CraftBukkit-Package-Version" to craftbukkitPackageVersion, // Paper + "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
) )
for (tld in setOf("net", "com", "org")) { for (tld in setOf("net", "com", "org")) {
attributes("$tld/bukkit", "Sealed" to true) attributes("$tld/bukkit", "Sealed" to true)

2
patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View File

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling + implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
} }
val craftbukkitPackageVersion = "1_20_R4" // Paper paperweight {
diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/StacktraceDeobfuscatingRewritePolicy.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000

18
patches/server/Plugin-remapping.patch
View File

@@ -14,25 +14,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
+ implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins + implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins
+}
+
+paperweight {
+ craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
} }
-val craftbukkitPackageVersion = "1_20_R4" // Paper paperweight {
tasks.jar {
archiveClassifier.set("dev")
@@ -0,0 +0,0 @@ tasks.jar {
"Specification-Vendor" to "Bukkit Team",
"Git-Branch" to gitBranch, // Paper
"Git-Commit" to gitHash, // Paper
- "CraftBukkit-Package-Version" to craftbukkitPackageVersion, // Paper
+ "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
)
for (tld in setOf("net", "com", "org")) {
attributes("$tld/bukkit", "Sealed" to true)
@@ -0,0 +0,0 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM @@ -0,0 +0,0 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
runtime.filterNot { it.asFile.absolutePath == vanilla } runtime.filterNot { it.asFile.absolutePath == vanilla }
} }

5
patches/server/Setup-Gradle-project.patch
View File

@@ -60,7 +60,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ testImplementation("org.ow2.asm:asm-tree:9.7") + testImplementation("org.ow2.asm:asm-tree:9.7")
+} +}
+ +
+val craftbukkitPackageVersion = "1_20_R4" // Paper +paperweight {
+ craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
+}
+
+tasks.jar { +tasks.jar {
+ archiveClassifier.set("dev") + archiveClassifier.set("dev")
+ +

2
patches/server/Test-changes.patch
View File

@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest + testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
} }
val craftbukkitPackageVersion = "1_20_R4" // Paper paperweight {
@@ -0,0 +0,0 @@ tasks.jar { @@ -0,0 +0,0 @@ tasks.jar {
} }
} }