2 Player gameplay works!!! (Sorta)

Author: abhay7dev

client/src/main/java/dev/abhay7/skribbl/client/Client.java

@@ -27,8 +27,11 @@
 import javax.swing.SwingWorker;
 import javax.swing.border.EmptyBorder;
 
+import org.json.JSONArray;
+
 import dev.abhay7.skribbl.client.jameskwong.pwdsignal.PWDSignalSession;
 import dev.abhay7.skribbl.client.jameskwong.pwdsignal.PWDSignalSessionState;
+import dev.abhay7.skribbl.server.datapacks.GameDataPack;
 import dev.abhay7.skribbl.server.datapacks.LobbyJoinPack;
 import dev.abhay7.skribbl.server.datapacks.PayloadPack;
 import dev.abhay7.skribbl.server.datapacks.WordsFetchPack;
@@ -56,8 +59,8 @@ public class Client {
 
 
     public Map<String, Integer> currentPlayersMap;
-    private ArrayList<String> currentPlayersList;
-    private ArrayList<String> playersWhoHavePlayed;
+    public ArrayList<String> currentPlayersList;
+    public ArrayList<String> playersWhoHavePlayed;
     private ArrayList<String> wordsGuessed;
 
     public String chosenWord = "";
@@ -514,7 +517,7 @@ private JPanel getGamePanel(String lobName, Map<String, Integer> players, boolea
             startLobbyButton.addActionListener((_) -> {
                 if(this.getCurrentPlayersList().size() > 1) {
                     try {
-                        String player = chooseRandomPlayer();
+                        String player = chooseNextPlayer();
                         if(player != null) {
                             networkHandler.startLobby(player);
                             eastWrapper.remove(eastWrapper.getComponent(eastWrapper.getComponentCount() - 1));
@@ -545,7 +548,7 @@ private JPanel getGamePanel(String lobName, Map<String, Integer> players, boolea
         return toRet;
     }
 
-    private String chooseRandomPlayer() {
+    private String chooseNextPlayer() {
         if(playersWhoHavePlayed.size() < currentPlayersList.size()) {
             String player = currentPlayersList.get(playersWhoHavePlayed.size());
             playersWhoHavePlayed.add(player);
@@ -606,7 +609,7 @@ protected void startDrawing() {
     }
 
     // Leave a lobby
-    private void leaveLobby() {
+    protected void leaveLobby() {
         this.isPlaying = false;
         this.isHosting = false;
         inPrivate = false;
@@ -778,6 +781,8 @@ protected void updatePlayerList(ArrayList<String> usernames) {
     }
 
     protected void updateMessages(String message) {
+        System.out.println("playersWhoHavePlayed size" + playersWhoHavePlayed.size());
+        System.out.println("currentPlayersList size" + currentPlayersList.size());
         if (chatPanel != null) {
             SwingUtilities.invokeLater(() -> {
                 chatPanel.setText(chatPanel.getText() + "\n" + message);
@@ -813,7 +818,7 @@ private synchronized void exitProgram() {
     private void showMessageDialog(String msg, String titleMsg, int errorCode) {
         showMessageDialog(msg, titleMsg, errorCode, true);
     }
-    private void showMessageDialog(String msg, String titleMsg, int errorCode, boolean invokeLater) {
+    protected void showMessageDialog(String msg, String titleMsg, int errorCode, boolean invokeLater) {
         if(invokeLater) {
             SwingUtilities.invokeLater(() -> {
                 if(openDialogs < MAX_DIALOG_COUNT) {
@@ -899,7 +904,26 @@ public void run() {
                 } catch(Exception e) {}
             }
 
-            System.out.println("Finished gametimer");
+            try {
+                board.setDrawing(false);
+                board.getCanvas().delLines();
+                String player = chooseNextPlayer();
+                if(player != null) {
+                    networkHandler.sendGameDataPack(new GameDataPack(player + ":" + new JSONArray(playersWhoHavePlayed.toArray()).toString(), "nextplayer"));
+                } else {
+                    networkHandler.sendGameDataPack(new GameDataPack("done!", "gamedone"));
+                    String winner = "";
+                    int highest = -1;
+                    for(String s: currentPlayersList) {
+                        if(currentPlayersMap.get(s) > highest) {
+                            winner = s;
+                            highest = currentPlayersMap.get(s);
+                        }
+                    }
+                    showMessageDialog("Game is over! Winner is: " + winner + " with " + highest + " points.", "GAME COMPLETED", JOptionPane.OK_OPTION, true);
+                    leaveLobby();
+                }
+            } catch(Exception e) { System.err.println(e); }
 
         }
     }

client/src/main/java/dev/abhay7/skribbl/client/NetworkHandler.java

@@ -18,7 +18,9 @@
 import java.util.concurrent.TimeoutException;
 
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -279,6 +281,32 @@ private void handleRawGameDataPack(ReceivedPacket packet) {
                     } catch(Exception e) {
                         System.err.println(e);
                     }
+                } else if(packet.getData().getString("type").equalsIgnoreCase("nextplayer")) {
+                    try {
+                        JSONArray jsonArray = new JSONArray(packet.getData().getString("message").split(":")[1]);
+                        for(int i = 0; i < jsonArray.length(); i++) {
+                            if(client.playersWhoHavePlayed.indexOf(jsonArray.getString(i)) < 0) {
+                                client.playersWhoHavePlayed.add(jsonArray.getString(i));
+                            }
+                        }
+                    } catch(Exception e) {}
+                    if(packet.getData().getString("message").split(":")[0].equals(client.username)) {
+                        client.getBoard().setDrawing(true);
+                        client.startDrawing();
+                    }
+                    client.updateMessages(packet.getData().getString("message").split(":")[0] + " IS NOW DRAWING");
+                    client.getBoard().getCanvas().delLines();
+                } else if(packet.getData().getString("type").equalsIgnoreCase("gamedone")) {
+                    String winner = "";
+                    int highest = -1;
+                    for(String s: this.client.currentPlayersList) {
+                        if(this.client.currentPlayersMap.get(s) > highest) {
+                            winner = s;
+                            highest = this.client.currentPlayersMap.get(s);
+                        }
+                    }
+                    this.client.showMessageDialog("Game is over! Winner is: " + winner + " with " + highest + " points.", "GAME COMPLETED", JOptionPane.OK_OPTION, true);
+                    this.client.leaveLobby();
                 }
             }
         } else /* if(packet.getData().has("image")) */ {