From 4f1b4504532b7390c7aa0385305ddbd38138d0f8 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Sat, 24 Jul 2021 00:57:21 +0200
Subject: [PATCH] Shade a cloud dependency as well

---
 bungee/pom.xml   | 9 +++++++--
 spigot/pom.xml   | 9 +++++++--
 velocity/pom.xml | 5 +++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bungee/pom.xml b/bungee/pom.xml
index b69a4de0..e7e6885c 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -92,13 +92,18 @@
             </goals>
             <configuration>
               <relocations>
+                <relocation>
+                  <pattern>net.kyori</pattern>
+                  <shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>cloud.commandframework</pattern>
                   <shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
                 </relocation>
+                <!-- used in cloud -->
                 <relocation>
-                  <pattern>net.kyori</pattern>
-                  <shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
+                  <pattern>io.leangen.geantyref</pattern>
+                  <shadedPattern>org.geysermc.floodgate.shaded.io.leangen.geantyref</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>
diff --git a/spigot/pom.xml b/spigot/pom.xml
index a3abfa03..b83020f6 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -112,13 +112,18 @@
             </goals>
             <configuration>
               <relocations>
+                <relocation>
+                  <pattern>net.kyori</pattern>
+                  <shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>cloud.commandframework</pattern>
                   <shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
                 </relocation>
+                <!-- used in cloud -->
                 <relocation>
-                  <pattern>net.kyori</pattern>
-                  <shadedPattern>org.geysermc.floodgate.shaded.net.kyori</shadedPattern>
+                  <pattern>io.leangen.geantyref</pattern>
+                  <shadedPattern>org.geysermc.floodgate.shaded.io.leangen.geantyref</shadedPattern>
                 </relocation>
                 <!-- hack to make pre 1.12 work -->
                 <relocation>
diff --git a/velocity/pom.xml b/velocity/pom.xml
index e28709c8..b7fa6b98 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -119,6 +119,11 @@
                   <pattern>cloud.commandframework</pattern>
                   <shadedPattern>org.geysermc.floodgate.shaded.cloud.commandframework</shadedPattern>
                 </relocation>
+                <!-- used in cloud -->
+                <relocation>
+                  <pattern>io.leangen.geantyref</pattern>
+                  <shadedPattern>org.geysermc.floodgate.shaded.io.leangen.geantyref</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>