From be5cf042edc3c3fbb100eb449d379160ebd7d745 Mon Sep 17 00:00:00 2001
From: redstone2888 <leonidazgihin@MacBook-Air-Leonid.local>
Date: Mon, 6 Jul 2026 19:45:44 +0400
Subject: [PATCH] apply review fixes

---
 .../kentoj/scrow/bukkit/CoreImplPlugin.java   |  4 ++--
 ...ormatEvent.java => ChatStyleListener.java} | 20 ++++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/{ChatFormatEvent.java => ChatStyleListener.java} (50%)

diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
index 48fe64d..5a5b25d 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
@@ -6,7 +6,7 @@ import de.kentoj.scrow.bukkit.command.instance.InstanceCache;
 import de.kentoj.scrow.bukkit.command.instance.InstanceCommand;
 import de.kentoj.scrow.bukkit.command.instance.LobbyCommand;
 import de.kentoj.scrow.bukkit.command.instance.PlayCommand;
-import de.kentoj.scrow.bukkit.listener.ChatFormatEvent;
+import de.kentoj.scrow.bukkit.listener.ChatStyleListener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
@@ -30,7 +30,7 @@ public class CoreImplPlugin extends JavaPlugin {
         }
 
         // Listeners
-        getServer().getPluginManager().registerEvents(new ChatFormatEvent(), this);
+        getServer().getPluginManager().registerEvents(new ChatStyleListener(), this);
 
         // TODO/FIXME
         //registerServer();
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatFormatEvent.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java
similarity index 50%
rename from core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatFormatEvent.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java
index a7043e8..5b921e6 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatFormatEvent.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/listener/ChatStyleListener.java
@@ -2,13 +2,12 @@ package de.kentoj.scrow.bukkit.listener;
 
 import io.papermc.paper.event.player.AsyncChatEvent;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-public class ChatFormatEvent implements Listener {
+public class ChatStyleListener implements Listener {
     @EventHandler
     public void onChat(AsyncChatEvent event) {
         Player player = event.getPlayer();
@@ -19,14 +18,11 @@ public class ChatFormatEvent implements Listener {
     }
 
     private Component formatMessage(Player player, Component message) {
-        String messageText = PlainTextComponentSerializer.plainText().serialize(message);
-        String playerName = player.getName();
-
-        // EDIT THIS TO CHANGE FORMAT!
-        String FORMAT = "<gray>{player}</gray>: <white>{message}</white>";
-
-        return MiniMessage.miniMessage().deserialize(FORMAT
-                .replace("{player}", playerName)
-                .replace("{message}", messageText));
+        // §7Steve: §fHi
+        return Component.text()
+                .append(player.displayName().color(NamedTextColor.GRAY))
+                .append(Component.text(": ").color(NamedTextColor.GRAY))
+                .append(message.color(NamedTextColor.WHITE))
+                .build();
     }
 }