- Initial commit to attempt to smooth turning.

tags : #issue[78]

src/main/java/seng302/App.java

@@ -80,12 +80,14 @@ public class App extends Application {
         ViewManager.getInstance().initialiseSplashScreen(primaryStage);
     }
 
-    private static void runDiscoveryServer(){
+    private static void runDiscoveryServer() throws Exception {
-        try{
+        while (true){
-            new DiscoveryServer();
+            try {
-        }
+                new DiscoveryServer();
-        catch (Exception e){
+            }
-            runDiscoveryServer();
+            catch (Exception ignored){
+                ;
+            }
         }
     }
 

src/main/java/seng302/discoveryServer/DiscoveryServer.java

@@ -11,11 +11,13 @@ import seng302.discoveryServer.util.ServerRepoStreamParser;
 import seng302.discoveryServer.util.ServerTable;
 import seng302.visualiser.ServerListener;
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
+import java.util.Timer;
 
 public class DiscoveryServer {
     public static final String ANSI_GREEN = "\u001B[32m";
@@ -27,6 +29,7 @@ public class DiscoveryServer {
 
     private ServerTable serverTable;
     public static final Integer PORT_NUMBER = 9969;
+    private ServerSocket serverSocket;
 
     private final Logger logger = LoggerFactory.getLogger(DiscoveryServer.class);
 
@@ -56,8 +59,6 @@ public class DiscoveryServer {
         displayHeader();
         serverTable = new ServerTable();
 
-        ServerSocket serverSocket;
-
         try{
             serverSocket = new ServerSocket(PORT_NUMBER);
         }
@@ -69,12 +70,17 @@ public class DiscoveryServer {
 
         logger.info("Started successfully - Now accepting connections");
 
-        while (true){
+        try{
-            Socket clientSocket = serverSocket.accept();
+            while (true){
+                Socket clientSocket = serverSocket.accept();
 
-            parseRequest(clientSocket);
+                parseRequest(clientSocket);
 
-            clientSocket.close();
+                clientSocket.close();
+            }
+        }
+        catch (Exception e){
+            close();
         }
     }
 
@@ -147,6 +153,18 @@ public class DiscoveryServer {
             tries++;
         }
 
+        if (serverToJoin != null && serverToJoin.isMaxPlayersReached()){
+            return null;
+        }
+
         return serverToJoin;
     }
+
+    public void close(){
+        try {
+            serverSocket.close();
+        } catch (IOException ignored) {
+            ;
+        }
+    }
 }

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

@@ -40,6 +40,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     private boolean terminated;
 
     private Thread thread;
+    private boolean hasStarted = false;
 
     private ServerSocket serverSocket = null;
     private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
@@ -98,6 +99,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         new HeartbeatThread(this);
         new ServerListenThread(serverSocket, this);
 
+        hasStarted = true;
+
         //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
         while (!terminated) {
             if (GameState.getPlayerHasLeftFlag()) {
@@ -146,8 +149,10 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             }
         }
         try {
-            for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+            synchronized (this){
-                serverToClientThread.terminate();
+                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+                    serverToClientThread.terminate();
+                }
             }
             serverSocket.close();
         } catch (IOException e) {
@@ -450,4 +455,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             );
         }
     }
+
+    public boolean hasStarted() {
+        return hasStarted;
+    }
 }

src/main/java/seng302/model/ServerYacht.java

