From d7aaf2423f0b65ac8a413642c6c744eb740d3b7f Mon Sep 17 00:00:00 2001
From: Jo0001 <47455182+Jo0001@users.noreply.github.com>
Date: Sat, 12 Dec 2020 15:44:35 +0100
Subject: [PATCH] Ready for 2.0.0

---
 README.md                                     |  8 +++-
 resources/mainUI.fxml                         | 41 +++++++++++--------
 .../battleGoalCards/core/AppLauncher.java     | 16 +++++++-
 .../battleGoalCards/core/Controller.java      |  8 ++--
 .../battleGoalCards/network/Client.java       |  2 +-
 .../battleGoalCards/network/Server.java       | 13 +++---
 6 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 0cc73f8..92d81f3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
 # Gloomhaven Battle Goal Cards
 A simple application to show the Gloomhaven Battle Goal Cards via sockets to all clients
 
-Start with a specific host and port via commandline:
+Start server only (no gui):
+
+`java -jar gloomhaven_battle_goal_cards.jar -startserver -port 12345`
+
+Start with a specific host and port via commandline (you still have to manually connect) :
 
 `java -jar gloomhaven_battle_goal_cards.jar -host your-host.com -port 12345`
 
-Note: Still in development -use at your own risk
\ No newline at end of file
+Note: Still in development - use at your own risk
\ No newline at end of file
diff --git a/resources/mainUI.fxml b/resources/mainUI.fxml
index 0d93422..5ea702f 100644
--- a/resources/mainUI.fxml
+++ b/resources/mainUI.fxml
@@ -6,25 +6,32 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 
-<BorderPane fx:id="mainScreen" prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.jo0001.gloomhaven.battleGoalCards.core.Controller">
+<BorderPane fx:id="mainScreen" prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/8"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.jo0001.gloomhaven.battleGoalCards.core.Controller">
     <center>
         <AnchorPane prefHeight="-1.0" prefWidth="-1.0">
             <children>
-                <Button fx:id="btn" layoutX="120.0" layoutY="367.0" mnemonicParsing="false" text="Für alle Anzeigen" />
-                <AnchorPane fx:id="card1" layoutX="20.0" layoutY="22.0" prefHeight="285.0" prefWidth="200.0" styleClass="side1">
+                <Button fx:id="btn" layoutX="120.0" layoutY="367.0" mnemonicParsing="false" text="Für alle Anzeigen"/>
+                <AnchorPane fx:id="card1" layoutX="20.0" layoutY="22.0" prefHeight="285.0" prefWidth="200.0"
+                            styleClass="side1">
                     <children>
-                        <Label fx:id="title1" layoutX="2.0" layoutY="54.0" prefHeight="17.0" prefWidth="197.0" text="Title" />
-                        <Label fx:id="desc1" layoutX="39.0" layoutY="69.0" prefHeight="163.0" prefWidth="125.0" text="description" />
-                        <Label fx:id="checks1" layoutX="77.0" layoutY="229.0" text="checks" />
-                        <Label fx:id="id1" layoutX="77.0" layoutY="263.0" text="id" />
+                        <Label fx:id="title1" layoutX="2.0" layoutY="54.0" prefHeight="17.0" prefWidth="197.0"
+                               text="Title"/>
+                        <Label fx:id="desc1" layoutX="39.0" layoutY="69.0" prefHeight="163.0" prefWidth="125.0"
+                               text="description"/>
+                        <Label fx:id="checks1" layoutX="77.0" layoutY="229.0" text="checks"/>
+                        <Label fx:id="id1" layoutX="77.0" layoutY="263.0" text="id"/>
                     </children>
                 </AnchorPane>
-                <AnchorPane fx:id="card2" layoutX="274.0" layoutY="22.0" prefHeight="285.0" prefWidth="200.0" styleClass="side1">
+                <AnchorPane fx:id="card2" layoutX="274.0" layoutY="22.0" prefHeight="285.0" prefWidth="200.0"
+                            styleClass="side1">
                     <children>
