Index: AE/installer2/doc/outline.txt =================================================================== --- AE/installer2/doc/outline.txt (revision 610) +++ (revision ) @@ -1,67 +1,0 @@ -http://wiki.oni2.net/Anniversary_Edition/Framework - -The globalization process -When first running the Installer, this is a one-time process that takes the -vanilla .dats in Oni's GDF and breaks them into thousands of .oni files in -folders like Edition/GDF/level1_Final. Next, the Installer combines those -folders of .oni files into singleton, large .oni files, one for each level, in -Edition/install/VanillaDats/. Note that no data has been modded yet, just -reformatted. This process of pre-compiling the data results in a large speed -increase over previous recombination methods. - -The mod installation process -Right after this, the Installer prompts you to choose some mods to install. -When you hit the Install button, the Installer starts off by deleting the -existing .dat/.raw(/.sep) files in Edition/GDF to start from a blank slate. It -then iterates through each mod package you selected, and sends a command to -OniSplit to combine the singleton .oni for that level (in VanillaDats) with the -.oni files in whichever packages have files meant for that level. The final -.dat/.raw(/.sep) files are then created in Edition/GDF. - --1) AEI-folder has to be able to be moved to another machine including -downloaded mods, OniSplit etc so that it can be distributed as an offline -install - -*) Open package folder from mod list (also menu options for other folders like -gdf) - -0) OniSplit -Download/Update from depot. Perhaps even without a shipped one -(-> globalization after downloading onisplit) - -1) Dependencies -Would be nice if in the future we could at least give a warning when a mod -requires another that isn't available (and of course allow write dependencies -for the new mods).This would help very much in some mods that require others. -For example the china mod requires about other 3 packages, and it will crash if -they aren't present. This would at least warn the user of that. - -2) Mod-Depot access -Another thing that would be awesome but can be a little tough to program would -be that the installer would show the latest mods from the depot with a short -description, plus maybe the most downloaded mods. In addition install and -download them directly from it would be even more interesting. - -3) Supply new tools -I think the new version should contain the latest oni split version plus maybe -the latest vago/ae tools too. -* Onisplit latest version and scripts vago gui or/and demos's gui and lukas -creator's oni levels unlock should be included. - -4) Switch supplied mods -We should see which mods are more used right now that aren't included with the -edition. For example I see that perceptible blood is kinda popular between the -players, even if the edition already comes with another soft blood version. -Dunno if we should replace that one with the perceptible blood (which is more -anime style in my opinion). - -5) Update supplied mods -There are a lot of outdated mods in the last Edition things like brutal AI, -New Characters and Andrashi Melee System I think, which should be updated to -the last version. - -6) Order in mod-list -AE installer should list mods ordered by numbers rather than by alphabetical -order. Arranging by package numbers makes related packages ordered after each -other and makes it easier to identify which will overwrite which. - Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 610) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 611) @@ -52,4 +52,5 @@ import net.oni2.aeinstaller.backend.oni.InstallProgressListener; import net.oni2.aeinstaller.backend.oni.Installer; +import net.oni2.aeinstaller.backend.oni.OniSplit; import net.oni2.aeinstaller.gui.about.AboutDialog; import net.oni2.aeinstaller.gui.downloadwindow.Downloader; @@ -349,4 +350,32 @@ } + @SuppressWarnings("unused") + private void checkDotNet() { + if (!OniSplit.isDotNETInstalled()) { + HTMLLinkLabel hll = new HTMLLinkLabel(); + String dlUrl = ""; + switch (Settings.getPlatform()) { + case WIN: + switch (Settings.getArchitecture()) { + case X86: + dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe"; + break; + case AMD64: + dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe"; + break; + } + break; + default: + dlUrl = "http://www.go-mono.com/mono-downloads/download.html"; + } + hll.setText(bundle.getString("dotNetMissing.text").replaceAll("%1", + String.format("%s", dlUrl, dlUrl))); + JOptionPane.showMessageDialog(this, hll, + bundle.getString("dotNetMissing.title"), + JOptionPane.ERROR_MESSAGE); + exit(); + } + } + @DoInBackground(progressMessage = "mandatoryFiles.title", cancelable = false, indeterminateProgress = false) private void checkMandatoryFiles(final BackgroundEvent evt) { Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties (revision 610) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties (revision 611) @@ -58,2 +58,6 @@ mandatoryFiles.title=Checking for mandatory files mandatoryToolsInstall.title=Installing mandatory tools + +dotNetMissing.title=.NET is not installed +dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.
Please download and install it:
%1 + Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml (revision 610) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml (revision 611) @@ -6,5 +6,5 @@ locationRelativeTo: null defaultCloseOperation: doNothingOnClose - onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus] + onWindowOpened: [checkDotNet,execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus] onWindowClosing: [saveLocalData,exit] iconImage: img.ae