Add name desampling for CB version

* Add name color desampling for DSerial (CB1060)

Author: Lukiiy

DSerial/src/main/kotlin/me/lukiiy/discordBridge/api/serialize/DSerial.kt

@@ -3,6 +3,8 @@ package me.lukiiy.discordBridge.api.serialize
 import me.lukiiy.discordBridge.api.serialize.DSerial.fromDiscord
 import me.lukiiy.discordBridge.api.serialize.DSerial.toDiscord
 import net.dv8tion.jda.api.entities.Message
+import java.awt.Color
+import kotlin.math.sqrt
 
 
 object DSerial {
@@ -93,4 +95,39 @@ object DSerial {
 
         return result
     }
+
+    /**
+     * Downsample a hex color string to a chat color code
+     */
+    @JvmStatic
+    fun minecraftSampledHex(hex: String): String {
+        val colorMap = mapOf(
+            '0' to Color.BLACK, // Black
+            '1' to Color(0, 0, 170), // Dark Blue
+            '2' to Color(0, 170, 0), // Dark Green
+            '3' to Color(0, 170, 170), // Dark Aqua
+            '4' to Color(170, 0, 0), // Dark Red
+            '5' to Color(170, 0, 170), // Dark Purple
+            '6' to Color(255, 170, 0), // Gold
+            '7' to Color(170, 170, 170), // Gray
+            '8' to Color(85, 85, 85), // Dark Gray
+            '9' to Color(85, 85, 255), // Blue
+            'a' to Color(85, 255, 85), // Green
+            'b' to Color(85, 255, 255), // Aqua
+            'c' to Color(255, 85, 85), // Red
+            'd' to Color(255, 85, 255), // Light Purple
+            'e' to Color(255, 255, 85), // Yellow
+            'f' to Color.WHITE // White
+        )
+
+        val target = runCatching { Color.decode(hex) }.getOrElse { Color.WHITE }
+
+        return colorMap.minByOrNull { (_, color) ->
+            val dr = target.red - color.red
+            val dg = target.green - color.green
+            val db = target.blue - color.blue
+
+            dr * dr + dg * dg + db * db
+        }?.let { "§${it.key}" } ?: "§f"
+    }
 }

DSerialAdvnt/src/main/kotlin/me/lukiiy/discordBridge/api/serialize/DSerialAdvnt.kt

@@ -104,7 +104,7 @@ object DSerialAdvnt {
         return result
     }
 
-    // Colors from BridgeDefaults
+    // Default colors
     @JvmStatic val bridgeBlue = TextColor.fromHexString("#647ff8")
     @JvmStatic val bridgeFaint = TextColor.fromHexString("#7175a3")
     @JvmStatic val bridgeList = TextColor.fromHexString("#6d7494")

common/src/main/kotlin/me/lukiiy/discordBridge/api/DiscordContext.kt

@@ -103,9 +103,7 @@ class DiscordContext(val bot: JDA, val guild: Guild, val channel: TextChannel, v
     /**
      * Reloads the registered commands
      */
-    fun reloadCommands() {
-        guild.updateCommands().addCommands(commands.values.map { it.command() }).queue()
-    }
+    fun reloadCommands() = guild.updateCommands().addCommands(commands.values.map { it.command() }).queue()
 
     /**
      * Unregisters every command from the bot instance (on Discord)

craftbukkit/src/main/java/me/lukiiy/discordBridge/DiscordBridge.java

@@ -1,14 +1,17 @@
 package me.lukiiy.discordBridge;
 
 import me.lukiiy.discordBridge.api.DiscordContext;
+import me.lukiiy.discordBridge.api.serialize.DSerial;
 import me.lukiiy.discordBridge.cmds.Main;
 import me.lukiiy.discordBridge.discordCmds.Console;
 import me.lukiiy.discordBridge.listeners.DiscordEvents;
 import me.lukiiy.discordBridge.listeners.PlayerEvents;
 import me.lukiiy.discordBridge.utils.BotHelper;
+import me.lukiiy.discordBridge.utils.MemberHelper;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
+import net.dv8tion.jda.api.entities.Member;
 import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -99,6 +102,11 @@ public DiscordContext getContext() {
         return context;
     }
 
+    public String miniSerializableName(Member member) {
+        if (getConfiguration().getBoolean("discord.useMemberNameColor", false)) return DSerial.minecraftSampledHex(MemberHelper.getHexColor(member)) + member.getEffectiveName() + "§f";
+        else return member.getEffectiveName();
+    }
+
     // Config
     public void setupConfig() {
         Configuration config = getConfiguration();
@@ -111,6 +119,7 @@ public void setupConfig() {
         config.getString("discord.activity", "playing Minecraft");
         config.getString("discord.status", "ONLINE");
         config.getBoolean("discord.playerEvents", true);
+        config.getBoolean("discord.useMemberNameColor", false);
         config.getBoolean("discord.ignoreBots", false);
         if (config.getProperty("discord.shutdown.timeLimit") == null) config.setProperty("discord.shutdown.timeLimit", 3);
         config.getBoolean("discord.shutdown.clearCommands", true);

craftbukkit/src/main/java/me/lukiiy/discordBridge/listeners/DiscordEvents.java

@@ -51,7 +51,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent e) {
             msg.set(event.getMessage());
 
             MessageParts parts = MessageParts.from(
-                    config.getString("messages.minecraft.format", ""),
+                    config.getString("messages.minecraft.format", "").replace("(user)", instance.miniSerializableName(member)),
                     config.getString("messages.minecraft.prefix", ""),
                     member,
                     msg.get(),