From 09637ba7756227611854bbd117d07672ec253a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Fri, 28 Feb 2025 15:02:03 +0100 Subject: [PATCH] Correct format for hour --- ChatApp/src/client/ClientConnexion.java | 6 ++++-- ChatApp/src/network/protocol/ANSIColor.java | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChatApp/src/client/ClientConnexion.java b/ChatApp/src/client/ClientConnexion.java index 232ef71..79e45ed 100644 --- a/ChatApp/src/client/ClientConnexion.java +++ b/ChatApp/src/client/ClientConnexion.java @@ -50,12 +50,14 @@ public class ClientConnexion implements PacketVisitor, PacketHandler{ public void visitPacket(ChatMessagePacket packet) { StringBuilder sb = new StringBuilder(); String time = packet.getTime().toString(); + sb.append("&y["); sb.append(time, 11, 19); // We only take the HH:MM:SS part + sb.append("]&n"); sb.append(" "); sb.append(packet.getChatter()); sb.append(" : "); - sb.append(ANSIColor.formatString(packet.getContent() + "&n")); // make the color back to normal at the end of every message - System.out.println(sb); + sb.append(packet.getContent()).append("&n"); // make the color back to normal at the end of every message + System.out.println(ANSIColor.formatString(sb.toString())); } @Override diff --git a/ChatApp/src/network/protocol/ANSIColor.java b/ChatApp/src/network/protocol/ANSIColor.java index e1f0b0a..b65cf9f 100644 --- a/ChatApp/src/network/protocol/ANSIColor.java +++ b/ChatApp/src/network/protocol/ANSIColor.java @@ -6,11 +6,13 @@ public class ANSIColor { public static final String RED = "\u001B[31m"; public static final String GREEN = "\u001B[32m"; public static final String BLUE = "\u001B[34m"; + public static final String GREY = "\u001B[37m"; public static String formatString(String message){ return message.replace("&r", RED) .replace("&g", GREEN) .replace("&b", BLUE) + .replace("&y", GREY) .replace("&n", RESET); } }