8.3.6 beta - potential fix for general config resets

Author: Osiris-Team

src/main/java/com/osiris/autoplug/client/Main.java

@@ -268,7 +268,7 @@ public static void main(String[] _args) {
             try {
                 if (generalConfig.autoplug_system_tray.asBoolean()) {
                     now = System.currentTimeMillis();
-                    new MainWindow();
+                    new MainWindow(generalConfig);
                     AL.info("Started system-tray GUI, took " + (System.currentTimeMillis() - now) + "ms");
                 }
             } catch (Exception e) {

src/main/java/com/osiris/autoplug/client/configs/BackupConfig.java

@@ -121,7 +121,7 @@ public BackupConfig() throws IOException, DuplicateKeyException, YamlReaderExcep
                 "./plugins/WorldBorder"
         );
         backup_upload = put(name, "upload", "enable").setDefValues("false").setComments(
-                "Upload the newly generated backup zip to the FTPS/SFTP server.");
+                "Upload the newly generated backup zip to the FTPS/SFTP server or Google Drive.");
         backup_upload_delete_on_complete = put(name, "upload", "delete-on-complete").setDefValues("false").setComments(
                 "Deletes the newly generated backup zip, directly after uploading finishes.");
         backup_upload_host = put(name, "upload", "host").setComments(
@@ -144,7 +144,7 @@ public BackupConfig() throws IOException, DuplicateKeyException, YamlReaderExcep
                 "3. When enabled, your browser will automatically open for authentication\n" +
                 "4. After authentication, a refresh token is saved for future use\n" +
                 "\n" +
-                "Google-Drive Setup:\n" +
+                "Google-Drive Setup (assuming your server is hosted on a regular PC, meaning your system has a GUI and web-browser):\n" +
                 "1. Create a project in Google Cloud Console (or use an existing one) and enter its project_id below: https://developers.google.com/workspace/guides/create-project\n" +
                 "2. Enable the Google Drive API: https://console.cloud.google.com/flows/enableapi?apiid=drive.googleapis.com\n" +
                 "3. Create OAuth 2.0 login panel: https://console.cloud.google.com/auth/branding\n" +
@@ -155,6 +155,10 @@ public BackupConfig() throws IOException, DuplicateKeyException, YamlReaderExcep
                 "8. Your browser will automatically open for authentication, or you can find the URL in the console and open it manually\n" +
                 "9. After authentication, backups will be uploaded to your Google Drive\n" +
                 "\n" +
+                "Google-Drive Setup (assuming your server has no GUI and no web-browser, typical hosted linux server setup):\n" +
+                "1. Ensure you have done all the steps above at least once until step 5\n" +
+                "2. " +
+                "\n" +
                 "!!!IMPORTANT!!! This file contains sensitive data - do not share it with anyone!\n");
         backup_upload_alternatives_google_drive_enable = put(name, "upload", "alternatives", "google-drive", "enable").setDefValues("false");
         backup_upload_alternatives_google_drive_project_id = put(name, "upload", "alternatives", "google-drive", "project-id").setComments(

src/main/java/com/osiris/autoplug/client/configs/GeneralConfig.java

@@ -50,7 +50,8 @@ public GeneralConfig(boolean save) throws IOException, DuplicateKeyException, Ya
         addSingletonConfigFileEventListener(e -> {
 
             try {
-                GD.determineTarget(this);
+                // Saving this file in this event causes an infinite loop, thus don't
+                //GD.determineTarget(this);
             } catch (Exception ex) {
                 AL.warn(ex);
             }
@@ -66,7 +67,7 @@ public GeneralConfig(boolean save) throws IOException, DuplicateKeyException, Ya
             try {
                 if (this.autoplug_system_tray.asBoolean()) {
                     boolean firstStart = MainWindow.GET == null;
-                    new MainWindow();
+                    new MainWindow(this);
                     if (firstStart) AL.info("Started system-tray GUI.");
                 } else {
                     boolean isRunning = MainWindow.GET != null;
@@ -110,7 +111,8 @@ public GeneralConfig(boolean save) throws IOException, DuplicateKeyException, Ya
                 "If you have no GUI its recommended to install software like \"screen\" for virtual terminals and edit the script accordingly.");
         autoplug_target_software = put(name, "autoplug", "target-software").setComments(
                 "Select the target software AutoPlug was installed on.",
-                "Available options: MINECRAFT_CLIENT, MINECRAFT_SERVER, MINDUSTRY_SERVER, OTHER.");
+                "Available options: MINECRAFT_CLIENT, MINECRAFT_SERVER, MINDUSTRY_SERVER, OTHER.",
+                "If value changed -> restart AutoPlug.");
         autoplug_system_tray = put(name, "autoplug", "system-tray", "enable").setDefValues("false");
         autoplug_system_tray_theme = put(name, "autoplug", "system-tray", "theme").setDefValues("light")
                 .setComments("Select between: light, dark and darcula.");

src/main/java/com/osiris/autoplug/client/ui/MainWindow.java

@@ -32,12 +32,17 @@ public class MainWindow extends JFrame {
      * There should always be only one instance of {@link MainWindow}.
      */
     public static MainWindow GET = null;
+    public static final Object lockUI = new Object();
     public TrayIcon trayIcon;
 
-    public MainWindow() throws Exception {
-        if (GET != null) return;
-        GET = this;
-        initTheme();
+    public MainWindow(GeneralConfig generalConfig) throws Exception {
+        synchronized (lockUI){
+            if (GET != null) {
+                GET.close(); // There should only be one, thus stop old
+            }
+            GET = this;
+        }
+        initTheme(generalConfig);
         start();
         this.addKeyListener(new KeyListener() {
             @Override

src/main/java/com/osiris/autoplug/client/utils/GD.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Scanner;
 
 /**
@@ -64,7 +65,7 @@ public static void determineTarget(GeneralConfig generalConfig) throws YamlReade
                 for (String comment : generalConfig.autoplug_target_software.getComments()) {
                     AL.info(comment);
                 }
-                AL.info("Please enter a valid option and press enter:");
+                AL.info("Please enter a valid option for target ("+ Arrays.stream(Target.values()).map(t -> " "+t.name()) +") and press enter:");
                 target = new Scanner(System.in).nextLine();
                 generalConfig.autoplug_target_software.setValues(target);
                 generalConfig.save();