OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +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 0cd65441d1
commit 9bebf0b6f8
No known key found for this signature in database
GPG key ID: 86AF5613ACA30CC5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/server/0001-Setup-Gradle-project.patch
View file

@ -20,10 +20,10 @@ 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..84af6353d060c65d5f125559becc011aeba8a842 index 0000000000000000000000000000000000000000..393f282ea082772593ae34c0b3d3dcd2ea9e4c52
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,134 @@ @@ -0,0 +1,135 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.util.Git +import io.papermc.paperweight.util.Git
@ -103,7 +103,8 @@ index 0000000000000000000000000000000000000000..84af6353d060c65d5f125559becc011a
+ +
+ 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.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 -> + ).forEach { pack ->
+ relocate(pack, "org.bukkit.craftbukkit.libs.$pack") + relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
+ } + }

6
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 84af6353d060c65d5f125559becc011aeba8a842..4d6e92815951c3291fb865381677c52673e53462 100644 index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7578e018d 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -22,21 +22,24 @@ repositories { @@ -22,21 +22,24 @@ repositories {
@ -63,9 +63,9 @@ index 84af6353d060c65d5f125559becc011aeba8a842..4d6e92815951c3291fb865381677c526
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
"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 -> ).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 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index dfe101d9f5db1bd7cfc59dfe9adc9abb643586cc..24e08ca0fca3e87f8a6b7670b266f3c2900b798c 100644 index dfe101d9f5db1bd7cfc59dfe9adc9abb643586cc..24e08ca0fca3e87f8a6b7670b266f3c2900b798c 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java