-                        <Label fx:id="title2" layoutX="3.0" layoutY="54.0" prefHeight="17.0" prefWidth="197.0" text="Title" textAlignment="CENTER" />
-                        <Label fx:id="desc2" layoutX="41.0" layoutY="69.0" prefHeight="163.0" prefWidth="125.0" text="description" />
-                        <Label fx:id="checks2" layoutX="77.0" layoutY="229.0" text="checks" />
-                        <Label fx:id="id2" layoutX="77.0" layoutY="263.0" text="id" />
+                        <Label fx:id="title2" layoutX="3.0" layoutY="54.0" prefHeight="17.0" prefWidth="197.0"
+                               text="Title" textAlignment="CENTER"/>
+                        <Label fx:id="desc2" layoutX="41.0" layoutY="69.0" prefHeight="163.0" prefWidth="125.0"
+                               text="description"/>
+                        <Label fx:id="checks2" layoutX="77.0" layoutY="229.0" text="checks"/>
+                        <Label fx:id="id2" layoutX="77.0" layoutY="263.0" text="id"/>
                     </children>
                 </AnchorPane>
             </children>
@@ -35,14 +42,14 @@
             <menus>
                 <Menu mnemonicParsing="false" text="Settings">
                     <items>
-                        <MenuItem fx:id="connect" mnemonicParsing="false" text="Connect" />
-                        <MenuItem fx:id="resetbtn" mnemonicParsing="false" text="Reset" />
-                        <MenuItem fx:id="manageServerBtn" mnemonicParsing="false" text="Start server" />
+                        <MenuItem fx:id="connect" mnemonicParsing="false" text="Connect"/>
+                        <MenuItem fx:id="resetbtn" mnemonicParsing="false" text="Reset"/>
+                        <MenuItem fx:id="manageServerBtn" mnemonicParsing="false" text="Start server"/>
                     </items>
                 </Menu>
-                <Menu  mnemonicParsing="false" text="About">
-                    <MenuItem  mnemonicParsing="false" text="Version: 1.4.0"/>
+                <Menu mnemonicParsing="false" text="About">
                     <MenuItem fx:id="helpBtn" mnemonicParsing="false" text="Info &amp; Help"/>
+                    <MenuItem mnemonicParsing="false" text="Version: 2.0.0"/>
                 </Menu>
             </menus>
         </MenuBar>
diff --git a/src/de/jo0001/gloomhaven/battleGoalCards/core/AppLauncher.java b/src/de/jo0001/gloomhaven/battleGoalCards/core/AppLauncher.java
index 57a3ee8..b58cae5 100644
--- a/src/de/jo0001/gloomhaven/battleGoalCards/core/AppLauncher.java
+++ b/src/de/jo0001/gloomhaven/battleGoalCards/core/AppLauncher.java
@@ -1,10 +1,12 @@
 package de.jo0001.gloomhaven.battleGoalCards.core;
 
+import de.jo0001.gloomhaven.battleGoalCards.network.Server;
 import de.jo0001.gloomhaven.battleGoalCards.other.DataHolder;
 import de.jo0001.gloomhaven.battleGoalCards.other.DataManager;
 import javafx.application.Application;
 
 import java.io.*;
+import java.net.BindException;
 
 public class AppLauncher {
 
@@ -17,7 +19,19 @@ public static void main(String[] args) throws IOException {
             System.out.println("Restarting");
             System.exit(-2);
         }
-        if (args.length == 4 && args[0].equalsIgnoreCase("-host") && args[2].equalsIgnoreCase("-port")) {
+        if (args.length == 3 && args[0].equalsIgnoreCase("-startserver") && args[1].equalsIgnoreCase("-port")) {
+            try {
+                Server server = new Server(Integer.parseInt(args[2]));
+                server.start();
+            } catch (IllegalArgumentException e) {
+                System.err.println("Invalid port");
+                e.printStackTrace();
+            } catch (BindException e) {
+                System.err.println("Can't bind to port. Already in use?");
+                e.printStackTrace();
+            }
+            return;
+        } else if (args.length == 4 && args[0].equalsIgnoreCase("-host") && args[2].equalsIgnoreCase("-port")) {
             DataHolder data = new DataHolder(args[1], Integer.parseInt(args[3]));
             DataManager.saveData(data);
         }
diff --git a/src/de/jo0001/gloomhaven/battleGoalCards/core/Controller.java b/src/de/jo0001/gloomhaven/battleGoalCards/core/Controller.java
index d662096..b8703a2 100644
--- a/src/de/jo0001/gloomhaven/battleGoalCards/core/Controller.java
+++ b/src/de/jo0001/gloomhaven/battleGoalCards/core/Controller.java
@@ -20,6 +20,7 @@
 
 import java.awt.*;
 import java.io.IOException;
+import java.net.BindException;
 import java.net.URI;
 import java.net.URL;
 import java.util.Optional;
@@ -77,7 +78,6 @@ public void onBtnPress(ActionEvent buttonEvent) {
             resetCard(2);
             //showSide(1);
             client.getInfo();
-            client.getInfo();
         }
     }
 
@@ -146,11 +146,13 @@ private void mangeServer(ActionEvent actionEvent) {
                 startServer(tmpPort);
             } catch (NumberFormatException e) {
                 alert("Invalid port", "Port must contain only numbers. For example 58889", Alert.AlertType.ERROR);
+            } catch (BindException e) {
+                alert("Can't bind to port", "Can't bind to port. Already in use?", Alert.AlertType.ERROR);
             }
         }
     }
 
