From 518f3faa975bfce731c8653d88d0d01a092dd925 Mon Sep 17 00:00:00 2001
From: Muspah <simondw@sapo.pt>
Date: Sun, 28 Apr 2024 22:03:40 +0200
Subject: [PATCH] Load libraries via plugin.yml

---
 pom.xml                                      |  7 ++-
 uSkyBlock-Core/pom.xml                       | 46 +++++---------------
 uSkyBlock-Core/src/main/resources/plugin.yml |  9 ++++
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6e3562b..7be22063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,13 @@
     <name>Ultimate SkyBlock</name>
 
     <properties>
-        <adventure-api.version>4.15.0</adventure-api.version>
-        <adventure-bukkit.version>4.3.0</adventure-bukkit.version>
+        <adventure-api.version>4.16.0</adventure-api.version>
+        <adventure-bukkit.version>4.3.2</adventure-bukkit.version>
+        <apache-commons.version>3.14.0</apache-commons.version>
+        <apache-commons-text.version>1.12.0</apache-commons-text.version>
         <apache-http.version>4.5.14</apache-http.version>
         <gson.version>2.10.1</gson.version>
+        <guava.version>33.1.0-jre</guava.version>
         <jbannotations.version>23.0.0</jbannotations.version>
         <maven-artifact.version>3.8.6</maven-artifact.version>
         <api.version>${project.version}</api.version>
diff --git a/uSkyBlock-Core/pom.xml b/uSkyBlock-Core/pom.xml
index 20d135d6..5c4f9968 100644
--- a/uSkyBlock-Core/pom.xml
+++ b/uSkyBlock-Core/pom.xml
@@ -82,22 +82,13 @@
                             <minimizeJar>true</minimizeJar>
                             <artifactSet>
                                 <includes>
-                                    <include>com.google.code.gson:gson</include>
                                     <include>dk.lockfuglsang.minecraft:bukkit-utils</include>
                                     <include>io.papermc:paperlib</include>
-                                    <include>net.kyori:*</include>
-                                    <include>org.apache.httpcomponents:httpclient</include>
-                                    <include>org.apache.maven:maven-artifact</include>
-                                    <include>org.apache.commons:*</include>
                                     <include>org.bstats:*</include>
                                     <include>ovh.uskyblock:po-utils</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
-                                <relocation>
-                                    <pattern>com.google.code.gson</pattern>
-                                    <shadedPattern>us.talabrek.ultimateskyblock.gson</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>dk.lockfuglsang.minecraft</pattern>
                                     <shadedPattern>us.talabrek.ultimateskyblock.utils</shadedPattern>
@@ -106,22 +97,6 @@
                                     <pattern>io.papermc.lib</pattern>
                                     <shadedPattern>us.talabrek.ultimateskyblock.paperlib</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>net.kyori</pattern>
-                                    <shadedPattern>us.talabrek.ultimateskyblock.kyori</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>us.talabrek.ultimateskyblock.apache.commons</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.httpcomponents</pattern>
-                                    <shadedPattern>us.talabrek.ultimateskyblock.apache.httpcomponents</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.maven</pattern>
-                                    <shadedPattern>us.talabrek.ultimateskyblock.apache.maven</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
                                     <shadedPattern>us.talabrek.ultimateskyblock.metrics</shadedPattern>
@@ -474,18 +449,17 @@
             <scope>compile</scope>
         </dependency>
         <!-- Guava -->
-        <!-- bundled with Minecraft, should be kept in sync -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>${guava.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Google Gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>be.maximvdw</groupId>
@@ -503,12 +477,12 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- ANNOTATIONS -->
         <dependency>
@@ -518,25 +492,25 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-            <scope>compile</scope>
+            <version>${apache-commons.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
-            <scope>compile</scope>
+            <version>${apache-commons-text.version}</version>
+            <scope>provided</scope>
         </dependency>
         <!-- Apache HttpComponents -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- TESTING -->
         <dependency>
diff --git a/uSkyBlock-Core/src/main/resources/plugin.yml b/uSkyBlock-Core/src/main/resources/plugin.yml
index 4c20f997..02339140 100644
--- a/uSkyBlock-Core/src/main/resources/plugin.yml
+++ b/uSkyBlock-Core/src/main/resources/plugin.yml
@@ -19,6 +19,15 @@ softdepend:
  # placeholders
  - MVdWPlaceholderAPI
 api-version: 1.19
+libraries:
+  - com.google.code.gson:gson:${gson.version}
+  - com.google.guava:guava:${guava.version}
+  - net.kyori:adventure-api:${adventure-api.version}
+  - net.kyori:adventure-platform-bukkit:${adventure-bukkit.version}
+  - org.apache.commons:commons-lang3:${apache-commons.version}
+  - org.apache.commons:commons-text:${apache-commons-text.version}
+  - org.apache.httpcomponents:httpclient:${apache-http.version}
+  - org.apache.maven:maven-artifact:${maven-artifact.version}
 
 commands:
   challenges: