Save last instance to load it automatically on instance page

Author: danieldieeins

application-main/src/main/java/com/zyneonstudios/application/Application.java

@@ -36,6 +36,7 @@ public class Application {
     public static String version;
     public static String theme;
     public static boolean logOutput;
+    public static String lastInstance;
 
     public Application(String ver) {
         version = ver;
@@ -57,11 +58,17 @@ private void initConfig() {
         config.checkEntry("settings.memory.default", 1024);
         config.checkEntry("settings.logger.debug", false);
         config.checkEntry("settings.appearance.theme","default.dark");
+        config.checkEntry("settings.lastInstance","zyneon::overview");
 
         logOutput = config.getBool("settings.logOutput");
         theme = config.getString("settings.appearance.theme");
         memory = config.getInteger("settings.memory.default");
         startTab = config.getString("settings.starttab");
+        if(config.getString("settings.lastInstance").equalsIgnoreCase("zyneon::overview")) {
+            lastInstance = null;
+        } else {
+            lastInstance = config.getString("settings.lastInstance");
+        }
         if(!Main.getLogger().isDebugEnabled()) {
             Main.getLogger().setDebugEnabled(config.getBool("settings.logger.debug"));
             ShadeMeBaby.getLogger().setDebugEnabled(Main.getLogger().isDebugEnabled());
@@ -198,15 +205,20 @@ public static String getStartURL() {
         } else {
             url = getNewsURL();
         }
-        return url+"?theme="+theme;
+        if(url.contains("?")) {
+            url=url+"&theme="+theme;
+        } else {
+            url=url+"?theme="+theme;
+        }
+        return url;
     }
 
     public static String getNewsURL() {
         return "file://" + Main.getDirectoryPath() + "libs/zyneon/" + Main.version + "/" + "start.html";
     }
 
     public static String getInstancesURL() {
-        return "file://" + Main.getDirectoryPath() + "libs/zyneon/" + Main.version + "/" + "instances.html";
+        return  "file://" + Main.getDirectoryPath() + "libs/zyneon/" + Main.version + "/" + "instances.html";
     }
 
     public static String getSettingsURL() {

application-main/src/main/java/com/zyneonstudios/application/backend/utils/backend/Connector.java

@@ -116,7 +116,7 @@ public void resolveRequest(String request) {
             } catch (IOException e) {
                 Main.getLogger().error(e.getMessage());
             }
-            frame.executeJavaScript("loadTab();");
+            frame.executeJavaScript("loadTab('"+Application.lastInstance+"');");
         } else if (request.contains("sync.login")) {
             try {
                 if (Application.auth.isLoggedIn()) {
@@ -219,6 +219,9 @@ public void resolveRequest(String request) {
                 String command = "syncSettings(\"" + id + "\",\"" + ram + " MB\",\"" + name + "\",\"" + version + "\",\"" + description + "\",\"" + minecraft + "\",\"" + modloader + "\",\"" + mlversion + "\",\"" + icon_ + "\",\"" + logo_ + "\",\"" + background_ + "\");";
                 Main.getLogger().debug("[CONNECTOR] Sending command: "+command);
                 frame.executeJavaScript(command);
+
+                Application.lastInstance = id;
+                Application.config.set("settings.lastInstance",Application.lastInstance);
             }
         } else if (request.contains("button.delete.")) {
             request = request.replace("button.delete.", "");

application-ui/content/assets/zyneon/js/instances.js

@@ -26,10 +26,22 @@ function syncInstanceList() {
     callJavaMethod("sync.instances.list");
 }
 
-function loadTab() {
+function loadTab(tab) {
     const urlParams = new URLSearchParams(window.location.search);
+    let tab_ = "zyneon::overview";
     if(urlParams.get("tab")!=null) {
-        syncInstance(urlParams.get("tab"));
+        tab_ = urlParams.get("tab");
+    } else {
+        if(tab!==null) {
+            if(tab!==undefined) {
+                if(tab!=="null") {
+                    tab_ = tab;
+                }
+            }
+        }
+    }
+    if(document.getElementById(tab)!==null) {
+        syncInstance(tab_);
     }
 }
 

application-ui/content/start.html

@@ -96,7 +96,7 @@
                         <img alt="Zyneon Logo" src="assets/zyneon/images/abstract.png">
                         <div>
                             <h2>Zyneon Application</h2>
-                            <h3>Manage, create and share beloved Minecraft instances, mod packs, resources and more!</h3>
+                            <h3>Manage, create and share beloved Minecraft instances, mod packs, resource pack and much more!</h3>
                         </div>
                     </div>
                 </div>