OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 06:30:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Relocate other libraries Spigot added and relocates in 1.17

Browse source
This commit is contained in:
Kyle Wood 2021-06-16 20:56:44 -05:00
parent c7a0195cdd
commit 3dc0a3fafc
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,9 +63,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
listOf(
- "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
"org.apache.commons.lang3", "org.objectweb.asm"
"org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
"org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
).forEach { pack ->
relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java

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

@ -103,7 +103,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+ listOf(
+ "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "org.apache.commons.lang3", "org.objectweb.asm"
+ "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
+ "org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
+ ).forEach { pack ->
+ relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
+ }