From 5b43aed0b490b7f345d0f662d5f7cd528506adae Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Thu, 23 Mar 2023 19:00:51 +0100
Subject: [PATCH] Stop using deprecated Bungee ChatColor in BukkitChatColorUtil

---
 .../lib/paper/util/BukkitChatColorUtil.java   | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/BukkitChatColorUtil.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/BukkitChatColorUtil.java
index e0c7884..695e0ec 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/BukkitChatColorUtil.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/BukkitChatColorUtil.java
@@ -1,65 +1,69 @@
 package fr.pandacube.lib.paper.util;
 
-import org.bukkit.DyeColor;
-
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import net.md_5.bungee.api.ChatColor;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
 
+/**
+ * Utility class around chat coloring.
+ */
 public class BukkitChatColorUtil {
 
 
 	
 	
 	/**
-	 * Returns the {@link ChatColor} that is visually the closest from the provided {@link DyeColor} when used on a sign.
-	 * 
-	 * Multiple {@link DyeColor} may return the same 
+	 * Returns the {@link TextColor} that is visually the closest from the provided {@link DyeColor} when used on a sign.
 	 * @param dye the provided dye color
 	 * @return the closest chat color from {@code dye}
 	 */
-	public static ChatColor fromDyeToSignColor(DyeColor dye) {
+	public static TextColor fromDyeToSignColor(DyeColor dye) {
 		//org.bukkit.Color col = dye.getColor();
 		//return ChatColor.of(new Color(col.asRGB()));
 		// hmmm this is not that simple, of course
 		
 		// black 
 		return switch (dye) {
-			case BLACK -> ChatColor.of("#000000");
-			case RED -> ChatColor.of("#650000");
-			case GREEN -> ChatColor.of("#006500");
-			case BROWN -> ChatColor.of("#361B07");
-			case BLUE -> ChatColor.of("#000065");
-			case PURPLE -> ChatColor.of("#3F0C5F");
-			case CYAN -> ChatColor.of("#006565");
-			case LIGHT_GRAY -> ChatColor.of("#535353");
-			case GRAY -> ChatColor.of("#323232");
-			case PINK -> ChatColor.of("#652947");
-			case LIME -> ChatColor.of("#4B6500");
-			case YELLOW -> ChatColor.of("#656500");
-			case LIGHT_BLUE -> ChatColor.of("#3C4B51");
-			case MAGENTA -> ChatColor.of("#650065");
-			case ORANGE -> ChatColor.of("#65280C");
-			case WHITE -> ChatColor.of("#656565");
+			case BLACK -> TextColor.fromHexString("#000000");
+			case RED -> TextColor.fromHexString("#650000");
+			case GREEN -> TextColor.fromHexString("#006500");
+			case BROWN -> TextColor.fromHexString("#361B07");
+			case BLUE -> TextColor.fromHexString("#000065");
+			case PURPLE -> TextColor.fromHexString("#3F0C5F");
+			case CYAN -> TextColor.fromHexString("#006565");
+			case LIGHT_GRAY -> TextColor.fromHexString("#535353");
+			case GRAY -> TextColor.fromHexString("#323232");
+			case PINK -> TextColor.fromHexString("#652947");
+			case LIME -> TextColor.fromHexString("#4B6500");
+			case YELLOW -> TextColor.fromHexString("#656500");
+			case LIGHT_BLUE -> TextColor.fromHexString("#3C4B51");
+			case MAGENTA -> TextColor.fromHexString("#650065");
+			case ORANGE -> TextColor.fromHexString("#65280C");
+			case WHITE -> TextColor.fromHexString("#656565");
 		};
 	}
 	
 
 	
-	public static org.bukkit.ChatColor toBukkit(ChatColor color) {
-		return org.bukkit.ChatColor.valueOf(color.getName().toUpperCase());
+	public static ChatColor toBukkit(net.md_5.bungee.api.ChatColor color) {
+		return ChatColor.valueOf(color.getName().toUpperCase());
 	}
 	
-	public static org.bukkit.ChatColor toBukkit(TextColor color) {
+	public static ChatColor toBukkit(TextColor color) {
 		return toBukkit(NamedTextColor.nearestTo(color));
 	}
 	
-	public static org.bukkit.ChatColor toBukkit(NamedTextColor color) {
-		return org.bukkit.ChatColor.valueOf(color.toString().toUpperCase());
+	public static ChatColor toBukkit(NamedTextColor color) {
+		return ChatColor.valueOf(color.toString().toUpperCase());
 	}
-	
-	public static NamedTextColor toAdventure(org.bukkit.ChatColor color) {
+
+	public static NamedTextColor toAdventure(ChatColor color) {
 		return NamedTextColor.NAMES.value(color.name().toLowerCase());
 	}
+
+	public static NamedTextColor toAdventure(net.md_5.bungee.api.ChatColor color) {
+		return NamedTextColor.NAMES.value(color.getName());
+	}
 	
 }