From 13a44f4ff4a2a64b6fa97a813928aacbe0783fb5 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Sat, 8 May 2021 23:27:02 +0200
Subject: [PATCH] workaround #15 (crash when using JFXTextFields)

---
 .../main/dialogs/login/MojangLoginController.java    |  8 ++++----
 .../main/dialogs/login/OfflineLoginController.java   |  6 +++---
 .../assets/minosoft/layout/dialogs/login/mojang.fxml | 12 +++++-------
 .../minosoft/layout/dialogs/login/offline.fxml       | 11 +++++------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/MojangLoginController.java b/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/MojangLoginController.java
index 180764fe2..c475bbc7c 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/MojangLoginController.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/MojangLoginController.java
@@ -14,8 +14,6 @@
 package de.bixilon.minosoft.gui.main.dialogs.login;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXPasswordField;
-import com.jfoenix.controls.JFXTextField;
 import de.bixilon.minosoft.Minosoft;
 import de.bixilon.minosoft.data.accounts.Account;
 import de.bixilon.minosoft.data.accounts.MojangAccount;
@@ -29,6 +27,8 @@ import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
@@ -40,9 +40,9 @@ public class MojangLoginController implements Initializable {
     public HBox hBox;
     public Label header;
     public Label emailLabel;
-    public JFXTextField email;
+    public TextField email;
     public Label passwordLabel;
-    public JFXPasswordField password;
+    public PasswordField password;
     public JFXButton loginButton;
     public Label errorMessage;
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/OfflineLoginController.java b/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/OfflineLoginController.java
index 05a76712a..d88a3a299 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/OfflineLoginController.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/dialogs/login/OfflineLoginController.java
@@ -14,7 +14,6 @@
 package de.bixilon.minosoft.gui.main.dialogs.login;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXTextField;
 import de.bixilon.minosoft.Minosoft;
 import de.bixilon.minosoft.data.accounts.OfflineAccount;
 import de.bixilon.minosoft.data.locale.LocaleManager;
@@ -28,6 +27,7 @@ import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
@@ -39,9 +39,9 @@ public class OfflineLoginController implements Initializable {
     public HBox hBox;
     public Label header;
     public Label usernameLabel;
-    public JFXTextField username;
+    public TextField username;
     public Label uuidLabel;
-    public JFXTextField uuid;
+    public TextField uuid;
     public JFXButton addButton;
 
     @Override
diff --git a/src/main/resources/assets/minosoft/layout/dialogs/login/mojang.fxml b/src/main/resources/assets/minosoft/layout/dialogs/login/mojang.fxml
index e0201ea25..b1457c4ba 100644
--- a/src/main/resources/assets/minosoft/layout/dialogs/login/mojang.fxml
+++ b/src/main/resources/assets/minosoft/layout/dialogs/login/mojang.fxml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXPasswordField?>
-<?import com.jfoenix.controls.JFXTextField?>
 <?import javafx.geometry.*?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 <HBox xmlns:fx="http://javafx.com/fxml/1" fx:id="hBox" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/11.0.1" fx:controller="de.bixilon.minosoft.gui.main.dialogs.login.MojangLoginController">
@@ -43,21 +41,21 @@
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
             </Label>
-            <JFXTextField fx:id="email" GridPane.columnIndex="1">
+            <TextField fx:id="email" GridPane.columnIndex="1">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
-            </JFXTextField>
+            </TextField>
             <Label fx:id="passwordLabel" text="PASSWORD" GridPane.rowIndex="1">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
             </Label>
-            <JFXPasswordField fx:id="password" minWidth="-Infinity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
+            <PasswordField fx:id="password" minWidth="-Infinity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
-            </JFXPasswordField>
+            </PasswordField>
         </GridPane>
         <JFXButton fx:id="loginButton" disable="true" maxHeight="Infinity" maxWidth="Infinity" mnemonicParsing="false" text="LOGIN" GridPane.rowIndex="3" onAction="#login">
             <GridPane.margin>
diff --git a/src/main/resources/assets/minosoft/layout/dialogs/login/offline.fxml b/src/main/resources/assets/minosoft/layout/dialogs/login/offline.fxml
index efdceb6d0..b11cfa048 100644
--- a/src/main/resources/assets/minosoft/layout/dialogs/login/offline.fxml
+++ b/src/main/resources/assets/minosoft/layout/dialogs/login/offline.fxml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXTextField?>
 <?import javafx.geometry.*?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 <HBox xmlns:fx="http://javafx.com/fxml/1" fx:id="hBox" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/11.0.1" fx:controller="de.bixilon.minosoft.gui.main.dialogs.login.OfflineLoginController">
@@ -42,21 +41,21 @@
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
             </Label>
-            <JFXTextField fx:id="username" GridPane.columnIndex="1">
+            <TextField fx:id="username" GridPane.columnIndex="1">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
-            </JFXTextField>
+            </TextField>
             <Label fx:id="uuidLabel" text="UUID" GridPane.rowIndex="1">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
             </Label>
-            <JFXTextField fx:id="uuid" minWidth="-Infinity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
+            <TextField fx:id="uuid" minWidth="-Infinity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.vgrow="ALWAYS">
                 <GridPane.margin>
                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                 </GridPane.margin>
-            </JFXTextField>
+            </TextField>
         </GridPane>
         <JFXButton fx:id="addButton" disable="true" maxHeight="Infinity" maxWidth="Infinity" mnemonicParsing="false" text="ADD" GridPane.rowIndex="3" onAction="#add">
             <GridPane.margin>