@@ -104,6 +104,7 @@ public class ServerYacht {
      * @param secondsElapsed The seconds elapsed since the last update of this yacht
      */
     public void updateLocation(Double secondsElapsed) {
+        //test
         lastLocation = location;
         location = GeoUtility.getGeoCoordinate(location, heading, currentVelocity * secondsElapsed);
     }

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -1,5 +1,14 @@
 package seng302.visualiser;
 
+import javafx.application.Platform;
+import javafx.util.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.*;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.utilities.XMLParser;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,6 +51,8 @@ import seng302.visualiser.controllers.ViewManager;
  */
 public class ClientToServerThread implements Runnable {
 
+    private boolean isStarted = false;
+
     /**
      * Functional interface for receiving packets from client socket.
      */
@@ -117,6 +128,8 @@ public class ClientToServerThread implements Runnable {
      * variable is false.
      */
     public void run() {
+        isStarted = true;
+
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
@@ -167,8 +180,10 @@ public class ClientToServerThread implements Runnable {
         notifyDisconnectListeners("Connection to server was terminated");
         closeSocket();
 
-        ViewManager.getInstance().goToStartView();
+        Platform.runLater(() -> {
-        ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
+            ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
+            ViewManager.getInstance().goToStartView();
+        });
     }
 
     public void sendCustomizationRequest(CustomizeRequestType reqType, byte[] payload) {
@@ -194,12 +209,6 @@ public class ClientToServerThread implements Runnable {
         if (connectionErrorListener != null){
             connectionErrorListener.notifyConnectionError(message);
         }
-
-        try {
-            this.socket.close();
-        } catch (IOException e) {
-            logger.error("Couldn't close socket");
-        }
     }
 
     /**
@@ -390,9 +399,9 @@ public class ClientToServerThread implements Runnable {
         }
         if (currentByte == -1) {
             notifyDisconnectListeners("Cannot read from server.");
-            closeSocket();
             logger.warn("InputStream reach end of stream", 1);
             handleConnectionError("Could not connect to server. Server is no longer available.");
+            closeSocket();
         }
         return currentByte;
     }
@@ -435,4 +444,8 @@ public class ClientToServerThread implements Runnable {
             ).getBuffer()
         );
     }
+
+    public boolean hasStarted() {
+        return isStarted;
+    }
 }

src/main/java/seng302/visualiser/GameClient.java

@@ -119,7 +119,7 @@ public class GameClient {
 
             getServerThread().setConnectionErrorListener((eMessage) -> {
                 ViewManager.getInstance().showErrorSnackBar(eMessage);
-                destroyClientToServerThread();
+                //destroyClientToServerThread();
             });
 
             this.lobbyController = ViewManager.getInstance().goToLobby(true);
@@ -147,18 +147,45 @@ public class GameClient {
 
         server = new MainServerThread();
 
+        while (!server.hasStarted()){
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         try {
             startClientToServerThread(ipAddress, 4942);
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
+
+        // Wait for C2S thread
+        while (!socketThread.hasStarted()){
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         socketThread.sendXML(race, serverName, numLegs, maxPlayers, tokensEnabled);
-        while (regattaData == null){
+
+        int triesLeft = 15;
+
+        while (regattaData == null && triesLeft > 0){
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
+            triesLeft--;
+        }
+
+        if (triesLeft <= 0){
+            showConnectionError("Could not launch server");
+            return null;
         }
 
         this.lobbyController = ViewManager.getInstance().goToLobby(false);

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -2,33 +2,17 @@ package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
 import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
@@ -43,10 +27,13 @@ import seng302.utilities.Sounds;
 import seng302.visualiser.MapPreview;
 import seng302.visualiser.controllers.cells.PlayerCell;
 import seng302.visualiser.controllers.dialogs.BoatCustomizeController;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
+
-import seng302.visualiser.controllers.dialogs.TokenInfoDialogController;
+import java.io.IOException;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
+import java.net.URL;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
 
 public class LobbyController implements Initializable {
 
@@ -70,13 +57,10 @@ public class LobbyController implements Initializable {
     private AnchorPane serverMap;
     @FXML
     private Label roomLabel;
-    @FXML
-    private Pane speedTokenPane, handlingTokenPane, windWalkerTokenPane, bumperTokenPane, randomTokenPane;
     //---------FXML END---------//
 
     private RaceState raceState;
     private JFXDialog customizationDialog;
-    private JFXDialog tokenInfoDialog;
     public Color playersColor;
     private Map<Integer, ClientYacht> playerBoats;
     private Double mapWidth = INITIAL_MAP_WIDTH, mapHeight = INITIAL_MAP_HEIGHT;
@@ -144,107 +128,6 @@ public class LobbyController implements Initializable {
         beginRaceButton.setOnMouseEntered(e -> Sounds.playHoverSound());
 
         initMapPreview();
-        initTokenPreviews();
-    }
-
-
-    /**
-     * Initialises the tokens in the side panel
-     */
-    private void initTokenPreviews() {
-        Group speedToken = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
-        Group handlingToken = ModelFactory.importModel(ModelType.HANDLING_PICKUP).getAssets();
-        Group windWalkerToken = ModelFactory.importModel(ModelType.WIND_WALKER_PICKUP).getAssets();
-        Group bumperToken = ModelFactory.importModel(ModelType.BUMPER_PICKUP).getAssets();
-        Group randomToken = ModelFactory.importModel(ModelType.RANDOM_PICKUP).getAssets();
-
-        HashMap<Pane, Group> tokenPanes = new HashMap<>();
-        tokenPanes.put(speedTokenPane, speedToken);
-        tokenPanes.put(handlingTokenPane, handlingToken);
-        tokenPanes.put(windWalkerTokenPane, windWalkerToken);
-        tokenPanes.put(bumperTokenPane, bumperToken);
-        tokenPanes.put(randomTokenPane, randomToken);
-
-        Scale hoverScale = new Scale(1.2, 1.2, 1.2);
-
-        tokenPanes.entrySet().forEach((entry) -> {
-            Pane thisPane = entry.getKey();
-            Group thisToken = entry.getValue();
-
-            thisToken.getTransforms().addAll(
-                new Translate(40, 50, 0),
-                new Scale(13, 13, 13));
-
-            thisPane.setOnMouseEntered(event -> {
-                thisToken.getTransforms().add(hoverScale);
-            });
-            thisPane.setOnMouseExited(event -> {
-                thisToken.getTransforms().remove(hoverScale);
-            });
-            thisPane.setOnMouseReleased(event -> {
-                tokenInfoDialog = makeTokenDialog(thisPane);
-                tokenInfoDialog.show();
-            });
-
-            thisPane.getChildren().add(thisToken);
-        });
-
-        //Hacky rotations for wind and random to level it in the plane
-        windWalkerToken.getTransforms().addAll(
-            new Rotate(-70, new Point3D(1, 0, 0)),
-            new Translate(0, 2,0)
-        );
-        randomToken.getTransforms().addAll(
-            new Rotate(-90, new Point3D(1, 0, 0)),
-            new Translate(0, 0,1)
-        );
-    }
-
-    private JFXDialog makeTokenDialog(Pane inducingPane) {
-        String header = "...";
-        String body = "Nothing to see here";
-        ModelType modelType = ModelType.RANDOM_PICKUP;
-
-        if (inducingPane == speedTokenPane) {
-            header = "Speed Boost";
-            body = "Increases your max velocity";
-            modelType = ModelType.VELOCITY_PICKUP;
-        } else if (inducingPane == handlingTokenPane) {
-            header = "Handling Boost";
-            body = "Increases your turing rate";
-            modelType = ModelType.HANDLING_PICKUP;
-        } else if (inducingPane == windWalkerTokenPane) {
-            header = "Wind Walker";
-            body = "The wind now rotates with you, giving you your optimal speed in all directions";
-            modelType = ModelType.WIND_WALKER_PICKUP;
-        } else if (inducingPane == bumperTokenPane) {
-            header = "Bumper";
-            body = "While this is active, upon hitting another boat, you will power it down for a short time";
-            modelType = ModelType.BUMPER_PICKUP;
-        } else if (inducingPane == randomTokenPane) {
-            header = "Random";
-            body = "A 50% chance of becoming any other token and a 50% chance of slowing your boat for a time";
-            modelType = ModelType.RANDOM_PICKUP;
-        }
-
-        FXMLLoader dialog = new FXMLLoader(
-            getClass().getResource("/views/dialogs/TokenInfoDialog.fxml"));
-
-        JFXDialog tokenInfoDialog = null;
-
-        try {
-            tokenInfoDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                JFXDialog.DialogTransition.CENTER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        TokenInfoDialogController controller = dialog.getController();
-        controller.setParentController(this);
-        controller.setHeader(header);
-        controller.setContent(body);
-        controller.setToken(modelType);
-        return tokenInfoDialog;
     }
 
     private JFXDialog createCustomizeDialog() {
@@ -369,10 +252,6 @@ public class LobbyController implements Initializable {
         customizationDialog.close();
     }
 
-    public void closeTokenInfoDialog() {
-        tokenInfoDialog.close();
-    }
-
     public void setRoomCode(String roomCode) {
         roomLabel.setText("Room: " + roomCode);
     }

src/main/java/seng302/visualiser/controllers/ViewManager.java

@@ -302,7 +302,7 @@ public class ViewManager {
             Stage stage = new Stage();
             initialStartView(stage);
         } catch (Exception e) {
-            logger.warn("Could not go to start view");
+            e.printStackTrace();
         }
     }
 

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -28,12 +28,12 @@ public class ServerCreationController implements Initializable {
     @FXML
     private JFXSlider maxPlayersSlider;
     @FXML
-    private Label maxPlayersLabel;
-    @FXML
     private JFXButton submitBtn;
     @FXML
     private Label closeLabel;
     @FXML
+    private Label maxPlayersLabel;
+    @FXML
     private JFXButton nextMapButton;
     @FXML
     private JFXButton lastMapButton;
@@ -47,11 +47,10 @@ public class ServerCreationController implements Initializable {
     private JFXCheckBox pickupsCheckBox;
     @FXML
     private AnchorPane mapHolder;
+    //---------FXML END---------//
 
     private MapMaker mapMaker = MapMaker.getInstance();
 
-    //---------FXML END---------//
-
     private List<ServerCreationDialogListener> serverCreationDialogListeners;
 
     public void initialize(URL location, ResourceBundle resources) {
@@ -96,7 +95,7 @@ public class ServerCreationController implements Initializable {
         mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
         mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
         pickupsCheckBox.setSelected(true);
-        //closeLabel.setOnMouseClicked(event -> notifyListeners());
+        closeLabel.setOnMouseClicked(event -> notifyListeners());
     }
 
     /**
@@ -119,6 +118,12 @@ public class ServerCreationController implements Initializable {
             .runAsHost("localhost", 4941, serverName.getText(), (int) maxPlayersSlider
                 .getValue(), mapMaker.getCurrentRacePath(), (int) legsSlider.getValue(), pickupsCheckBox.isSelected());
 
+        if (serverDescription == null){
+            ViewManager.getInstance().getGameClient().getServerThread().closeSocket();
+            ViewManager.getInstance().getGameClient().stopGame();
+            return;
+        }
+
         ViewManager.getInstance().setProperty("serverName", serverDescription.getName());
         ViewManager.getInstance().setProperty("mapName", serverDescription.getMapName());
     }
@@ -128,7 +133,8 @@ public class ServerCreationController implements Initializable {
      */
     private void updateMaxPlayerLabel() {
         maxPlayersSlider.setValue(Math.floor(maxPlayersSlider.getValue()));
-        maxPlayersLabel.setText(String.format("Max players: %.0f", maxPlayersSlider.getValue()));
+        maxPlayersLabel.setText(String
+            .format("Only %.0f players are allowed into the game", maxPlayersSlider.getValue()));
     }
 
     private void updateLegSliderLabel() {

src/main/java/seng302/visualiser/controllers/dialogs/TokenInfoDialogController.java

@@ -1,90 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXTextArea;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
-import seng302.utilities.Sounds;
-import seng302.visualiser.controllers.LobbyController;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
-
-/**
- * Created by wmu16 on 28/09/17.
- */
-public class TokenInfoDialogController implements Initializable {
-
-    @FXML
-    private Label headerLabel;
-    @FXML
-    private TextArea contentText;
-    @FXML
-    private Pane tokenPane;
-    @FXML
-    private Button optionButton;
-
-    private LobbyController lobbyController;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        optionButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            lobbyController.closeTokenInfoDialog();
-        });
-
-        contentText.setEditable(false);
-
-    }
-
-
-    public void setContent(String content) {
-        contentText.setText(content);
-    }
-
-    public void setHeader(String header) {
-        this.headerLabel.setText(header);
-    }
-
-    public void setToken(ModelType token) {
-        tokenPane.getChildren().clear();
-
-        Group tokenObject = ModelFactory.importModel(token).getAssets();
-
-        tokenObject.getTransforms().addAll(
-            new Translate(138 / 2, 138 / 2, 0),
-            new Scale(20, 20, 20));
-
-        if (token == ModelType.WIND_WALKER_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-70, new Point3D(1, 0, 0)),
-                new Translate(0, 2, 0)
-            );
-        } else if (token == ModelType.RANDOM_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-90, new Point3D(1, 0, 0)),
-                new Translate(0, 0, 1)
-            );
-        }
-
-        tokenPane.getChildren().add(tokenObject);
-    }
-
-    public void setParentController(LobbyController lobbyController) {
-        this.lobbyController = lobbyController;
-    }
-
-
-}

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java

@@ -13,8 +13,7 @@ public enum BoatMeshType {
     PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl",
         -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2),
     DUCKY("ducky_hull.stl", "ducky_mast.stl", -2.18539, "ducky_sail.stl", -2.18539, "ducky_eyes.stl", false, 1.2, 1.1, 1.4),
-    PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1),
+    PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1);
-    WAKA("waka_hull.stl", "waka_mast.stl", 0, "waka_sail.stl", 0, null, true, 1.7, 0.5, 1.5);
 
     final String hullFile, mastFile, sailFile, jibFile;
     final double mastOffset, sailOffset;
@@ -22,7 +21,7 @@ public enum BoatMeshType {
     public final double accelerationMultiplier;
     public final double turnStep;
     final boolean fixedSail;
-    final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT, WAKA};
+    final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT};
 
     BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile,
         double sailOffset, String jibFile, boolean fixedSail, double maxSpeedMultiplier, double accelerationMultiplier, double turnStep) {

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -80,6 +80,30 @@ public class ModelFactory {
         return bo;
     }
 
+    public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {
+        Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
+        boatAssets.getTransforms().addAll(
+            new Scale(40, 40, 40),
+            new Rotate(90, new Point3D(0,0,1)),
+            new Rotate(90, new Point3D(0, 1, 0))
+        );
+
+        final Rotate animationRotate = new Rotate(0, new Point3D(1,1,1));
+        boatAssets.getTransforms().add(animationRotate);
+
+        return new BoatModel(boatAssets, new AnimationTimer() {
+
+            private double rotation = 0;
+            private Rotate rotate = animationRotate;
+
+            @Override
+            public void handle(long now) {
+                rotation += 0.5;
+                rotate.setAngle(rotation);
+            }
+        }, boatType);
+    }
+
     public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().setAll(

src/main/resources/css/LobbyView.css

@@ -65,12 +65,4 @@
     /*-fx-background-repeat: no-repeat;*/
     /*-fx-background-size: cover;*/
     -fx-background-color: dodgerblue;
-}
-
-.tokenView {
-    -fx-cursor: hand;
-}
-
-.tokenGridView StackPane {
-    -fx-background-color: white;
 }

src/main/resources/css/TokenInfoDialog.css

@@ -1,22 +0,0 @@
-.text-area {
-    -fx-background-insets: 0;
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused {
-    -fx-highlight-fill: #7ecfff;
-}
-
-.text-area .content {
-    -fx-padding: 10px;
-    -fx-text-fill: gray;
-    -fx-highlight-fill: #7ecfff;
-}

src/main/resources/css/dialogs/ServerCreation.css

@@ -2,6 +2,14 @@
     -fx-font-family: monospace !important;
 }
 
+.sliderLabel {
+    -fx-text-fill: -fx-pp-dark-text-color;
+}
+
+.error-label * {
+    -fx-text-fill: red;
+}
+
 #submitBtn {
     -fx-background-color: -fx-pp-theme-color;
     -fx-text-fill: -fx-pp-light-text-color;
@@ -32,12 +40,7 @@
     -fx-font-size: 16px;
 }
 
