Add colour support in both directions

Author: Fuchs

src/main/java/simpleircbridge/BridgeIRCBot.java

@@ -6,6 +6,7 @@
 
 import genericircbot.AbstractIRCBot;
 import genericircbot.IRCConnectionInfo;
+import utils.IRCMinecraftConverter;
 
 public class BridgeIRCBot extends AbstractIRCBot {
 
@@ -33,27 +34,47 @@ protected void onJoin(String channel, String sender) {
 
 	@Override
 	protected void onPart(String channel, String sender, String reason) {
+		if(bridge.getSibConf().mcFormatting)
+		{
+			reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
+		}
 		toMc(String.format(FORMAT2_IRC_PART, sender, reason));
 	}
 
 	@Override
 	protected void onQuit(String sender, String reason) {
+		if(bridge.getSibConf().mcFormatting)
+		{
+			reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
+		}
 		toMc(String.format(FORMAT2_IRC_QUIT, sender, reason));
 	}
 
 	@Override
 	protected void onKick(String channel, String opsender, String victim, String reason) {
+		if(bridge.getSibConf().mcFormatting)
+		{
+			reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
+		}
 		toMc(String.format(FORMAT3_IRC_KICK, victim, opsender, reason));
 	}
 
 	@Override
 	protected void onMessage(String channel, String sender, String message) {
+		if(bridge.getSibConf().mcFormatting)
+		{
+			message = IRCMinecraftConverter.convIRCtoMinecraft(message);
+		}
 		toMc(String.format(FORMAT2_IRC_CHAT, sender, message));
 
 	}
 
 	@Override
 	protected void onAction(String channel, String sender, String action) {
+		if(bridge.getSibConf().mcFormatting)
+		{
+			action = IRCMinecraftConverter.convIRCtoMinecraft(action);
+		}
 		toMc(String.format(FORMAT2_IRC_EMOTE, sender, action));
 	}
 

src/main/java/simpleircbridge/GameEventHandler.java

@@ -9,6 +9,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
+import utils.IRCMinecraftConverter;
 
 public class GameEventHandler {
 	private final SimpleIRCBridge bridge;
@@ -38,16 +39,30 @@ public void command(CommandEvent e) {
 		 * However, some mods insist on overriding commands with their own wrappers
 		 * (looking at you, FTBUtilities) so we're checking the names here.
 		 */
+		
+		String content = SIBUtil.join(" ", e.getParameters());
+		
 		if ("say".equals(e.getCommand().getName())) {
-			toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, SIBUtil.join(" ", e.getParameters())));
+			if(bridge.getSibConf().ircFormatting) {
+				content = IRCMinecraftConverter.convMinecraftToIRC(content);
+			}
+			toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, content));
+			
 		} else if ("me".equals(e.getCommand().getName())) {
-			toIrc(String.format(FORMAT2_MC_EMOTE, nickname, SIBUtil.join(" ", e.getParameters())));
+			if(bridge.getSibConf().ircFormatting) {
+				content = IRCMinecraftConverter.convMinecraftToIRC(content);
+			}
+			toIrc(String.format(FORMAT2_MC_EMOTE, nickname, content));
 		}
 	}
 
 	@SubscribeEvent
 	public void serverChat(ServerChatEvent e) {
-		toIrc(String.format(FORMAT2_MC_CHAT, SIBUtil.mangle(e.getPlayer().getDisplayNameString()), e.getMessage()));
+		String content = e.getMessage();
+		if(bridge.getSibConf().ircFormatting) {
+			content = IRCMinecraftConverter.convMinecraftToIRC(content);
+		}
+		toIrc(String.format(FORMAT2_MC_CHAT, SIBUtil.mangle(e.getPlayer().getDisplayNameString()), content));
 	}
 
 	@SubscribeEvent