Changeset 1076 for java/installer2/src

Timestamp:

Oct 16, 2017, 5:03:44 PM (7 years ago)

Author:

alloc

Message:

Fixed #112

Location:

java/installer2/src/net/oni2/aeinstaller/backend

Files:

• oni/management/Installer.java (modified) (2 diffs)
• packages/PackageManager.java (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java

@@ -107 +107 @@
                                                         : ""));
                 }
-                log.println("Installing mods:");
+                log.println("Core mods:");
                 for (Package m : mods) {
-                        log.println(String.format(" - %s (%s)", m.getName(), m.getVersion()));
+                        if (m.isCorePackage()) {
+                                log.println(String.format(" - %s (%s)", m.getName(), m.getVersion()));
+                        }
+                }
+                log.println("Selected mods:");
+                for (Package m : mods) {
+                        if (!m.isCorePackage()) {
+                                log.println(String.format(" - %s (%s)", m.getName(), m.getVersion()));
+                        }
                 }
                 log.println();
@@ -220 +228 @@
                                         levels.get(levelN).add(levelF);
                                 } else if (!isSecondaryFile) {
-                                        log.println("\t\t\tNot a level file!?");
+                                        if (fn.equalsIgnoreCase(".DS_Store")) {
+                                                // Ignore OSX bullshit
+                                        } else {
+                                                log.println("\t\t\tNot a level file!?");
+                                        }
                                 }
                         }

java/installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java

@@ -260 +260 @@
                 TreeSet<Package> res = new TreeSet<Package>();
                 for (int n : ToolInstallationList.getInstance().getItems().keySet()) {
-                        res.add(getPackageByNumber(n));
+                        Package p = getPackageByNumber(n);
+                        if (p.isTool()) {
+                                res.add(p);
+                        }
                 }
                 return res;