-#maxPlayersLabel {
+.optionLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-#maxPlayerPromptLabel {
     -fx-text-fill: -fx-pp-dark-text-color;
     -fx-font-size: 16px;
 }
@@ -55,3 +58,8 @@
     -fx-text-fill: red;
     -fx-font-size: 33px;
 }
+
+JFXCheckBox {
+    -jfx-checked-color: -fx-pp-theme-color;
+    -fx-text-fill: -fx-pp-dark-text-color;
+}

src/main/resources/views/LobbyView.fxml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.*?>
-<?import javafx.scene.*?>
-<?import com.jfoenix.controls.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import com.jfoenix.controls.JFXButton?>
 <?import java.lang.String?>
 <?import javafx.geometry.Insets?>
@@ -21,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<StackPane fx:id="serverListMainStackPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.LobbyController">
+<StackPane fx:id="serverListMainStackPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.LobbyController">
     <children>
         <GridPane fx:id="serverListMainGridPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
             <children>
@@ -80,148 +72,29 @@
                 </GridPane>
                 <GridPane GridPane.rowIndex="1">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="NEVER" maxWidth="-Infinity" minWidth="-Infinity"
+                        <ColumnConstraints hgrow="SOMETIMES" />
-                          prefWidth="115.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="400.0" minWidth="400.0" prefWidth="400.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"
-                          minWidth="337.0" prefWidth="430.0"/>
-                        <ColumnConstraints hgrow="NEVER" maxWidth="350.0" minWidth="350.0"
-                          prefWidth="350.0"/>
                     </columnConstraints>
                     <rowConstraints>
                         <RowConstraints vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
-                        <ScrollPane fx:id="playerListScrollPane" hbarPolicy="NEVER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                        <ScrollPane fx:id="playerListScrollPane" hbarPolicy="NEVER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
                             <content>
-                                <VBox fx:id="playerListVBox" alignment="TOP_RIGHT" maxWidth="328.0" minWidth="328.0" prefWidth="328.0" />
+                                <VBox fx:id="playerListVBox" prefHeight="200.0" prefWidth="100.0" />
                             </content>
                             <GridPane.margin>
                                 <Insets bottom="15.0" left="7.0" right="15.0" top="15.0" />
                             </GridPane.margin>
-                     <padding>
-                        <Insets right="5.0" />
-                     </padding>
                         </ScrollPane>
-                        <AnchorPane fx:id="serverMap" style="-fx-background-color: skyblue;" GridPane.columnIndex="1">
+                  <AnchorPane fx:id="serverMap" style="-fx-background-color: skyblue;">
                      <opaqueInsets>
                         <Insets />
                      </opaqueInsets>
                      <GridPane.margin>
