From 03b6c3d554d3cf00bb659b8355005d184159b4ce Mon Sep 17 00:00:00 2001
From: ceze88 <dev.ceze@gmail.com>
Date: Sun, 26 May 2024 15:56:40 +0200
Subject: [PATCH] Shade adventure stuff to avoid strange loading issues on
 1.20.5+ paper servers

---
 Core/pom.xml                                  | 79 ++++++++++++++++++-
 .../java/com/craftaro/core/SongodaPlugin.java | 16 ----
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/Core/pom.xml b/Core/pom.xml
index 43bd5018..a83f5483 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -112,7 +112,7 @@
 
                                 <relocation>
                                     <pattern>net.kyori</pattern>
-                                    <shadedPattern>com.craftaro.third_party.net.kyori</shadedPattern>
+                                    <shadedPattern>com.craftaro.core.third_party.net.kyori</shadedPattern>
                                 </relocation>
 
                                 <relocation>
@@ -224,6 +224,69 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>option</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-viaversion</artifactId>
+            <version>4.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-facet</artifactId>
+            <version>4.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-api</artifactId>
+            <version>4.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-nbt</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-key</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>examination-api</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>examination-string</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
@@ -252,6 +315,20 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-gson</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-json</artifactId>
diff --git a/Core/src/main/java/com/craftaro/core/SongodaPlugin.java b/Core/src/main/java/com/craftaro/core/SongodaPlugin.java
index 19078cb4..965d199e 100644
--- a/Core/src/main/java/com/craftaro/core/SongodaPlugin.java
+++ b/Core/src/main/java/com/craftaro/core/SongodaPlugin.java
@@ -100,22 +100,6 @@ public abstract class SongodaPlugin extends JavaPlugin {
             //Use ; instead of . so maven plugin won't relocate it
             dependencies.add(new Dependency("https://repo1.maven.org/maven2", "org;apache;commons", "commons-text", "1.12.0"));
             dependencies.add(new Dependency("https://repo1.maven.org/maven2", "org;apache;commons", "commons-lang3", "3.14.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-api", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-key", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-nbt", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-platform-api", "4.3.2"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-platform-bukkit", "4.3.2"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-platform-facet", "4.3.2"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-platform-viaversion", "4.3.2"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-minimessage", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-serializer-gson", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-serializer-gson-legacy-impl", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-serializer-legacy", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-serializer-plain", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "adventure-text-serializer-json", "4.17.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "option", "1.0.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "examination-api", "1.3.0"));
-            dependencies.add(new Dependency("https://repo1.maven.org/maven2", "net;kyori", "examination-string", "1.3.0"));
             dependencies.add(new Dependency("https://repo1.maven.org/maven2", "org;slf4j", "slf4j-api", "2.0.11", false));
             dependencies.add(new Dependency("https://repo1.maven.org/maven2", "com;zaxxer", "HikariCP", "4.0.3"));
             dependencies.add(new Dependency("https://repo1.maven.org/maven2", "org;reactivestreams", "reactive-streams", "1.0.2", true));