Changeset 623 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 16, 2013, 11:25:00 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.83:

• Dependencies from Mods to Tools supported
• Installed tools can get a menu entry to launch them
• Mods can unlock levels in persist.dat through UnlockLevel-tag

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• AppExecution.java (added)
• QuickAppExecution.java (deleted)
• Settings.java (modified) (2 diffs)
• mods/Mod.java (modified) (8 diffs)
• mods/ModManager.java (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -80 +80 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmd);
+                        res = AppExecution.executeAndWait(cmd);
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -134 +134 @@
                                 Vector<String> res = null;
                                 try {
-                                        res = QuickAppExecution.execute(cmd);
+                                        res = AppExecution.executeAndWait(cmd);
                                 } catch (IOException e) {
                                         e.printStackTrace();

AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java

@@ -26 +26 @@
 
         private HashSet<Type> types = new HashSet<Type>();
+        private boolean tool = false;
         private ECompatiblePlatform platform = null;
         private String version = "";
@@ -36 +37 @@
         private net.oni2.aeinstaller.backend.depot.model.File file = null;
 
+        private File exeFile = null;
+        private File iconFile = null;
+        private String workingDir = "Base";
+
         private HashSet<Integer> incompatibilities = new HashSet<Integer>();
         private HashSet<Integer> dependencies = new HashSet<Integer>();
+        private HashSet<Integer> unlockLevel = new HashSet<Integer>();
 
         private long localTimestamp = 0;
@@ -52 +58 @@
                 packageNumber = nm.getPackageNumber();
                 platform = nm.getPlatform();
+                tool = nm.isTool();
                 for (TaxonomyTerm tt : nm.getTypes()) {
                         Type t = ModManager.getInstance().getTypeByName(tt.getName());
                         types.add(t);
-                        if (!nm.isTool() && !isMandatoryMod() && isValidOnPlatform())
+                        if (!tool && !isMandatoryMod() && isValidOnPlatform())
                                 t.addEntry(this);
                 }
@@ -76 +83 @@
                 File config = new File(getLocalPath(), "Mod_Info.cfg");
                 File aeicfg = new File(getLocalPath(), "aei.cfg");
+                File plain = new File(getLocalPath(), "plain");
                 if (config.exists()) {
                         try {
@@ -131 +139 @@
                                                         }
                                                 }
+                                        } else if (sName.equalsIgnoreCase("UnlockLevel")) {
+                                                String[] levelsS = sVal.split(",");
+                                                for (String s : levelsS) {
+                                                        try {
+                                                                int level = Integer.parseInt(s);
+                                                                unlockLevel.add(level);
+                                                        } catch (NumberFormatException e) {
+                                                                System.err
+                                                                                .format("Mod %05d does contain a non-number UnlockLevel value: '%s'\n",
+                                                                                                packageNumber, s);
+                                                        }
+                                                }
+                                        } else if (sName.equalsIgnoreCase("ExeName")) {
+                                                exeFile = new File(Paths.getEditionBasePath(), sVal);
+                                        } else if (sName.equalsIgnoreCase("WorkingDir")) {
+                                                workingDir = sVal;
+                                        } else if (sName.equalsIgnoreCase("IconName")) {
+                                                iconFile = new File(Paths.getEditionBasePath(), sVal);
                                         }
                                 }
@@ -166 +192 @@
                         }
                 }
+                if (node == null)
+                        tool = plain.exists();
         }
 
@@ -254 +282 @@
 
         /**
+         * @return Is this mod actually a tool?
+         */
+        public boolean isTool() {
+                return tool;
+        }
+
+        /**
          * @return Compatible platforms
          */
@@ -326 +361 @@
         public HashSet<Integer> getDependencies() {
                 return dependencies;
+        }
+
+        /**
+         * @return the levels this mod will unlock
+         */
+        public HashSet<Integer> getUnlockLevels() {
+                return unlockLevel;
+        }
+
+        /**
+         * @return Executable name of this tool
+         */
+        public File getExeFile() {
+                return exeFile;
+        }
+        /**
+         * @return Icon file of this tool
+         */
+        public File getIconFile() {
+                return iconFile;
+        }
+
+        /**
+         * @return Working directory of this tool
+         */
+        public File getWorkingDir() {
+                if (workingDir.equalsIgnoreCase("Exe")) {
+                        if (exeFile != null)
+                                return exeFile.getParentFile();
+                        else
+                                return Paths.getEditionGDF();
+                } else if (workingDir.equalsIgnoreCase("GDF"))
+                        return Paths.getEditionGDF();
+                else
+                        return Paths.getEditionBasePath();
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java

@@ -253 +253 @@
 
         /**
-         * Get a mod by its package number
+         * @return Currently installed tools
+         */
+        public TreeSet<Mod> getInstalledTools() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (int n : Installer.getInstalledTools()) {
+                        res.add(getModByNumber(n));
+                }
+                return res;
+        }
+
+        /**
+         * Get a mod/tool by its package number
          * 
          * @param number
          *            Package number
-         * @return Mod or null
+         * @return Mod/tool or null
          */
         public Mod getModByNumber(int number) {
-                for (Mod m : mods.values()) {
-                        if (m.getPackageNumber() == number)
-                                return m;
-                }
+                if (mods.containsKey(number))
+                        return mods.get(number);
+                if (tools.containsKey(number))
+                        return tools.get(number);
                 return null;
         }