-                        <Insets bottom="15.0" left="7.0" right="7.0" top="15.0" />
+                        <Insets bottom="15.0" left="15.0" right="7.0" top="15.0" />
                      </GridPane.margin>
-                        </AnchorPane>
+                  </AnchorPane>
-                        <GridPane prefHeight="370.0" prefWidth="189.0" styleClass="tokenGridView"
-                          vgap="5.0">
-                            <children>
-                                <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Tokens"
-                                  GridPane.halignment="CENTER">
-                                    <font>
-                                        <Font name="System Bold" size="18.0"/>
-                                    </font>
-                                </Text>
-                                <StackPane prefHeight="150.0" prefWidth="200.0"
-                                  GridPane.rowIndex="1">
-                                    <children>
-                                        <Label alignment="BOTTOM_CENTER" text="Speed"
-                                          StackPane.alignment="BOTTOM_CENTER">
-                                            <font>
-                                                <Font size="12.0"/>
-                                            </font>
-                                            <padding>
-                                                <Insets bottom="5.0"/>
-                                            </padding>
-                                        </Label>
-                                        <Pane fx:id="speedTokenPane" prefHeight="999.0"
-                                          prefWidth="200.0" styleClass="tokenView"/>
-                                    </children>
-                                </StackPane>
-                                <StackPane prefHeight="150.0" prefWidth="200.0"
-                                  GridPane.rowIndex="2">
-                                    <children>
-                                        <Label alignment="BOTTOM_CENTER" text="Handling"
-                                          StackPane.alignment="BOTTOM_CENTER">
-                                            <font>
-                                                <Font size="12.0"/>
-                                            </font>
-                                            <padding>
-                                                <Insets bottom="5.0"/>
-                                            </padding>
-                                        </Label>
-                                        <Pane fx:id="handlingTokenPane" prefHeight="999.0"
-                                          prefWidth="200.0" styleClass="tokenView"/>
-                                    </children>
-                                </StackPane>
-                                <StackPane prefHeight="150.0" prefWidth="200.0"
-                                  GridPane.rowIndex="3">
-                                    <children>
-                                        <Label alignment="BOTTOM_CENTER" text="Wind Walker"
-                                          StackPane.alignment="BOTTOM_CENTER">
-                                            <font>
-                                                <Font size="12.0"/>
-                                            </font>
-                                            <padding>
-                                                <Insets bottom="5.0"/>
-                                            </padding>
-                                        </Label>
-                                        <Pane fx:id="windWalkerTokenPane" prefHeight="999.0"
-                                          prefWidth="200.0" styleClass="tokenView"/>
-                                    </children>
-                                </StackPane>
-                                <StackPane prefHeight="150.0" prefWidth="200.0"
-                                  GridPane.rowIndex="4">
-                                    <children>
-                                        <Label alignment="BOTTOM_CENTER" text="Bumper"
-                                          StackPane.alignment="BOTTOM_CENTER">
-                                            <font>
-                                                <Font size="12.0"/>
-                                            </font>
-                                            <padding>
-                                                <Insets bottom="5.0"/>
-                                            </padding>
-                                        </Label>
-                                        <Pane fx:id="bumperTokenPane" prefHeight="999.0"
-                                          prefWidth="200.0" styleClass="tokenView"/>
-                                    </children>
-                                </StackPane>
-                                <StackPane prefHeight="150.0" prefWidth="200.0"
-                                  GridPane.rowIndex="5">
-                                    <children>
-                                        <Label alignment="BOTTOM_CENTER" text="Random"
-                                          StackPane.alignment="BOTTOM_CENTER">
-                                            <font>
-                                                <Font size="12.0"/>
-                                            </font>
-                                            <padding>
-                                                <Insets bottom="5.0"/>
-                                            </padding>
-                                        </Label>
-                                        <Pane fx:id="randomTokenPane" prefHeight="999.0"
-                                          prefWidth="60.0" styleClass="tokenView"/>
-                                    </children>
-                                </StackPane>
-                            </children>
-                            <columnConstraints>
-                                <ColumnConstraints hgrow="SOMETIMES" maxWidth="80.0" minWidth="80.0"
-                                  prefWidth="80.0"/>
-                            </columnConstraints>
-                            <padding>
-                                <Insets bottom="15.0" left="15.0" right="7.0" top="15.0"/>
-                            </padding>
-                            <rowConstraints>
-                                <RowConstraints maxHeight="116.0" minHeight="0.0" prefHeight="40.0"
-                                  vgrow="NEVER"/>
-                                <RowConstraints maxHeight="285.0" minHeight="-Infinity"
-                                  prefHeight="60.0" vgrow="SOMETIMES"/>
-                                <RowConstraints maxHeight="285.0" minHeight="-Infinity"
-                                  prefHeight="60.0" vgrow="SOMETIMES"/>
-                                <RowConstraints maxHeight="141.0" minHeight="-Infinity"
-                                  prefHeight="60.0" vgrow="SOMETIMES"/>
-                                <RowConstraints maxHeight="285.0" minHeight="-Infinity"
-                                  prefHeight="60.0" vgrow="SOMETIMES"/>
-                                <RowConstraints maxHeight="285.0" minHeight="-Infinity"
-                                  prefHeight="60.0" vgrow="SOMETIMES"/>
-                            </rowConstraints>
-                        </GridPane>
                     </children>
                 </GridPane>
             </children>
@@ -233,10 +106,10 @@
                 <RowConstraints maxHeight="1.7976931348623157E308" minHeight="400.0" prefHeight="400.0" vgrow="SOMETIMES" />
                 <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
             </rowConstraints>
+            <stylesheets>
+                <String fx:value="/css/Master.css" />
+                <String fx:value="/css/LobbyView.css" />
+            </stylesheets>
         </GridPane>
     </children>
-    <stylesheets>
-        <URL value="@../css/Master.css"/>
-        <URL value="@../css/LobbyView.css"/>
-    </stylesheets>
 </StackPane>

src/main/resources/views/RaceView.fxml

@@ -24,283 +24,281 @@
 <?import javafx.scene.text.Font?>
 
 <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.RaceViewController">
-    <children>
-    <StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
-      maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
-      prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8.0.111"
-      xmlns:fx="http://javafx.com/fxml/1">
         <children>
-            <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+            <StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
-              prefHeight="800.0" prefWidth="1200.0">
+                       maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
-                <columnConstraints>
+                       prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8.0.111"
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="250.0" minWidth="250.0"
+                       xmlns:fx="http://javafx.com/fxml/1">
-                      prefWidth="250.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"/>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="400.0"
-                      prefWidth="400.0"/>
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints maxHeight="70.0" minHeight="70.0" prefHeight="70.0"
-                      vgrow="SOMETIMES"/>
-                    <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
-                    <RowConstraints maxHeight="250.0" minHeight="250.0" prefHeight="250.0"
-                      valignment="BOTTOM" vgrow="SOMETIMES"/>
-                </rowConstraints>
                 <children>
-                    <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0" styleClass="timer">
+                    <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+                              prefHeight="800.0" prefWidth="1200.0">
                         <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="250.0" minWidth="250.0"
