twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-21 23:33:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix CB lib relocation (#6454)

Browse Source
This commit is contained in:
Jake Potrebic
2021-08-22 10:22:57 -07:00
parent 7b08aa27ab
commit 78d3eda3db
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+} +}
+ +
+relocation { +relocation {
+ // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
+ val packageVersion = "1_17_R1"
+ relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*")
+ }
+
+ fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack" + fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
+ +
+ sequenceOf( + sequenceOf(
@@ -129,11 +135,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ ).forEach { pack -> + ).forEach { pack ->
+ relocate(pack to cb(pack)) + relocate(pack to cb(pack))
+ } + }
+
+ val packageVersion = "1_17_R1"
+ relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*")
+ }
+} +}
+ +
+tasks.shadowJar { +tasks.shadowJar {