Merge remote-tracking branch 'origin/serverClient' into serverClient

hamidalipour · hamidalipour · commit bfb35f5573dd · 2022-07-26T12:15:51.000+04:30
# Conflicts:
#	Server/src/main/resources/usersData.json
diff --git a/Client/src/main/java/Client/controllers/ClientSocketController.java b/Client/src/main/java/Client/controllers/ClientSocketController.java
@@ -11,6 +11,7 @@
 import Client.views.ChatRoomPageController;
 import Client.views.GamePageController;
 import Client.views.MainMenuController;
+import Client.views.StartGameMenuController;
 import com.google.gson.Gson;
 import javafx.scene.paint.Color;
 
@@ -91,6 +92,10 @@ public static void handleServerUpdate(Response response) {
                 MainMenuController.loggedInUser = new Gson().fromJson(response.getParams().get("user"), User.class);
                 ChatRoomPageController.updateChatroom = true;
             }
+            case UPDATE_INVITATIONS -> {
+                MainMenuController.loggedInUser = new Gson().fromJson(response.getParams().get("user"), User.class);
+                StartGameMenuController.updateInvites = true;
+            }
             case CHOOSE_CITY_OPTIONS -> GamePageController.setCityOptions(new Gson().fromJson(response.getParams().get("city"), City.class), new Gson().fromJson(response.getParams().get("combatUnit"), CombatUnit.class));
             case CHOOSE_WAR_OPTIONS -> GamePageController.setDeclareWarOptions(new Gson().fromJson(response.getParams().get("enemyName"), String.class));
         }