-                              prefWidth="50.0"/>
+                                               prefWidth="250.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"/>
-                              prefWidth="135.0"/>
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="400.0"
-                        </columnConstraints>
+                                               prefWidth="400.0"/>
-                        <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        </rowConstraints>
-                        <opaqueInsets>
-                            <Insets/>
-                        </opaqueInsets>
-                        <GridPane.margin>
-                            <Insets left="10.0" right="200.0" top="10.0"/>
-                        </GridPane.margin>
-                        <children>
-                            <ImageView fitHeight="40.0" fitWidth="40.0" pickOnBounds="true"
-                              preserveRatio="true" GridPane.halignment="CENTER"
-                              GridPane.valignment="CENTER">
-                                <image>
-                                    <Image url="@../images/timer.png"/>
-                                </image>
-                                <GridPane.margin>
-                                    <Insets/>
-                                </GridPane.margin>
-                            </ImageView>
-                            <Label fx:id="timerLabel" text="00:03:34" GridPane.columnIndex="1"
-                              GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                                <font>
-                                    <Font size="21.0"/>
-                                </font>
-                                <GridPane.margin>
-                                    <Insets/>
-                                </GridPane.margin>
-                            </Label>
-                        </children>
-                    </GridPane>
-                    <GridPane GridPane.columnIndex="2">
-                        <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                        </columnConstraints>
-                        <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        </rowConstraints>
-                    </GridPane>
-                    <GridPane fx:id="chatGridPane" GridPane.columnIndex="2" GridPane.rowIndex="2">
-                        <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
-                              prefWidth="390.0"/>
                         </columnConstraints>
                         <rowConstraints>
+                            <RowConstraints maxHeight="70.0" minHeight="70.0" prefHeight="70.0"
+                                            vgrow="SOMETIMES"/>
                             <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
-                            <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
+                            <RowConstraints maxHeight="250.0" minHeight="250.0" prefHeight="250.0"
-                              vgrow="SOMETIMES"/>
+                                            valignment="BOTTOM" vgrow="SOMETIMES"/>
                         </rowConstraints>
                         <children>
-                            <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0"
+                            <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0" styleClass="timer">
-                              GridPane.hgrow="ALWAYS" GridPane.valignment="BOTTOM"
-                              GridPane.vgrow="ALWAYS">
-                                <GridPane.margin>
-                                    <Insets/>
-                                </GridPane.margin>
-                                <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                </padding>
-                            </Pane>
-                            <GridPane fx:id="chatInputHolder" GridPane.rowIndex="1">
                                 <columnConstraints>
-                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
-                                      prefWidth="100.0"/>
+                                                       prefWidth="50.0"/>
-                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity"
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
-                                      minWidth="90.0" prefWidth="90.0"/>
+                                                       prefWidth="135.0"/>
                                 </columnConstraints>
                                 <rowConstraints>
-                                    <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0"
+                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                                      valignment="CENTER" vgrow="SOMETIMES"/>
                                 </rowConstraints>
-                                <children>
-                                    <JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED"
-                                      focusTraversable="false" maxHeight="-Infinity"
-                                      maxWidth="1.7976931348623157E308" minHeight="-Infinity"
-                                      minWidth="-Infinity" prefHeight="35.0" text="SEND"
-                                      GridPane.columnIndex="1">
-                                        <GridPane.margin>
-                                            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                        </GridPane.margin>
-                                    </JFXButton>
-                                    <JFXTextField fx:id="chatInput" focusTraversable="false"
-                                      maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0">
-                                        <GridPane.margin>
-                                            <Insets bottom="10.0" left="20.0" right="10.0"/>
-                                        </GridPane.margin>
-                                        <padding>
-                                            <Insets right="15.0"/>
-                                        </padding>
-                                    </JFXTextField>
-                                </children>
-                                <GridPane.margin>
-                                    <Insets top="10.0"/>
-                                </GridPane.margin>
-                            </GridPane>
-                        </children>
-                        <GridPane.margin>
-                            <Insets bottom="10.0" right="10.0"/>
-                        </GridPane.margin>
-                    </GridPane>
-                    <GridPane fx:id="windGridPane" maxHeight="-Infinity" maxWidth="-Infinity"
-                      prefHeight="150.0" prefWidth="240.0" GridPane.halignment="CENTER"
-                      GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
-                        <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0" minWidth="110.0"
-                              prefWidth="110.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0" minWidth="10.0"
-                              prefWidth="132.0"/>
-                        </columnConstraints>
-                        <rowConstraints>
-                            <RowConstraints maxHeight="120.0" minHeight="120.0" prefHeight="120.0"
-                              vgrow="SOMETIMES"/>
-                            <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
-                              vgrow="SOMETIMES"/>
-                        </rowConstraints>
-                        <children>
-                            <Label fx:id="positionLabel" text="Position:" GridPane.columnIndex="1"
-                              GridPane.halignment="LEFT" GridPane.rowSpan="2" GridPane.valignment="TOP">
-                                <padding>
-                                    <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
-                                </padding>
-                            </Label>
-                            <Label fx:id="boatSpeedLabel" text="Boat Speed:" GridPane.columnIndex="1"
-                              GridPane.halignment="LEFT" GridPane.rowSpan="2"
-                              GridPane.valignment="CENTER">
                                 <opaqueInsets>
                                     <Insets/>
                                 </opaqueInsets>
-                                <padding>
+                                <GridPane.margin>
-                                    <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
+                                    <Insets left="10.0" right="200.0" top="10.0"/>
-                                </padding>
+                                </GridPane.margin>
-                            </Label>
-                            <Label fx:id="boatHeadingLabel" text="Boat Heading:"
-                              GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2"
-                              GridPane.valignment="BOTTOM">
-                                <padding>
-                                    <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
-                                </padding>
-                            </Label>
-                            <GridPane fx:id="windHolder" GridPane.rowSpan="2">
-                                <columnConstraints>
-                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-                                      prefWidth="100.0"/>
-                                </columnConstraints>
-                                <rowConstraints>
-                                    <RowConstraints maxHeight="120.0" minHeight="120.0"
-                                      prefHeight="120.0" vgrow="SOMETIMES"/>
-                                    <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
-                                      vgrow="SOMETIMES"/>
-                                </rowConstraints>
                                 <children>
-                                    <ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
+                                    <ImageView fitHeight="40.0" fitWidth="40.0" pickOnBounds="true"
-                                      pickOnBounds="true" preserveRatio="true"
+                                               preserveRatio="true" GridPane.halignment="CENTER"
-                                      GridPane.halignment="CENTER" GridPane.rowSpan="2"
+                                               GridPane.valignment="CENTER">
-                                      GridPane.valignment="CENTER"/>
+                                        <image>
-                                    <Label fx:id="windSpeedLabel" text="0.0 Knots"
+                                            <Image url="@../images/timer.png"/>
-                                      GridPane.halignment="RIGHT" GridPane.rowIndex="1"
+                                        </image>
-                                      GridPane.valignment="CENTER">
                                         <GridPane.margin>
-                                            <Insets right="5.0"/>
+                                            <Insets/>
                                         </GridPane.margin>
-                                    </Label>
+                                    </ImageView>
-                                    <Label fx:id="windDirectionLabel" text="180.0°"
+                                    <Label fx:id="timerLabel" text="00:03:34" GridPane.columnIndex="1"
-                                      GridPane.halignment="LEFT" GridPane.rowIndex="1"
+                                           GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                                      GridPane.valignment="CENTER">
+                                        <font>
+                                            <Font size="21.0"/>
+                                        </font>
                                         <GridPane.margin>
-                                            <Insets left="5.0"/>
+                                            <Insets/>
                                         </GridPane.margin>
                                     </Label>
                                 </children>
                             </GridPane>
