refactor: Set clientMods and javaPath with fallback-list and system e…

…nvironemnt respectively, if the config is empty or an invalid javaPath was specified.
Griefed · Jul 22, 2021 · ff18c5e · ff18c5e
1 parent db6dcd0
commit ff18c5e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/backend/main/java/de/griefed/serverpackcreator/gui/CreateServerPackTab.java b/backend/main/java/de/griefed/serverpackcreator/gui/CreateServerPackTab.java
@@ -848,11 +848,23 @@ public void mouseExited(java.awt.event.MouseEvent evt) {
 
                 textModpackDir.setText(config.getString("modpackDir"));
 
-                textClientMods.setText(CONFIGURATION.buildString(config.getStringList("clientMods").toString()));
+                if (config.getStringList("clientMods").isEmpty()) {
+                    textClientMods.setText(CONFIGURATION.buildString(CONFIGURATION.getFallbackModsList().toString()));
+                    // TODO: Replace with lang key
+                    LOG.debug("Set clientMods from fallback list.");
+                } else {
+                    textClientMods.setText(config.getStringList("clientMods").toString());
+                }
 
                 textCopyDirs.setText(CONFIGURATION.buildString(config.getStringList("copyDirs").toString().replace("\\","/")));
 
-                textJavaPath.setText(config.getString("javaPath"));
+                if (!CONFIGURATION.checkJavaPath(config.getString("javaPath"))) {
+                    textJavaPath.setText(CONFIGURATION.getJavaPathFromSystem(""));
+                    // TODO: Replace with lang key
+                    LOG.debug("Set javaPath from system environment.");
+                } else {
+                    textJavaPath.setText(config.getString("javaPath"));
+                }
 
                 textMinecraftVersion.setText(config.getString("minecraftVersion"));