diff --git a/Client/src/main/java/Client/enums/QueryRequests.java b/Client/src/main/java/Client/enums/QueryRequests.java
@@ -120,6 +120,10 @@ public enum QueryRequests {
     ADD_LISTENER,
     //game page
     DECLARE_WAR,
+    SEND_INVITATION,
+    ACCEPT_INVITATION,
+    DECLINE_INVITATION,
+    LEAVE_LOBBY,
     //trade panel
     GET_ALL_CIVILIZATIONS_NAMES,
     ADD_TRADE,
diff --git a/Client/src/main/java/Client/enums/QueryResponses.java b/Client/src/main/java/Client/enums/QueryResponses.java
@@ -22,6 +22,7 @@ public enum QueryResponses {
     UPDATE_ALL_HEXES,
     CHANGE_SCENE,
     UPDATE_CHAT,
+    UPDATE_INVITATIONS,
     //
     YOU_NOT_ENOUGH_GOLD, YOU_LACK_STRATEGIC_RESOURCE, YOU_LACK_LUXURY_RESOURCE, OTHER_CIVILIZATION_NOT_ENOUGH_GOLD, OTHER_CIVILIZATION_LACK_STRATEGIC_RESOURCE, OTHER_CIVILIZATION_LACK_LUXURY_RESOURCE,
     CHOOSE_CITY_OPTIONS,
diff --git a/Client/src/main/java/Client/models/tiles/Hex.java b/Client/src/main/java/Client/models/tiles/Hex.java
@@ -100,6 +100,7 @@ public void setGroupEventHandlers() {
                     }
                     case RESET_GIVEN_TILE_COLOR -> {
                         HexController.getHexOfTheGivenCoordination(Integer.parseInt(response.getParams().get("x")), Integer.parseInt(response.getParams().get("y"))).setColorAdjust(null);
+                        Hex.this.colorAdjust.setInput(new Bloom());
                         setPopup(getInfoPopup(coordination), mouseEvent.getSceneX() + 30, mouseEvent.getSceneY() + 15);
                     }
                 }
diff --git a/Client/src/main/java/Client/views/StartGameMenuController.java b/Client/src/main/java/Client/views/StartGameMenuController.java
@@ -5,8 +5,11 @@
 import Client.controllers.HexController;
 import Client.enums.QueryRequests;
 import Client.models.User;
+import Client.models.network.Response;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -17,6 +20,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
+import javafx.util.Duration;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,10 +51,22 @@ public class StartGameMenuController {
     private Button saveGameButton;
     @FXML
     private TextField saveNameTextField;
+    @FXML
+    private VBox lobbyPeopleVBox;
+    public static boolean updateInvites = false;
+    public Timeline timeline;
 
     public void initialize() {
         initPanes();
         initInvitations();
+        timeline = new Timeline(new KeyFrame(Duration.millis(500), actionEvent -> {
+            if (updateInvites) {
+                updateInvites = false;
+                initInvitations();
+                updateLobbyPeopleVBox();
+            }
+        }));
+        timeline.setCycleCount(-1);
 //        continueButton.setVisible(WorldController.getWorld() != null);
 //        saveGameButton.setVisible(WorldController.getWorld() != null);
 //        saveNameTextField.setVisible(WorldController.getWorld() != null);
@@ -65,6 +81,15 @@ public void initialize() {
                 cheatCodeText.setVisible(!cheatCodeText.isVisible());
             }
         });
+        updateLobbyPeopleVBox();
+        timeline.play();
+    }
+
+    public void updateLobbyPeopleVBox() {
+        lobbyPeopleVBox.getChildren().clear();
+        for (String s : MainMenuController.loggedInUser.getPeopleInLobby()) {
+            lobbyPeopleVBox.getChildren().add(new Text(s));
+        }
     }
 
     public void initPanes() {
@@ -82,38 +107,32 @@ public void initPanes() {
 
     public void initInvitations() {
         invitationsVBox.getChildren().clear();
-//        for (String invitation : UserController.getLoggedInUser().getInvitations()) {
-//            invitationsVBox.getChildren().add(makeInvitationBox(invitation));
-//        }
+        for (String invitation : MainMenuController.loggedInUser.getInvitations()) {
+            invitationsVBox.getChildren().add(makeInvitationBox(invitation));
+        }
     }
 
     public HBox makeInvitationBox(String invitation) {
         Button accept = new Button("✔");
         Button decline = new Button("❌");
-        accept.setOnMouseClicked(new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent mouseEvent) {
-//                User host = UserController.getUserByUsername(invitation.substring(16));
-//                assert host != null;
-//                UserController.getLoggedInUser().resetPeopleInLobby();
-//                for (String s : host.getPeopleInLobby()) {
-//                    UserController.getLoggedInUser().addPersonToLobby(s);
-//                }
-//                host.addPersonToLobby(UserController.getLoggedInUser().getUsername());
-//                for (String s : host.getPeopleInLobby()) {
-//                    if (!s.equals(host.getUsername()) && !s.equals(UserController.getLoggedInUser().getUsername()))
-//                        Objects.requireNonNull(UserController.getUserByUsername(s)).addPersonToLobby(UserController.getLoggedInUser().getUsername());
-//                }
-//                UserController.getLoggedInUser().removeInvitation(invitation);
-//                initInvitations();
-            }
+        accept.setOnMouseClicked(mouseEvent -> {
+            Response response = ClientSocketController.sendRequestAndGetResponse(QueryRequests.ACCEPT_INVITATION, new HashMap<>() {{
+                put("loggedInUser", MainMenuController.loggedInUser.getUsername());
+                put("host", invitation.substring(16));
+                put("invitation", invitation);
+            }});
+            assert response != null;
+            MainMenuController.loggedInUser = new Gson().fromJson(response.getParams().get("user"), User.class);
+            initInvitations();
         });
-        decline.setOnMouseClicked(new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent mouseEvent) {
-//                UserController.getLoggedInUser().removeInvitation(invitation);
-//                initInvitations();
-            }
+        decline.setOnMouseClicked(mouseEvent -> {
+            Response response = ClientSocketController.sendRequestAndGetResponse(QueryRequests.DECLINE_INVITATION, new HashMap<>() {{
+                put("loggedInUser", MainMenuController.loggedInUser.getUsername());
+                put("invitation", invitation);
+            }});
+            assert response != null;
+            MainMenuController.loggedInUser = new Gson().fromJson(response.getParams().get("user"), User.class);
+            initInvitations();
         });
         accept.setStyle("-fx-pref-width: 50");
         decline.setStyle("-fx-pref-width: 50");
@@ -131,43 +150,55 @@ public void cheatCodeAreaTyped(KeyEvent keyEvent) {
             if (command.equals("clear")) {
                 cheatCodeArea.clear();
             } else {
-                ClientSocketController.sendRequestAndGetResponse(QueryRequests.CHEAT_COMMAND, new HashMap<>(){{
+                ClientSocketController.sendRequestAndGetResponse(QueryRequests.CHEAT_COMMAND, new HashMap<>() {{
                     put("command", command);
                 }});
             }
         }
     }
 
     public void backButtonClicked(MouseEvent mouseEvent) {
+        timeline.stop();
+        ClientSocketController.sendRequestAndGetResponse(QueryRequests.LEAVE_LOBBY, new HashMap<>(){{
+            put("username", MainMenuController.loggedInUser.getUsername());
+        }});
         App.changeScene("mainMenuPage");
     }
 
     public void sendInvitations(MouseEvent mouseEvent) {
-//        for (MenuItem item : usernamesMenuButton.getItems()) {
-//            if (((CheckMenuItem) item).isSelected())
-//                Objects.requireNonNull(UserController.getUserByUsername(item.getText())).addInvitations(UserController.getLoggedInUser().getUsername());
-//        }
+        ArrayList<String> receivers = new ArrayList<>();
+        for (MenuItem item : usernamesMenuButton.getItems()) {
+            if (((CheckMenuItem) item).isSelected())
+                receivers.add(item.getText());
+        }
+        if (receivers.size() >= 1)
+            ClientSocketController.sendRequestAndGetResponse(QueryRequests.SEND_INVITATION, new HashMap<>() {{
+                put("sender", MainMenuController.loggedInUser.getUsername());
+                put("receivers", new Gson().toJson(receivers));
+            }});
     }
 
     public void startGameButtonClicked(MouseEvent mouseEvent) {
-//        if (UserController.getLoggedInUser().getPeopleInLobby().size() < 2) {
-//            System.out.println("can't start");
-//            return;
-//        } else if (UserController.getLoggedInUser().getPeopleInLobby().size() > numberOfPlayersSpinner.getValue()) {
-//            System.out.println("number of players is less the actual players");
-//            return;
-//        }
+        if (MainMenuController.loggedInUser.getPeopleInLobby().size() < 2) {
+            System.out.println("can't start");
+            return;
+        } else if (MainMenuController.loggedInUser.getPeopleInLobby().size() > numberOfPlayersSpinner.getValue()) {
+            System.out.println("number of players is less the actual players");
+            return;
+        }
         System.out.println(MainMenuController.loggedInUser.getPeopleInLobby() + " * " + mapWidthSpinner.getValue() + " " + mapHeightSpinner.getValue());
         HexController.generateHexes(mapWidthSpinner.getValue(), mapHeightSpinner.getValue());
-        ClientSocketController.sendRequestAndGetResponse(QueryRequests.NEW_WORLD, new HashMap<>(){{
+        ClientSocketController.sendRequestAndGetResponse(QueryRequests.NEW_WORLD, new HashMap<>() {{
             put("people", new Gson().toJson(MainMenuController.loggedInUser.getPeopleInLobby()));
             put("width", String.valueOf(mapWidthSpinner.getValue()));
             put("height", String.valueOf(mapHeightSpinner.getValue()));
         }});
+        timeline.stop();
         App.changeScene("gamePage");
     }
 
     public void continueButtonClicked(MouseEvent mouseEvent) {
+        timeline.stop();
 //        App.changeScene("gamePage");
     }
 
diff --git a/Client/src/main/resources/fxml/startGameMenuPage.fxml b/Client/src/main/resources/fxml/startGameMenuPage.fxml
@@ -29,15 +29,19 @@
             text="Continue"/>
     <Text fill="ORANGE" layoutX="1045.0" layoutY="231.0" text="number of players " textAlignment="CENTER"/>
     <Spinner fx:id="numberOfPlayersSpinner" layoutX="1054.0" layoutY="239.0"/>
-    <Text fill="ORANGE" layoutX="1045.0" layoutY="316.0" text="map height" textAlignment="CENTER"/>
-    <Text fill="ORANGE" layoutX="1045.0" layoutY="401.0" text="map width" textAlignment="CENTER"/>
+    <Text fill="ORANGE" layoutX="1077.0" layoutY="317.0" text="map height" textAlignment="CENTER"/>
+    <Text fill="ORANGE" layoutX="1081.0" layoutY="403.0" text="map width" textAlignment="CENTER"/>
     <Spinner fx:id="mapHeightSpinner" layoutX="1054.0" layoutY="324.0"/>
     <Spinner fx:id="mapWidthSpinner" layoutX="1054.0" layoutY="409.0"/>
     <TextArea fx:id="cheatCodeArea" layoutX="1009.0" layoutY="490.0" onKeyPressed="#cheatCodeAreaTyped"
               prefHeight="200.0" prefWidth="200.0"/>
     <Text fx:id="cheatCodeText" fill="WHITE" layoutX="1009.0" layoutY="480.0" text="Enter your cheatCode : "/>
-    <TextField fx:id="saveNameTextField" layoutX="607.0" layoutY="528.0" promptText="Write the name of your save" style="-fx-pref-width: 165;"/>
-    <Button fx:id="saveGameButton" layoutX="615.0" layoutY="572.0" text="Save Game" onMouseClicked="#saveGameButtonClicked"/>
+    <TextField fx:id="saveNameTextField" layoutX="607.0" layoutY="528.0" promptText="Write the name of your save"
+               style="-fx-pref-width: 165;"/>
+    <Button fx:id="saveGameButton" layoutX="615.0" layoutY="572.0" onMouseClicked="#saveGameButtonClicked"
+            text="Save Game"/>
+    <VBox fx:id="lobbyPeopleVBox" layoutX="427.0" layoutY="132.0" prefHeight="434.0" prefWidth="150.0"/>
+    <Text fill="#ff9d00" layoutX="426.0" layoutY="115.0" text="People in lobby : "/>
 
 
 </AnchorPane>
diff --git a/Server/src/main/java/Server/enums/QueryRequests.java b/Server/src/main/java/Server/enums/QueryRequests.java
@@ -120,6 +120,10 @@ public enum QueryRequests {
     ADD_LISTENER,
     //game page
     DECLARE_WAR,
+    SEND_INVITATION,
+    ACCEPT_INVITATION,
+    DECLINE_INVITATION,
+    LEAVE_LOBBY,
     //trade panel
     GET_ALL_CIVILIZATIONS_NAMES,
     ADD_TRADE,
diff --git a/Server/src/main/java/Server/enums/QueryResponses.java b/Server/src/main/java/Server/enums/QueryResponses.java
@@ -22,6 +22,7 @@ public enum QueryResponses {
     UPDATE_ALL_HEXES,
     CHANGE_SCENE,
     UPDATE_CHAT,
+    UPDATE_INVITATIONS,
     //
     YOU_NOT_ENOUGH_GOLD, YOU_LACK_STRATEGIC_RESOURCE, YOU_LACK_LUXURY_RESOURCE, OTHER_CIVILIZATION_NOT_ENOUGH_GOLD, OTHER_CIVILIZATION_LACK_STRATEGIC_RESOURCE, OTHER_CIVILIZATION_LACK_LUXURY_RESOURCE,
     CHOOSE_CITY_OPTIONS,
diff --git a/Server/src/main/java/Server/models/network/ServerSocketHandler.java b/Server/src/main/java/Server/models/network/ServerSocketHandler.java
@@ -146,9 +146,12 @@ public Response handleRequest(Request request) throws IOException {
                         return new Response(QueryResponses.RESET_COLOR_ADJUST, new HashMap<>());
                     } else {
                         if (WorldController.getSelectedTile() != null) {
+                            int x = WorldController.getSelectedTile().getX();
+                            int y = WorldController.getSelectedTile().getY();
+                            WorldController.setSelectedTile(MapController.getTileByCoordinates(coordination));
                             return new Response(QueryResponses.RESET_GIVEN_TILE_COLOR, new HashMap<>() {{
-                                put("x", String.valueOf(WorldController.getSelectedTile().getX()));
-                                put("y", String.valueOf(WorldController.getSelectedTile().getY()));
+                                put("x", String.valueOf(x));
+                                put("y", String.valueOf(y));
                             }});
                         }
                         WorldController.setSelectedTile(MapController.getTileByCoordinates(coordination));
@@ -432,12 +435,70 @@ public Response handleRequest(Request request) throws IOException {
                 for (String username : usernames) {
                     Objects.requireNonNull(UserController.getUserByUsername(username)).addChats(new Chat(usernames, request.getParams().get("chatName")));
                     if (UserController.getLoggedInUsers().contains(UserController.getUserByUsername(username))) {
-                        ServerUpdateController.sendUpdate(username, new Response(QueryResponses.UPDATE_CHAT, new HashMap<>(){{
+                        ServerUpdateController.sendUpdate(username, new Response(QueryResponses.UPDATE_CHAT, new HashMap<>() {{
                             put("user", new Gson().toJson(UserController.getUserByUsername(username)));
                         }}));
                     }
                 }
             }
+            case SEND_INVITATION -> {
+                ArrayList<String> receivers = new Gson().fromJson(request.getParams().get("receivers"), new TypeToken<List<String>>() {
+                }.getType());
+                for (String receiver : receivers) {
+                    Objects.requireNonNull(UserController.getUserByUsername(receiver)).addInvitations(request.getParams().get("sender"));
+                    if (UserController.getLoggedInUsers().contains(UserController.getUserByUsername(receiver))) {
+                        ServerUpdateController.sendUpdate(receiver, new Response(QueryResponses.UPDATE_INVITATIONS, new HashMap<>() {{
+                            put("user", new Gson().toJson(UserController.getUserByUsername(receiver)));
+                        }}));
+                    }
+                }
+            }
+            case ACCEPT_INVITATION -> {
+                User host = UserController.getUserByUsername(request.getParams().get("host"));
+                assert host != null;
+                User loggedInUser = UserController.getUserByUsername(request.getParams().get("loggedInUser"));
+                assert loggedInUser != null;
+                loggedInUser.resetPeopleInLobby();
+                for (String s : host.getPeopleInLobby()) {
+                    loggedInUser.addPersonToLobby(s);
+                }
+                host.addPersonToLobby(loggedInUser.getUsername());
+                for (String s : host.getPeopleInLobby()) {
+                    if (!s.equals(host.getUsername()) && !s.equals(loggedInUser.getUsername()))
+                        Objects.requireNonNull(UserController.getUserByUsername(s)).addPersonToLobby(loggedInUser.getUsername());
+                }
+                loggedInUser.removeInvitation(request.getParams().get("invitation"));
+                for (String s : loggedInUser.getPeopleInLobby()) {
+                    ServerUpdateController.sendUpdate(s, new Response(QueryResponses.UPDATE_INVITATIONS, new HashMap<>() {{
+                        put("user", new Gson().toJson(UserController.getUserByUsername(s)));
+                    }}));
+                }
+                return new Response(QueryResponses.OK, new HashMap<>() {{
+                    put("user", new Gson().toJson(loggedInUser));
+                }});
+            }
+            case DECLINE_INVITATION -> {
+                User loggedInUser = UserController.getUserByUsername(request.getParams().get("loggedInUser"));
+                assert loggedInUser != null;
+                loggedInUser.removeInvitation(request.getParams().get("invitation"));
+                return new Response(QueryResponses.OK, new HashMap<>() {{
+                    put("user", new Gson().toJson(loggedInUser));
+                }});
+            }
+            case LEAVE_LOBBY -> {
+                User user = UserController.getUserByUsername(request.getParams().get("username"));
+                assert user != null;
+                for (String s : user.getPeopleInLobby()) {
+                    if (s.equals(user.getUsername())) {
+                        user.resetPeopleInLobby();
+                    } else {
+                        Objects.requireNonNull(UserController.getUserByUsername(s)).removePersonFromLobby(user.getUsername());
+                    }
+                    ServerUpdateController.sendUpdate(s, new Response(QueryResponses.UPDATE_INVITATIONS, new HashMap<>(){{
+                        put("user", new Gson().toJson(UserController.getUserByUsername(s)));
+                    }}));
+                }
+            }
             case DECLARE_WAR -> WarController.declareWar(request.getParams().get("enemyName"));
             case GET_CURRENT_CIVILIZATION_NAME -> {
                 return new Response(QueryResponses.OK, new HashMap<>(){{
diff --git a/Server/src/main/resources/usersData.json b/Server/src/main/resources/usersData.json

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public void setGroupEventHandlers() {`
`100`	`100`	`}`
`101`	`101`	`case RESET_GIVEN_TILE_COLOR -> {`
`102`	`102`	`HexController.getHexOfTheGivenCoordination(Integer.parseInt(response.getParams().get("x")), Integer.parseInt(response.getParams().get("y"))).setColorAdjust(null);`
	`103`	`+ Hex.this.colorAdjust.setInput(new Bloom());`
`103`	`104`	`setPopup(getInfoPopup(coordination), mouseEvent.getSceneX() + 30, mouseEvent.getSceneY() + 15);`
`104`	`105`	`}`
`105`	`106`	`}`