Merge branch 'develop' into story1273_minimap

# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
#	src/main/resources/views/RaceView.fxml

src/main/java/seng302/visualiser/GameView3D.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
+import javafx.beans.value.ObservableValue;
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
 import javafx.scene.Camera;
@@ -69,6 +70,8 @@ public class GameView3D extends GameView {
     /* Note that if either of these is null then values for it have not been added and the other
        should be used as the limits of the map. */
     private Map<Mark, Marker3D> markerObjects;
+
+    private BoatObject playerBoat;
     private Map<ClientYacht, BoatObject> boatObjects = new HashMap<>();
     private Group wakesGroup = new Group();
     private Group boatObjectGroup = new Group();
@@ -334,9 +337,35 @@ public class GameView3D extends GameView {
                 ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
                 ((ChaseCamera) chaseCam).setPlayerBoat(newBoat);
                 ((TopDownCamera) topDownCam).setPlayerBoat(newBoat);
+
+                newBoat.setMarkIndicator(ModelFactory.importSTL("mark_pointer.stl"));
+                playerBoat = newBoat;
+
             }
         }
         Platform.runLater(() -> {
+            ClientYacht playerYacht = ViewManager.getInstance().getGameClient().getAllBoatsMap()
+                .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId());
+
+            for (ObservableValue o : Arrays
+                .asList(playerBoat.layoutXProperty(), playerBoat.layoutXProperty())) {
+                o.addListener((obs, oldVal, newVal) -> {
+
+                    List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks();
+                    Point2D midPoint = new Point2D(0, 0);
+                    if (marks.size() == 1) {
+                        midPoint = scaledPoint.findScaledXY(marks.get(0));
+                    } else if (marks.size() == 2) {
+                        midPoint = (scaledPoint.findScaledXY(marks.get(0)))
+                            .midpoint(scaledPoint.findScaledXY(marks.get(1)));
+                    }
+
+                    if (midPoint != null) {
+                        playerBoat.updateMarkIndicator(midPoint);
+                    }
+
+                });
+            }
             gameObjects.getChildren().addAll(wakes);
             gameObjects.getChildren().addAll(boatObjectGroup);
         });

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

