Minor code rearrangement, fix a bug causing the existing mods folder popup to always be shown when use custom loader is unticked, and check if the mods folder is not empty as a condition of showing the popup

Author: Justsnoopy30

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=1.0.2
+version=1.0.3
 maven_group=net.hypercubemc
 archives_base_name=Iris-Installer
 

src/main/java/net/hypercubemc/iris_installer/Installer.java

@@ -266,67 +266,63 @@ public void start() {
                     if (!installDir.exists() || !installDir.isDirectory()) installDir.mkdir();
 
                     File modsFolder = getInstallDir().resolve(useCustomLoader ? "iris-reserved" : "mods").toFile();
-                    if (!modsFolder.exists() || !modsFolder.isDirectory()) {
-                        modsFolder.mkdir();
-                    }
+                    File[] modsFolderContents = modsFolder.listFiles();
 
-                    if (!useCustomLoader) {
-                        int result = JOptionPane.showConfirmDialog(frame,"An existing mods folder was found in the selected game directory. Do you want to update/install iris?", "Mods Folder Detected",
-                                JOptionPane.YES_NO_OPTION,
-                                JOptionPane.QUESTION_MESSAGE);
-                        if (result != JOptionPane.YES_OPTION) {
-                            cancelled = true;
+                    if (modsFolderContents != null) {
+                        boolean isEmpty = modsFolderContents.length == 0;
+
+                        if (!useCustomLoader && modsFolder.exists() && modsFolder.isDirectory() && !isEmpty) {
+                            int result = JOptionPane.showConfirmDialog(frame,"An existing mods folder was found in the selected game directory. Do you want to update/install iris?", "Mods Folder Detected",
+                                    JOptionPane.YES_NO_OPTION,
+                                    JOptionPane.QUESTION_MESSAGE);
+                            if (result != JOptionPane.YES_OPTION) {
+                                cancelled = true;
+                            }
                         }
-                    }
 
-                    if (cancelled) {
-                        readyAll();
-                        return;
-                    }
+                        if (!cancelled) {
+                            boolean shownOptifineDialog = false;
+                            boolean failedToRemoveOptifine = false;
 
-                    File[] modsFolderContents = modsFolder.listFiles();
-                    if (modsFolderContents != null) {
-                        boolean shownOptifineDialog = false;
-                        boolean failedToRemoveOptifine = false;
-
-                        for (File mod : modsFolderContents) {
-                            if (mod.getName().toLowerCase().contains("optifine") || mod.getName().toLowerCase().contains("optifabric")) {
-                                if (!shownOptifineDialog) {
-                                    int result = JOptionPane.showOptionDialog(frame,"Optifine was found in your mods folder, but Optifine is incompatible with Iris. Do you want to remove it, or cancel the installation?", "Optifine Detected",
-                                            JOptionPane.DEFAULT_OPTION,
-                                            JOptionPane.WARNING_MESSAGE, null, new String[]{"Yes", "Cancel"}, "Yes");
-
-                                    shownOptifineDialog = true;
-                                    if (result != JOptionPane.YES_OPTION) {
-                                        cancelled = true;
-                                        break;
+                            for (File mod : modsFolderContents) {
+                                if (mod.getName().toLowerCase().contains("optifine") || mod.getName().toLowerCase().contains("optifabric")) {
+                                    if (!shownOptifineDialog) {
+                                        int result = JOptionPane.showOptionDialog(frame,"Optifine was found in your mods folder, but Optifine is incompatible with Iris. Do you want to remove it, or cancel the installation?", "Optifine Detected",
+                                                JOptionPane.DEFAULT_OPTION,
+                                                JOptionPane.WARNING_MESSAGE, null, new String[]{"Yes", "Cancel"}, "Yes");
+
+                                        shownOptifineDialog = true;
+                                        if (result != JOptionPane.YES_OPTION) {
+                                            cancelled = true;
+                                            break;
+                                        }
                                     }
-                                }
 
-                                if (!mod.delete()) failedToRemoveOptifine = true;
+                                    if (!mod.delete()) failedToRemoveOptifine = true;
+                                }
                             }
-                        }
 
-                        if (failedToRemoveOptifine) {
-                            System.out.println("Failed to delete optifine from mods folder");
-                            JOptionPane.showMessageDialog(frame, "Failed to remove optifine from your mods folder, please make sure your game is closed and try again!", "Failed to remove optifine", JOptionPane.ERROR_MESSAGE);
-                            cancelled = true;
+                            if (failedToRemoveOptifine) {
+                                System.out.println("Failed to delete optifine from mods folder");
+                                JOptionPane.showMessageDialog(frame, "Failed to remove optifine from your mods folder, please make sure your game is closed and try again!", "Failed to remove optifine", JOptionPane.ERROR_MESSAGE);
+                                cancelled = true;
+                            }
                         }
 
-                        boolean failedToRemoveIrisOrSodium = false;
-
                         if (!cancelled) {
+                            boolean failedToRemoveIrisOrSodium = false;
+
                             for (File mod : modsFolderContents) {
                                 if (mod.getName().toLowerCase().contains("iris") || mod.getName().toLowerCase().contains("sodium-fabric")) {
                                     if (!mod.delete()) failedToRemoveIrisOrSodium = true;
                                 }
                             }
-                        }
 
-                        if (failedToRemoveIrisOrSodium) {
-                            System.out.println("Failed to remove Iris or Sodium from mods folder to update them!");
-                            JOptionPane.showMessageDialog(frame, "Failed to remove iris and sodium from your mods folder to update them, please make sure your game is closed and try again!", "Failed to prepare mods for update", JOptionPane.ERROR_MESSAGE);
-                            cancelled = true;
+                            if (failedToRemoveIrisOrSodium) {
+                                System.out.println("Failed to remove Iris or Sodium from mods folder to update them!");
+                                JOptionPane.showMessageDialog(frame, "Failed to remove iris and sodium from your mods folder to update them, please make sure your game is closed and try again!", "Failed to prepare mods for update", JOptionPane.ERROR_MESSAGE);
+                                cancelled = true;
+                            }
                         }
                     }
 
@@ -335,6 +331,8 @@ public void start() {
                         return;
                     }
 
+                    if (!modsFolder.exists() || !modsFolder.isDirectory()) modsFolder.mkdir();
+
                     boolean installSuccess = installFromZip(saveLocation);
                     if (installSuccess) {
                         button.setText("Installation succeeded!");