OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages 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 5e9ba09e6d
commit c867b69e41
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
patches/server/Build-system-changes.patch
View file

@ -59,6 +59,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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

6
patches/server/Setup-Gradle-project.patch
View file

@ -101,6 +101,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+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..00000000000000000000000000000000
+ ).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)
+} +}