@@ -2,17 +2,33 @@ 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;
@@ -27,13 +43,10 @@ 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 java.io.IOException;
+import seng302.visualiser.controllers.dialogs.TokenInfoDialogController;
-import java.net.URL;
+import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import java.util.ArrayList;
+import seng302.visualiser.fxObjects.assets_3D.ModelType;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
 
 public class LobbyController implements Initializable {
 
@@ -57,10 +70,13 @@ 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;
@@ -128,6 +144,107 @@ 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() {
@@ -252,6 +369,10 @@ 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) {
-            e.printStackTrace();
+            logger.warn("Could not go to start view");
         }
     }
 

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());
     }
 
     /**
@@ -134,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

@@ -0,0 +1,90 @@
+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,7 +13,8 @@ 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;
@@ -21,7 +22,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};
+    final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT, WAKA};
 
     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/BoatObject.java

@@ -4,10 +4,14 @@ import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
+import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.MeshView;
 import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
 
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
@@ -30,9 +34,10 @@ public class BoatObject extends Group {
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
     private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
-//    private Rotate tilt = new Rotate(0, new Point3D(0, 1, 0));
-    private double previousRotation = 0;
 
+    // This stuff only matters to the players boat object.
+    private MeshView markIndicator;
+    private MeshView playerIndicator;
     private ReadOnlyDoubleWrapper rotationProperty;
 
     private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
@@ -81,6 +86,19 @@ public class BoatObject extends Group {
         });
     }
 
+    public void updateMarkIndicator(Point2D markPoint) {
+        Point2D boatLoc = new Point2D(this.getLayoutX(), this.getLayoutY());
+        Double angle = Math.toDegrees(
+            Math.atan2(boatLoc.getY() - markPoint.getY(), boatLoc.getX() - markPoint.getX())) - 90;
+
+        Double radius = 0.5;
+        markIndicator.getTransforms().clear();
+        markIndicator.getTransforms().addAll(
+            new Rotate(angle, new Point3D(0, 0, 1)),
+            new Translate(0, -radius, 0)
+        );
+    }
+
     private Double normalizeHeading(double heading, double windDirection) {
         Double normalizedHeading = heading - windDirection;
         normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
@@ -91,14 +109,6 @@ public class BoatObject extends Group {
     private void rotateTo(double heading, boolean sailsIn, double windDir) {
         rotationProperty.set(heading);
         rotation.setAngle(heading);
-//        if (heading == previousRotation) {
-//            tilt.setAngle(0);
-//        } else if (heading < previousRotation) {
-//            tilt.setAngle(-10);
-//        } else {
-//            tilt.setAngle(10);
-//        }
-//        previousRotation = heading;
         wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
         if (sailsIn) {
             boatAssets.showSail();
@@ -128,6 +138,26 @@ public class BoatObject extends Group {
         }
     }
 
+    public void setMarkIndicator(MeshView indicator) {
+        this.markIndicator = indicator;
+        this.getChildren().add(markIndicator);
+        createPlayerIndicator();
+        setIndicatorColor();
+    }
+
+    private void createPlayerIndicator() {
+        MeshView torus = ModelFactory.importSTL("player_circle.stl");
+        playerIndicator = torus;
+        this.getChildren().add(torus);
+    }
+
+    public void setIndicatorColor() {
+        Platform.runLater(() -> {
+            markIndicator.setMaterial(new PhongMaterial(Color.DARKORANGE));
+            playerIndicator.setMaterial(new PhongMaterial(colour));
+        });
+    }
+
     public Group getWake () {
         return wake;
     }

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

@@ -80,30 +80,6 @@ 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(
@@ -115,26 +91,28 @@ public class ModelFactory {
     private static Group getUnmodifiedBoatModel(BoatMeshType boatType, Color primaryColour) {
 
         Group boatAssets = new Group();
-        MeshView hull = importSTL(boatType.hullFile);
+        MeshView hull = importBoatSTL(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
         boatAssets.getChildren().addAll(hull);
 
         if (boatType.mastFile != null) {
-            MeshView mast = importSTL(boatType.mastFile);
+            MeshView mast = importBoatSTL(boatType.mastFile);
             mast.setMaterial(new PhongMaterial(primaryColour));
             boatAssets.getChildren().add(mast);
+        } else {
+            boatAssets.getChildren().add(new Group());
         }
 
-        MeshView sail = importSTL(boatType.sailFile);
+        MeshView sail = importBoatSTL(boatType.sailFile);
         sail.setMaterial(
-            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
+            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
         );
         boatAssets.getChildren().addAll(sail);
 
         if (boatType.jibFile != null) {
-            MeshView jib = importSTL(boatType.jibFile);
+            MeshView jib = importBoatSTL(boatType.jibFile);
-            jib.setMaterial(
+            sail.setMaterial(
-                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
+                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
             );
             boatAssets.getChildren().add(jib);
         }
@@ -142,9 +120,13 @@ public class ModelFactory {
         return boatAssets;
     }
 
-    private static MeshView importSTL(String fileName) {
+    private static MeshView importBoatSTL(String fileName) {
+        return importSTL("boatSTLs/" + fileName);
+    }
+
+    public static MeshView importSTL(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
-        importer.read(ModelFactory.class.getResource("/meshes/boatSTLs/" + fileName));
+        importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
         MeshView importedFile = new MeshView(importer.getImport());
         importedFile.setCache(true);
         importedFile.setCacheHint(CacheHint.SCALE_AND_ROTATE);
@@ -163,6 +145,10 @@ public class ModelFactory {
             assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
+            case PLAYER_IDENTIFIER_TORUS:
+                return makeIdentifierTorus(assets);
+            case NEXT_MARK_INDICATOR:
+                return makeNextMarkIndicator(assets);
             case VELOCITY_PICKUP:
             case BUMPER_PICKUP:
             case RANDOM_PICKUP:
@@ -197,6 +183,16 @@ public class ModelFactory {
         }
     }
 
+    private static Model makeIdentifierTorus(Group assets) {
+//        assets.getChildren().add(new AmbientLight());
+        return new Model(new Group(assets), null);
+    }
+
+    private static Model makeNextMarkIndicator(Group assets) {
+//        assets.getChildren().add(new AmbientLight());
+        return new Model(new Group(assets), null);
+    }
+
     private static Model makeTokenPickup(Group assets) {
         Rotate animationRotate = new Rotate(0, new Point3D(0, 0, 1));
         assets.getTransforms().addAll(

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

@@ -28,7 +28,9 @@ public enum ModelType {
     START_ARROW ("start_arrow.dae"),
     FINISH_ARROW ("finish_arrow.dae"),
     LAND("land.dae"),
-    LAND_SMOOTH("land_smooth.dae");
+    LAND_SMOOTH("land_smooth.dae"),
+    NEXT_MARK_INDICATOR("indicator_arrow.dae"),
+    PLAYER_IDENTIFIER_TORUS("torus.dae");
 
     final String filename;
 

src/main/resources/css/LobbyView.css

@@ -66,3 +66,11 @@
     /*-fx-background-size: cover;*/
     -fx-background-color: dodgerblue;
 }