-                        </children>
+                            <GridPane GridPane.columnIndex="2">
-                        <opaqueInsets>
+                                <columnConstraints>
-                            <Insets/>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                        </opaqueInsets>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                        <GridPane.margin>
+                                </columnConstraints>
-                            <Insets bottom="10.0" left="10.0" top="40.0"/>
+                                <rowConstraints>
-                        </GridPane.margin>
+                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                    </GridPane>
+                                </rowConstraints>
-                    <GridPane GridPane.columnIndex="1" GridPane.rowIndex="2">
+                            </GridPane>
-                        <columnConstraints>
+                            <GridPane fx:id="chatGridPane" GridPane.columnIndex="2" GridPane.rowIndex="2">
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                                       prefWidth="390.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                </columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                <rowConstraints>
-                        </columnConstraints>
+                                    <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
-                        <rowConstraints>
+                                    <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
-                            <RowConstraints maxHeight="152.0" minHeight="10.0" prefHeight="152.0"
+                                                    vgrow="SOMETIMES"/>
-                              vgrow="SOMETIMES"/>
+                                </rowConstraints>
-                            <RowConstraints maxHeight="118.0" minHeight="10.0" prefHeight="98.0"
+                                <children>
-                              vgrow="SOMETIMES"/>
+                                    <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0"
-                        </rowConstraints>
+                                          GridPane.hgrow="ALWAYS" GridPane.valignment="BOTTOM"
-                        <children>
+                                          GridPane.vgrow="ALWAYS">
-                            <ImageView fx:id="velocityIcon" fitHeight="88.0" fitWidth="106.0"
+                                        <GridPane.margin>
-                              pickOnBounds="true" preserveRatio="true" visible="false"
+                                            <Insets/>
-                              GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                                        </GridPane.margin>
-                                <image>
+                                        <padding>
-                                    <Image url="@../icons/velocity.png"/>
+                                            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                </image>
+                                        </padding>
-                            </ImageView>
+                                    </Pane>
-                            <ImageView fx:id="handlingIcon" fitHeight="87.0" fitWidth="98.0"
+                                    <GridPane fx:id="chatInputHolder" GridPane.rowIndex="1">
-                              pickOnBounds="true" preserveRatio="true" visible="false"
+                                        <columnConstraints>
-                              GridPane.columnIndex="1" GridPane.halignment="CENTER"
+                                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-                              GridPane.rowIndex="1">
+                                                               prefWidth="100.0"/>
-                                <image>
+                                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity"
-                                    <Image url="@../icons/handlingIcon.png"/>
+                                                               minWidth="90.0" prefWidth="90.0"/>
-                                </image>
+                                        </columnConstraints>
-                            </ImageView>
+                                        <rowConstraints>
-                            <ImageView fx:id="windWalkerIcon" fitHeight="83.0" fitWidth="100.0"
+                                            <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0"
-                              pickOnBounds="true" preserveRatio="true" visible="false"
+                                                            valignment="CENTER" vgrow="SOMETIMES"/>
-                              GridPane.columnIndex="2" GridPane.halignment="CENTER"
+                                        </rowConstraints>
-                              GridPane.rowIndex="1">
+                                        <children>
-                                <image>
+                                            <JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED"
-                                    <Image url="@../icons/windWalkerIcon.png"/>
+                                                       focusTraversable="false" maxHeight="-Infinity"
-                                </image>
+                                                       maxWidth="1.7976931348623157E308" minHeight="-Infinity"
-                            </ImageView>
+                                                       minWidth="-Infinity" prefHeight="35.0" text="SEND"
-                            <ImageView fx:id="bumperIcon" fitHeight="83.0" fitWidth="88.0"
+                                                       GridPane.columnIndex="1">
-                              pickOnBounds="true" preserveRatio="true" visible="false"
+                                                <GridPane.margin>
-                              GridPane.columnIndex="3" GridPane.halignment="CENTER"
+                                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                              GridPane.rowIndex="1">
+                                                </GridPane.margin>
-                                <image>
+                                            </JFXButton>
-                                    <Image url="@../icons/bumperIcon.png"/>
+                                            <JFXTextField fx:id="chatInput" focusTraversable="false"
-                                </image>
+                                                          maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0">
-                            </ImageView>
+                                                <GridPane.margin>
-                            <ImageView fx:id="badRandomIcon" fitHeight="69.0" fitWidth="103.0"
+                                                    <Insets bottom="10.0" left="20.0" right="10.0"/>
-                              pickOnBounds="true" preserveRatio="true" visible="false"
+                                                </GridPane.margin>
-                              GridPane.columnIndex="4" GridPane.halignment="CENTER"
+                                                <padding>
-                              GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                                    <Insets right="15.0"/>
-                                <image>
+                                                </padding>
-                                    <Image url="@../icons/slowedIcon.png"/>
+                                            </JFXTextField>
-                                </image>
+                                        </children>
-                            </ImageView>
+                                        <GridPane.margin>
+                                            <Insets top="10.0"/>
+                                        </GridPane.margin>
+                                    </GridPane>
+                                </children>
+                                <GridPane.margin>
+                                    <Insets bottom="10.0" right="10.0"/>
+                                </GridPane.margin>
+                            </GridPane>
+                            <GridPane fx:id="windGridPane" maxHeight="-Infinity" maxWidth="-Infinity"
+                                      prefHeight="150.0" prefWidth="240.0" GridPane.halignment="CENTER"
+                                      GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0" minWidth="110.0"
+                                                       prefWidth="110.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0" minWidth="10.0"
+                                                       prefWidth="132.0"/>
+                                </columnConstraints>
+                                <rowConstraints>
+                                    <RowConstraints maxHeight="120.0" minHeight="120.0" prefHeight="120.0"
+                                                    vgrow="SOMETIMES"/>
+                                    <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
+                                                    vgrow="SOMETIMES"/>
+                                </rowConstraints>
+                                <children>
+                                    <Label fx:id="positionLabel" text="Position:" GridPane.columnIndex="1"
+                                           GridPane.halignment="LEFT" GridPane.rowSpan="2" GridPane.valignment="TOP">
+                                        <padding>
+                                            <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
+                                        </padding>
+                                    </Label>
+                                    <Label fx:id="boatSpeedLabel" text="Boat Speed:" GridPane.columnIndex="1"
+                                           GridPane.halignment="LEFT" GridPane.rowSpan="2"
+                                           GridPane.valignment="CENTER">
+                                        <opaqueInsets>
+                                            <Insets/>
+                                        </opaqueInsets>
+                                        <padding>
+                                            <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
+                                        </padding>
+                                    </Label>
+                                    <Label fx:id="boatHeadingLabel" text="Boat Heading:"
+                                           GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2"
+                                           GridPane.valignment="BOTTOM">
+                                        <padding>
+                                            <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
+                                        </padding>
+                                    </Label>
+                                    <GridPane fx:id="windHolder" GridPane.rowSpan="2">
+                                        <columnConstraints>
+                                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                                               prefWidth="100.0"/>
+                                        </columnConstraints>
+                                        <rowConstraints>
+                                            <RowConstraints maxHeight="120.0" minHeight="120.0"
+                                                            prefHeight="120.0" vgrow="SOMETIMES"/>
+                                            <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
+                                                            vgrow="SOMETIMES"/>
+                                        </rowConstraints>
+                                        <children>
+                                            <ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
+                                                       pickOnBounds="true" preserveRatio="true"
+                                                       GridPane.halignment="CENTER" GridPane.rowSpan="2"
+                                                       GridPane.valignment="CENTER"/>
+                                            <Label fx:id="windSpeedLabel" text="0.0 Knots"
+                                                   GridPane.halignment="RIGHT" GridPane.rowIndex="1"
+                                                   GridPane.valignment="CENTER">
+                                                <GridPane.margin>
+                                                    <Insets right="5.0"/>
+                                                </GridPane.margin>
+                                            </Label>
+                                            <Label fx:id="windDirectionLabel" text="180.0°"
+                                                   GridPane.halignment="LEFT" GridPane.rowIndex="1"
+                                                   GridPane.valignment="CENTER">
+                                                <GridPane.margin>
+                                                    <Insets left="5.0"/>
+                                                </GridPane.margin>
+                                            </Label>
+                                        </children>
+                                    </GridPane>
+                                </children>
+                                <opaqueInsets>
+                                    <Insets/>
+                                </opaqueInsets>
+                                <GridPane.margin>
+                                    <Insets bottom="10.0" left="10.0" top="40.0"/>
+                                </GridPane.margin>
+                            </GridPane>
+                            <GridPane GridPane.columnIndex="1" GridPane.rowIndex="2">
+                                <columnConstraints>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                                </columnConstraints>
+                                <rowConstraints>
+                                    <RowConstraints maxHeight="152.0" minHeight="10.0" prefHeight="152.0"
+                                                    vgrow="SOMETIMES"/>
+                                    <RowConstraints maxHeight="118.0" minHeight="10.0" prefHeight="98.0"
+                                                    vgrow="SOMETIMES"/>
+                                </rowConstraints>
+                                <children>
+                                    <ImageView fx:id="velocityIcon" fitHeight="88.0" fitWidth="106.0"
+                                               pickOnBounds="true" preserveRatio="true" visible="false"
+                                               GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                                        <image>
+                                            <Image url="@../icons/velocity.png"/>
+                                        </image>
+                                    </ImageView>
+                                    <ImageView fx:id="handlingIcon" fitHeight="87.0" fitWidth="98.0"
+                                               pickOnBounds="true" preserveRatio="true" visible="false"
+                                               GridPane.columnIndex="1" GridPane.halignment="CENTER"
+                                               GridPane.rowIndex="1">
+                                        <image>
+                                            <Image url="@../icons/handlingIcon.png"/>
+                                        </image>
+                                    </ImageView>
+                                    <ImageView fx:id="windWalkerIcon" fitHeight="83.0" fitWidth="100.0"
+                                               pickOnBounds="true" preserveRatio="true" visible="false"
+                                               GridPane.columnIndex="2" GridPane.halignment="CENTER"
+                                               GridPane.rowIndex="1">
+                                        <image>
+                                            <Image url="@../icons/windWalkerIcon.png"/>
+                                        </image>
+                                    </ImageView>
+                                    <ImageView fx:id="bumperIcon" fitHeight="83.0" fitWidth="88.0"
+                                               pickOnBounds="true" preserveRatio="true" visible="false"
+                                               GridPane.columnIndex="3" GridPane.halignment="CENTER"
+                                               GridPane.rowIndex="1">
+                                        <image>
+                                            <Image url="@../icons/bumperIcon.png"/>
+                                        </image>
+                                    </ImageView>
+                                    <ImageView fx:id="badRandomIcon" fitHeight="69.0" fitWidth="103.0"
+                                               pickOnBounds="true" preserveRatio="true" visible="false"
+                                               GridPane.columnIndex="4" GridPane.halignment="CENTER"
+                                               GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                        <image>
+                                            <Image url="@../icons/slowedIcon.png"/>
+                                        </image>
+                                    </ImageView>
+                                </children>
+                            </GridPane>
                         </children>
                     </GridPane>
                 </children>
