From fd077cf9c57c6320511d5a56077ffc87b1fb3682 Mon Sep 17 00:00:00 2001
From: Asal Lotfi <asal.army.233@gmail.com>
Date: Thu, 15 May 2025 21:11:52 +0330
Subject: [PATCH 1/2] Done!

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  5 +-
 src/main/java/Client/Client.java              | 25 ++++---
 .../java/Client/ClientNetworkReceiver.java    | 47 +++++++++----
 src/main/java/Server/ClientHandler.java       | 69 +++++++++++++------
 src/main/java/Server/Server.java              | 36 +++++-----
 6 files changed, 122 insertions(+), 62 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 95f4786..40b771a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:/gradle-8.10.2" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle/gradle-8.13" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5cd9a10..9026d7f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/Client/Client.java b/src/main/java/Client/Client.java
index ab10b54..eb2932a 100644
--- a/src/main/java/Client/Client.java
+++ b/src/main/java/Client/Client.java
@@ -31,10 +31,8 @@ public Client(Socket clientSocket) {
         this.clientSocket = clientSocket;
 
         try {
-            //TODO: initialize out
             this.out = new DataOutputStream(clientSocket.getOutputStream());
-            //TODO: create a ClientNetworkReceiver
-            //TODO: start it in another thread
+            new Thread(new ClientNetworkReceiver(new DataInputStream(clientSocket.getInputStream()), this)).start();
 
             System.out.println("Enter Username: ");
             Scanner usernameScanner = new Scanner(System.in);
@@ -95,12 +93,24 @@ public Client(Socket clientSocket) {
 
     //Actions
     private void attack() {
-        //TODO: send attack message to server
+        String message = "attack|" + lastEnemyRow + "," + lastEnemyCol;
+        try {
+            out.writeUTF(message);
+        } catch (IOException e) {
+            System.out.println("Could not send message to the server!\n\n");
+        }
+
         isTurn = false;
     }
     private void sendUsername(String username) throws IOException {
-        //TODO: send username to server
+        String message = "set-username|" + username;
+        try {
+            out.writeUTF(message);
+        } catch (IOException e) {
+            System.out.println("Could not send message to the server!\n\n");
+        }
     }
+
     public void setEnemyResult(boolean hit, String shipName) {
         enemyBoard[lastEnemyRow][lastEnemyCol].setEnemyShip(hit);
         enemyBoard[lastEnemyRow][lastEnemyCol].setMarked(true);
@@ -115,7 +125,6 @@ public void setOtherPlayerJoined() {
         otherPlayerJoined = true;
     }
     public void finishGame(boolean won){
-        //TODO:
     }
     public String getHit(int row, int col){
         String message = "";
@@ -289,8 +298,8 @@ public static void main(String[] args) throws IOException {
         //TODO: get IP_Address
 
         try {
-            //initialize clientSocket
-            //initialize Client
+            clientSocket = new Socket("localhost", PORT_NUMBER);
+            Client client = new Client(clientSocket);
         } finally {
             try {
                 if (clientSocket != null) {
diff --git a/src/main/java/Client/ClientNetworkReceiver.java b/src/main/java/Client/ClientNetworkReceiver.java
index 0572b06..84fe9a5 100644
--- a/src/main/java/Client/ClientNetworkReceiver.java
+++ b/src/main/java/Client/ClientNetworkReceiver.java
@@ -3,39 +3,58 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.util.Objects;
 
 public class ClientNetworkReceiver implements Runnable{
     private Client client;
     private DataInputStream in;
 
-    public ClientNetworkReceiver(Socket clientSocket, Client client) throws IOException {
-        // initialize client
-        // initialize in
+    public ClientNetworkReceiver(DataInputStream clientSocket, Client client) throws IOException {
+        this.client = client;
+        this.in = clientSocket;
     }
     @Override
     public void run() {
         while(true) {
-                //TODO: get response
-                String response = "";
 
-                if(false) // TODO: set player number ( 0 or 1)
+            String response;
+            try {
+                response = in.readUTF();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
+                if(response.startsWith("set-player-number|"))
                 {
-                    int number = 0;
+                    int number = Integer.parseInt(response.replace("set-player-number|", ""));
                     client.setPlayerNumber(number);
                 }
-                else if(false) // TODO: other player joined the game
+                else if(response.startsWith("enemy-joined"))
                 {
                     client.setOtherPlayerJoined();
                 }
-                else if(false){ // TODO: handle incoming hit
-                    int row = 0; //TODO: extract row
-                    int col = 0; //TODO: extract col
+                else if(response.startsWith("incoming-attack|")){
+                    int row = 0;
+                    int col = 0;
+                    //incoming-attack|row,col
+                    response.replace("incoming-attack|", "");
+                    row = Integer.parseInt(response.split(",")[0]);
+                    col = Integer.parseInt(response.split(",")[1]);
                     String message = client.getHit(row, col);
-                    //TODO: inform server
+                    try {
+                        client.out.writeUTF("attack-result|" + message);
+                        client.out.flush();
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
-                else if(false) //TODO: handle hit result from opponent
+                else if(response.startsWith("enemy-result|"))
                 {
-                    client.setEnemyResult(false, "NONE");
+                    response = response.replace("enemy-result|", "");
+                    //enemy-result|HIT,SHIPNAME
+                    //enemy-result|HIT,NONE
+                    //enemy-result|MISS,NINE
+                    client.setEnemyResult(Objects.equals(response.split(",")[0], "HIT"), response.split(",")[1]);
                 }
             }
         }
diff --git a/src/main/java/Server/ClientHandler.java b/src/main/java/Server/ClientHandler.java
index 7f75062..6d3e211 100644
--- a/src/main/java/Server/ClientHandler.java
+++ b/src/main/java/Server/ClientHandler.java
@@ -14,7 +14,12 @@ public class ClientHandler implements Runnable {
     ClientHandler enemy;
 
     public void sendData(String request) {
-        //TODO: write to output and flush
+        try {
+            out.writeUTF(request);
+            out.flush();
+        } catch (IOException e) {
+            System.out.println(e.getMessage());
+        }
     }
 
     public void setEnemy(ClientHandler enemy) throws IOException {
@@ -26,40 +31,60 @@ public String getUsername()
     }
 
     public ClientHandler(Socket client, boolean isFirst) throws IOException {
-        //initialize client
-        //initialize in
-        //initialize out
-        //initialize isFirst
+        this.client = client;
+        this.isFirst = isFirst;
+        in = new DataInputStream(client.getInputStream());
+        out = new DataOutputStream(client.getOutputStream());
     }
 
     public void run() {
         try {
             while(true) {
-                // TODO: Read a UTF-encoded string from the client
-                String request = "";
-                if (false) { //TODO: Set Username
-                    int playerNumber = isFirst?0:1;
-                    // TODO: Send player number to client
+                String request = in.readUTF();
+                if (request.startsWith("set-username")) {
 
-                    username = "";//TODO extract username
-                    //TODO: wait till enemy is specified
-                    //TODO: tell the clients that the other player joined
+                    int playerNumber = isFirst?0:1;
+                    username = request.replace("set-username|", "");
+                    out.writeUTF("set-player-number|" + playerNumber);
+                    out.flush();
+                    while (enemy == null) {
+                        Thread.sleep(10);
+                    }
+                    out.writeUTF("enemy-joined");
+                    out.flush();
                 }
-                else if (false) { //TODO: Handle Attack
-                    int row = 0;//TODO: extract row and col
-                    int col = 0;//TODO: extract row and col
-                    //TODO: inform enemy of the attack
+                else if (request.startsWith("attack") && !request.startsWith("attack-result")) {
+                    int row = 0;
+                    int col = 0;
+
+                    //attack|row,col
+                    request.replace("attack|", "");
+                    row = Integer.parseInt(request.split(",")[0]);
+                    col = Integer.parseInt(request.split(",")[1]);
+
+                    enemy.out.writeUTF("incoming-attack|" + row + "," + col);
                 }
-                else if (false) { //TODO: Handle Attack Result
-                    // TODO: Notify the attacker about the result of their attack (hit or miss)
+                else if (request.startsWith("attack-result")) {
+
+                    request.replace("attack-result|", "");
+                    enemy.out.writeUTF("enemy-result|" + request);
+                    enemy.out.flush();
                 }
                 //TODO(for later): handle winning and losing
             }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         } finally
         {
-            // close in
-            // close out
-            // close client
+            try {
+                in.close();
+                out.close();
+                client.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/Server/Server.java b/src/main/java/Server/Server.java
index 39e6a55..3b5ebbb 100644
--- a/src/main/java/Server/Server.java
+++ b/src/main/java/Server/Server.java
@@ -2,13 +2,15 @@
 
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.net.Socket;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import Server.ClientHandler;
+
 public class Server {
     private static int PORT = 3737;
-    // TODO: Create a collection to keep track of connected clients
     private static ArrayList<ClientHandler> clients = new ArrayList();
     private static ExecutorService pool = Executors.newFixedThreadPool(4);
 
@@ -20,27 +22,29 @@ public static void main(String[] args) {
         ServerSocket listener = null;
 
         try {
-            // TODO: Create a ServerSocket to listen for incoming connections
-            //int i = 0;
+            ServerSocket serverSocket = new ServerSocket();
+            int i = 0;
             while(true) {
+                Socket socket = serverSocket.accept();
+                ClientHandler clientThread = new ClientHandler(socket, i == 0);
 
-                // TODO: Accept a client connection
-                // TODO: Create a ClientHandler named clientThread for the connected client
-                // TODO: uncomment this code
-                //if(i == 0) {
-                //    playerOne = clientThread;
-                //}
-                //if(i == 1) {
-                //    playerTwo = clientThread;
-                //    playerOne.setEnemy(playerTwo);
-                //    playerTwo.setEnemy(playerOne);
-                //}
-                //i++;
-                //TODO add clientThread to clients and executor service
+                if(i == 0) {
+                    playerOne = clientThread;
+                }
+                if(i == 1) {
+                    playerTwo = clientThread;
+                    playerOne.setEnemy(playerTwo);
+                    playerTwo.setEnemy(playerOne);
+                }
+                i++;
+                clients.add(clientThread);
+                pool.execute(clientThread);
 
                 //TODO(for later): handle the situation where more than two players join at the same time
                 //TODO(for later): handle the situation where more than one game happens
             }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         } finally {
             if (listener != null) {
                 try {

From 0892fae0b3b1981558407e8aab465dcec71db065 Mon Sep 17 00:00:00 2001
From: Parsa Tajik <parsa,tajik163@gmail.com>
Date: Fri, 16 May 2025 02:02:25 +0330
Subject: [PATCH 2/2] Winning and Losing System Implemented;

---
 .idea/gradle.xml                              |  2 +-
 src/main/java/Client/Client.java              | 84 +++++++++++++++++--
 .../java/Client/ClientNetworkReceiver.java    | 18 ++--
 src/main/java/Server/ClientHandler.java       | 30 +++++--
 src/main/java/Server/Server.java              |  8 +-
 5 files changed, 115 insertions(+), 27 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 40b771a..4b6bed5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle/gradle-8.13" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../../../../../../Program Files/Gradle/gradle-8.13" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/src/main/java/Client/Client.java b/src/main/java/Client/Client.java
index eb2932a..b767114 100644
--- a/src/main/java/Client/Client.java
+++ b/src/main/java/Client/Client.java
@@ -27,6 +27,9 @@ public class Client {
     volatile boolean otherPlayerJoined = false;
     DataOutputStream out;
 
+    boolean won = false;
+    boolean lost = false;
+
     public Client(Socket clientSocket) {
         this.clientSocket = clientSocket;
 
@@ -48,11 +51,14 @@ public Client(Socket clientSocket) {
             }
 
             printBoards();
-            while(true)
+            mainLoop : while(!won && !lost)
             {
                 while(!isTurn)
                 {
                     Thread.onSpinWait();
+                    if (won || lost) {
+                        break mainLoop;
+                    }
                 }
 
                 System.out.println("Your Turn Now!");
@@ -96,7 +102,7 @@ private void attack() {
         String message = "attack|" + lastEnemyRow + "," + lastEnemyCol;
         try {
             out.writeUTF(message);
-        } catch (IOException e) {
+        } catch (Exception e) {
             System.out.println("Could not send message to the server!\n\n");
         }
 
@@ -126,7 +132,7 @@ public void setOtherPlayerJoined() {
     }
     public void finishGame(boolean won){
     }
-    public String getHit(int row, int col){
+    public void getHit(int row, int col){
         String message = "";
         playerBoard[row][col].setMarked(true);
         String sankBattleShipName = "NONE";
@@ -142,8 +148,35 @@ public String getHit(int row, int col){
         } catch (InterruptedException e) {
 
         }
-        isTurn = true;
-        return message;
+
+        try {
+            out.writeUTF("attack-result|" + message);
+            out.flush();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        // checking game status
+        boolean lost = true;
+        for (int i = 0; i < SIZE; i++) {
+            for (int j = 0; j < SIZE; j++) {
+                if (playerBoard[i][j].isShip() && !playerBoard[i][j].isMarked()) {
+                    lost = false;
+                }
+            }
+        }
+
+        if (lost) {
+            try {
+                out.writeUTF("enemy-won");
+                out.flush();
+                lose();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            isTurn = true;
+        }
     }
     private static void playSound(String soundFileName) {
         try {
@@ -293,13 +326,48 @@ private static boolean tryPlace(BattleShipCell[][] board, int row, int col, bool
         return false;
     }
 
+    public void win() {
+        try {
+            out.writeUTF("gameover"); //to terminate ClientHandler and ClientNetworkReceiver
+            out.flush();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        for (int i = 0; i < 20; i++) {
+            System.out.println();
+        }
+        System.out.println(AnsiColor.CYAN + "Congratulations! You won the game! wait for the next round..." + AnsiColor.RESET + "\n\n");
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        won = true;
+    }
+    public void lose() {
+        for (int i = 0; i < 20; i++) {
+            System.out.println();
+        }
+        System.out.println(AnsiColor.RED + "What a shame! You lost! wait fot the next round..." + AnsiColor.RESET + "\n\n");
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        lost = true;
+    }
+
     public static void main(String[] args) throws IOException {
         Socket clientSocket = null;
-        //TODO: get IP_Address
 
         try {
-            clientSocket = new Socket("localhost", PORT_NUMBER);
-            Client client = new Client(clientSocket);
+            while (true) {
+                clientSocket = new Socket("localhost", PORT_NUMBER);
+                new Client(clientSocket);
+            }
         } finally {
             try {
                 if (clientSocket != null) {
diff --git a/src/main/java/Client/ClientNetworkReceiver.java b/src/main/java/Client/ClientNetworkReceiver.java
index 84fe9a5..0662351 100644
--- a/src/main/java/Client/ClientNetworkReceiver.java
+++ b/src/main/java/Client/ClientNetworkReceiver.java
@@ -37,16 +37,10 @@ else if(response.startsWith("incoming-attack|")){
                     int row = 0;
                     int col = 0;
                     //incoming-attack|row,col
-                    response.replace("incoming-attack|", "");
+                    response = response.replace("incoming-attack|", "");
                     row = Integer.parseInt(response.split(",")[0]);
                     col = Integer.parseInt(response.split(",")[1]);
-                    String message = client.getHit(row, col);
-                    try {
-                        client.out.writeUTF("attack-result|" + message);
-                        client.out.flush();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
+                    client.getHit(row, col);
                 }
                 else if(response.startsWith("enemy-result|"))
                 {
@@ -56,6 +50,14 @@ else if(response.startsWith("enemy-result|"))
                     //enemy-result|MISS,NINE
                     client.setEnemyResult(Objects.equals(response.split(",")[0], "HIT"), response.split(",")[1]);
                 }
+                else if(response.equals("win"))
+                {
+                    client.win();
+                }
+                else if (response.equals("gameover"))
+                {
+                    return;
+                }
             }
         }
     }
diff --git a/src/main/java/Server/ClientHandler.java b/src/main/java/Server/ClientHandler.java
index 6d3e211..268e297 100644
--- a/src/main/java/Server/ClientHandler.java
+++ b/src/main/java/Server/ClientHandler.java
@@ -10,6 +10,7 @@ public class ClientHandler implements Runnable {
     private DataInputStream in;
     private DataOutputStream out;
     private boolean isFirst;
+    private boolean usernameSet;
     private String username;
     ClientHandler enemy;
 
@@ -33,6 +34,7 @@ public String getUsername()
     public ClientHandler(Socket client, boolean isFirst) throws IOException {
         this.client = client;
         this.isFirst = isFirst;
+        this.usernameSet = false;
         in = new DataInputStream(client.getInputStream());
         out = new DataOutputStream(client.getOutputStream());
     }
@@ -47,9 +49,15 @@ public void run() {
                     username = request.replace("set-username|", "");
                     out.writeUTF("set-player-number|" + playerNumber);
                     out.flush();
+                    this.usernameSet = true;
+
                     while (enemy == null) {
-                        Thread.sleep(10);
+                        Thread.onSpinWait();
+                    }
+                    while (!enemy.isUsernameSet()) {
+                        Thread.onSpinWait();
                     }
+
                     out.writeUTF("enemy-joined");
                     out.flush();
                 }
@@ -58,7 +66,7 @@ else if (request.startsWith("attack") && !request.startsWith("attack-result")) {
                     int col = 0;
 
                     //attack|row,col
-                    request.replace("attack|", "");
+                    request = request.replace("attack|", "");
                     row = Integer.parseInt(request.split(",")[0]);
                     col = Integer.parseInt(request.split(",")[1]);
 
@@ -66,16 +74,22 @@ else if (request.startsWith("attack") && !request.startsWith("attack-result")) {
                 }
                 else if (request.startsWith("attack-result")) {
 
-                    request.replace("attack-result|", "");
+                    request = request.replace("attack-result|", "");
                     enemy.out.writeUTF("enemy-result|" + request);
                     enemy.out.flush();
                 }
-                //TODO(for later): handle winning and losing
+                else if (request.equals("enemy-won")) {
+                    enemy.out.writeUTF("win");
+                    enemy.out.flush();
+                }
+                else if (request.equals("gameover")) {
+                    out.writeUTF("gameover"); //to terminate ClientNetworkReceiver
+                    out.flush();
+                    return;
+                }
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
         } finally
         {
             try {
@@ -87,4 +101,8 @@ else if (request.startsWith("attack-result")) {
             }
         }
     }
+
+    public boolean isUsernameSet() {
+        return usernameSet;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/Server/Server.java b/src/main/java/Server/Server.java
index 3b5ebbb..b9e8e73 100644
--- a/src/main/java/Server/Server.java
+++ b/src/main/java/Server/Server.java
@@ -22,16 +22,16 @@ public static void main(String[] args) {
         ServerSocket listener = null;
 
         try {
-            ServerSocket serverSocket = new ServerSocket();
+            ServerSocket serverSocket = new ServerSocket(PORT);
             int i = 0;
             while(true) {
                 Socket socket = serverSocket.accept();
-                ClientHandler clientThread = new ClientHandler(socket, i == 0);
+                ClientHandler clientThread = new ClientHandler(socket, i % 2 == 0);
 
-                if(i == 0) {
+                if(i % 2 == 0) {
                     playerOne = clientThread;
                 }
-                if(i == 1) {
+                else {
                     playerTwo = clientThread;
                     playerOne.setEnemy(playerTwo);
                     playerTwo.setEnemy(playerOne);