+
+.tokenView {
+    -fx-cursor: hand;
+}
+
+.tokenGridView StackPane {
+    -fx-background-color: white;
+}

src/main/resources/css/TokenInfoDialog.css

@@ -0,0 +1,22 @@
+.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/meshes/indicator_arrow.dae

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.79.0 commit date:2017-09-11, commit time:10:43, hash:5bd8ac9</authoring_tool>
+    </contributor>
+    <created>2017-09-28T01:59:46</created>
+    <modified>2017-09-28T01:59:46</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0 0.3215737 0.002428917 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.1614584 0.1614584 0.1614584 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001-material" name="Material_001">
+      <instance_effect url="#Material_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Cone-mesh" name="Cone">
+      <mesh>
+        <source id="Cone-mesh-positions">
+          <float_array id="Cone-mesh-positions-array" count="99">0 1 -1 0 0 1 0.1950902 0.9807853 -1 0.3826835 0.9238795 -1 0.5555703 0.8314696 -1 0.7071068 0.7071068 -1 0.8314697 0.5555702 -1 0.9238795 0.3826834 -1 0.9807853 0.1950902 -1 1 0 -1 0.9807853 -0.1950902 -1 0.9238796 -0.3826833 -1 0.8314697 -0.5555702 -1 0.7071068 -0.7071068 -1 0.5555702 -0.8314697 -1 0.3826833 -0.9238796 -1 0.1950901 -0.9807853 -1 -3.25841e-7 -1 -1 -0.1950907 -0.9807852 -1 -0.3826839 -0.9238793 -1 -0.5555707 -0.8314693 -1 -0.7071073 -0.7071064 -1 -0.83147 -0.5555697 -1 -0.9238799 -0.3826827 -1 -0.9807854 -0.1950893 -1 -1 9.65599e-7 -1 -0.9807851 0.1950913 -1 -0.9238791 0.3826845 -1 -0.8314689 0.5555713 -1 -0.7071059 0.7071077 -1 -0.5555691 0.8314704 -1 -0.3826821 0.9238801 -1 -0.1950888 0.9807856 -1</float_array>
+          <technique_common>
+            <accessor source="#Cone-mesh-positions-array" count="33" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cone-mesh-normals">
+          <float_array id="Cone-mesh-normals-array" count="117">0.08775347 0.8909768 0.4454884 0.2598883 0.8567371 0.4454883 0.4220357 0.7895733 0.4454883 0.5679644 0.6920669 0.4454883 0.6920669 0.5679644 0.4454883 0.7895736 0.4220353 0.4454883 0.8567369 0.2598885 0.4454883 0.8909768 0.08775347 0.4454884 0.8909768 -0.08775347 0.4454884 0.8567371 -0.2598881 0.4454883 0.7895734 -0.4220355 0.4454884 0.6920669 -0.5679644 0.4454883 0.5679644 -0.6920669 0.4454883 0.4220356 -0.7895734 0.4454883 0.2598879 -0.8567371 0.4454885 0.08775335 -0.8909768 0.4454884 -0.08775389 -0.8909767 0.4454883 -0.2598887 -0.8567368 0.4454883 -0.4220361 -0.7895731 0.4454884 -0.5679646 -0.6920668 0.4454883 -0.6920675 -0.5679637 0.4454884 -0.7895734 -0.4220355 0.4454884 -0.8567374 -0.2598869 0.4454883 -0.8909769 -0.08775287 0.4454884 -0.8909766 0.08775418 0.4454883 -0.8567367 0.2598895 0.4454884 -0.7895728 0.4220367 0.4454883 -0.6920663 0.5679652 0.4454883 -0.5679636 0.6920676 0.4454884 -0.4220345 0.789574 0.4454885 -0.259887 0.8567373 0.4454883 -0.08775269 0.8909768 0.4454884 0 0 -1 -3.97508e-6 0 -1 3.97512e-6 0 -1 3.88859e-7 0 -1 -1.36853e-6 0 -1 1.36853e-6 0 -1 -3.88857e-7 0 -1</float_array>
+          <technique_common>
+            <accessor source="#Cone-mesh-normals-array" count="39" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Cone-mesh-vertices">
+          <input semantic="POSITION" source="#Cone-mesh-positions"/>
+        </vertices>
+        <triangles material="Material_001-material" count="62">
+          <input semantic="VERTEX" source="#Cone-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Cone-mesh-normals" offset="1"/>
+          <p>0 0 1 0 2 0 2 1 1 1 3 1 3 2 1 2 4 2 4 3 1 3 5 3 5 4 1 4 6 4 6 5 1 5 7 5 7 6 1 6 8 6 8 7 1 7 9 7 9 8 1 8 10 8 10 9 1 9 11 9 11 10 1 10 12 10 12 11 1 11 13 11 13 12 1 12 14 12 14 13 1 13 15 13 15 14 1 14 16 14 16 15 1 15 17 15 17 16 1 16 18 16 18 17 1 17 19 17 19 18 1 18 20 18 20 19 1 19 21 19 21 20 1 20 22 20 22 21 1 21 23 21 23 22 1 22 24 22 24 23 1 23 25 23 25 24 1 24 26 24 26 25 1 25 27 25 27 26 1 26 28 26 28 27 1 27 29 27 29 28 1 28 30 28 30 29 1 29 31 29 31 30 1 30 32 30 32 31 1 31 0 31 16 32 24 32 8 32 32 32 0 32 2 32 2 32 3 32 4 32 4 32 5 32 6 32 6 32 7 32 4 32 8 32 9 32 10 32 10 32 11 32 8 32 12 32 13 32 16 32 14 32 15 32 16 32 16 32 17 32 18 32 18 32 19 32 20 32 20 32 21 32 22 32 22 33 23 33 24 33 24 34 25 34 26 34 26 32 27 32 28 32 28 32 29 32 32 32 30 32 31 32 32 32 32 35 2 35 8 35 4 36 7 36 8 36 8 37 11 37 12 37 13 32 14 32 16 32 16 32 18 32 24 32 20 32 22 32 24 32 24 38 26 38 32 38 29 32 30 32 32 32 2 32 4 32 8 32 8 32 12 32 16 32 18 32 20 32 24 32 26 32 28 32 32 32 32 32 8 32 24 32</p>
+        </triangles>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Cone" name="Cone" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 1.015816 0 0 0 1</matrix>
+        <instance_geometry url="#Cone-mesh" name="Cone">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001-material" target="#Material_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>