-    private void startServer(int tmpPort) {
+    private void startServer(int tmpPort) throws BindException {
         Server s = new Server(tmpPort);
         s.start();
     }
@@ -227,7 +229,6 @@ private void prompt(ActionEvent buttonEvent) {
             host = res[0];
             setUpClient(host, port);
             btn.setText("Für alle Anzeigen");
-            connected = true;
             DataManager.saveData(new DataHolder(host, port));
 
         }
@@ -236,6 +237,7 @@ private void prompt(ActionEvent buttonEvent) {
     private void setUpClient(String host, int port) {
         client = new Client(host, port, this);
         client.start();
+        connected = true;
     }
 
     private void alert(String title, String mes, Alert.AlertType alertType) {
diff --git a/src/de/jo0001/gloomhaven/battleGoalCards/network/Client.java b/src/de/jo0001/gloomhaven/battleGoalCards/network/Client.java
index 6846cbc..faa039d 100644
--- a/src/de/jo0001/gloomhaven/battleGoalCards/network/Client.java
+++ b/src/de/jo0001/gloomhaven/battleGoalCards/network/Client.java
@@ -97,7 +97,7 @@ public void startClient() {
                 Alert alert = new Alert(Alert.AlertType.ERROR);
                 alert.setTitle("Verbindungsfehler");
                 alert.setHeaderText(null);
-                alert.setContentText("Es konnte keine Verbindung zu " + host + "unter Port " + port + " herstellen. Bitte versuche es erneut.");
+                alert.setContentText("Couldn't connect to " + host + " with port " + port + " Please try again");
                 Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
                 stage.getIcons().add(new Image(Client.class.getResourceAsStream("/logo.png")));
                 alert.showAndWait();
diff --git a/src/de/jo0001/gloomhaven/battleGoalCards/network/Server.java b/src/de/jo0001/gloomhaven/battleGoalCards/network/Server.java
index 42b06c8..cd6748c 100644
--- a/src/de/jo0001/gloomhaven/battleGoalCards/network/Server.java
+++ b/src/de/jo0001/gloomhaven/battleGoalCards/network/Server.java
@@ -1,6 +1,7 @@
 package de.jo0001.gloomhaven.battleGoalCards.network;
 
 import java.io.*;
+import java.net.BindException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -13,11 +14,13 @@ public class Server extends Thread {
     private static final List<Integer> usedIds = new ArrayList<>();
     private static final List<Socket> clients = new ArrayList<>();
 
-    public Server(int port) {
+    public Server(int port) throws BindException {
         try {
             serverSocket = new ServerSocket(port);
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (BindException e) {
+            throw new BindException();
+        } catch (IOException ioException) {
+            ioException.printStackTrace();
         }
     }
 
@@ -68,7 +71,7 @@ public static void notifyClients() {
     }
 
     //Just for Testing
-    public static void main(String[] args) {
+    public static void main(String[] args) throws BindException {
         Server s = new Server(58889);
         s.runServer();
     }
@@ -101,7 +104,7 @@ public void run() {
             try {
                 if (s != null) {
                     s.close();
-                    System.out.println(" Socket Closed");
+                    System.out.println("Socket Closed");
                 }
             } catch (IOException ignored) {
             }