re-set jsonconfs

Author: samubarb

.gitignore

@@ -103,7 +103,7 @@ buildNumber.properties
 
 ### Client and Server settings ###
 #JSONconf folder
-JSONconf/ClientSettings.json
-JSONconf/ServerSettings.json
+#JSONconf/ClientSettings.json
+#JSONconf/ServerSettings.json
 
 # End of https://www.gitignore.io/api/maven,intellij,sonarqube

JSONconf/ClientSettings.json

@@ -0,0 +1,5 @@
+{
+  "serverAddress" : "127.0.0.1",
+  "clientAddress" : "127.0.0.1",
+  "port" : 4242
+}

JSONconf/ServerSettings.json

@@ -0,0 +1,4 @@
+{
+  "serverAddress" : "127.0.0.1",
+  "port" : 4242
+}

src/main/java/it/polimi/ingsw/view/cards/VPrivateObjectiveCard.java

@@ -3,6 +3,7 @@
 import it.polimi.ingsw.view.exceptions.ColorIncompatibleException;
 import it.polimi.ingsw.view.other_elements.VColor;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
 
 import static it.polimi.ingsw.inputoutput.IOManager.*;
 
@@ -24,14 +25,14 @@ public String toString() {
         return newline + this.color + this.getDescription() + VColor.RESET + newline ;
     }
 
-    public ImageView toGUI() {
+    public Pane toGUI() {
         String number = null;
         try {
             number = "" + getPrivateObjectiveNumber(this.color);
         } catch (ColorIncompatibleException e) {
             println("Colore carta obiettivo privato non valido.");
             errorExit();
         }
-        return getImage(private_obj_path + "pri" + number + ".jpg");
+        return new Pane(getImage(private_obj_path + "pri" + number + ".jpg"));
     }
 }

src/main/java/it/polimi/ingsw/view/cards/VPublicObjectiveCard.java

@@ -2,6 +2,7 @@
 
 import it.polimi.ingsw.view.exceptions.NameIncompatibleException;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
 
 import static it.polimi.ingsw.inputoutput.IOManager.*;
 
@@ -23,16 +24,14 @@ public String toString() {
         return newline + super.getName() + " " + "Punti: " + points + newline + this.getDescription() + newline;
     }
 
-    public ImageView toGUI() {
+    public Pane toGUI() {
         String number = null;
-
         try {
             number = "" + getPublicObjectiveNumber(this.getName());
         } catch (NameIncompatibleException e) {
             println("Nome della carta non valido.");
             errorExit();
         }
-
-        return getImage(public_obj_path + "pub" + number + ".jpg");
+        return new Pane(getImage(public_obj_path + "pub" + number + ".jpg"));
     }
 }

src/main/java/it/polimi/ingsw/view/game_elements/VCurrentDice.java

@@ -47,6 +47,7 @@ public FlowPane toGUI() {
         for(VDice vd : this.dice)
             if (vd != null)
                 currentDice.getChildren().add(vd.toGUI());
+        else currentDice.getChildren().add(VDice.slotDice());
 
         return currentDice;
     }

src/main/java/it/polimi/ingsw/view/game_elements/VGame.java

@@ -2,15 +2,14 @@
 
 import it.polimi.ingsw.view.cards.*;
 import it.polimi.ingsw.view.exceptions.TooManyPlayersException;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.Group;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.GridPane;
+import javafx.scene.layout.*;
 
 import java.util.ArrayList;
 
-import static it.polimi.ingsw.inputoutput.IOManager.getInt;
-import static it.polimi.ingsw.inputoutput.IOManager.newline;
-import static it.polimi.ingsw.inputoutput.IOManager.println;
+import static it.polimi.ingsw.inputoutput.IOManager.*;
 
 public class VGame {
     private final static int maxPlayer = 4;
@@ -62,7 +61,7 @@ public void addVPlayer(VPlayer player) throws TooManyPlayersException { // add a
 
     public void setScore(String playerName, int score) {
         for(VPlayer vp : this.players)
-            if (vp.getName() == playerName)
+            if (vp.getName().equals(playerName))
                 vp.setScore(score);
     }
 
@@ -124,31 +123,52 @@ public String toString() {
     }
 
     public Group toGUI() {
-        GridPane grid = new GridPane();
+        BorderPane organizer = new BorderPane();
         Group game = new Group();
         VPlayer clientPlayer = null;
 
+        HBox diceChain = new HBox();
+        HBox playersChain = new HBox();
+        HBox objCardsChain = new HBox();
+
+        diceChain.setMaxWidth(1000);
+        //diceChain.set
+        //diceChain.getChildren().add(this.roundTrack.toGUI());
+        diceChain.getChildren().add(this.dice.toGUI());
+
         for (VPlayer p : this.players)
             if (this.clientPlayer.equals(p.getName())) {
                 clientPlayer = p;
-                grid.add(clientPlayer.toGUI(), 0, 0);
-                grid.add(clientPlayer.getvPrivateObjectives().toGUI(), 0, 1);
+                playersChain.getChildren().add(clientPlayer.toGUI());
+                objCardsChain.getChildren().add(clientPlayer.getvPrivateObjectives().toGUI());
             }
 
-        for (int i = 0; i < this.players.size(); i++)
-            if (this.players.get(i) != clientPlayer) {
-                grid.add(this.players.get(i).toGUI(), i + 1, 0);
+
+        for (VPublicObjectiveCard card : publicObjectives) {
+            objCardsChain.getChildren().add(card.toGUI());
+
+        }
+
+
+            int i = 1;
+        for (VPlayer p : this.players)
+            if (p != clientPlayer) {
+                playersChain.getChildren().add(p.toGUI());
+                i++;
             }
 
-        grid.add(this.dice.toGUI(), 1, 1);
+        organizer.setTop(playersChain);
+        organizer.setCenter(objCardsChain);
+        organizer.setBottom(diceChain);
+
+        playersChain.setAlignment(Pos.CENTER);
+        objCardsChain.setAlignment(Pos.CENTER);
+        objCardsChain.setSpacing(thinPadding);
+        diceChain.setAlignment(Pos.CENTER);
 
-        FlowPane publicObjs = new FlowPane();
-        for (VPublicObjectiveCard card : publicObjectives)
-            publicObjs.getChildren().add(card.toGUI());
+        organizer.setPadding(new Insets(thinPadding));
 
-        grid.add(publicObjs, 2, 1);
 
-        game.getChildren().add(grid);
-        return game;
+        return new Group(organizer);
     }
 }

src/main/java/it/polimi/ingsw/view/game_elements/VRoundTrack.java

@@ -40,9 +40,9 @@ public String toString() {
 
     public FlowPane toGUI() {
         FlowPane roundTrack = new FlowPane();
-        for (int i = 0; i < this.track.length; i++)
-            if (this.track[i] != null)
-                roundTrack.getChildren().add(this.track[i].toGUI());
+        for (VDice dice : this.track)
+            if (dice != null)
+                roundTrack.getChildren().add(dice.toGUI());
         else roundTrack.getChildren().add(VDice.slotDice());
 
         return roundTrack;