src/main/resources/views/LobbyView.fxml

@@ -1,5 +1,13 @@
 <?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?>
@@ -13,7 +21,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.0.112" 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" 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>
@@ -72,29 +80,148 @@
                 </GridPane>
                 <GridPane GridPane.rowIndex="1">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" />
+                        <ColumnConstraints hgrow="NEVER" maxWidth="-Infinity" minWidth="-Infinity"
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="400.0" minWidth="400.0" prefWidth="400.0" />
+                          prefWidth="115.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="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                        <ScrollPane fx:id="playerListScrollPane" hbarPolicy="NEVER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
                             <content>
-                                <VBox fx:id="playerListVBox" prefHeight="200.0" prefWidth="100.0" />
+                                <VBox fx:id="playerListVBox" alignment="TOP_RIGHT" maxWidth="328.0" minWidth="328.0" prefWidth="328.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;">
+                        <AnchorPane fx:id="serverMap" style="-fx-background-color: skyblue;" GridPane.columnIndex="1">
                      <opaqueInsets>
                         <Insets />
                      </opaqueInsets>
                      <GridPane.margin>
-                        <Insets bottom="15.0" left="15.0" right="7.0" top="15.0" />
+                        <Insets bottom="15.0" left="7.0" right="7.0" top="15.0" />
                      </GridPane.margin>
                         </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>
