next turn and turns for users completed

Author: amirmm03

src/main/java/client/controller/ListenerController.java

@@ -3,7 +3,9 @@
 import client.model.GlobalThings;
 import client.model.Request;
 import client.model.Response;
+import client.view.GameMenu;
 import client.view.GameSettingsMenu;
+import client.view.Menu;
 import com.google.gson.Gson;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
@@ -67,7 +69,7 @@ public void run() {
                     hBox.setStyle("-fx-background-color: purple");
                     Label label = new Label(command + " do you accept?");
                     label.setFont(new Font(40));
-                    label.setStyle("-fx-fill: yellow");
+                    label.setStyle("-fx-text-fill: yellow");
                     Button accept = new Button("accept");
                     accept.setOnAction(new EventHandler<ActionEvent>() {
                         @Override
@@ -130,11 +132,46 @@ public void run() {
                 }
 
             });
-
+            return;
         }
-        switch (command) {
 
+        if (command.equals("game started")) {
+            Controller.send("change menu Game");
+            Platform.runLater(() -> {
+                Controller.setGameMenu(new GameMenu());
+                Controller.getWindow().setScene(Controller.getGameMenu().getScene());
+            });
+            return;
+        }
 
+        if (command.startsWith("not your turn. turn for : ")) {
+            Platform.runLater(() -> {
+                HBox hBox = new HBox();
+                hBox.toBack();
+                hBox.getChildren().clear();
+                hBox.setStyle("-fx-background-color: purple");
+                Label label = new Label(command);
+                label.setFont(new Font(40));
+                label.setStyle("-fx-text-fill: yellow");
+                hBox.getChildren().add(label);
+                hBox.setAlignment(Pos.CENTER);
+                hBox.setPrefHeight(720);
+                hBox.setPrefWidth(1280);
+                ((AnchorPane) Controller.getWindow().getScene().getRoot()).getChildren().add(hBox);
+            });
+            return;
         }
+        if (command.equals("its your turn")) {
+            Platform.runLater(() -> {
+                if (((AnchorPane) Controller.getWindow().getScene().getRoot()).getChildren().
+                        get(((AnchorPane) Controller.getWindow().getScene().getRoot()).getChildren().size() - 1) instanceof HBox)
+                    ((AnchorPane) Controller.getWindow().getScene().getRoot()).getChildren().remove(
+                            ((AnchorPane) Controller.getWindow().getScene().getRoot()).getChildren().size() - 1);
+                Controller.getGameMenu().updateAll();
+            });
+            return;
+        }
+
+
     }
 }

src/main/java/client/view/GameMenu.java

@@ -114,7 +114,7 @@ public void initialize(URL location, ResourceBundle resources) {
         });
     }
 
