From 9aa465844d8a249cee41be1bdcadc3b25e636b45 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 3 Oct 2021 12:54:38 +0100
Subject: [PATCH] Finally fixed Adventure + MiniMessage shading / Dependency
 issues

---
 build.gradle                                           |  2 +-
 eco-api/build.gradle                                   | 10 +++++-----
 .../src/main/java/com/willfp/eco/util/StringUtils.java |  5 ++++-
 eco-core/core-plugin/build.gradle                      |  4 +++-
 eco-core/core-plugin/src/main/resources/plugin.yml     | 10 +++++++---
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 76f7ba28..946cac1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ allprojects {
 
     shadowJar {
         relocate('org.bstats', 'com.willfp.eco.shaded.bstats')
-        relocate('net.kyori.adventure', 'com.willfp.eco.shaded.adventure')
+        relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage')
     }
 
     jar {
diff --git a/eco-api/build.gradle b/eco-api/build.gradle
index ec195c95..1972375c 100644
--- a/eco-api/build.gradle
+++ b/eco-api/build.gradle
@@ -7,11 +7,11 @@ version rootProject.version
 
 dependencies {
     // Adventure
-    implementation 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
-    implementation 'net.kyori:adventure-platform-bukkit:4.0.0'
-    implementation 'net.kyori:adventure-api:4.9.1'
-    implementation 'net.kyori:adventure-text-serializer-gson:4.8.1'
-    implementation 'net.kyori:adventure-text-serializer-legacy:4.8.1'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
+    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-api:4.9.1'
+    compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
+    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
 
     // Other
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
diff --git a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java
index a537b839..5090f052 100644
--- a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java
+++ b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java
@@ -1,6 +1,7 @@
 package com.willfp.eco.util;
 
 import com.google.common.collect.ImmutableList;
+import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.text.Component;
@@ -251,9 +252,11 @@ public class StringUtils {
             processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player);
         }
         processedMessage = translateGradients(processedMessage);
-        processedMessage = translateMiniMessage(processedMessage);
         processedMessage = translateHexColorCodes(processedMessage);
         processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            processedMessage = translateMiniMessage(processedMessage);
+        }
         return processedMessage;
     }
 
diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle
index 8a7a2c6f..60be5f03 100644
--- a/eco-core/core-plugin/build.gradle
+++ b/eco-core/core-plugin/build.gradle
@@ -3,7 +3,9 @@ version rootProject.version
 
 dependencies {
     implementation 'org.bstats:bstats-bukkit:1.7'
-    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    implementation('net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT') {
+        exclude group: 'net.kyori', module: 'adventure-api'
+    }
     compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
     compileOnly 'net.kyori:adventure-api:4.9.1'
     compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml
index b3339a4c..429d426b 100644
--- a/eco-core/core-plugin/src/main/resources/plugin.yml
+++ b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -25,6 +25,10 @@ softdepend:
   - ItemsAdder
   - Oraxen
 libraries:
-  - org.reflections:reflections:0.9.12
-  - org.apache.maven:maven-artifact:3.0.3
-  - org.jetbrains.kotlin:kotlin-stdlib:1.5.31
\ No newline at end of file
+  - 'org.reflections:reflections:0.9.12'
+  - 'org.apache.maven:maven-artifact:3.0.3'
+  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+  - 'net.kyori:adventure-platform-bukkit:4.0.0'
+  - 'net.kyori:adventure-api:4.9.1'
+  - 'net.kyori:adventure-text-serializer-gson:4.8.1'
+  - 'net.kyori:adventure-text-serializer-legacy:4.8.1'
\ No newline at end of file