Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki Activity

Thanks for joining us for the magic show tonight

Browse Source
This commit is contained in:
Riley Park 2021-06-17 20:38:22 -07:00
parent c5070937e4
commit 4f14647c37
No known key found for this signature in database
GPG Key ID: D831AF236C834E45
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Setup-Gradle-project.patch
View File

@ -20,7 +20,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a
/.project /.project
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..393f282ea082772593ae34c0b3d3dcd2ea9e4c52 index 0000000000000000000000000000000000000000..fada7057dcb81c3206bdb0ca1730c3df2420ae3e
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
@ -101,6 +101,9 @@ index 0000000000000000000000000000000000000000..393f282ea082772593ae34c0b3d3dcd2
+tasks.shadowJar { +tasks.shadowJar {
+ archiveClassifier.set("mojang-mapped") + archiveClassifier.set("mojang-mapped")
+ +
+ relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*")
+ }
+ listOf( + listOf(
+ "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", + "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus", + "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
@ -108,9 +111,6 @@ index 0000000000000000000000000000000000000000..393f282ea082772593ae34c0b3d3dcd2
+ ).forEach { pack -> + ).forEach { pack ->
+ relocate(pack, "org.bukkit.craftbukkit.libs.$pack") + relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
+ } + }
+ relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*")
+ }
+ mergeServiceFiles() + mergeServiceFiles()
+ transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java) + transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
+} +}

7
patches/server/0003-Build-system-changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..f3b51015bcd765e2035e9071fab273903b48abdf 100644 index fada7057dcb81c3206bdb0ca1730c3df2420ae3e..ba7087874f781a0de57e5a637da4c69c6aea5943 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -22,21 +22,23 @@ repositories { @@ -22,21 +22,23 @@ repositories {
@ -44,7 +44,7 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..f3b51015bcd765e2035e9071fab27390
) )
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)
@@ -72,11 +75,19 @@ publishing { @@ -72,14 +75,22 @@ publishing {
} }
} }
@ -59,6 +59,9 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..f3b51015bcd765e2035e9071fab27390
+ rename { "pom.xml" } + rename { "pom.xml" }
+ } + }
+ +
relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
exclude("org.bukkit.craftbukkit.Main*")
}
listOf( listOf(
- "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", - "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil + "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil