Merge develop into NewUI, and 3D

tags: #story[1245]

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

@@ -1,11 +1,6 @@
 package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -13,31 +8,16 @@ import javafx.fxml.Initializable;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.effect.DropShadow;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
-import seng302.gameServer.ServerAdvertiser;
 import seng302.gameServer.ServerDescription;
-import seng302.gameServer.GameState;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameClient;
-import seng302.visualiser.ServerListener;
-import seng302.visualiser.ServerListenerDelegate;
 
 import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
 import java.net.URL;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.ResourceBundle;
 
@@ -54,50 +34,32 @@ public class StartScreenController implements Initializable{
     private Logger logger = LoggerFactory.getLogger(StartScreenController.class);
 
     private List<ServerDescription> servers;
-    public void initialize(URL url,  ResourceBundle resourceBundle) {
-        Sounds.stopMusic();
-        Sounds.stopSoundEffects();
-        Sounds.playMenuMusic();
-        if (Sounds.isMusicMuted()) {
-            muteMusicButton.setText("UnMute Music");
-        } else {
-            muteMusicButton.setText("Mute Music");
-        }
-        if (Sounds.isSoundEffectsMuted()) {
-            muteSoundsButton.setText("UnMute Sounds");
-        } else {
-            muteSoundsButton.setText("Mute Sounds");
-        }
-        Sounds.setMutes();
-//        gameClient = new GameClient(holder);
-    }
+    private GameClient gameClient;
+//    public void initialize(URL url,  ResourceBundle resourceBundle) {
+//        Sounds.stopMusic();
+//        Sounds.stopSoundEffects();
+//        Sounds.playMenuMusic();
+//        if (Sounds.isMusicMuted()) {
+//            muteMusicButton.setText("UnMute Music");
+//        } else {
+//            muteMusicButton.setText("Mute Music");
+//        }
+//        if (Sounds.isSoundEffectsMuted()) {
+//            muteSoundsButton.setText("UnMute Sounds");
+//        } else {
+//            muteSoundsButton.setText("Mute Sounds");
+//        }
+//        Sounds.setMutes();
+////        gameClient = new GameClient(holder);
+//    }
 
-    private void setInitialDropShadow(){
+    private void setInitialDropShadow() {
         DropShadow dropShadow = new DropShadow();
         dropShadow.setRadius(10.0);
         dropShadow.setOffsetX(3.0);
         dropShadow.setOffsetY(4.0);
         dropShadow.setColor(Color.color(0, 0, 0, 0.5));
         headText.setEffect(dropShadow);
-    /**
-     * Creates an instance of GameClient and runs it as a host.
-     */
-    @FXML
-    public void hostButtonPressed() {
-        Sounds.playButtonClick();
-        gameClient = new GameClient(holder);
-        gameClient.runAsHost(getLocalHostIp(), 4942);
-    }
-
-    /**
-     * Creates an instance of GameClient and runs it has a client.
-     */
-    @FXML
-    public void connectButtonPressed() {
-        // TODO: 10/07/17 wmu16 - Finish function
-        Sounds.playButtonClick();
-        gameClient = new GameClient(holder);
-        gameClient.runAsClient(ipTextField.getText().trim().toLowerCase(), 4942);
     }
 
     private void preloadServerListView(){
@@ -132,9 +94,9 @@ public class StartScreenController implements Initializable{
         Sounds.toggleMuteMusic();
         Sounds.playButtonClick();
         if (Sounds.isMusicMuted()) {
-            muteMusicButton.setText("UnMute Music");
+//            muteMusicButton.setText("UnMute Music");
         } else {
-            muteMusicButton.setText("Mute Music");
+//            muteMusicButton.setText("Mute Music");
         }
     }
 
@@ -142,9 +104,9 @@ public class StartScreenController implements Initializable{
         Sounds.toggleMuteEffects();
         Sounds.playButtonClick();
         if (Sounds.isSoundEffectsMuted()) {
-            muteSoundsButton.setText("UnMute Sounds");
+//            muteSoundsButton.setText("UnMute Sounds");
         } else {
-            muteSoundsButton.setText("Mute Sounds");
+//            muteSoundsButton.setText("Mute Sounds");
         }
     }