LobbyView now can change to RaceView upon race start packet received.

Added port number text field in start screen controller.
Created a client state.

#story[1055] #pair[hyi25, zyt10]

src/main/java/seng302/gameServer/GameState.java

@@ -1,5 +1,6 @@
 package seng302.gameServer;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -28,6 +29,7 @@ public class GameState {
     public GameState(String hostIpAddress) {
         GameState.hostIpAddress = hostIpAddress;
         players = new ArrayList<>();
+        yachts = new HashMap<>();
         currentStage = GameStages.LOBBYING;
         isRaceStarted = false;
         //set this when game stage changes to prerace

src/main/java/seng302/gameServer/MainServerThread.java

@@ -32,7 +32,7 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
         try {
             serverSocket = new ServerSocket(PORT);
         } catch (IOException e) {
-            System.out.println("IO error in server thread handler upon trying to make new server socket");
+            serverLog("IO error in server thread handler upon trying to make new server socket", 0);
         }
 
         packetBuffer = new PriorityBlockingQueue<>();
@@ -73,7 +73,6 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
             updateClients();
 
             while (!packetBuffer.isEmpty()){
-                System.out.println("WHATUPPP");
                 try {
                     StreamPacket packet = packetBuffer.take();
                     ClientPacketParser.parsePacket(packet);
@@ -83,9 +82,6 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
             }
         }
 
-        System.out.println("WHOOPSIES");
-
-
         // TODO: 14/07/17 wmu16 - Send out disconnect packet to clients
         try {
             serverSocket.close();
@@ -111,7 +107,6 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
 
     @Override
     public boolean addToBuffer(StreamPacket streamPacket) {
-        System.out.println("HEY HI");
         return packetBuffer.add(streamPacket);
     }
 

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -50,7 +50,7 @@ public class ServerToClientThread extends Thread {
         GameState.addPlayer(new Player(socket));
         Random rand = new Random();
         sourceId = rand.nextInt(100000);
-        GameState.addYacht(sourceId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
+//        GameState.addYacht(sourceId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
     }
 
     public void run() {
@@ -58,14 +58,13 @@ public class ServerToClientThread extends Thread {
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
         while(true) {
-            //System.out.print(".");
 
             try {
                 //Perform a write if it is time to as delegated by the MainServerThread
                 if (updateClient) {
                     // TODO: 13/07/17 wmu16 - Write out game state - some function that would write all appropriate messages to this output stream
-                    ChatterMessage chatterMessage = new ChatterMessage(4, 14, "Hello, it's me");
-                    sendMessage(chatterMessage);
+                    //ChatterMessage chatterMessage = new ChatterMessage(4, 14, "Chatter message");
+                    //sendMessage(chatterMessage);
 
 //                try {
 //                    GameState.outputState(os);