From fc2bdfcc5fc272b28103e8330cc70a229d0860a4 Mon Sep 17 00:00:00 2001
From: XorTroll <xabofdez@gmail.com>
Date: Sun, 27 Aug 2023 13:47:59 +0200
Subject: [PATCH] Remove searchable boxes but support Java 8

---
 emuiigen/pom.xml                  | 25 ++++++++++---------------
 emuiigen/res/main.fxml            | 22 ++++++++++++++++------
 emuiigen/src/ui/MainController.kt |  8 ++++----
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/emuiigen/pom.xml b/emuiigen/pom.xml
index 144eb9a..c07fb14 100644
--- a/emuiigen/pom.xml
+++ b/emuiigen/pom.xml
@@ -19,7 +19,7 @@
         
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-        <kotlin.compiler.jvmTarget>10</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <kotlin.version>1.7.10</kotlin.version>
 
         <javafx.plugin.version>0.0.5</javafx.plugin.version>
@@ -36,21 +36,21 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>linux</classifier>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>win</classifier>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>mac</classifier>
             <scope>compile</scope>
         </dependency>
@@ -58,21 +58,21 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>linux</classifier>
             <scope>compile</scope> 
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>win</classifier>
             <scope>compile</scope> 
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>mac</classifier>
             <scope>compile</scope> 
         </dependency>
@@ -80,21 +80,21 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>linux</classifier>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>win</classifier>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
-            <version>17</version>
+            <version>12</version>
             <classifier>mac</classifier>
             <scope>compile</scope>
         </dependency>
@@ -114,11 +114,6 @@
             <artifactId>json</artifactId>
             <version>20230227</version>
         </dependency>
-        <dependency>
-            <groupId>org.controlsfx</groupId>
-            <artifactId>controlsfx</artifactId>
-            <version>11.1.2</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/emuiigen/res/main.fxml b/emuiigen/res/main.fxml
index 9c789a0..461a41d 100644
--- a/emuiigen/res/main.fxml
+++ b/emuiigen/res/main.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.Separator?>
@@ -12,7 +13,6 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
-<?import org.controlsfx.control.SearchableComboBox?>
 
 <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.xortroll.emuiibo.emuiigen.ui.MainController">
    <children>
@@ -32,13 +32,14 @@
                                           <Button fx:id="AmiiboOpenButton" layoutX="15.0" layoutY="14.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="347.0" text="Open" />
                                           <TextField fx:id="OpenedAmiiboNameText" disable="true" layoutX="15.0" layoutY="63.0" prefHeight="27.0" prefWidth="224.0" promptText="Virtual amiibo name" />
                                           <CheckBox fx:id="OpenedAmiiboUseRandomUuidCheck" disable="true" layoutX="15.0" layoutY="106.0" mnemonicParsing="false" text="Enable UUID randomization" />
-                                          <ListView fx:id="OpenedAmiiboAreaList" disable="true" layoutX="253.0" layoutY="58.0" prefHeight="125.0" prefWidth="505.0" />
+                                          <ListView fx:id="OpenedAmiiboAreaList" disable="true" layoutX="259.0" layoutY="87.0" prefHeight="98.0" prefWidth="501.0" />
                                           <Button fx:id="AmiiboSaveButton" layoutX="372.0" layoutY="14.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="386.0" text="Save" />
+                                          <Label layoutX="259.0" layoutY="63.0" text="Amiibo application areas" />
                                        </children>
                                     </AnchorPane>
                                 </content>
                               </TitledPane>
-                              <TitledPane animated="false" layoutX="14.0" layoutY="249.0" prefHeight="280.0" prefWidth="772.0" text="Misc">
+                              <TitledPane animated="false" layoutX="14.0" layoutY="249.0" prefHeight="280.0" prefWidth="772.0" text="About">
                                 <content>
                                   <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="80.0" prefWidth="677.0">
                                        <children>
@@ -63,6 +64,15 @@
                                                       </AnchorPane>
                                                 </content>
                                               </Tab>
+                                                <Tab text="Application areas">
+                                                  <content>
+                                                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                                         <children>
+                                                            <Label layoutX="14.0" layoutY="42.0" text="An application area is per-game amiibo savedata. Real amiibos only can save data from one game,&#10;while emuiibo's virtual amiibos do not have this restriction.&#10;&#10;If you open an amiibo on the menu above, you will be able to check all the areas the amiibo has, along&#10;with their corresponding game's application ID." />
+                                                         </children>
+                                                      </AnchorPane>
+                                                  </content>
+                                                </Tab>
                                             </tabs>
                                           </TabPane>
                                        </children>
