From e35e94e87cc17694dd11c2565623c2c96881885a Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Mon, 19 Jun 2023 00:42:29 +0200
Subject: [PATCH] Migrate chat formatting to Paper's text component API (#130)

- Also updated the configs to use the interfaces
- Also updated the fun component to use a list config
- The text component change adds Paper as a requirement for this plugin
---
 pom.xml                                       |  31 ++--
 .../java/buttondevteam/chat/ChatPlayer.java   |  20 +--
 .../java/buttondevteam/chat/PluginMain.java   |   4 +-
 .../announce/AnnouncerComponent.java          |   8 +-
 .../appendext/AppendTextComponent.java        |   6 +-
 .../chatonly/ChatOnlyComponent.java           |  12 +-
 .../chat/components/flair/FlairComponent.java |   4 +-
 .../components/formatter/ChatProcessing.java  | 124 ++++++-------
 .../formatter/FormatterComponent.java         |  10 +-
 .../formatter/formatting/ChatFormatter.java   |  91 +++++-----
 .../formatter/formatting/FormatSettings.java  |   4 +-
 .../formatting/MatchProviderBase.java         |   4 +-
 .../chat/components/fun/FunComponent.java     |  12 +-
 .../towncolors/TownColorComponent.java        |   6 +-
 .../chat/components/towny/TownyComponent.java |  20 +--
 .../components/formatter/ChatFormatIT.java    | 168 +++++++++---------
 16 files changed, 256 insertions(+), 268 deletions(-)

diff --git a/pom.xml b/pom.xml
index d6bd59d..3db9190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,18 +100,23 @@
             <id>Dynmap</id>
             <url>https://repo.mikeprimm.com</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
     </repositories>
-	<dependencies>
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.12.2-R0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.TBMCPlugins.ChromaCore</groupId>
-			<artifactId>Chroma-Core</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.TBMCPlugins.ChromaCore</groupId>
+            <artifactId>Chroma-Core</artifactId>
             <version>v2.0.0-SNAPSHOT</version>
-		</dependency>
+        </dependency>
         <dependency>
             <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
@@ -141,12 +146,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
diff --git a/src/main/java/buttondevteam/chat/ChatPlayer.java b/src/main/java/buttondevteam/chat/ChatPlayer.java
index 57aa03f..b5be9b6 100644
--- a/src/main/java/buttondevteam/chat/ChatPlayer.java
+++ b/src/main/java/buttondevteam/chat/ChatPlayer.java
@@ -1,8 +1,8 @@
 package buttondevteam.chat;
 
 import buttondevteam.chat.components.flair.FlairStates;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ListConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
+import buttondevteam.lib.architecture.config.IListConfigData;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.player.PlayerClass;
 import buttondevteam.lib.player.TBMCPlayerBase;
