Convert Discord user colors to closest MC color

Author: shadowfacts

1.10.2/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.

1.11.2/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.

1.12/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.

1.7.10/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.

1.8.9/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.

core/src/main/java/net/shadowfacts/discordchat/api/IMessageFormatter.java

@@ -7,7 +7,7 @@ public interface IMessageFormatter {
 
 	String fromMC(String sender, String message);
 
-	String fromDiscord(String channel, String sender, String message);
+	String fromDiscord(String channel, String senderColor, String sender, String message);
 
 	String fromMCPrivate(String sender, String message);
 

core/src/main/java/net/shadowfacts/discordchat/core/Listener.java

@@ -9,6 +9,9 @@
 import net.shadowfacts.discordchat.api.IMessageFormatter;
 import net.shadowfacts.discordchat.api.IMinecraftAdapter;
 import net.shadowfacts.discordchat.api.command.ICommandManager;
+import net.shadowfacts.discordchat.core.util.NearestMCColor;
+
+import java.awt.*;
 
 /**
  * @author shadowfacts
@@ -46,9 +49,10 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
 			commandManager.execute(raw.substring(config.getCommandPrefix().length()), event.getAuthor(), event.getChannel());
 		} else {
 			String channel = event.getChannel().getName();
+			String color = NearestMCColor.get(event.getMember().getColor().getRGB());
 			String author = event.getMember().getEffectiveName().replaceAll("\\.", "_");
 			String message = EmojiParser.parseToAliases(event.getMessage().getContent());
-			minecraftAdapter.sendMessage(formatter.fromDiscord(channel, author, message));
+			minecraftAdapter.sendMessage(formatter.fromDiscord(channel, color, author, message));
 			event.getMessage().getAttachments().forEach(it -> {
 				minecraftAdapter.sendMessage("Attachment: " + it.getUrl());
 			});

core/src/main/java/net/shadowfacts/discordchat/core/MessageFormatter.java

@@ -23,11 +23,12 @@ public String fromMC(String sender, String message) {
 	}
 
 	@Override
-	public String fromDiscord(String channel, String sender, String message) {
+	public String fromDiscord(String channel, String senderColor, String sender, String message) {
 		return config.getFromDiscordFormat()
 				.replace("$1", channel)
 				.replace("$2", sender)
-				.replace("$3", message);
+				.replace("$3", message)
+				.replace("$4", senderColor);
 	}
 
 	@Override

core/src/main/java/net/shadowfacts/discordchat/core/util/NearestMCColor.java

@@ -0,0 +1,45 @@
+package net.shadowfacts.discordchat.core.util;
+
+import net.shadowfacts.shadowlib.util.NearestColor;
+
+/**
+ * @author shadowfacts
+ */
+public class NearestMCColor {
+
+	public static String get(int color) {
+		return "§" + NearestColor.find(color, Color.values(), Color::getColor).character;
+	}
+
+	private enum Color {
+		BLACK(0x000000, '0'),
+		DARK_BLUE(0x0000AA, '1'),
+		DARK_GREEN(0x00AA00, '2'),
+		DARK_AQUA(0x00AAAA, '3'),
+		DARK_RED(0xAA0000, '4'),
+		DARK_PURPLE(0xAA00AA, '5'),
+		GOLD(0xFFAA00, '6'),
+		GRAY(0xAAAAAA, '7'),
+		DARK_GRAY(0x555555, '8'),
+		BLUE(0x5555FF, '9'),
+		GREEN(0x55FF55, 'a'),
+		AQUA(0x55FFFF, 'b'),
+		RED(0xFF5555, 'c'),
+		LIGHT_PURPLE(0xFF55FF, 'd'),
+		YELLOW(0xFFFF55, 'e'),
+		WHITE(0xFFFFFF, 'f');
+
+		public final int color;
+		public final char character;
+
+		Color(int color, char character) {
+			this.color = color;
+			this.character = character;
+		}
+
+		public int getColor() {
+			return color;
+		}
+	}
+
+}

core/src/main/resources/assets/discordchat/default.conf

@@ -43,8 +43,8 @@ discordchat {
 		fromMC = "MC » <$1> $2"
 
 		# Format for a normal message from Discord to MC.
-		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, and $3 will be replaced with the message
-		fromDiscord = "#$1 » <$2> $3"
+		# $1 will be replaced with the channel, $2 will be replaced with the sender's username, $3 will be replaced with the message, and $4 will be replaced with the MC color (e.g. §3) closest to the Discord user's color.
+		fromDiscord = "#$1 » <$4$2§f> $3"
 
 		# Format for a private message from MC to Discord.
 		# $1 will be replaced with the sender's username and $2 will be replaced with the message.