-            </GridPane>
+            </StackPane>
-        </children>
+            <AnchorPane fx:id="loadingScreenPane">
-    </StackPane>
-    </children>
-    <AnchorPane fx:id="loadingScreenPane">
-        <children>
             <ImageView fx:id="loadingScreen" fitHeight="672.0" fitWidth="1200.0" pickOnBounds="true" preserveRatio="true" />
             <JFXSpinner layoutX="566.0" layoutY="692.0" radius="30.0" />
+            </AnchorPane>
         </children>
-    </AnchorPane>
     <stylesheets>
         <String fx:value="/css/Master.css"/>
         <String fx:value="/css/RaceView.css"/>

src/main/resources/views/cells/PlayerCell.fxml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import java.lang.String?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
@@ -12,30 +8,33 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
+<VBox fx:id="playerCellVBox" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
-<VBox fx:id="playerCellVBox" maxHeight="-Infinity" maxWidth="340.0" minHeight="-Infinity" minWidth="340.0" prefHeight="80.0" prefWidth="340.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+  minHeight="-Infinity" minWidth="-Infinity" prefHeight="80.0"
+  xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
    <stylesheets>
-       <String fx:value="/css/Master.css" />
+       <String fx:value="/css/Master.css"/>
-       <String fx:value="/css/cells/PlayerCell.css" />
+       <String fx:value="/css/cells/PlayerCell.css"/>
    </stylesheets>
    <children>
-       <GridPane fx:id="playerListCell" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="70.0">
+       <GridPane fx:id="playerListCell" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
+         minHeight="-Infinity" prefHeight="70.0">
         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="80.0" minWidth="80.0" prefWidth="80.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="80.0" minWidth="80.0" prefWidth="80.0"/>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="260.0" minWidth="260.0" prefWidth="260.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="290.0" minWidth="290.0"
+              prefWidth="290.0"/>
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES"/>
         </rowConstraints>
          <children>
              <Label fx:id="playerName" text="Party parrots in space" GridPane.columnIndex="1">
                <padding>
                   <Insets left="20.0" />
                </padding></Label>
-             <Pane fx:id="boatPane" prefHeight="200.0" prefWidth="200.0" />
+             <Pane fx:id="boatPane" prefHeight="200.0" prefWidth="200.0"/>
          </children>
            <VBox.margin>
-               <Insets right="40.0" />
+               <Insets right="40.0"/>
            </VBox.margin>
       </GridPane>
    </children>

src/main/resources/views/dialogs/PopupDialog.fxml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.*?>
+
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXDialogLayout?>
 <?import java.net.URL?>
@@ -14,7 +9,6 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-
 <JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
   minWidth="-Infinity" prefWidth="550.0" xmlns="http://javafx.com/javafx/8"
   xmlns:fx="http://javafx.com/fxml/1"

src/main/resources/views/dialogs/ServerCreationDialog.fxml

@@ -5,16 +5,18 @@
 <?import com.jfoenix.controls.JFXDialogLayout?>
 <?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextField?>
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-
+<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
-<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.dialogs.ServerCreationController">
+  minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="seng302.visualiser.controllers.dialogs.ServerCreationController">
    <children>
       <GridPane>
          <children>
@@ -36,9 +38,14 @@
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
                     <rowConstraints>
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="-Infinity" minHeight="90.0" prefHeight="90.0"
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          vgrow="SOMETIMES"/>
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="-Infinity" minHeight="90.0" prefHeight="90.0"
+                          vgrow="SOMETIMES"/>
+                        <RowConstraints maxHeight="-Infinity" minHeight="90.0" prefHeight="90.0"
+                          vgrow="SOMETIMES"/>
+                        <RowConstraints maxHeight="-Infinity" minHeight="90.0" prefHeight="90.0"
+                          vgrow="SOMETIMES"/>
                     </rowConstraints>
                      <children>
                         <JFXTextField fx:id="serverName" promptText="SERVER NAME">
@@ -46,29 +53,33 @@
                               <Insets left="15.0" right="15.0" />
                            </padding>
                            <GridPane.margin>
-                              <Insets left="35.0" right="35.0" />
+                               <Insets left="20.0" right="35.0"/>
                            </GridPane.margin>
                         </JFXTextField>
                         <GridPane fx:id="maxPlayersGridPane" GridPane.rowIndex="1">
                            <children>