@@ -13,22 +13,22 @@ import java.util.Collections;
 
 @PlayerClass(pluginname = "Chroma-Chat")
 public class ChatPlayer extends TBMCPlayerBase {
-	public final ConfigData<String> UserName = getConfig().getData("UserName", "");
+	public final IConfigData<String> UserName = getConfig().getData("UserName", "");
 
-	public final ListConfigData<String> UserNames = getConfig().getListData("UserNames", Collections.emptyList());
+	public final IListConfigData<String> UserNames = getConfig().getListData("UserNames", Collections.emptyList());
 
-	public final ConfigData<Integer> FlairTime = getConfig().getData("FlairTime", FlairTimeNone);
+	public final IConfigData<Integer> FlairTime = getConfig().getData("FlairTime", FlairTimeNone);
 
-	public final ConfigData<FlairStates> FlairState = getConfig().getData("FlairState", FlairStates.NoComment,
+	public final IConfigData<FlairStates> FlairState = getConfig().getData("FlairState", FlairStates.NoComment,
 		fs -> FlairStates.valueOf((String) fs), FlairStates::toString);
 
-	public final ConfigData<Integer> FCount = getConfig().getData("FCount", 0);
+	public final IConfigData<Integer> FCount = getConfig().getData("FCount", 0);
 
-	public final ConfigData<Integer> FDeaths = getConfig().getData("FDeaths", 0);
+	public final IConfigData<Integer> FDeaths = getConfig().getData("FDeaths", 0);
 
-	public final ConfigData<Boolean> FlairCheater = getConfig().getData("FlairCheater", false);
+	public final IConfigData<Boolean> FlairCheater = getConfig().getData("FlairCheater", false);
 
-	public final ListConfigData<Integer> NameColorLocations = getConfig().getListData("NameColorLocations", Collections.emptyList()); // No byte[], no TIntArrayList
+	public final IListConfigData<Integer> NameColorLocations = getConfig().getListData("NameColorLocations", Collections.emptyList()); // No byte[], no TIntArrayList
 
 	public boolean Working;
 	// public int Tables = 10;
diff --git a/src/main/java/buttondevteam/chat/PluginMain.java b/src/main/java/buttondevteam/chat/PluginMain.java
index abbb55d..24d92b6 100644
--- a/src/main/java/buttondevteam/chat/PluginMain.java
+++ b/src/main/java/buttondevteam/chat/PluginMain.java
@@ -21,7 +21,7 @@ import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import com.earth2me.essentials.Essentials;
@@ -38,7 +38,7 @@ public class PluginMain extends ButtonPlugin { // Translated to Java: 2015.07.15
 	 * If enabled, stores and displays the last 10 messages the player can see (public, their town chat etc.)
 	 * Can be used with the Discord plugin so players can see some of the conversation they missed that's visible on Discord anyways.
 	 */
-	public ConfigData<Boolean> storeChatHistory = getIConfig().getData("storeChatHistory", true);
+	public IConfigData<Boolean> storeChatHistory = getIConfig().getData("storeChatHistory", true);
 
 	// Fired when plugin is first enabled
 	@Override
diff --git a/src/main/java/buttondevteam/chat/components/announce/AnnouncerComponent.java b/src/main/java/buttondevteam/chat/components/announce/AnnouncerComponent.java
index 7539998..8cceedc 100644
--- a/src/main/java/buttondevteam/chat/components/announce/AnnouncerComponent.java
+++ b/src/main/java/buttondevteam/chat/components/announce/AnnouncerComponent.java
@@ -5,8 +5,8 @@ import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.architecture.ComponentMetadata;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ListConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
+import buttondevteam.lib.architecture.config.IListConfigData;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import org.bukkit.Bukkit;
 
@@ -20,12 +20,12 @@ public class AnnouncerComponent extends Component<PluginMain> implements Runnabl
 	/**
 	 * The messages to display to players.
 	 */
-	public ListConfigData<String> announceMessages = getConfig().getListData("announceMessages", Collections.emptyList());
+	public IListConfigData<String> announceMessages = getConfig().getListData("announceMessages", Collections.emptyList());
 
 	/**
 	 * The time in milliseconds between the messages. Use /u announce settime to set minutes.
 	 */
-	public ConfigData<Integer> announceTime = getConfig().getData("announceTime", 15 * 60 * 1000);
+	public IConfigData<Integer> announceTime = getConfig().getData("announceTime", 15 * 60 * 1000);
 
 	private TBMCSystemChatEvent.BroadcastTarget target;
 
diff --git a/src/main/java/buttondevteam/chat/components/appendext/AppendTextComponent.java b/src/main/java/buttondevteam/chat/components/appendext/AppendTextComponent.java
index 72cfbf2..edccb25 100644
--- a/src/main/java/buttondevteam/chat/components/appendext/AppendTextComponent.java
+++ b/src/main/java/buttondevteam/chat/components/appendext/AppendTextComponent.java
@@ -2,8 +2,8 @@ package buttondevteam.chat.components.appendext;
 
 import buttondevteam.chat.PluginMain;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
 import buttondevteam.lib.architecture.IHaveConfig;
+import buttondevteam.lib.architecture.config.IConfigData;
 import buttondevteam.lib.chat.*;
 import lombok.val;
 
@@ -19,7 +19,7 @@ import java.util.function.Consumer;
 public class AppendTextComponent extends Component<PluginMain> {
 	private Map<String, IHaveConfig> appendTexts;
 
-	private ConfigData<String[]> helpText(IHaveConfig config) {
+	private IConfigData<String[]> helpText(IHaveConfig config) {
 		return config.getData("helpText", new String[]{
 			"Tableflip", //
 			"This command appends a tableflip after your message", //
@@ -27,7 +27,7 @@ public class AppendTextComponent extends Component<PluginMain> {
 		});
 	}
 
-	private ConfigData<String> appendedText(IHaveConfig config) {
+	private IConfigData<String> appendedText(IHaveConfig config) {
 		return config.getData("appendedText", "tableflip");
 	}
 
diff --git a/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java b/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java
index 9de11d5..e16c1b3 100644
--- a/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java
+++ b/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java
@@ -2,13 +2,12 @@ package buttondevteam.chat.components.chatonly;
 
 import buttondevteam.chat.ChatPlayer;
 import buttondevteam.chat.PluginMain;
-import buttondevteam.chat.components.formatter.formatting.TellrawEvent;
-import buttondevteam.chat.components.formatter.formatting.TellrawPart;
 import buttondevteam.core.ComponentManager;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.architecture.ComponentMetadata;
 import buttondevteam.lib.player.TBMCPlayer;
 import lombok.val;
+import net.kyori.adventure.text.TextComponent;
 import org.bukkit.GameMode;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -17,6 +16,10 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
+import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT;
+import static net.kyori.adventure.text.event.HoverEvent.hoverEvent;
+
 /**
  * Allows players to enter chat-only mode which puts them into spectator mode and disallows moving.
  */
@@ -43,12 +46,11 @@ public class ChatOnlyComponent extends Component<PluginMain> implements Listener
 		}
 	}
 
-	public static void tellrawCreate(ChatPlayer mp, TellrawPart json) {
+	public static void tellrawCreate(ChatPlayer mp, TextComponent.Builder json) {
 		if (!ComponentManager.isEnabled(ChatOnlyComponent.class))
 			return;
 		if (mp != null && mp.ChatOnly) {
-			json.addExtra(new TellrawPart("[C]")
-				.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Chat only")));
+			json.append(text("[C]").hoverEvent(hoverEvent(SHOW_TEXT, text("Chat only"))));
 		}
 	}
 
diff --git a/src/main/java/buttondevteam/chat/components/flair/FlairComponent.java b/src/main/java/buttondevteam/chat/components/flair/FlairComponent.java
index e584915..ecaaab8 100644
--- a/src/main/java/buttondevteam/chat/components/flair/FlairComponent.java
+++ b/src/main/java/buttondevteam/chat/components/flair/FlairComponent.java
@@ -5,7 +5,7 @@ import buttondevteam.chat.PluginMain;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.architecture.ComponentMetadata;
-import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
 import buttondevteam.lib.player.TBMCPlayerBase;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -27,7 +27,7 @@ public class FlairComponent extends Component<PluginMain> {
 	/**
 	 * The Reddit thread to check for account connections. Re-enable the component if this was empty.
 	 */
-	ConfigData<String> flairThreadURL = getConfig().getData("flairThreadURL", "");
+	IConfigData<String> flairThreadURL = getConfig().getData("flairThreadURL", "");
 
 	/**
 	 * <p>
diff --git a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
index b37f639..13a4c17 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
@@ -15,7 +15,6 @@ import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCChatEvent;
 import buttondevteam.lib.TBMCChatEventBase;
 import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TellrawSerializableEnum;
 import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
@@ -27,6 +26,10 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import lombok.val;
 import net.ess3.api.events.AfkStatusChangeEvent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
@@ -39,12 +42,18 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
+import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.event.ClickEvent.suggestCommand;
+import static net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT;
+import static net.kyori.adventure.text.event.HoverEvent.hoverEvent;
+import static net.kyori.adventure.text.format.NamedTextColor.*;
+
 public class ChatProcessing {
 	private static final Pattern HASHTAG_PATTERN = Pattern.compile("#(\\w+)");
 	private static final Pattern URL_PATTERN = Pattern.compile("(http[\\w:/?=$\\-_.+!*'(),&]+(?:#[\\w]+)?)");
 	private static final Pattern MASKED_LINK_PATTERN = Pattern.compile("\\[([^\\[\\]]+)]\\(([^()]+)\\)");
-	private static final Color[] RainbowPresserColors = new Color[]{Color.Red, Color.Gold, Color.Yellow, Color.Green,
-		Color.Blue, Color.DarkPurple};
+	private static final NamedTextColor[] RainbowPresserColors = new NamedTextColor[]{RED, GOLD, YELLOW, GREEN,
+		BLUE, DARK_PURPLE};
 	private static final Pattern WORD_PATTERN = Pattern.compile("\\S+");
 	private static final Pattern GREENTEXT_PATTERN = Pattern.compile("^>(?:.|\\s)*");
 	private static boolean pingedconsole = false;
@@ -60,8 +69,8 @@ public class ChatProcessing {
 				cf.setHoverText(match);
 				return match;
 			}).build()),
-		new StringMatchProvider("nullMention", FormatSettings.builder().color(Color.DarkRed).build(), true, "null"), // Properly added a bug as a feature
-		new StringMatchProvider("consolePing", FormatSettings.builder().color(Color.Aqua)
+		new StringMatchProvider("nullMention", FormatSettings.builder().color(DARK_RED).build(), true, "null"), // Properly added a bug as a feature
+		new StringMatchProvider("consolePing", FormatSettings.builder().color(AQUA)
 			.onmatch((match, builder, section) -> {
 				if (!pingedconsole) {
 					System.out.print("\007");
@@ -70,8 +79,8 @@ public class ChatProcessing {
 				return "@console";
 			}).build(), true, "@console"),
 
-		new StringMatchProvider("cyan", FormatSettings.builder().color(Color.Aqua).build(), true, "cyan"), // #55
-		new RangeMatchProvider("code", "`", FormatSettings.builder().color(Color.DarkGray).build()),
+		new StringMatchProvider("cyan", FormatSettings.builder().color(AQUA).build(), true, "cyan"), // #55
+		new RangeMatchProvider("code", "`", FormatSettings.builder().color(DARK_GRAY).build()),
 		new RegexMatchProvider("maskedLink", MASKED_LINK_PATTERN, FormatSettings.builder().underlined(true)
 			.onmatch((match, builder, section) -> {
 				String text, link;
@@ -81,8 +90,8 @@ public class ChatProcessing {
 				return text;
 			}).build()),
 		new RegexMatchProvider("url", URL_PATTERN, FormatSettings.builder().underlined(true).openlink("$1").build()),
-		new RegexMatchProvider("hashtag", HASHTAG_PATTERN, FormatSettings.builder().color(Color.Blue).openlink("https://twitter.com/hashtag/$1").build()),
-		new StringMatchProvider("someone", FormatSettings.builder().color(Color.Aqua)
+		new RegexMatchProvider("hashtag", HASHTAG_PATTERN, FormatSettings.builder().color(BLUE).openlink("https://twitter.com/hashtag/$1").build()),
+		new StringMatchProvider("someone", FormatSettings.builder().color(AQUA)
 			.onmatch((match, builder, section) -> {
 				if (Bukkit.getOnlinePlayers().size() == 0) return match;
 				var players = ImmutableList.copyOf(Bukkit.getOnlinePlayers());
@@ -91,7 +100,7 @@ public class ChatProcessing {
 				playPingSound(player, ComponentManager.getIfEnabled(FormatterComponent.class));
 				return "@someone (" + player.getDisplayName() + "§r)";
 			}).build(), true, "@someone"),
-		new RegexMatchProvider("greentext", GREENTEXT_PATTERN, FormatSettings.builder().color(Color.Green).build()));
+		new RegexMatchProvider("greentext", GREENTEXT_PATTERN, FormatSettings.builder().color(GREEN).build()));
 	private static final Gson gson = new GsonBuilder()
 		.registerTypeHierarchyAdapter(TellrawSerializableEnum.class, new TellrawSerializer.TwEnum())
 		.registerTypeHierarchyAdapter(Collection.class, new TellrawSerializer.TwCollection())
@@ -145,42 +154,39 @@ public class ChatProcessing {
 
 		if (Bukkit.getOnlinePlayers().size() == 0) return false; //Don't try to send to nobody (errors on 1.14)
 
-		Color colormode = channel.color.get();
-		if (mp != null && mp.OtherColorMode != null)
-			colormode = mp.OtherColorMode;
+		TextColor colormode = NAMES.value(channel.color.get().getName());
+		boolean colorModeChanged = false;
+		if (mp != null && mp.OtherColorMode != null) {
+			colormode = NAMES.value(mp.OtherColorMode.getName());
+			colorModeChanged = true;
+		}
 
 		ArrayList<MatchProviderBase> formatters;
 		if (component.allowFormatting.get()) {
 			formatters = addFormatters(sender -> e.shouldSendTo(ChromaGamerBase.getFromSender(sender)), component);
-			if (colormode == channel.color.get() && mp != null && mp.RainbowPresserColorMode) { // Only overwrite channel color
+			if (colorModeChanged && mp.RainbowPresserColorMode) { // Only overwrite channel color
 				createRPC(colormode, formatters);
 			}
 			pingedconsole = false; // Will set it to true onmatch (static constructor)
 		} else
 			formatters = Lists.newArrayList();
 
-		TellrawPart json = createTellraw(cuser, message, player, mp, e.getUser(), channelidentifier, e.getOrigin());
+		TextComponent.Builder builder = createEmptyMessageLine(cuser, message, player, channelidentifier, e.getOrigin());
 		long combinetime = System.nanoTime();
-		ChatFormatter.Combine(formatters, message, json, component.getConfig(), FormatSettings.builder().color(colormode).build());
+		ChatFormatter.Combine(formatters, message, builder, component.getConfig(), FormatSettings.builder().color(colormode).build());
 		combinetime = System.nanoTime() - combinetime;
-		String jsonstr = toJson(json);
-		if (jsonstr.length() >= 32767) {
-			cuser.sendMessage("§cError: Message too long. Try shortening it, or remove hashtags and other formatting.");
-			return true;
-		}
-		DebugCommand.SendDebugMessage(jsonstr);
 
 		try {
 			if (!channel.isGlobal()) {
-				String senderGroup = e.getGroupID(sender);
+				String senderGroup = e.getGroupID(cuser);
 				if (senderGroup == null) { // Never send messages if the group is null
-					sender.sendMessage("§cYou don't have permission to send this message or something went wrong");
+					cuser.sendMessage("§cYou don't have permission to send this message or something went wrong");
 					return true;
 				}
 				val tc = ComponentManager.getIfEnabled(TownyComponent.class);
 				Consumer<Player> spyConsumer = null;
 				if (tc != null)
-					spyConsumer = tc.handleSpiesInit(channel, json, ChatProcessing::toJson, cuser, message);
+					spyConsumer = tc.handleSpiesInit(channel, builder);
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					final String group;
 					if (player != null
@@ -188,19 +194,18 @@ public class ChatProcessing {
 						group = null; // Don't send the message to them
 					else
 						group = VanillaUtils.getGroupIfChatOn(p, e);
-					if (senderGroup.equals(group))
-						if (!VanillaUtils.tellRaw(p, jsonstr))
-							p.sendMessage(ChatUtils.getMessageString(channel, sender, message));
-						else if (tc != null) spyConsumer.accept(p);
+					if (senderGroup.equals(group)) {
+						p.sendMessage(builder.build());
+						if (tc != null) spyConsumer.accept(p);
+					}
 					//Only sends if didn't send normally
 				}
 			} else
 				for (Player p : Bukkit.getOnlinePlayers())
-					if (!VanillaUtils.tellRaw(p, jsonstr))
-						ChatUtils.sendChatMessage(channel, sender, message, p);
+					p.sendMessage(builder.build());
 		} catch (Exception ex) {
 			TBMCCoreAPI.SendException("An error occured while sending a chat message!", ex, PluginMain.Instance);
-			sender.sendMessage("§cAn error occured while sending the message.");
+			cuser.sendMessage("§cAn error occured while sending the message.");
 			return true;
 		}
 		DebugCommand.SendDebugMessage(
@@ -209,7 +214,7 @@ public class ChatProcessing {
 		return false;
 	}
 
-	static void createRPC(Color colormode, ArrayList<MatchProviderBase> formatters) {
+	static void createRPC(TextColor colormode, ArrayList<MatchProviderBase> formatters) {
 		final AtomicInteger rpc = new AtomicInteger(0);
 		formatters.add(new RegexMatchProvider("rpc", WORD_PATTERN, FormatSettings.builder().color(colormode).onmatch((match, cf, s) -> {
 			cf.setColor(RainbowPresserColors[rpc.getAndUpdate(i -> ++i < RainbowPresserColors.length ? i : 0)]);
@@ -221,40 +226,25 @@ public class ChatProcessing {
 		return gson.toJson(json);
 	}
 
-	static TellrawPart createTellraw(ChromaGamerBase user, String message, @Nullable Player player,
-	                                 @Nullable ChatPlayer mp, @Nullable ChromaGamerBase cg, final String channelidentifier,
-	                                 String origin) {
-		TellrawPart json = new TellrawPart("");
-		ChatOnlyComponent.tellrawCreate(mp, json); //TODO: Use nice API (Paper)
-		json.addExtra(
-			new TellrawPart(channelidentifier)
-				.setHoverEvent(
-					TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT,
-						new TellrawPart((ChatUtils.MCORIGIN.equals(origin) ? "" : "From " + origin + "\n")
-							+ "Copy message").setColor(Color.Blue)))
-				.setClickEvent(TellrawEvent.create(TellrawEvent.ClickAction.SUGGEST_COMMAND, message)));
-		if (PluginMain.permission.has(sender, "tbmc.badge.diamond"))
-			json.addExtra(new TellrawPart("[P]").setColor(Color.Aqua).setBold(true)
-				.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Diamond Patreon supporter")));
-		else if (PluginMain.permission.has(sender, "tbmc.badge.gold"))
-			json.addExtra(new TellrawPart("[P]").setColor(Color.Gold).setBold(true)
-				.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Gold Patreon supporter")));
-		json.addExtra(new TellrawPart(" <"));
-		TellrawPart hovertp = new TellrawPart("");
-		if (cg != null)
-			hovertp.addExtra(new TellrawPart(cg.getInfo(ChromaGamerBase.InfoTarget.MCHover)));
-		json.addExtra(new TellrawPart(user.getName())
-			.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, hovertp)));
-		json.addExtra(new TellrawPart("> "));
+	static TextComponent.Builder createEmptyMessageLine(ChromaGamerBase user, String message, @Nullable Player player,
+	                                                    final String channelidentifier, String origin) {
+		val json = text();
+		ChatOnlyComponent.tellrawCreate(user.getAs(ChatPlayer.class), json);
+		val channelHover = (ChatUtils.MCORIGIN.equals(origin) ? "" : "From " + origin + "\n") + "Copy message";
+		json.append(text(channelidentifier)
+			.hoverEvent(hoverEvent(SHOW_TEXT, text(channelHover).color(BLUE))).clickEvent(suggestCommand(message)));
+		if (PluginMain.permission.has(player, "tbmc.badge.diamond")) // TODO: Cross-platform permissions
+			json.append(text("[P]").color(AQUA).decorate(TextDecoration.BOLD)
+				.hoverEvent(hoverEvent(SHOW_TEXT, text("Diamond Patreon supporter"))));
+		else if (PluginMain.permission.has(player, "tbmc.badge.gold"))
+			json.append(text("[P]").color(GOLD).decorate(TextDecoration.BOLD)
+				.hoverEvent(hoverEvent(SHOW_TEXT, text("Gold Patreon supporter"))));
+		json.append(text(" <"));
+		json.append(text(user.getName()).hoverEvent(hoverEvent(SHOW_TEXT, text(user.getInfo(ChromaGamerBase.InfoTarget.MCHover)))));
+		json.append(text("> "));
 		return json;
 	}
 
-	private static String getSenderName(CommandSender sender, Player player) {
-		if (player == null)
-			return sender.getName();
-		return player.getDisplayName();
-	}
-
 	static String getChannelID(Channel channel, String origin) {
 		return ("[" + (ChatUtils.MCORIGIN.equals(origin) ? "" : "§8" + origin.charAt(0) + "§r|") + channel.displayName.get())
 			+ "]";
@@ -284,12 +274,12 @@ public class ChatProcessing {
 			};
 
 			if (names.length > 0) //Add as first so it handles special characters (_) - though the order of the different types are defined
-				formatters.add(0, new StringMatchProvider("name", FormatSettings.builder().color(Color.Aqua)
+				formatters.add(0, new StringMatchProvider("name", FormatSettings.builder().color(AQUA)
 					.onmatch((match, builder, section) -> {
 						Player p = Bukkit.getPlayer(match);
 						Optional<String> pn = nottest ? Optional.empty()
 							: Arrays.stream(testPlayers).filter(tp -> tp.equalsIgnoreCase(match)).findAny();
-						if (nottest ? p == null : !pn.isPresent()) {
+						if (nottest ? p == null : pn.isEmpty()) {
 							error.accept("Error: Can't find player " + match + " but was reported as online.");
 							return "§c" + match + "§r";
 						}
@@ -302,7 +292,7 @@ public class ChatProcessing {
 					}).build(), true, names));
 
 			if (nicknames.length > 0) //Add as first so it handles special characters
-				formatters.add(0, new StringMatchProvider("nickname", FormatSettings.builder().color(Color.Aqua)
+				formatters.add(0, new StringMatchProvider("nickname", FormatSettings.builder().color(AQUA)
 					.onmatch((match, builder, section) -> {
 						if (PlayerListener.nicknames.containsKey(match.toLowerCase())) { //Made a stream and all that but I can actually store it lowercased
 							Player p = Bukkit.getPlayer(PlayerListener.nicknames.get(match.toLowerCase()));
diff --git a/src/main/java/buttondevteam/chat/components/formatter/FormatterComponent.java b/src/main/java/buttondevteam/chat/components/formatter/FormatterComponent.java
index 6fd717b..649bff5 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/FormatterComponent.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/FormatterComponent.java
@@ -5,7 +5,7 @@ import buttondevteam.core.ComponentManager;
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCChatEvent;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
 
 /**
  * This component handles the custom processing of chat messages. If this component is disabled channels won't be supported in Minecraft.
@@ -16,22 +16,22 @@ public class FormatterComponent extends Component<PluginMain> {
 	/**
 	 * Determines whether Markdown formatting, name mentioning and similar features are enabled.
 	 */
-	ConfigData<Boolean> allowFormatting = getConfig().getData("allowFormatting", true);
+	IConfigData<Boolean> allowFormatting = getConfig().getData("allowFormatting", true);
 
 	/**
 	 * The sound to play when a player is mentioned. Leave empty to use default.
 	 */
-	public ConfigData<String> notificationSound = getConfig().getData("notificationSound", "");
+	public IConfigData<String> notificationSound = getConfig().getData("notificationSound", "");
 
 	/**
 	 * The pitch of the notification sound.
 	 */
-	public ConfigData<Float> notificationPitch = getConfig().getData("notificationPitch", 1.0f);
+	public IConfigData<Float> notificationPitch = getConfig().getData("notificationPitch", 1.0f);
 
 	/**
 	 * The minimum time between messages in milliseconds.
 	 */
-	public ConfigData<Integer> minTimeBetweenMessages = getConfig().getData("minTimeBetweenMessages", 100);
+	public IConfigData<Integer> minTimeBetweenMessages = getConfig().getData("minTimeBetweenMessages", 100);
 
 	@Override
 	protected void enable() {
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
index 53a13fa..98e02fd 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
@@ -2,15 +2,24 @@ package buttondevteam.chat.components.formatter.formatting;
 
 import buttondevteam.chat.commands.ucmds.admin.DebugCommand;
 import buttondevteam.lib.architecture.IHaveConfig;
-import buttondevteam.lib.chat.Color;
 import lombok.val;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.event.ClickEvent.Action.OPEN_URL;
+import static net.kyori.adventure.text.event.ClickEvent.clickEvent;
+import static net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT;
+import static net.kyori.adventure.text.event.HoverEvent.hoverEvent;
+
 /**
- * A {@link MatchProvider} finds where the given {@link FormatSettings} need to be applied. {@link ChatFormatter#Combine(List, String, TellrawPart, IHaveConfig, FormatSettings)}} is used to turn it into a {@link TellrawPart}, combining
+ * A {@link MatchProvider} finds where the given {@link FormatSettings} need to be applied. {@link ChatFormatter#Combine(List, String, TextComponent.Builder, IHaveConfig, FormatSettings)}} is used to turn it into a {@link TellrawPart}, combining
  * intersecting parts found, for example when {@code _abc*def*ghi_} is said in chat, it'll turn it into an underlined part, then an underlined <i>and italics</i> part, finally an underlined part
  * again.
  *
@@ -26,7 +35,7 @@ public final class ChatFormatter {
 	}
 
 	//synchronized: Some of the formatters are reused, see createSections(...)
-	public static synchronized void Combine(List<MatchProviderBase> formatters, String str, TellrawPart tp, IHaveConfig config, FormatSettings defaults) {
+	public static synchronized void Combine(List<MatchProviderBase> formatters, String str, TextComponent.Builder tp, IHaveConfig config, FormatSettings defaults) {
 		/*
 		 * A global formatter is no longer needed
 		 */
@@ -152,11 +161,11 @@ public final class ChatFormatter {
 
 				DebugCommand.SendDebugMessage("To sections");
 				if (!removeIfNeeded.test(firstSection)) {
-					DebugCommand.SendDebugMessage("  1:" + firstSection + "");
+					DebugCommand.SendDebugMessage("  1:" + firstSection);
 					ChatFormatUtils.sendMessageWithPointer(str, firstSection.Start, firstSection.End);
 				}
 				if (!removeIfNeeded.test(section)) {
-					DebugCommand.SendDebugMessage("  2:" + section + "");
+					DebugCommand.SendDebugMessage("  2:" + section);
 					ChatFormatUtils.sendMessageWithPointer(str, section.Start, section.End);
 				}
 				if (!removeIfNeeded.test(lastSection)) {
@@ -169,8 +178,8 @@ public final class ChatFormatter {
 		}
 	}
 
-	private static void applySections(String str, TellrawPart tp, ArrayList<FormattedSection> sections, ArrayList<int[]> remchars) {
-		TellrawPart lasttp = null;
+	private static void applySections(String str, TextComponent.Builder tp, ArrayList<FormattedSection> sections, ArrayList<int[]> remchars) {
+		TextComponent lasttp = null;
 		String lastlink = null;
 		for (FormattedSection section : sections) {
 			DebugCommand.SendDebugMessage("Applying section: " + section);
@@ -178,21 +187,9 @@ public final class ChatFormatter {
 			int start = section.Start, end = section.End;
 			DebugCommand.SendDebugMessage("Start: " + start + " - End: " + end);
 			ChatFormatUtils.sendMessageWithPointer(str, start, end);
-			/*DebugCommand.SendDebugMessage("RCS: "+remchars.stream().filter(rc -> rc[0] <= start && start <= rc[1]).count());
-			DebugCommand.SendDebugMessage("RCE: "+remchars.stream().filter(rc -> rc[0] <= end && end <= rc[1]).count());
-			DebugCommand.SendDebugMessage("RCI: "+remchars.stream().filter(rc -> start < rc[0] || rc[1] < end).count());*/
 			val rci = remchars.stream().filter(rc -> (rc[0] <= start && rc[1] >= start)
 				|| (rc[0] >= start && rc[1] <= end)
 				|| (rc[0] <= end && rc[1] >= end)).sorted(Comparator.comparingInt(rc -> rc[0] * 10000 + rc[1])).toArray(int[][]::new);
-			/*if (rcs.isPresent())
-				s = rcs.get()[1] + 1;
-			if (rce.isPresent())
-				e = rce.get()[0] - 1;
-			DebugCommand.SendDebugMessage("After RC - Start: " + s + " - End: " + e);
-			if (e - s < 0) { //e-s==0 means the end char is the same as start char, so one char message
-				DebugCommand.SendDebugMessage("Skipping section because of remchars (length would be " + (e - s + 1) + ")");
-				continue;
-			}*/
 			DebugCommand.SendDebugMessage("Applying RC: " + Arrays.stream(rci).map(Arrays::toString).collect(Collectors.joining(", ", "[", "]")));
 			originaltext = str.substring(start, end + 1);
 			val sb = new StringBuilder(originaltext);
@@ -205,50 +202,52 @@ public final class ChatFormatter {
 			}
 			DebugCommand.SendDebugMessage("Section text: " + originaltext);
 			String openlink = null;
-			//section.Formatters.sort(Comparator.comparing(cf2 -> cf2.priority.GetValue())); //Apply the highest last, to overwrite previous ones
-			TellrawPart newtp = new TellrawPart("");
 			var settings = section.Settings;
 			DebugCommand.SendDebugMessage("Applying settings: " + settings);
+			if (lasttp != null && hasSameDecorations(lasttp, settings) && Objects.equals(lastlink, settings.openlink)) {
+				DebugCommand.SendDebugMessage("This part has the same properties as the previous one, combining.");
+				lasttp = lasttp.content(lasttp.content() + originaltext);
+				continue; //Combine parts with the same properties
+			}
+			TextComponent.@NotNull Builder newtp = text();
 			if (settings.onmatch != null)
 				originaltext = settings.onmatch.apply(originaltext, settings, section);
 			if (settings.color != null)
-				newtp.setColor(settings.color);
+				newtp.color(settings.color);
 			if (settings.bold)
-				newtp.setBold(true);
+				newtp.decorate(TextDecoration.BOLD);
 			if (settings.italic)
-				newtp.setItalic(true);
+				newtp.decorate(TextDecoration.ITALIC);
 			if (settings.underlined)
-				newtp.setUnderlined(true);
+				newtp.decorate(TextDecoration.UNDERLINED);
 			if (settings.strikethrough)
-				newtp.setStrikethrough(true);
+				newtp.decorate(TextDecoration.STRIKETHROUGH);
 			if (settings.obfuscated)
-				newtp.setObfuscated(true);
+				newtp.decorate(TextDecoration.OBFUSCATED);
 			if (settings.openlink != null)
 				openlink = settings.openlink;
 			if (settings.hoverText != null)
-				newtp.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, settings.hoverText));
-			if (lasttp != null && newtp.getColor() == lasttp.getColor()
-				&& newtp.isBold() == lasttp.isBold()
-				&& newtp.isItalic() == lasttp.isItalic()
-				&& newtp.isUnderlined() == lasttp.isUnderlined()
-				&& newtp.isStrikethrough() == lasttp.isStrikethrough()
-				&& newtp.isObfuscated() == lasttp.isObfuscated()
-				&& Objects.equals(openlink, lastlink)) {
-				DebugCommand.SendDebugMessage("This part has the same properties as the previous one, combining.");
-				lasttp.setText(lasttp.getText() + originaltext);
-				continue; //Combine parts with the same properties
-			}
+				newtp.hoverEvent(hoverEvent(SHOW_TEXT, text(settings.hoverText)));
+			if (lasttp != null) tp.append(lasttp);
 			lastlink = openlink;
-			newtp.setText(originaltext);
+			newtp.content(originaltext);
 			if (openlink != null && openlink.length() > 0) {
-				newtp.setClickEvent(TellrawEvent.create(TellrawEvent.ClickAction.OPEN_URL,
-					(section.Matches.size() > 0 ? openlink.replace("$1", section.Matches.get(0)) : openlink)))
-					.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT,
-						new TellrawPart("Click to open").setColor(Color.Blue)));
+				if (section.Matches.size() > 0)
+					openlink = openlink.replace("$1", section.Matches.get(0));
+				newtp.clickEvent(clickEvent(OPEN_URL, openlink)).hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(NamedTextColor.BLUE)));
 			}
-			tp.addExtra(newtp);
-			lasttp = newtp;
+			lasttp = newtp.build();
 		}
+		if (lasttp != null) tp.append(lasttp);
+	}
+
+	private static boolean hasSameDecorations(TextComponent c1, FormatSettings settings) {
+		return Objects.equals(c1.color(), settings.color)
+			&& c1.hasDecoration(TextDecoration.BOLD) == settings.bold
+			&& c1.hasDecoration(TextDecoration.ITALIC) == settings.italic
+			&& c1.hasDecoration(TextDecoration.UNDERLINED) == settings.underlined
+			&& c1.hasDecoration(TextDecoration.STRIKETHROUGH) == settings.strikethrough
+			&& c1.hasDecoration(TextDecoration.OBFUSCATED) == settings.obfuscated;
 	}
 
 	private static void sortSections(ArrayList<FormattedSection> sections) {
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/FormatSettings.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/FormatSettings.java
index ee739b2..789b6ac 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/FormatSettings.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/FormatSettings.java
@@ -1,8 +1,8 @@
 package buttondevteam.chat.components.formatter.formatting;
 
-import buttondevteam.lib.chat.Color;
 import lombok.Builder;
 import lombok.Data;
+import net.kyori.adventure.text.format.TextColor;
 
 /**
  * Describes how a matched section of the message should look. May be combined with other format settings.
@@ -15,7 +15,7 @@ public class FormatSettings {
 	boolean underlined;
 	boolean strikethrough;
 	boolean obfuscated;
-	Color color;
+	TextColor color;
 	ChatFormatter.TriFunc<String, FormatSettings, FormattedSection, String> onmatch;
 	String openlink;
 	String hoverText;
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/MatchProviderBase.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/MatchProviderBase.java
index fd25901..f713bc4 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/MatchProviderBase.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/MatchProviderBase.java
@@ -1,7 +1,7 @@
 package buttondevteam.chat.components.formatter.formatting;
 
-import buttondevteam.lib.architecture.ConfigData;
 import buttondevteam.lib.architecture.IHaveConfig;
+import buttondevteam.lib.architecture.config.IConfigData;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -31,7 +31,7 @@ public abstract class MatchProviderBase implements MatchProvider {
 		resetSubclass();
 	}
 
-	ConfigData<Boolean> enabled(IHaveConfig config) {
+	IConfigData<Boolean> enabled(IHaveConfig config) {
 		return config.getData(name + ".enabled", true);
 	}
 
diff --git a/src/main/java/buttondevteam/chat/components/fun/FunComponent.java b/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
index 9c8c5b8..e6ead92 100644
--- a/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
+++ b/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
@@ -7,11 +7,13 @@ import buttondevteam.lib.TBMCChatEventBase;
 import buttondevteam.lib.TBMCCommandPreprocessEvent;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
+import buttondevteam.lib.architecture.config.IListConfigData;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
+import com.google.common.collect.Lists;
 import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -44,20 +46,20 @@ public class FunComponent extends Component<PluginMain> implements Listener {
 	/**
 	 * The strings that count as laughs, see unlol.
 	 */
-	private final ConfigData<String[]> laughStrings = getConfig().getData("laughStrings", new String[]{"xd", "lel", "lawl", "kek", "lmao", "hue", "hah", "rofl"});
+	private final IListConfigData<String> laughStrings = getConfig().getListData("laughStrings", Lists.newArrayList("xd", "lel", "lawl", "kek", "lmao", "hue", "hah", "rofl"));
 
 	/**
 	 * The "Press F to pay respects" meme in Minecraft. It will randomly appear on player death and keep track of how many "F"s are said in chat.
 	 * You can hover over a player's name to see their respect.
 	 */
-	private final ConfigData<Boolean> respect = getConfig().getData("respect", true);
+	private final IConfigData<Boolean> respect = getConfig().getData("respect", true);
 
 	/**
 	 * This is an inside joke on our server.
 	 * It keeps track of laughs (lols and what's defined in laughStrings) and if someone does /unlol or /unlaugh it will unlaugh the last person who laughed.
 	 * Which also blinds the laughing person for a few seconds. This action can only be performed once per laugh.
 	 */
-	private final ConfigData<Boolean> unlol = getConfig().getData("unlol", true);
+	private final IConfigData<Boolean> unlol = getConfig().getData("unlol", true);
 
 	@Override
 	protected void enable() {
@@ -90,7 +92,7 @@ public class FunComponent extends Component<PluginMain> implements Listener {
 			if (add)
 				lld.setLolornot(true);
 			else {
-				String[] laughs = laughStrings.get();
+				val laughs = laughStrings.get();
 				for (String laugh : laughs) {
 					add = msg.contains(laugh);
 					if (add) {
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
index d81415c..8c1f7f9 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
@@ -8,7 +8,7 @@ import buttondevteam.core.ComponentManager;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.architecture.ComponentMetadata;
-import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.architecture.config.IConfigData;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.player.TBMCPlayer;
 import com.earth2me.essentials.User;
@@ -53,13 +53,13 @@ public class TownColorComponent extends Component<PluginMain> implements Listene
 	/**
 	 * The amount of town colors allowed. If more than one is used (or nation colors are enabled), players can change how many letters to be in a specific color using /u ncolor.
 	 */
-	public final ConfigData<Byte> colorCount = getConfig().getData("colorCount", (byte) 1, cc -> ((Integer) cc).byteValue(), Byte::intValue);
+	public final IConfigData<Byte> colorCount = getConfig().getData("colorCount", (byte) 1, cc -> ((Integer) cc).byteValue(), Byte::intValue);
 
 	/**
 	 * If enabled, players will have a nation-defined color in addition to town colors, white by default.
 	 * They can change how much of each color they want with this as well.
 	 */
-	public final ConfigData<Boolean> useNationColors = getConfig().getData("useNationColors", true);
+	public final IConfigData<Boolean> useNationColors = getConfig().getData("useNationColors", true);
 
 	@Getter
 	private static TownColorComponent component;
diff --git a/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java b/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
index 2f22d17..2998edf 100644
--- a/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
+++ b/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
@@ -1,9 +1,6 @@
 package buttondevteam.chat.components.towny;
 
-import buttondevteam.chat.ChatUtils;
 import buttondevteam.chat.PluginMain;
-import buttondevteam.chat.VanillaUtils;
-import buttondevteam.chat.components.formatter.formatting.TellrawPart;
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Color;
@@ -17,12 +14,11 @@ import com.palmergames.bukkit.towny.object.Nation;
 import com.palmergames.bukkit.towny.object.Resident;
 import com.palmergames.bukkit.towny.object.Town;
 import lombok.val;
+import net.kyori.adventure.text.TextComponent;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -55,25 +51,23 @@ public class TownyComponent extends Component<PluginMain> {
 		TownyAnnouncer.setdown();
 	}
 
-	public Consumer<Player> handleSpiesInit(Channel channel, TellrawPart json, Function<TellrawPart, String> toJson,
-	                                        ChromaGamerBase sender, String message) {
+	public Consumer<Player> handleSpiesInit(Channel channel, TextComponent.Builder json) {
 		if (channel.getIdentifier().equals(TownChat.getIdentifier()) || channel.getIdentifier().equals(NationChat.getIdentifier())) {
-			((List<TellrawPart>) json.getExtra()).add(0, new TellrawPart("[SPY]"));
-			String jsonstr = toJson.apply(json);
-			return p -> handleSpies(channel, p, jsonstr, sender, message);
+			// TODO: Cannot prepend to json, so we need to run this ealier
+			//((List<TellrawPart>) json.getExtra()).add(0, new TellrawPart("[SPY]"));
+			return p -> handleSpies(channel, p, json);
 		}
 		return p -> {};
 	}
 
-	private void handleSpies(Channel channel, Player p, String jsonstr, ChromaGamerBase sender, String message) {
+	private void handleSpies(Channel channel, Player p, TextComponent.Builder jsonstr) {
 		if (channel.getIdentifier().equals(TownChat.getIdentifier()) || channel.getIdentifier().equals(NationChat.getIdentifier())) {
 			val res = dataSource.getResident(p.getName());
 			if (res == null) {
 				return;
 			}
 			if (res.hasMode("spy"))
-				if (!VanillaUtils.tellRaw(p, jsonstr))
-					ChatUtils.sendChatMessage(channel, sender, message, p);
+				p.sendMessage(jsonstr.build());
 		}
 	}
 
diff --git a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
index abe5dd9..46436e5 100644
--- a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
+++ b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java
@@ -1,21 +1,23 @@
 package buttondevteam.chat.components.formatter;
 
+import buttondevteam.chat.ChatPlayer;
 import buttondevteam.chat.ChatUtils;
 import buttondevteam.chat.ObjectTestRunner;
 import buttondevteam.chat.ObjectTestRunner.Objects;
 import buttondevteam.chat.PluginMain;
 import buttondevteam.chat.commands.ucmds.admin.DebugCommand;
-import buttondevteam.chat.components.formatter.formatting.*;
-import buttondevteam.chat.components.formatter.formatting.TellrawEvent.ClickAction;
-import buttondevteam.chat.components.formatter.formatting.TellrawEvent.HoverAction;
+import buttondevteam.chat.components.formatter.formatting.ChatFormatter;
+import buttondevteam.chat.components.formatter.formatting.FormatSettings;
+import buttondevteam.chat.components.formatter.formatting.MatchProviderBase;
 import buttondevteam.core.TestPrepare;
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Color;
+import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import net.milkbowl.vault.permission.Permission;
-import org.bukkit.command.CommandSender;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,101 +27,101 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
+import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.event.ClickEvent.Action.OPEN_URL;
+import static net.kyori.adventure.text.event.ClickEvent.clickEvent;
+import static net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT;
+import static net.kyori.adventure.text.event.HoverEvent.hoverEvent;
+import static net.kyori.adventure.text.format.NamedTextColor.*;
+import static net.kyori.adventure.text.format.TextDecoration.*;
+
 @RunWith(ObjectTestRunner.class)
 public class ChatFormatIT {
 	@Objects
 	public static List<Object> data() {
 		TestPrepare.PrepareServer();
-		final CommandSender sender = Mockito.mock(CommandSender.class);
+		var sender = ChromaGamerBase.getUser("test", ChatPlayer.class);
 		DebugCommand.DebugMode = true;
 		PluginMain.permission = Mockito.mock(Permission.class);
 		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class, TBMCPlayer::new);
 
 		List<Object> list = new ArrayList<>();
 
-		list.add(new ChatFormatIT(sender, "*test*", new TellrawPart("test").setItalic(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "**test**", new TellrawPart("test").setBold(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "***test***",
-			new TellrawPart("test").setBold(true).setItalic(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "***__test__***",
-			new TellrawPart("test").setBold(true).setItalic(true).setUnderlined(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "***__~~test~~__***", new TellrawPart("test").setBold(true).setItalic(true)
-			.setUnderlined(true).setStrikethrough(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "¯\\\\\\_(ツ)\\_/¯", new TellrawPart("¯\\_(ツ)_/¯").setColor(Color.White)));
+		list.add(new ChatFormatIT(sender, "*test*", text("test").decorate(ITALIC).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "**test**", text("test").decorate(BOLD).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "***test***", text("test").decorate(BOLD, ITALIC).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "***__test__***", text("test").decorate(BOLD, ITALIC, UNDERLINED).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "***__~~test~~__***", text("test").decorate(BOLD, ITALIC, UNDERLINED, STRIKETHROUGH).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "¯\\\\\\_(ツ)\\_/¯", text("¯\\_(ツ)_/¯").color(WHITE)));
 		list.add(new ChatFormatIT(sender, "https://google.hu/",
-			new TellrawPart("https://google.hu/").setColor(Color.White).setUnderlined(true)
-				.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
-					new TellrawPart("Click to open").setColor(Color.Blue)))
-				.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://google.hu/"))));
-		list.add(new ChatFormatIT(sender, "*test", new TellrawPart("*test").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "**test*", new TellrawPart("**test*").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "***test", new TellrawPart("***test").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "Koiiev", new TellrawPart("§bKoiiev§r").setColor(Color.Aqua)));
-		list.add(new ChatFormatIT(sender, "norbipeti", new TellrawPart("§bNorbiPeti§r").setColor(Color.Aqua)));
-		list.add(new ChatFormatIT(sender, "Arsen_Derby_FTW", new TellrawPart("§bArsen_Derby_FTW§r").setColor(Color.Aqua)));
-		list.add(new ChatFormatIT(sender, "carrot_lynx", new TellrawPart("§bcarrot_lynx§r").setColor(Color.Aqua)));
-		list.add(new ChatFormatIT(sender, "*carrot_lynx*", new TellrawPart("§bcarrot_lynx§r").setItalic(true).setColor(Color.Aqua)));
-		list.add(new ChatFormatIT(sender, "https://norbipeti.github.io/", new TellrawPart("https://norbipeti.github.io/")
-			.setColor(Color.White).setUnderlined(true)
-			.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
-				new TellrawPart("Click to open").setColor(Color.Blue)))
-			.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/"))));
-		list.add(new ChatFormatIT(sender, "*https://norbipeti.github.io/ heh*", new TellrawPart("https://norbipeti.github.io/").setItalic(true).setUnderlined(true)
-			.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
-				new TellrawPart("Click to open").setColor(Color.Blue)))
-			.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/")).setColor(Color.White), new TellrawPart(" heh").setItalic(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "*test _test_ test*", new TellrawPart("test test test").setItalic(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "*test __test__ test*", new TellrawPart("test ").setItalic(true).setColor(Color.White),
-			new TellrawPart("test").setItalic(true).setUnderlined(true).setColor(Color.White), new TellrawPart(" test").setItalic(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "**test __test__ test**", new TellrawPart("test ").setBold(true).setColor(Color.White),
-			new TellrawPart("test").setBold(true).setUnderlined(true).setColor(Color.White), new TellrawPart(" test").setBold(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "**test _test_ test**", new TellrawPart("test ").setBold(true).setColor(Color.White),
-			new TellrawPart("test").setItalic(true).setBold(true).setColor(Color.White), new TellrawPart(" test").setBold(true).setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "https://norbipeti.github.io/test?test&test#test", new TellrawPart("https://norbipeti.github.io/test?test&test#test")
-			.setColor(Color.White).setUnderlined(true)
-			.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
-				new TellrawPart("Click to open").setColor(Color.Blue)))
-			.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/test?test&test#test"))));
-		list.add(new ChatFormatIT(sender, "[hmm](https://norbipeti.github.io/test)", new TellrawPart("hmm")
-			.setColor(Color.White).setUnderlined(true)
-			.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT,
-				new TellrawPart("Click to open").setColor(Color.Blue)))
-			.setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://norbipeti.github.io/test"))));
-		TellrawPart space = new TellrawPart(" ").setColor(Color.White);
-		list.add(new ChatFormatIT(sender, "A rainbow text for testing. O", new TellrawPart("A").setColor(Color.Red),
-			space, new TellrawPart("rainbow").setColor(Color.Gold), space, new TellrawPart("text").setColor(Color.Yellow),
-			space, new TellrawPart("for").setColor(Color.Green), space, new TellrawPart("testing.").setColor(Color.Blue),
-			space, new TellrawPart("O").setColor(Color.DarkPurple)).setRainbowMode());
-		list.add(new ChatFormatIT(sender, "***test*** test", new TellrawPart("test").setColor(Color.White)
-			.setItalic(true).setBold(true), new TellrawPart(" test").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, ">test message\nheh", new TellrawPart(">test message\nheh").setColor(Color.Green)));
-		list.add(new ChatFormatIT(sender, "[here's a link]()", new TellrawPart("[here's a link]()").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "[](fakelink)", new TellrawPart("[](fakelink)").setColor(Color.White)));
-		list.add(new ChatFormatIT(sender, "||this is a spoiler||", new TellrawPart("this is a spoiler").setColor(Color.White)
-			.setObfuscated(true).setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT, "this is a spoiler"))));
-		Function<String, TellrawPart> whiteBoldItalic = text -> new TellrawPart(text).setColor(Color.White).setBold(true).setItalic(true);
+			text("https://google.hu/").color(WHITE).decorate(UNDERLINED)
+				.hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE)))
+				.clickEvent(clickEvent(OPEN_URL, "https://google.hu/"))));
+		list.add(new ChatFormatIT(sender, "*test", text("*test").color(WHITE)));
+		list.add(new ChatFormatIT(sender, "**test*", text("**test*").color(WHITE)));
+		list.add(new ChatFormatIT(sender, "***test", text("***test").color(WHITE)));
+		list.add(new ChatFormatIT(sender, "Koiiev", text("§bKoiiev§r").color(AQUA)));
+		list.add(new ChatFormatIT(sender, "norbipeti", text("§bNorbiPeti§r").color(AQUA)));
+		list.add(new ChatFormatIT(sender, "Arsen_Derby_FTW", text("§bArsen_Derby_FTW§r").color(AQUA)));
+		list.add(new ChatFormatIT(sender, "carrot_lynx", text("§bcarrot_lynx§r").color(AQUA)));
+		list.add(new ChatFormatIT(sender, "*carrot_lynx*", text("§bcarrot_lynx§r").decorate(ITALIC).color(AQUA)));
+		list.add(new ChatFormatIT(sender, "https://norbipeti.github.io/", text("https://norbipeti.github.io/")
+			.color(WHITE).decorate(UNDERLINED)
+			.hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE)))
+			.clickEvent(clickEvent(OPEN_URL, "https://norbipeti.github.io/"))));
+		list.add(new ChatFormatIT(sender, "*https://norbipeti.github.io/ heh*", text("https://norbipeti.github.io/").decorate(ITALIC).decorate(UNDERLINED)
+			.hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE)))
+			.clickEvent(clickEvent(OPEN_URL, "https://norbipeti.github.io/")).color(WHITE), text(" heh").decorate(ITALIC).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "*test _test_ test*", text("test test test").decorate(ITALIC).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "*test __test__ test*", text("test ").decorate(ITALIC).color(WHITE),
+			text("test").decorate(ITALIC).decorate(UNDERLINED).color(WHITE), text(" test").decorate(ITALIC).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "**test __test__ test**", text("test ").decorate(BOLD).color(WHITE),
+			text("test").decorate(BOLD).decorate(UNDERLINED).color(WHITE), text(" test").decorate(BOLD).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "**test _test_ test**", text("test ").decorate(BOLD).color(WHITE),
+			text("test").decorate(ITALIC).decorate(BOLD).color(WHITE), text(" test").decorate(BOLD).color(WHITE)));
+		list.add(new ChatFormatIT(sender, "https://norbipeti.github.io/test?test&test#test", text("https://norbipeti.github.io/test?test&test#test")
+			.color(WHITE).decorate(UNDERLINED)
+			.hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE)))
+			.clickEvent(clickEvent(OPEN_URL, "https://norbipeti.github.io/test?test&test#test"))));
+		list.add(new ChatFormatIT(sender, "[hmm](https://norbipeti.github.io/test)", text("hmm")
+			.color(WHITE).decorate(UNDERLINED)
+			.hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE)))
+			.clickEvent(clickEvent(OPEN_URL, "https://norbipeti.github.io/test"))));
+		var space = text(" ").color(WHITE);
+		list.add(new ChatFormatIT(sender, "A rainbow text for testing. O", text("A").color(RED),
+			space, text("rainbow").color(GOLD), space, text("text").color(YELLOW),
+			space, text("for").color(GREEN), space, text("testing.").color(BLUE),
+			space, text("O").color(DARK_PURPLE)).setRainbowMode());
+		list.add(new ChatFormatIT(sender, "***test*** test", text("test").color(WHITE)
+			.decorate(ITALIC).decorate(BOLD), text(" test").color(WHITE)));
+		list.add(new ChatFormatIT(sender, ">test message\nheh", text(">test message\nheh").color(GREEN)));
+		list.add(new ChatFormatIT(sender, "[here's a link]()", text("[here's a link]()").color(WHITE)));
+		list.add(new ChatFormatIT(sender, "[](fakelink)", text("[](fakelink)").color(WHITE)));
+		list.add(new ChatFormatIT(sender, "||this is a spoiler||", text("this is a spoiler").color(WHITE)
+			.decorate(OBFUSCATED).hoverEvent(hoverEvent(SHOW_TEXT, text("this is a spoiler").color(WHITE)))));
+		Function<String, TextComponent> whiteBoldItalic = text -> text(text).color(WHITE).decorate(BOLD).decorate(ITALIC);
 		list.add(new ChatFormatIT(sender, "***some complicated ||test message|| with [links](https://chromagaming.figytuna.com) and other __greatness__ by NorbiPeti***",
 			whiteBoldItalic.apply("some complicated "),
-			whiteBoldItalic.apply("test message").setObfuscated(true).setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT, "test message")),
+			whiteBoldItalic.apply("test message").decorate(OBFUSCATED).hoverEvent(hoverEvent(SHOW_TEXT, text("test message"))),
 			whiteBoldItalic.apply(" with "),
-			whiteBoldItalic.apply("links").setClickEvent(TellrawEvent.create(ClickAction.OPEN_URL, "https://chromagaming.figytuna.com")).setUnderlined(true)
-				.setHoverEvent(TellrawEvent.create(HoverAction.SHOW_TEXT, new TellrawPart("Click to open").setColor(Color.Blue))),
+			whiteBoldItalic.apply("links").clickEvent(clickEvent(OPEN_URL, "https://chromagaming.figytuna.com"))
+				.decorate(UNDERLINED).hoverEvent(hoverEvent(SHOW_TEXT, text("Click to open").color(BLUE))),
 			whiteBoldItalic.apply(" and other "),
-			whiteBoldItalic.apply("greatness").setUnderlined(true),
+			whiteBoldItalic.apply("greatness").decorate(UNDERLINED),
 			whiteBoldItalic.apply(" by "),
-			whiteBoldItalic.apply("§bNorbiPeti§r").setColor(Color.Aqua))); //§b: flair color
-		list.add(new ChatFormatIT(sender, "hey @console", new TellrawPart("hey ").setColor(Color.White),
-			new TellrawPart("@console").setColor(Color.Aqua)));
+			whiteBoldItalic.apply("§bNorbiPeti§r").color(AQUA))); //§b: flair color
+		list.add(new ChatFormatIT(sender, "hey @console", text("hey ").color(WHITE),
+			text("@console").color(AQUA)));
 
 		return list;
 	}
 
