From 72a0557a595618ec0fb92b93c961ee73218c575d Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Thu, 27 Aug 2020 20:05:23 +0200
Subject: [PATCH] Launcher: serverList: color green, when connected

---
 .../bixilon/minosoft/gui/main/MainWindow.java |  5 ++--
 .../minosoft/gui/main/ServerListCell.java     | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java
index e95d5cbb4..36de32324 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java
@@ -18,7 +18,6 @@ import de.bixilon.minosoft.game.datatypes.objectLoader.versions.Versions;
 import de.bixilon.minosoft.logging.Log;
 import de.bixilon.minosoft.util.DNSUtil;
 import javafx.application.Platform;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
@@ -41,7 +40,7 @@ public class MainWindow implements Initializable {
     }
 
     @FXML
-    public void addServer(ActionEvent e) {
+    public void addServer() {
         Dialog<Pair<String, String>> dialog = new Dialog<>();
         dialog.setTitle("Add server");
         dialog.setHeaderText("Enter the details of the server");
@@ -92,7 +91,7 @@ public class MainWindow implements Initializable {
     }
 
     @FXML
-    public void quit(ActionEvent e) {
+    public void quit() {
         System.exit(0);
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
index 448e58b7b..896d9a4ac 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
@@ -62,6 +62,7 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
     @FXML
     private AnchorPane root;
     private Server server;
+    boolean canConnect = false;
 
     public static ServerListCell newInstance() {
         FXMLLoader loader = new FXMLLoader(ServerListCell.class.getResource("/layout/cells/server.fxml"));
@@ -99,10 +100,7 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
                 favicon = GUITools.logo;
             }
             icon.setImage(favicon);
-            optionsConnect.setOnAction(e -> {
-                Connection connection = new Connection(Connection.lastConnectionId++, server.getAddress(), new Player(Minosoft.accountList.get(0)));
-                connection.resolve(ConnectionReasons.CONNECT, server.getDesiredVersion());
-            });
+            optionsConnect.setOnAction(e -> connect());
             optionsEdit.setOnAction(e -> edit());
             optionsDelete.setOnAction(e -> delete());
 
@@ -113,6 +111,7 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
                     players.setText("");
                     version.setText("Offline");
                     optionsConnect.setDisable(true);
+                    canConnect = false;
                     return;
                 }
                 players.setText(String.format("%d/%d", ping.getPlayerOnline(), ping.getMaxPlayers()));
@@ -126,8 +125,10 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
                     version.setText(ping.getServerVersion());
                     version.setTextFill(Color.RED);
                     optionsConnect.setDisable(true);
+                    canConnect = false;
                 } else {
                     version.setText(serverVersion.getVersionName());
+                    canConnect = true;
                 }
                 motd.setText(ping.getMotd().getRawMessage());
                 if (ping.getFavicon() != null) {
@@ -138,6 +139,11 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
             }));
             connection.resolve(ConnectionReasons.PING); // resolve dns address and ping
         }
+        setOnMouseClicked(click -> {
+            if (click.getClickCount() == 2) {
+                connect();
+            }
+        });
     }
 
     @Override
@@ -206,4 +212,13 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
         listView.getItems().remove(server);
         server.delete();
     }
+
+    public void connect() {
+        if (!canConnect) {
+            return;
+        }
+        Connection connection = new Connection(Connection.lastConnectionId++, server.getAddress(), new Player(Minosoft.accountList.get(0)));
+        connection.resolve(ConnectionReasons.CONNECT, server.getDesiredVersion());
+        setStyle("-fx-background-color: darkseagreen;");
+    }
 }
\ No newline at end of file