Online-TicTacToe

commit c8cf3c064984f3cfcf378082f0332c4c41019778
parent 69a160d64ff88cbf92ff2191cd3f925a822e8e05
Author: lukeeeeeee334 <lukeosullivan123@gmail.com>
Date:   Mon, 18 Nov 2024 12:27:21 +0000

final changes on score.java

Diffstat:
M
TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/login.java
 | 
2
++
M
TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/score.java
 | 
15
++++++++++++---
M
TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/TicTacToeClient.java
 | 
1
+

3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/login.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/login.java
@@ -91,6 +91,8 @@ public class login extends CustomPanel {
         loginButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                String username = usernameTextField.getText();  // Get the username
+                client.username = username; 
                 client.UID = String.valueOf(client.proxy.login(usernameTextField.getText(), String.valueOf(passwordTextField.getPassword())));
                 System.out.println("UID = " + client.UID);
                 
diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/score.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/score.java
@@ -13,6 +13,7 @@ public class score extends CustomPanel {
 
         // Get the logged-in UID from the client
         String loggedInUID = client.UID; 
+        String loggedInUsername = client.username; 
         System.out.println("Logged-in UID: " + loggedInUID);
 
         // Panel to display the stats
@@ -61,13 +62,21 @@ public class score extends CustomPanel {
                     
                         // Logged-in player is Player 1
                         
+                       if (player1UID.equals(loggedInUsername)) {
+                        // Logged-in player is Player 1
                         if (gameStateInt == 1) { // Player 1 wins
                             wins++;
-                            System.out.println("Win is updated");
                         } else if (gameStateInt == 2) { // Player 2 wins
                             losses++;
-                            System.out.println("loss is updated");
                         }
+                    } else if (player2UID.equals(loggedInUsername)) {
+                        // Logged-in player is Player 2
+                        if (gameStateInt == 2) { // Player 2 wins
+                            wins++;
+                        } else if (gameStateInt == 1) { // Player 1 wins
+                            losses++;
+                        }
+                    }
                     
                        
                     
@@ -78,7 +87,7 @@ public class score extends CustomPanel {
             }
 
             // Display the result as a summary
-            statsLabel.setText(String.format("Player UID %s: Wins = %d, Losses = %d", loggedInUID, wins, losses));
+            statsLabel.setText(String.format("Player %s: Wins = %d, Losses = %d", loggedInUsername, wins, losses));
         } catch (Exception e) {
             // Catch any unexpected errors
             statsLabel.setText("An error occurred while calculating player stats.");
diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/TicTacToeClient.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/TicTacToeClient.java
@@ -28,6 +28,7 @@ public class TicTacToeClient {
     private JFrame frame;
     private CustomPanel CurrentPanel;
     public String UID;
+    public String username;
     public String openGames;
 
     public static void main(String[] args) {