From 381ab971b6ce7f8026b2ef5b635908f0d5e02181 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Mon, 14 Jun 2021 12:05:58 +1200
Subject: [PATCH] Shade and repackage the adventure text library. I hate how it
 inflates the jar by 300kb

---
 pom.xml                                       | 51 ++++++++++++++++++-
 .../disguise/utilities/DisguiseUtilities.java |  5 ++
 .../utilities/watchers/CompileMethods.java    |  5 +-
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b17f87c8..5d6700f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,35 @@
                     <mainClass>me.libraryaddict.disguise.utilities.watchers.CompileMethods</mainClass>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <minimizeJar>true</minimizeJar>
+                    <artifactSet>
+                        <includes>
+                            <include>net.kyori:adventure-text-minimessage</include>
+                            <include>net.kyori:adventure-text-serializer-gson</include>
+                            <include>net.kyori:adventure-api</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>net.kyori</pattern>
+                            <shadedPattern>ld-shaded.net.kyori</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -75,7 +104,9 @@
         <junit.version>4.13.1</junit.version>
         <paper-api.version>[1.16,]</paper-api.version>
         <bungeecord-chat.version>1.12-SNAPSHOT</bungeecord-chat.version>
-        <adventure.version>4.1.0-SNAPSHOT</adventure.version>
+        <adventure-minimessage.version>4.1.0-SNAPSHOT</adventure-minimessage.version>
+        <adventure-api.version>4.7.0</adventure-api.version>
+        <adventure-serializer.version>4.7.0</adventure-serializer.version>
     </properties>
 
     <dependencies>
@@ -133,7 +164,23 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>${adventure.version}</version>
+            <version>${adventure-minimessage.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-gson</artifactId>
+            <version>${adventure-serializer.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>${adventure-api.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index b35d1ee5..b160a8b9 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -219,6 +219,11 @@ public class DisguiseUtilities {
         }
     }
 
+    /**
+     * This should return true every single time, except for when ProtocolLib isn't updated for AdventureComponentConverter
+     *
+     * The reason being is that we shade the adventure text library in the plugin
+     */
     public static boolean hasAdventureTextSupport() {
         if (adventureTextSupport == null) {
             try {
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java b/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java
index 325ee62e..2e7d285d 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java
@@ -10,7 +10,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsRemovedIn;
 import me.libraryaddict.disguise.utilities.reflection.WatcherInfo;
 import me.libraryaddict.disguise.utilities.sounds.DisguiseSoundEnums;
 import me.libraryaddict.disguise.utilities.sounds.SoundGroup;
-import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -69,7 +68,7 @@ public class CompileMethods {
         File soundsFile = new File("target/classes/ANTI_PIRACY_SECRET_FILE");
 
         try (FileOutputStream fos = new FileOutputStream(soundsFile)) {
-            byte[] array = StringUtils.join(list, "\n").getBytes(StandardCharsets.UTF_8);
+            byte[] array = String.join("\n", list).getBytes(StandardCharsets.UTF_8);
 
             for (int i = 0; i < array.length; i++) {
                 array[i] = (byte) (Byte.MAX_VALUE - array[i]);
@@ -160,7 +159,7 @@ public class CompileMethods {
         File methodsFile = new File("target/classes/ANTI_PIRACY_ENCRYPTION");
 
         try (FileOutputStream fos = new FileOutputStream(methodsFile)) {
-            byte[] array = StringUtils.join(methods, "\n").getBytes(StandardCharsets.UTF_8);
+            byte[] array = String.join("\n", methods).getBytes(StandardCharsets.UTF_8);
 
             for (int i = 0; i < array.length; i++) {
                 array[i] = (byte) (Byte.MAX_VALUE - array[i]);