From 3d232f97fb554a78b7a71d22cab880ebdd77576c Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Fri, 7 Oct 2022 14:31:08 +0100
Subject: [PATCH] Shade adventure instead of bundling at runtime

---
 build.gradle                         | 1 -
 bukkit/build.gradle                  | 3 ++-
 bukkit/src/main/resources/plugin.yml | 1 -
 common/build.gradle                  | 2 ++
 gradle.properties                    | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index b59cc99b..d2449330 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,6 @@ version "$ext.plugin_version-${versionMetadata()}"
 
 ext {
     set 'version', version.toString()
-    set 'adventure_version', adventure_version.toString()
     set 'jedis_version', jedis_version.toString()
     set 'mysql_driver_version', mysql_driver_version.toString()
     set 'snappy_version', snappy_version.toString()
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index 041bc13b..d190e99e 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -4,10 +4,10 @@ dependencies {
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
     implementation 'me.lucko:commodore:2.2'
+    implementation 'net.kyori:adventure-platform-bukkit:4.1.2'
 
     compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
     compileOnly 'commons-io:commons-io:2.11.0'
-    compileOnly 'net.kyori:adventure-platform-bukkit:' + adventure_version
     compileOnly 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT'
     compileOnly 'dev.dejvokep:boosted-yaml:1.3'
     compileOnly 'com.zaxxer:HikariCP:5.0.1'
@@ -22,6 +22,7 @@ shadowJar {
     relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io'
     relocate 'com.google.gson', 'net.william278.husksync.libraries.gson'
     relocate 'de.themoep', 'net.william278.husksync.libraries'
+    relocate 'net.kyori', 'net.william278.husksync.libraries'
     relocate 'org.jetbrains', 'net.william278.husksync.libraries'
     relocate 'org.intellij', 'net.william278.husksync.libraries'
     relocate 'com.zaxxer', 'net.william278.husksync.libraries'
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index 432588e7..55f50ecf 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -9,7 +9,6 @@ softdepend:
   - MysqlPlayerDataBridge
   - Plan
 libraries:
-  - 'net.kyori:adventure-platform-bukkit:${adventure_version}'
   - 'redis.clients:jedis:${jedis_version}'
   - 'mysql:mysql-connector-java:${mysql_driver_version}'
   - 'org.xerial.snappy:snappy-java:${snappy_version}'
diff --git a/common/build.gradle b/common/build.gradle
index 234ffaa8..40b1d11a 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,6 +1,7 @@
 dependencies {
     implementation 'commons-io:commons-io:2.11.0'
     implementation 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT'
+    implementation 'net.kyori:adventure-api:4.11.0'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'dev.dejvokep:boosted-yaml:1.3'
     implementation 'net.william278:DesertWell:1.1'
@@ -25,6 +26,7 @@ shadowJar {
     relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io'
     relocate 'com.google.gson', 'net.william278.husksync.libraries.gson'
     relocate 'de.themoep', 'net.william278.husksync.libraries'
+    relocate 'net.kyori', 'net.william278.husksync.libraries'
     relocate 'org.jetbrains', 'net.william278.husksync.libraries'
     relocate 'org.intellij', 'net.william278.husksync.libraries'
     relocate 'com.zaxxer', 'net.william278.husksync.libraries'
diff --git a/gradle.properties b/gradle.properties
index f37e5b61..2b8771bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,5 +9,4 @@ plugin_archive=husksync
 jedis_version=4.2.3
 mysql_driver_version=8.0.30
 snappy_version=1.1.8.4
-adventure_version=4.1.2
 commons_text_version=1.9
\ No newline at end of file