From 0f9c6f404188279abd4c74371d8e8199441f5ef6 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Tue, 3 Aug 2021 18:28:37 +0200
Subject: [PATCH] Relocate common module for each platform This is needed
 because velocity has adventure shaded. Velocity's common module does not need
 to shade adventure, while BungeeCord and Bukkit do have to shade the
 dependency in.

---
 Bukkit/build.gradle   | 2 ++
 Bungee/build.gradle   | 2 ++
 Common/build.gradle   | 1 -
 Velocity/build.gradle | 2 ++
 build.gradle          | 1 -
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index babaf00..61be4fe 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -24,4 +24,6 @@ shadowJar {
     relocate 'org.bstats', dependencyDir + '.bstats'
     relocate 'net.kyori.adventure', rootDependencyDir + '.adventure'
     relocate 'net.kyori.examination', rootDependencyDir + '.examination'
+    relocate 'net.frankheijden.serverutils.common', dependencyDir + '.su.common'
+    relocate 'net.kyori.adventure.text.minimessage', dependencyDir + '.adventure.text.minimessage'
 }
diff --git a/Bungee/build.gradle b/Bungee/build.gradle
index 9088f32..d4f48d6 100644
--- a/Bungee/build.gradle
+++ b/Bungee/build.gradle
@@ -28,4 +28,6 @@ shadowJar {
     relocate 'org.bstats', dependencyDir + '.bstats'
     relocate 'net.kyori.adventure', rootDependencyDir + '.adventure'
     relocate 'net.kyori.examination', rootDependencyDir + '.examination'
+    relocate 'net.kyori.adventure.text.minimessage', dependencyDir + '.adventure.text.minimessage'
+    relocate 'net.frankheijden.serverutils.common', dependencyDir + '.su.common'
 }
diff --git a/Common/build.gradle b/Common/build.gradle
index a0b4abb..80e3035 100644
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -23,7 +23,6 @@ blossom {
 }
 
 shadowJar {
-    exclude 'net/frankheijden/serverutilsupdater/**'
     exclude 'plugin.yml'
     exclude 'bungee.yml'
 }
\ No newline at end of file
diff --git a/Velocity/build.gradle b/Velocity/build.gradle
index e824765..df5985e 100644
--- a/Velocity/build.gradle
+++ b/Velocity/build.gradle
@@ -24,6 +24,8 @@ dependencies {
 
 shadowJar {
     relocate 'org.bstats', dependencyDir + '.bstats'
+    relocate 'net.frankheijden.serverutils.common', dependencyDir + '.su.common'
+    relocate 'net.kyori.adventure.text.minimessage', dependencyDir + '.adventure.text.minimessage'
 }
 
 blossom {
diff --git a/build.gradle b/build.gradle
index 7015951..70090d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,7 +93,6 @@ subprojects {
         relocate 'com.google.common.graph', dependencyDir + '.common.graph'
         relocate 'dev.frankheijden.minecraftreflection', dependencyDir + '.minecraftreflection'
         relocate 'cloud.commandframework', dependencyDir + '.cloud'
-        relocate 'net.kyori.adventure.text.minimessage', dependencyDir + '.adventure.text.minimessage'
         relocate 'me.lucko.commodore', dependencyDir + '.commodore'
         relocate 'io.leangen.geantyref', dependencyDir + '.typetoken'
     }