From c0517b8f1e91eabad31aae8453e5f2405249c35c Mon Sep 17 00:00:00 2001
From: Dorian HAMDANI <dorian.hamdani@etu.uca.fr>
Date: Mon, 14 Apr 2025 10:54:24 +0200
Subject: [PATCH] Refactor console rendering

---
 src/ConsoleRenderer.java | 26 +++++++++++---------------
 src/GomokuGame.java      |  8 ++------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/ConsoleRenderer.java b/src/ConsoleRenderer.java
index 1231b4b..9596ca2 100644
--- a/src/ConsoleRenderer.java
+++ b/src/ConsoleRenderer.java
@@ -13,7 +13,8 @@ public class ConsoleRenderer extends GomokuRenderer {
     @Override
     public void update() {
         // Print the board to the console
-        
+
+        // Clear the console
         System.out.print("\033[H\033[2J");
         System.out.flush();
 
@@ -24,9 +25,7 @@ public class ConsoleRenderer extends GomokuRenderer {
 
         // Print a separator line, followed by the game infos
         System.out.println(horizontalLine);
-        System.out.println("|" + String.format(" %-" + (width*4 - 2) + "s", "Gomoku Game!") + "|"+" y");
-        // System.out.println("Current player: " + game.getCurrentPlayer().getName());
-        // System.out.println("Number of tokens left: " + game.getCurrentPlayer().getTokensLeft());
+        System.out.println("|" + String.format(" %-" + (width*4 - 2) + "s", "Gomoku Game!") + "| Y");
 
         // Print the board
         System.out.println(horizontalLine);
@@ -34,27 +33,24 @@ public class ConsoleRenderer extends GomokuRenderer {
             System.out.print("|");
           
             for (int j=0; j<width; j++) {
-                switch (board[i].charAt(j)) {
+                char c = board[i].charAt(j);
+                switch (c) {
                     case 'X':
-                        System.out.print(" \u001B[31m" + board[i].charAt(j) + "\u001B[0m |");
+                        System.out.print(" \u001B[31m" + c + "\u001B[0m |");
                         break;
                     case 'O':
-                        System.out.print(" \u001B[32m" + board[i].charAt(j) + "\u001B[0m |");
+                        System.out.print(" \u001B[32m" + c + "\u001B[0m |");
                         break;
                     default:
-                        System.out.print(" " + board[i].charAt(j) + " |");
+                        System.out.print(" " + c + " |");
                 }
             }
-            System.out.println(" "+i);
+            System.out.println(" " + i);
             System.out.println(horizontalLine);
         }
-        System.out.print("x");
+        System.out.print("X");
         for (int i = 0; i < width; i++) {
-            if(i<10) {
-                System.out.print(" "+i+"  ");
-            } else {
-                System.out.print(" "+i+" ");
-            }
+            System.out.print(String.format(" %-2d ", i));
         }
         System.out.println("");
 
diff --git a/src/GomokuGame.java b/src/GomokuGame.java
index fd9f7fd..458f3aa 100644
--- a/src/GomokuGame.java
+++ b/src/GomokuGame.java
@@ -160,20 +160,16 @@ public class GomokuGame {
                     this.board.expandBoard(cardinal);
                 }
             }
-            System.out.println(board.countMax(board.countAlignedCells(currentPlay)));
             if (NB_CELL_PLAY <= board.countMax(board.countAlignedCells(currentPlay))) {
-                System.out.println("Le joueur " + this.currentPlayer + " a gagné !");
-                // this.renderer.updateStatus("Le joueur " + this.currentPlayer + "a gagné !");
+                this.renderer.updateStatus("Le joueur " + this.currentPlayer + "a gagné !");
                 return;
             }
             this.currentPlayer.tokens -= 1;
             this.currentPlayer = this.nextPlayer();
             renderer.update();
-            // System.out.println(this.board);
         }
 
-        // this.renderer.updateStatus("Match nul, il ne reste plus de jeton.");
-        System.out.println("Match nul, il ne reste plus de jeton");
+        this.renderer.updateStatus("Match nul, il ne reste plus de jetons.");
         return;
     }