Added CLI

Added CLI and ViewInterface
Refactored client messageParser
Added Manifest for client jar
Added resources

Author: DomenicoCacace

src/main/java/it/polimi/ingsw/model/Game.java

@@ -263,6 +263,7 @@ public Game restoreState() throws IOException {
         int x, y;
         ObjectMapper objectMapper = new ObjectMapper();
         Game restoredGame = objectMapper.readerFor(Game.class).readValue(file);
+        //FIXME: manage file path
         for (Player player : restoredGame.players) {
             /*for (Worker worker : player.getWorkers()) { //TODO: we should do the opposite, use the occupiedBy in cell to set the position in Worker
                 x = worker.getPosition().getCoordX();

src/main/java/it/polimi/ingsw/model/dataClass/GodData.java

@@ -35,7 +35,6 @@ public String getDescriptionStrategy() {
     }
 
 
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

src/main/java/it/polimi/ingsw/network/client/Client.java

@@ -1,28 +1,36 @@
 package it.polimi.ingsw.network.client;
 
 import it.polimi.ingsw.network.message.Message;
+import it.polimi.ingsw.view.ViewInterface;
+import it.polimi.ingsw.view.cli.CLI;
 
+import javax.swing.text.View;
 import java.io.IOException;
+import java.util.List;
 import java.util.Scanner;
 
 public class Client {
     private String username;
-    private final String ipAddress;
+    private String ipAddress;
     private NetworkHandler networkHandler;
     private boolean currentPlayer;
+    private ViewInterface view;
 
-    public static void main(String[] args) throws IOException {
-        System.out.println("Choose username");
-        Scanner in = new Scanner(System.in);
-        String username = in.nextLine();
-        String ip = "127.0.0.1"; // TODO: just for speed up socket testing, we will change this
-        System.out.println("IP: " + ip);
-        Client client = new Client(username, ip);
+    public static void main(String[] args) {
+        ViewInterface viewInterface;
+        if(args.length == 0 || !args[0].equals("--GUI"))
+            viewInterface = new CLI();
+        else
+            viewInterface = new CLI(); //FIXME: implement gui
+
+        List<String> loginData = viewInterface.loginScreen();
+        Client client = new Client(loginData.get(1), loginData.get(0), viewInterface);
         client.startConnection();
         //TODO: Here I ask the user if he wants to use the Cli/Gui
     }
 
-    public Client(String username, String ipAddress) {
+    public Client(String username, String ipAddress, ViewInterface viewInterface) {
+        this.view = viewInterface;
         this.username = username;
         this.ipAddress = ipAddress;
     }
@@ -39,10 +47,18 @@ public void setCurrentPlayer(boolean currentPlayer) {
         this.currentPlayer = currentPlayer;
     }
 
+    public void setUsername(String username) {
+        this.username = username;
+        networkHandler.login(username);
+    }
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
     /*
         The view asks the user for his Username and IpAddress (we need this because of quarantine), then it'll call this method to start the connection
          */
-    public void startConnection() throws IOException {
+    public void startConnection() {
         networkHandler = new NetworkHandler(this);
         new Thread(networkHandler).start();
         networkHandler.login(this.username);
@@ -53,17 +69,17 @@ public void sendMessage(Message message) { //View -> Client -> handler -> JsonPa
             networkHandler.sendMessage(message);
     }
 
-    public void setUsername(String username) {
-        this.username = username;
-        networkHandler.login(username);
-    }
 
     public void stopConnection() throws IOException {
         networkHandler.closeConnection();
     }
 
+    public ViewInterface getView() {
+        return this.view;
+    }
+
     public synchronized void notify(Message message) { //These come from the server to the Client
-        System.out.println("Message Received from server, message content is " + message.getContent());
+        //System.out.println("Message Received from server, message content is " + message.getContent());
         //TODO: We could have another message parser class instead of a method, here the client will call methods of the view to display the info inside the message (errors, gameboard, etc)
     }
 }