From 5e227cb4a5e3d6a03c37d1c388f2f34a9b27bbba Mon Sep 17 00:00:00 2001 From: KennyTV Date: Sat, 27 Feb 2021 10:21:06 +0100 Subject: [PATCH] Fix Bungee Chat relocation Fixes #2371 --- buildSrc/src/main/kotlin/extensions.kt | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt index 7399446ad..c3ca94d72 100644 --- a/buildSrc/src/main/kotlin/extensions.kt +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -32,28 +32,17 @@ private fun ShadowJar.configureRelocations() { relocate("javassist", "us.myles.viaversion.libs.javassist") relocate("com.google.gson", "us.myles.viaversion.libs.gson") relocate("com.github.steveice10.opennbt", "us.myles.viaversion.libs.opennbt") - relocate("net.md_5.bungee", "us.myles.viaversion.libs.bungeecordchat") + relocate("net.md_5.bungee", "us.myles.viaversion.libs.bungeecordchat") { + include("net.md_5.bungee.api.chat.*") + include("net.md_5.bungee.api.ChatColor") + include("net.md_5.bungee.api.ChatMessageType") + include("net.md_5.bungee.chat.*") + } relocate("it.unimi.dsi.fastutil", "us.myles.viaversion.libs.fastutil") } private fun ShadowJar.configureExcludes() { - // bungee api - /* - include("net.md_5.bungee.api.chat.*") - include("net.md_5.bungee.api.ChatColor") - include("net.md_5.bungee.api.ChatMessageType") - include("net.md_5.bungee.chat.*") - */ - - // fastutil - - // We only want int and Object maps - /* - include("it.unimi.dsi.fastutil.ints.*") - include("it.unimi.dsi.fastutil.objects.*") - include("it.unimi.dsi.fastutil.*.class") - */ - + // FastUtil - we only want object and int maps // Object types exclude("it/unimi/dsi/fastutil/*/*Reference*") exclude("it/unimi/dsi/fastutil/*/*Boolean*")