OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-02 17:32:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix jline relocation (#6677)

Browse source
This commit is contained in:
Jason Penilla 2021-09-29 11:34:16 -05:00
parent 3f3377a1eb
commit bcf4a2e70d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
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)
@@ -0,0 +0,0 @@ relocation { @@ -0,0 +0,0 @@ relocation {
"org.jline:jline-terminal-jansi" to "jline", sequenceOf(
"commons-codec:commons-codec" to "org.apache.commons.codec", "commons-codec:commons-codec" to "org.apache.commons.codec",
"commons-io:commons-io" to "org.apache.commons.io", "commons-io:commons-io" to "org.apache.commons.io",
- "it.unimi.dsi:fastutil" to "it.unimi", - "it.unimi.dsi:fastutil" to "it.unimi",

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

@ -113,8 +113,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack" + fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
+ +
+ relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
+ sequenceOf( + sequenceOf(
+ "org.jline:jline-terminal-jansi" to "jline",
+ "commons-codec:commons-codec" to "org.apache.commons.codec", + "commons-codec:commons-codec" to "org.apache.commons.codec",
+ "commons-io:commons-io" to "org.apache.commons.io", + "commons-io:commons-io" to "org.apache.commons.io",
+ "it.unimi.dsi:fastutil" to "it.unimi", + "it.unimi.dsi:fastutil" to "it.unimi",