-	private final CommandSender sender;
+	private final ChromaGamerBase sender;
 	private final String message;
-	private final TellrawPart[] extras;
+	private final Component[] extras;
 	private boolean rainbowMode;
 
-	public ChatFormatIT(CommandSender sender, String message, TellrawPart... expectedExtras) {
+	public ChatFormatIT(ChromaGamerBase sender, String message, Component... expectedExtras) {
 		this.sender = sender;
 		this.message = message;
 		this.extras = expectedExtras;
@@ -136,12 +138,12 @@ public class ChatFormatIT {
 		ArrayList<MatchProviderBase> cfs = ChatProcessing.addFormatters(p -> true, null);
 		final String chid = ChatProcessing.getChannelID(Channel.globalChat, ChatUtils.MCORIGIN);
 		if (rainbowMode)
-			ChatProcessing.createRPC(Color.White, cfs);
-		final TellrawPart tp = ChatProcessing.createTellraw(sender, message, null, null, null, chid, ChatUtils.MCORIGIN);
-		ChatFormatter.Combine(cfs, message, tp, null, FormatSettings.builder().color(Color.White).build());
-		final TellrawPart expectedtp = ChatProcessing.createTellraw(sender, message, null, null, null, chid, ChatUtils.MCORIGIN);
-		for (TellrawPart extra : extras)
-			expectedtp.addExtra(extra);
-		Assert.assertEquals(ChatProcessing.toJson(expectedtp), ChatProcessing.toJson(tp));
+			ChatProcessing.createRPC(WHITE, cfs);
+		final TextComponent.Builder tp = ChatProcessing.createEmptyMessageLine(sender, message, null, chid, ChatUtils.MCORIGIN);
+		ChatFormatter.Combine(cfs, message, tp, null, FormatSettings.builder().color(WHITE).build());
+		final TextComponent.Builder expectedtp = ChatProcessing.createEmptyMessageLine(sender, message, null, chid, ChatUtils.MCORIGIN);
+		for (Component extra : extras)
+			expectedtp.append(extra);
+		Assert.assertEquals(expectedtp.build(), tp.build());
 	}
 }