From ebf4d6576f15e12f033a8fd08ff385e64120dd32 Mon Sep 17 00:00:00 2001
From: OliverSchlueter <OliverSchlueter@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:59:58 +0100
Subject: [PATCH] Use ChatColorHandler

---
 api/build.gradle.kts                          |  3 +--
 .../oliver/fancyholograms/api/Hologram.java   | 21 ++-----------------
 build.gradle.kts                              |  6 +++++-
 gradle.properties                             |  2 --
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 8e73931a..0de59235 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -8,8 +8,7 @@ dependencies {
 
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
 
-    compileOnly("me.clip:placeholderapi:${findProperty("placeholderapiVersion")}")
-    compileOnly("io.github.miniplaceholders:miniplaceholders-api:${findProperty("miniplaceholdersVersion")}")
+    implementation("com.github.CoolDCB:ChatColorHandler:v2.5.0")
 }
 
 tasks {
diff --git a/api/src/main/java/de/oliver/fancyholograms/api/Hologram.java b/api/src/main/java/de/oliver/fancyholograms/api/Hologram.java
index 17862e72..25e265d6 100644
--- a/api/src/main/java/de/oliver/fancyholograms/api/Hologram.java
+++ b/api/src/main/java/de/oliver/fancyholograms/api/Hologram.java
@@ -4,13 +4,9 @@
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramHideEvent;
 import de.oliver.fancyholograms.api.events.HologramShowEvent;
-import de.oliver.fancyholograms.api.utils.LegacyColorConverter;
-import io.github.miniplaceholders.api.MiniPlaceholders;
-import me.clip.placeholderapi.PlaceholderAPI;
+import me.dave.chatcolorhandler.ModernChatColorHandler;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -280,22 +276,9 @@ public final Component getShownText(@Nullable final Player player) {
             return null;
         }
 
-        var tags = TagResolver.empty();
         var text = String.join("\n", textData.getText());
 
-        if (player != null) {
-            if (isUsingPlaceholderApi()) {
-                text = PlaceholderAPI.setPlaceholders(player, text);
-            }
-
-            if (isUsingMiniplaceholders()) {
-                tags = MiniPlaceholders.getAudienceGlobalPlaceholders(player);
-            }
-        }
-
-        text = LegacyColorConverter.legacyColorCodesToMiniMessages(text);
-
-        return MiniMessage.miniMessage().deserialize(text, tags);
+        return ModernChatColorHandler.translate(text, player);
     }
 
     @Override
diff --git a/build.gradle.kts b/build.gradle.kts
index 73e761cd..8891ceb1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,6 +26,7 @@ allprojects {
         maven(url = "https://repo.fancyplugins.de/snapshots")
         maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven(url = "https://repo.viaversion.com/")
+        maven(url = "https://jitpack.io")
     }
 }
 
@@ -57,8 +58,11 @@ tasks {
 
         downloadPlugins {
             hangar("FancyNpcs", findProperty("fancyNpcsVersion").toString())
-            hangar("PlaceholderAPI", findProperty("placeholderapiVersion").toString())
+            hangar("PlaceholderAPI", "2.11.5")
             modrinth("miniplaceholders", "M6gjRuIx")
+
+            hangar("ViaVersion", "4.9.3-SNAPSHOT+148")
+            hangar("ViaBackwards", "4.9.2-SNAPSHOT+89")
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 4ed27c1f..af3778ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,4 @@
 minecraftVersion=1.20.4
 fancyNpcsVersion=2.0.5
 fancyLibVersion=1.0.5.1
-placeholderapiVersion=2.11.5
-miniplaceholdersVersion=2.2.3
 viaversionVersion=4.7.0
\ No newline at end of file