From 9bebf0b6f84861248da7b2c257b4ddc756cae4f5 Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Wed, 16 Jun 2021 20:56:44 -0500
Subject: [PATCH] Relocate other libraries Spigot added and relocates in 1.17
---
patches/server/0001-Setup-Gradle-project.patch | 7 ++++---
patches/server/0003-Build-system-changes.patch | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index e4f6fd9dd8..0f2ae5ca19 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -20,10 +20,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a
/.project
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
-index 0000000000000000000000000000000000000000..84af6353d060c65d5f125559becc011aeba8a842
+index 0000000000000000000000000000000000000000..393f282ea082772593ae34c0b3d3dcd2ea9e4c52
--- /dev/null
+++ 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.Transformer
+import io.papermc.paperweight.util.Git
@@ -103,7 +103,8 @@ index 0000000000000000000000000000000000000000..84af6353d060c65d5f125559becc011a
+
+ 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")
+ }
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 75e27e1990..695f30e813 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
-index 84af6353d060c65d5f125559becc011aeba8a842..4d6e92815951c3291fb865381677c52673e53462 100644
+index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7578e018d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,21 +22,24 @@ repositories {
@@ -63,9 +63,9 @@ index 84af6353d060c65d5f125559becc011aeba8a842..4d6e92815951c3291fb865381677c526
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 dfe101d9f5db1bd7cfc59dfe9adc9abb643586cc..24e08ca0fca3e87f8a6b7670b266f3c2900b798c 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java