-                              <Label fx:id="maxPlayersLabel" text="20" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">
+                               <Label styleClass="optionLabel" text="MAX PLAYERS" translateY="5.0"
+                                 GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
                                  <GridPane.margin>
-                                    <Insets right="30.0" />
+                                     <Insets/>
                                  </GridPane.margin>
                               </Label>
-                              <Label fx:id="maxPlayerPromptLabel" text="MAX PLAYERS" GridPane.halignment="LEFT" GridPane.valignment="BOTTOM">
+                               <JFXSlider fx:id="maxPlayersSlider" blockIncrement="1.0"
+                                 majorTickUnit="2.0" max="20.0" min="1.0" minorTickCount="1"
+                                 snapToTicks="true" styleClass="maxPlayers" value="11.0"
+                                 GridPane.columnIndex="1" GridPane.valignment="BOTTOM">
                                  <GridPane.margin>
-                                    <Insets left="30.0" top="20.0" />
+                                     <Insets right="30.0"/>
                                  </GridPane.margin>
-                              </Label>
+                               </JFXSlider>
-                              <VBox alignment="BOTTOM_CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                               <Label fx:id="maxPlayersLabel" alignment="CENTER"
-                                 <children>
+                                 styleClass="sliderLabel" text="10" GridPane.columnIndex="1"
-                                    <JFXSlider fx:id="maxPlayersSlider" blockIncrement="1.0" majorTickUnit="2.0" max="20.0" min="1.0" minorTickCount="1" snapToTicks="true" styleClass="maxPlayers" value="11.0" />
+                                 GridPane.halignment="CENTER" GridPane.rowIndex="1"
-                                 </children>
+                                 GridPane.valignment="CENTER">
                                  <GridPane.margin>
-                                    <Insets bottom="10.0" right="30.0" />
+                                     <Insets right="15.0"/>
                                  </GridPane.margin>
-                              </VBox>
+                               </Label>
                            </children>
                            <columnConstraints>
                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="30.0" prefWidth="100.0" />
@@ -81,48 +92,68 @@
                         </GridPane>
                         <GridPane fx:id="maxPlayersGridPane1" GridPane.rowIndex="2">
                            <children>
-                              <Label fx:id="legsSliderLabel" text="20" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">
-                                 <GridPane.margin>
-                                    <Insets right="30.0" />
-                                 </GridPane.margin>
-                              </Label>
-                              <VBox alignment="BOTTOM_CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                                 <children>
-                                    <JFXSlider fx:id="legsSlider" blockIncrement="1.0" majorTickUnit="2.0" max="20.0" min="1.0" minorTickCount="1" snapToTicks="true" styleClass="maxPlayers" value="11.0" />
-                                 </children>
-                                 <GridPane.margin>
-                                    <Insets bottom="10.0" right="30.0" />
-                                 </GridPane.margin>
-                              </VBox>
                               <GridPane>
                                  <children>
-                                    <Label alignment="CENTER" text="NUMBER OF" GridPane.halignment="CENTER" />
+                                     <Label alignment="CENTER" styleClass="optionLabel"
-                                    <Label alignment="CENTER" text="REPEATING LEGS" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                                       text="NUMBER OF" GridPane.halignment="CENTER"
+                                       GridPane.valignment="BOTTOM"/>
                                  </children>
                                  <columnConstraints>
                                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                                  </columnConstraints>
                                  <rowConstraints>
                                     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                  </rowConstraints>
                               </GridPane>
-                              <JFXCheckBox fx:id="pickupsCheckBox" text="Enable Pickups" GridPane.rowIndex="1">
+                               <JFXSlider fx:id="legsSlider" blockIncrement="1.0"
+                                 majorTickUnit="2.0" max="20.0" min="1.0" minorTickCount="1"
+                                 snapToTicks="true" styleClass="maxPlayers" value="11.0"
+                                 GridPane.columnIndex="1" GridPane.halignment="CENTER"
+                                 GridPane.valignment="BOTTOM">
                                  <GridPane.margin>
-                                    <Insets left="5.0" />
+                                     <Insets right="30.0"/>
                                  </GridPane.margin>
-                              </JFXCheckBox>
+                               </JFXSlider>
+                               <Label alignment="CENTER" styleClass="optionLabel"
+                                 text="REPEATING LEGS" GridPane.halignment="CENTER"
+                                 GridPane.rowIndex="1"/>
+                               <Label fx:id="legsSliderLabel" styleClass="sliderLabel" text="10"
+                                 GridPane.columnIndex="1" GridPane.rowIndex="1">
+                                   <GridPane.margin>
+                                       <Insets right="15.0"/>
+                                   </GridPane.margin>
+                               </Label>
                            </children>
                            <columnConstraints>
                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="30.0" prefWidth="100.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0" />
+                               <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES"
+                                 minWidth="100.0" prefWidth="100.0"/>
                            </columnConstraints>
                            <rowConstraints>
-                              <RowConstraints minHeight="10.0" percentHeight="60.0" prefHeight="10.0" vgrow="SOMETIMES" />
+                               <RowConstraints maxHeight="-Infinity" minHeight="10.0"
-                              <RowConstraints minHeight="10.0" percentHeight="40.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                 percentHeight="60.0" prefHeight="100.0" vgrow="SOMETIMES"/>
+                               <RowConstraints maxHeight="-Infinity" minHeight="10.0"
+                                 percentHeight="40.0" prefHeight="100.0" vgrow="SOMETIMES"/>
                            </rowConstraints>
                         </GridPane>
+                         <GridPane GridPane.rowIndex="3">
+                             <columnConstraints>
+                                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                   percentWidth="30.0" prefWidth="100.0"/>
+                                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                   prefWidth="100.0"/>
+                             </columnConstraints>
+                             <rowConstraints>
+                                 <RowConstraints minHeight="10.0" prefHeight="30.0"
+                                   vgrow="SOMETIMES"/>
+                             </rowConstraints>
+                             <children>
+                                 <JFXCheckBox fx:id="pickupsCheckBox" text=" "
+                                   GridPane.columnIndex="1"/>
+                                 <Label styleClass="optionLabel" text="ENABLE TOKENS"
+                                   GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
+                             </children>
+                         </GridPane>
                      </children>
                   </GridPane>
                   <GridPane GridPane.columnIndex="1">
@@ -152,7 +183,8 @@
                             <RowConstraints maxHeight="342.0" minHeight="10.0" prefHeight="336.0" vgrow="SOMETIMES" />
                           </rowConstraints>
                            <children>
-                              <Label fx:id="mapNameLabel" text="MAP NAME" GridPane.halignment="CENTER" />
+                               <Label fx:id="mapNameLabel" styleClass="optionLabel" text="MAP NAME"
+                                 GridPane.halignment="CENTER"/>
                               <AnchorPane fx:id="mapHolder" prefHeight="333.0" prefWidth="404.0" GridPane.rowIndex="1" />
                            </children>
                         </GridPane>
@@ -164,6 +196,8 @@
                <font>
                   <Font size="20.0" />
                </font></Label>
+             <Label fx:id="closeLabel" text="✖" translateY="-10.0" GridPane.halignment="RIGHT"
+               GridPane.valignment="TOP"/>
          </children>
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -175,4 +209,8 @@
          </rowConstraints>
       </GridPane>
    </children>
+    <stylesheets>
+        <URL value="@../../css/Master.css"/>
+        <URL value="@../../css/dialogs/ServerCreation.css"/>
+    </stylesheets>
 </JFXDialogLayout>