-    private void updateAll() {
+    public void updateAll() {
         updateStatusBar();
         updateCurrentResearchStatus();
         while (true) {

src/main/java/client/view/GameSettingsMenu.java

@@ -144,13 +144,8 @@ public void startGameWithFriend(MouseEvent mouseEvent) {
             String text = (String) Controller.send("gameWithFriends", createArraylistOfUsers(), mapLength.getValue(), mapWidth.getValue(),
                     autoSave.getValue(), numberOfKeptSavedFiles.getValue());
             information.setText(text);
-            if (text.startsWith("a new game started with ")) {
-                Controller.send("change menu Game");
-                setup(cancelButton);
-                Controller.setGameMenu(new GameMenu());
-                window.setScene(Controller.getGameMenu().getScene());
 
-            }
+
         } else {
             String text = (String) Controller.send("loadSavedGame", loadGame.getValue());
             if (text.endsWith("successfully")) {

src/main/java/server/controller/SocketHandler.java

@@ -65,37 +65,38 @@ public void run() {
             while (true) {
                 Gson gson = GlobalThings.gson;
                 String s = dataInputStream.readUTF();
-                System.out.println("<<REQUEST>> : \n" + s); // TODO : delete this line
+                //System.out.println("<<REQUEST>> : \n" + s); // TODO : delete this line
                 Request request = gson.fromJson(s, Request.class);
-                System.out.println("New request from " + socket);
+                //System.out.println("New request from " + socket);
                 Response response = handleRequest(request);
-                System.out.println("<<RESPONSE>> : \n" + gson.toJson(response)); // TODO : delete this line
+               // System.out.println("<<RESPONSE>> : \n" + gson.toJson(response)); // TODO : delete this line
                 dataOutputStream.writeUTF(gson.toJson(response));
                 dataOutputStream.flush();
             }
         } catch (IOException | NoSuchMethodException | InvocationTargetException | IllegalAccessException exception) {
             if (user != null)
                 user.setLastOnlineTime(LocalDateTime.now());
+            exception.printStackTrace();
             ServerController.getInstance().removeSocket(this);
             // TODO : send updated list of users to online users
         }
     }
 
     private Response handleRequest(Request request) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         String methodName = request.getMethodName();
-        if (methodName.equals("getPlayersInLobby")){
+        if (methodName.equals("getPlayersInLobby")) {
             Response response = new Response();
             ArrayList<String> usernames = new ArrayList<>();
             for (SocketHandler socketHandler : waitingInLobbyWithYou) {
                 usernames.add(socketHandler.user.getUsername());
             }
             response.setAnswer(usernames);
-            return response ;
+            return response;
         }
-        if (methodName.startsWith("accept invite from")){
+        if (methodName.startsWith("accept invite from")) {
             String username = methodName.substring(19);
             for (SocketHandler socketHandler : ServerController.getInstance().getSocketHandlers()) {
-                if (socketHandler.user.getUsername().equals(username)){
+                if (socketHandler.user.getUsername().equals(username)) {
                     socketHandler.waitingInLobbyWithYou.add(this);
                     this.waitingInLobbyWithYou = socketHandler.waitingInLobbyWithYou;
                     socketHandler.sendCommand(user.getUsername() + " has accepted your invite");
@@ -106,10 +107,10 @@ private Response handleRequest(Request request) throws NoSuchMethodException, In
             }
             return new Response();
         }
-        if (methodName.startsWith("reject invite from")){
+        if (methodName.startsWith("reject invite from")) {
             String username = methodName.substring(19);
             for (SocketHandler socketHandler : ServerController.getInstance().getSocketHandlers()) {
-                if (socketHandler.user.getUsername().equals(username)){
+                if (socketHandler.user.getUsername().equals(username)) {
                     socketHandler.sendCommand(user.getUsername() + " has rejected your invite");
                 }
             }
@@ -166,10 +167,30 @@ private Response handleRequest(Request request) throws NoSuchMethodException, In
             case "Game":
                 method = gameMenuController.getClass().getMethod(methodName, types);
                 answer = method.invoke(gameMenuController, arguments);
+                if (answer instanceof String) {
+                    if (((String) answer).startsWith("change turn done \nIt's now your turn "))
+                        updateMapForClients();
+                }
                 break;
             case "GameSetting":
                 method = gameSettingMenuController.getClass().getMethod(methodName, types);
                 answer = method.invoke(gameSettingMenuController, arguments);
+                if (answer instanceof String) {
+                    if (((String) answer).startsWith("a new game started with ")) {
+                        new Thread(()->{
+                            try {
+                                Thread.sleep(100);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException(e);
+                            }
+                            for (SocketHandler socketHandler : waitingInLobbyWithYou) {
+                                socketHandler.sendCommand("game started");
+                            }
+                            updateMapForClients();
+                        }).start();
+
+                    }
+                }
                 break;
             case "Login":
                 method = loginMenuController.getClass().getMethod(methodName, types);
@@ -182,6 +203,7 @@ private Response handleRequest(Request request) throws NoSuchMethodException, In
                         user.setAuthToken(user.getUsername() + user.getPassword() + user.getNickname() + String.valueOf(random));
                         answer += user.getAuthToken();
                     }
+
                 }
                 break;
             case "Main":
@@ -207,6 +229,17 @@ private Response handleRequest(Request request) throws NoSuchMethodException, In
         return response;
     }
 
+    private void updateMapForClients() {
+        for (SocketHandler socketHandler : waitingInLobbyWithYou) {
+            if (socketHandler.user.getUsername().equals(Game.getGame().getSelectedCivilization().getUsername())) {
+                socketHandler.sendCommand("its your turn");
+            }
+            else {
+                socketHandler.sendCommand("not your turn. turn for : " + Game.getGame().getSelectedCivilization().getUsername());
+            }
+        }
+    }
+
     private void changeMenu(String name) {
         menu = name;
         System.out.println("you are now in " + name);