@@ -106,10 +233,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

@@ -23,206 +23,267 @@
 
 <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">
+            <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" prefHeight="800.0" prefWidth="1200.0">
+                    <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+                              prefHeight="800.0" prefWidth="1200.0">
                         <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="250.0" minWidth="250.0" prefWidth="250.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="250.0" minWidth="250.0"
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" />
+                                               prefWidth="250.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="400.0" prefWidth="400.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"/>
-                  <ColumnConstraints />
+                            <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="70.0" minHeight="70.0" prefHeight="70.0"
-                    <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES" />
+                                            vgrow="SOMETIMES"/>
-                    <RowConstraints maxHeight="250.0" minHeight="250.0" prefHeight="250.0" valignment="BOTTOM" 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">
                                 <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0" prefWidth="135.0" />
+                                                       prefWidth="50.0"/>
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
+                                                       prefWidth="135.0"/>
                                 </columnConstraints>
                                 <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                                 </rowConstraints>
                                 <opaqueInsets>
-                            <Insets />
+                                    <Insets/>
                                 </opaqueInsets>
                                 <GridPane.margin>
-                            <Insets left="10.0" right="200.0" top="10.0" />
+                                    <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">
+                                    <ImageView fitHeight="40.0" fitWidth="40.0" pickOnBounds="true"
+                                               preserveRatio="true" GridPane.halignment="CENTER"
+                                               GridPane.valignment="CENTER">
                                         <image>
-                                    <Image url="@../images/timer.png" />
+                                            <Image url="@../images/timer.png"/>
                                         </image>
                                         <GridPane.margin>
-                                    <Insets />
+                                            <Insets/>
                                         </GridPane.margin>
                                     </ImageView>
-                            <Label fx:id="timerLabel" text="00:03:34" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                                    <Label fx:id="timerLabel" text="00:03:34" GridPane.columnIndex="1"
+                                           GridPane.halignment="CENTER" GridPane.valignment="CENTER">
                                         <font>
-                                    <Font size="21.0" />
+                                            <Font size="21.0"/>
                                         </font>
                                         <GridPane.margin>
-                                    <Insets />
+                                            <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 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 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 hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
+                                                       prefWidth="390.0"/>
                                 </columnConstraints>
                                 <rowConstraints>
-                            <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES" />
+                                    <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
-                            <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
+                                    <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
+                                                    vgrow="SOMETIMES"/>
                                 </rowConstraints>
                                 <children>
-                            <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0" GridPane.hgrow="ALWAYS" GridPane.valignment="BOTTOM" GridPane.vgrow="ALWAYS">
+                                    <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0"
+                                          GridPane.hgrow="ALWAYS" GridPane.valignment="BOTTOM"
+                                          GridPane.vgrow="ALWAYS">
                                         <GridPane.margin>
-                                    <Insets />
+                                            <Insets/>
                                         </GridPane.margin>
                                         <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                            <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" prefWidth="100.0" />
+                                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="90.0" prefWidth="90.0" />
+                                                               prefWidth="100.0"/>
+                                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity"
+                                                               minWidth="90.0" prefWidth="90.0"/>
                                         </columnConstraints>
                                         <rowConstraints>
-                                    <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" valignment="CENTER" vgrow="SOMETIMES" />
+                                            <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0"
+                                                            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">
+                                            <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" />
+                                                    <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">
+                                            <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" />
+                                                    <Insets bottom="10.0" left="20.0" right="10.0"/>
                                                 </GridPane.margin>
                                                 <padding>
-                                            <Insets right="15.0" />
+                                                    <Insets right="15.0"/>
                                                 </padding>
                                             </JFXTextField>
                                         </children>
                                         <GridPane.margin>