@@ -81,8 +91,8 @@
                                 <content>
                                   <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="543.0" prefWidth="376.0">
                                        <children>
-                                    <SearchableComboBox fx:id="GenerateOneAmiiboSeriesBox" layoutX="15.0" layoutY="14.0" prefHeight="28.0" prefWidth="355.0" />
-                                    <SearchableComboBox fx:id="AmiiboBox" layoutX="26.0" layoutY="54.0" prefHeight="30.0" prefWidth="325.0" />
+                                    <ComboBox fx:id="GenerateOneAmiiboSeriesBox" layoutX="15.0" layoutY="14.0" prefHeight="28.0" prefWidth="355.0" />
+                                    <ComboBox fx:id="AmiiboBox" layoutX="26.0" layoutY="54.0" prefHeight="30.0" prefWidth="325.0" />
                                     <ImageView fx:id="AmiiboImage" fitHeight="376.0" fitWidth="310.0" layoutX="34.0" layoutY="96.0" pickOnBounds="true" preserveRatio="true" />
                                        </children>
                                     </AnchorPane>
@@ -144,7 +154,7 @@
                                 <content>
                                   <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="284.0" prefWidth="402.0">
                                        <children>
-                                          <SearchableComboBox fx:id="GenerateSeriesAmiiboSeriesBox" layoutX="14.0" layoutY="14.0" prefHeight="31.0" prefWidth="369.0" />
+                                          <ComboBox fx:id="GenerateSeriesAmiiboSeriesBox" layoutX="14.0" layoutY="14.0" prefHeight="31.0" prefWidth="369.0" />
                                           <Button fx:id="GenerateSeriesButton" layoutX="13.0" layoutY="234.0" mnemonicParsing="false" prefHeight="32.0" prefWidth="368.0" text="Generate virtual amiibos" />
                                           <CheckBox fx:id="GenerateSeriesUseRandomUuidCheck" layoutX="14.0" layoutY="67.0" mnemonicParsing="false" text="Enable UUID randomization" />
                                           <CheckBox fx:id="GenerateSeriesImageSaveCheck" layoutX="14.0" layoutY="107.0" mnemonicParsing="false" text="Save images" />
diff --git a/emuiigen/src/ui/MainController.kt b/emuiigen/src/ui/MainController.kt
index 641b5b1..57664a6 100644
--- a/emuiigen/src/ui/MainController.kt
+++ b/emuiigen/src/ui/MainController.kt
@@ -7,6 +7,7 @@ import java.io.File
 import java.io.FileInputStream
 import javafx.fxml.FXML
 import javafx.scene.control.Button
+import javafx.scene.control.ComboBox
 import javafx.scene.control.CheckBox
 import javafx.scene.control.Label
 import javafx.scene.control.TextField
@@ -25,7 +26,6 @@ import javafx.beans.value.ChangeListener
 import javafx.beans.binding.Bindings
 import javafx.concurrent.Task
 import javafx.application.HostServices
-import org.controlsfx.control.SearchableComboBox
 import org.apache.commons.io.FileUtils
 import org.apache.commons.net.ftp.FTPClient
 import org.apache.commons.net.ftp.FTPClientConfig
@@ -55,8 +55,8 @@ class MainController {
 
     @FXML lateinit var AboutButton: Button;
     
-    @FXML lateinit var GenerateOneAmiiboSeriesBox: SearchableComboBox<String>;
-    @FXML lateinit var AmiiboBox: SearchableComboBox<String>;
+    @FXML lateinit var GenerateOneAmiiboSeriesBox: ComboBox<String>;
+    @FXML lateinit var AmiiboBox: ComboBox<String>;
     @FXML lateinit var AmiiboImage: ImageView;
     @FXML lateinit var StatusLabel: Label;
 
@@ -79,7 +79,7 @@ class MainController {
 
     @FXML lateinit var GenerateSeriesUseRandomUuidCheck: CheckBox;
     @FXML lateinit var GenerateSeriesImageSaveCheck: CheckBox;
-    @FXML lateinit var GenerateSeriesAmiiboSeriesBox: SearchableComboBox<String>;
+    @FXML lateinit var GenerateSeriesAmiiboSeriesBox: ComboBox<String>;
     @FXML lateinit var GenerateSeriesFtpCheck: CheckBox;
     @FXML lateinit var GenerateSeriesFtpAddress: TextField;
     @FXML lateinit var GenerateSeriesFtpPort: TextField;