From c867b69e41872e7b8722d5064f54f615c1410e18 Mon Sep 17 00:00:00 2001 From: Riley Park Date: Thu, 17 Jun 2021 20:38:22 -0700 Subject: [PATCH] Thanks for joining us for the magic show tonight --- patches/server/Build-system-changes.patch | 3 +++ patches/server/Setup-Gradle-project.patch | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 898f8f635f..9862961043 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -59,6 +59,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + rename { "pom.xml" } + } + + relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { + exclude("org.bukkit.craftbukkit.Main*") + } 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 diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 598b1f9fda..5b78263eee 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -101,6 +101,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +tasks.shadowJar { + archiveClassifier.set("mojang-mapped") + ++ relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { ++ exclude("org.bukkit.craftbukkit.Main*") ++ } + listOf( + "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", + "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus", @@ -108,9 +111,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + ).forEach { pack -> + relocate(pack, "org.bukkit.craftbukkit.libs.$pack") + } -+ relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { -+ exclude("org.bukkit.craftbukkit.Main*") -+ } + mergeServiceFiles() + transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java) +}