-                                    <Insets top="10.0" />
+                                            <Insets top="10.0"/>
                                         </GridPane.margin>
                                     </GridPane>
                                 </children>
                                 <GridPane.margin>
-                            <Insets bottom="10.0" right="10.0" />
+                                    <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">
+                            <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="110.0" minWidth="110.0"
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0" minWidth="10.0" prefWidth="132.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="120.0" minHeight="120.0" prefHeight="120.0"
-                            <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    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">
+                                    <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" />
+                                            <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">
+                                    <Label fx:id="boatSpeedLabel" text="Boat Speed:" GridPane.columnIndex="1"
+                                           GridPane.halignment="LEFT" GridPane.rowSpan="2"
+                                           GridPane.valignment="CENTER">
                                         <opaqueInsets>
-                                    <Insets />
+                                            <Insets/>
                                         </opaqueInsets>
                                         <padding>
-                                    <Insets bottom="5.0" left="10.0" right="5.0" top="5.0" />
+                                            <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">
+                                    <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" />
+                                            <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 hgrow="SOMETIMES" minWidth="10.0"
+                                                               prefWidth="100.0"/>
                                         </columnConstraints>
                                         <rowConstraints>
-                                    <RowConstraints maxHeight="120.0" minHeight="120.0" prefHeight="120.0" vgrow="SOMETIMES" />
+                                            <RowConstraints maxHeight="120.0" minHeight="120.0"
-                                    <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                            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" />
+                                            <ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
-                                    <Label fx:id="windSpeedLabel" text="0.0 Knots" GridPane.halignment="RIGHT" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                                       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" />
+                                                    <Insets right="5.0"/>
                                                 </GridPane.margin>
                                             </Label>
-                                    <Label fx:id="windDirectionLabel" text="180.0°" GridPane.halignment="LEFT" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                            <Label fx:id="windDirectionLabel" text="180.0°"
+                                                   GridPane.halignment="LEFT" GridPane.rowIndex="1"
+                                                   GridPane.valignment="CENTER">
                                                 <GridPane.margin>
-                                            <Insets left="5.0" />
+                                                    <Insets left="5.0"/>
                                                 </GridPane.margin>
                                             </Label>
                                         </children>
                                     </GridPane>
                                 </children>
                                 <opaqueInsets>
-                            <Insets />
+                                    <Insets/>
                                 </opaqueInsets>
                                 <GridPane.margin>
-                            <Insets bottom="10.0" left="10.0" top="40.0" />
+                                    <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 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="152.0" minHeight="10.0" prefHeight="152.0"
-                            <RowConstraints maxHeight="118.0" minHeight="10.0" prefHeight="98.0" vgrow="SOMETIMES" />
+                                                    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">
+                                    <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 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">
+                                    <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 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">
+                                    <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 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">
+                                    <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 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">
+                                    <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 url="@../icons/slowedIcon.png"/>
                                         </image>
                                     </ImageView>
                                 </children>
@@ -244,13 +305,9 @@
                     <Insets right="15.0" top="15.0" />
                 </StackPane.margin>
             </JFXButton>
-    </children>
-   <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" />
-           </children>
             </AnchorPane>
         </children>
     <stylesheets>

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

@@ -1,5 +1,9 @@
 <?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?>
@@ -8,33 +12,30 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-<VBox fx:id="playerCellVBox" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
+
-  minHeight="-Infinity" minWidth="-Infinity" prefHeight="80.0"
+<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">
-  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"
+       <GridPane fx:id="playerListCell" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="70.0">
-         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="290.0" minWidth="290.0"
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="260.0" minWidth="260.0" prefWidth="260.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,6 +1,11 @@
 <?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?>
@@ -9,6 +14,7 @@
 <?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>
+                               </JFXSlider>
+                               <Label fx:id="maxPlayersLabel" alignment="CENTER"
+                                 styleClass="sliderLabel" text="10" GridPane.columnIndex="1"
+                                 GridPane.halignment="CENTER" GridPane.rowIndex="1"
+                                 GridPane.valignment="CENTER">
+                                 <GridPane.margin>
+                                     <Insets right="15.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="maxPlayersSlider" 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>
                            </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>