Remove busted splash

.gitignore

@@ -28,6 +28,7 @@ out/
 ### Mac OS ###
 .DS_Store
 
+### Binaries ###
 /firestar.zip
 /run-linux.sh
 /run-win32.bat
@@ -37,3 +38,4 @@ out/
 /build/
 /.gradle/
 /gradle/
+!/gradle/wrapper/*

.idea/artifacts/firestar_jar.xml

@@ -6,10 +6,14 @@
         <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
       </element>
       <element id="module-output" name="firestar.firestar.main" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20240303/ebb88e8fb5122b7506d5cf1d69f1ccdb790d22a/json-20240303.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.lingala.zip4j/zip4j/2.11.5/4214e396e3891cb19eded3ce5e584cba9032fdc3/zip4j-2.11.5.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.java/java-gui-forms-rt/203.7148.30/f0dbca371a2592689e541be912de6005939f9c7c/java-gui-forms-rt-203.7148.30.jar" path-in-jar="/" />
       <element id="dir-copy" path="$PROJECT_DIR$/firestar/src/main/resources" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.java/java-gui-forms-rt/203.7148.30/f0dbca371a2592689e541be912de6005939f9c7c/java-gui-forms-rt-203.7148.30.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.github.java-diff-utils/java-diff-utils/4.12/1a712a91324d566eef39817fc5c9980eb10c21db/java-diff-utils-4.12.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.lingala.zip4j/zip4j/2.11.5/4214e396e3891cb19eded3ce5e584cba9032fdc3/zip4j-2.11.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.14.0/1ed471194b02f2c6cb734a0cd6f6f107c673afae/commons-lang3-3.14.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-text/1.12.0/66aa90dc099701c4d3b14bd256c328f592ccf0d6/commons-text-1.12.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20240303/ebb88e8fb5122b7506d5cf1d69f1ccdb790d22a/json-20240303.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.netbeans.external/org-apache-commons-io/RELEASE113/815893df5f31da2ece4040fe0a12fd44b577afaf/org-apache-commons-io-RELEASE113.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/libraries/apache_commons_io.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="apache.commons.io" type="repository">
+    <properties maven-id="commons-io:commons-io:2.16.1" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/apache_commons_text.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="apache.commons.text" type="repository">
+    <properties maven-id="org.apache.commons:commons-text:1.12.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/uiDesigner.xml

@@ -32,17 +32,17 @@
       <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
       </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
       <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
         <initial-values>
           <property name="text" value="Label" />
         </initial-values>
       </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
       <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
           <preferred-size width="150" height="-1" />

README.md

@@ -1,47 +1,76 @@
 ![](https://files.worlio.com/users/bonkmaykr/http/git/embed/firestar.png)
 
-**Firestar is a cross-platform Java-based mod manager for WipEout 2048**, which runs on a desktop/laptop computer and aims to allow easy installation of mods for users with very little hassle. It is compatible with both real PSVita hardware, as well as emulators.  
+**Firestar is a cross-platform Java-based mod manager for WipEout 2048**, which runs on a desktop/laptop computer and aims to allow easy installation of mods with very little hassle. It is compatible with both real PSVita hardware, as well as with emulators.
 
-## Get Started: [>> CLICK HERE <<](https://git.worlio.com/bonkmaykr/firestar/wiki)  
+## Get Started: [>> CLICK HERE <<](https://git.worlio.com/bonkmaykr/firestar/wiki)
 
 ![](https://files.worlio.com/users/bonkmaykr/http/git/embed/2024-07-12_15-02.png)
 
 # Installation
 The latest version of Firestar will always be available from [Releases](https://git.worlio.com/bonkmaykr/firestar/releases).  
 If you aren't sure which file to get:
-- **Windows:** Download the latest installer [here](https://files.worlio.com/users/bonkmaykr/tools/firestar/latest/firestar_1.2_installer_windows.exe).
+- **Windows:** Download the latest installer [here](https://screwgravity.net/firestar/builds/stable/tetsuo/firestar_1.3_installer_winnt_x86-64.exe).
 - **Linux:** Install one of the packages from the [Releases](https://git.worlio.com/bonkmaykr/firestar/releases) page:
-    - Ubuntu, Mint, PopOS: `sudo dpkg -i firestar_ver_arch.deb` or `gdebi firestar_ver_arch.deb`
-    - Fedora, Mageia, OpenSUSE, AlmaLinux: `sudo rpm -i firestar-ver-arch.rpm`
-    - Arch, EndeavourOS, CachyOS, Steam Deck: `sudo pacman -U firestar-ver-arch.pkg.tar.zst`  
-- **All Platforms:** Grab the [Portable ZIP](https://files.worlio.com/users/bonkmaykr/tools/firestar/latest/firestar_dekka-1.2_portable.zip), extract it, and run the JAR file.
-  
+  - Ubuntu, Mint, PopOS: `sudo dpkg -i firestar_ver_arch.deb` or `gdebi firestar_ver_arch.deb`
+  - Fedora, Mageia, OpenSUSE, AlmaLinux: `sudo rpm -i firestar-ver-arch.rpm`
+  - Arch, EndeavourOS, CachyOS, Steam Deck: `sudo pacman -U firestar-ver-arch.pkg.tar.zst`
+- **All Platforms:** Grab the [JAR](https://screwgravity.net/firestar/builds/stable/tetsuo/firestar_1.3_portable.jar) and run it.
+
 # System Requirements
 - Windows 8 or newer, Mac OS X 10.14 or older, any modern version of Linux/BSD
-    - If you have a Mac running 10.15 Catalina or newer, you should use Crossover to run the Windows version of Firestar instead.
+  - If you have a Mac running 10.15 Catalina or newer, you should use Crossover to run the Windows version of Firestar instead.
 - Java 17 or above.
 - **Non-Windows systems only**: WINE
 - **Version 1.3 and above only:** [Visual C++ 2012 libraries](http://www.microsoft.com/en-au/download/confirmation.aspx?id=30679)
 - Do NOT install Firestar directly to your PSVita's storage. Some of it's file operations do not play nice with FAT filesystems.
 
+# Building
+You are always free to copy the Firestar source code and compile the latest work-in-progress version for yourself.  
+Firestar uses the Gradle build system. We write our code and perform all our tests on Linux, but these same steps should apply to all major operating systems.
+
+## With Intellij IDEA
+1. Create a new project cloned from this Git repo
+2. Open the run configurations editor by clicking "Default" in the top right corner and selecting "Edit Configurations".
+3. Set the JDK to Java 17, the module to firestar.firestar.main and the main class to Firestar's Main class.
+4. Go to Modify Options > Add before launch task, then add a Gradle "clean" task
+5. Go there again and add a Gradle "build" task
+6. Delete the default build task that has now appeared as step 1.
+7. Save your options and click the Play button to compile and test.
+
+## From the command line
+1. Ensure you have both Git and Gradle installed on your system.
+- Windows: Visit [git-scm.com](https://git-scm.com/downloads) and the [Gradle Installation Guide](https://gradle.org/install/).
+- Linux/BSD: Install the `git` and `gradle` packages from your package manager. For example:
+  - Arch-based: `sudo pacman -Sy git gradle` (if this breaks your computer then run -Syu to rectify it)
+  - Debian-based: `sudo apt install git gradle`
+- Mac: Figure it out! None of us on the dev team use Macs and we can't be assed to.
+2. Open the terminal and clone the git repo. This will download the Firestar source code to a `firestar/` folder in your current working directory.
+
+    ```
+    git clone https://git.worlio.com/bonkmaykr/firestar.git
+    ```
+
+3. `cd` to `firestar/` and run `gradle build` to make a JAR or `gradle run` to test your code immediately.
+- On Windows systems make sure you're running `gradlew.bat` and not the Bash script instead.
+
 # FAQ
 ## Can I use this on a Vita without enso/HEN?
 No. You need a modded Vita in order to use this. Hacking a Vita is super easy these days, but if you don't want to, you can always use Vita3K instead.
 
 ## Where do I download mods?
-There's no #1 place for Firestar mods as of now, but we can give you a few sample mods to test out if you are interested in seeing the program in action:  
+There's no #1 place for Firestar mods as of now, but we can give you a few sample mods to test out if you are interested in seeing the program in action:
 - [XP Rebalance](https://files.worlio.com/users/bonkmaykr/patches/2048/XPhack2.fstar): Reduces the amount of grinding required to level up for players who can't access the online campaign. **Leaderboard safe version!**
 - [Pepsi Mod](https://files.worlio.com/users/bonkmaykr/http/reddit/pepsi_agility.fstar): Gives the FEISAR Agility ship a Pepsi makeover.
 - [Gold AG-SYS Speed](https://files.worlio.com/users/bonkmaykr/patches/2048/gold3.fstar): Better Than Chrome™
 - [Continue?](https://files.worlio.com/users/bonkmaykr/patches/2048/continue.fstar): Allows you to exit the pause menu without taking your thumb off the throttle. By ThatOneBonk
-- [HD Skin](https://files.worlio.com/users/bonkmaykr/patches/2048/hd_skin.fstar): Recolors the UI to look like WipEout HD. By ThatOneBonk 
+- [HD Skin](https://files.worlio.com/users/bonkmaykr/patches/2048/hd_skin.fstar): Recolors the UI to look like WipEout HD. By ThatOneBonk
 - [Custom Soundtrack](https://files.catbox.moe/pcvfxj.fstar): A custom playlist I put together. This music is copyrighted, don't play it on stream
 
 ## What do I need to make my own mods?
-For making your own mods, we recommend grabbing one of the many leaked PS Vita SDKs off of Archive.org since it has many of the tools you will need. I recommend using Photoshop CS5 for textures, since Sony officially provides a texture export plugin for CS5 in their SDK. There is also an included at9tool which can help with replacing sounds and music.  
-  
-Many things like HUDs, custom translations, and even some game variables are kept in XML format and can be edited in any normal text editor like Microsoft Notepad, GNU Nano, GEdit or KWrite. (Please play nice when you're online.)  
-  
+For making your own mods, we recommend grabbing one of the many leaked PS Vita SDKs off of Archive.org since it has many of the tools you will need. I recommend using Photoshop CS5 for textures, since Sony officially provides a texture export plugin for CS5 in their SDK. There is also an included at9tool which can help with replacing sounds and music.
+
+Many things like HUDs, custom translations, and even some game variables are kept in XML format and can be edited in any normal text editor like Microsoft Notepad, GNU Nano, GEdit or KWrite. (Please play nice when you're online.)
+
 As for models and custom tracks, we don't have a concrete way of modifying those just yet, but work is being done on that, so stay tuned.
 
 ## (Non-Windows) About WINE Compatibility
@@ -49,6 +78,21 @@ Firestar itself can run natively on the system, but it needs WINE in order to ha
 **If you are on Mac OS X you will need an older OS version that is still compatible with 32-bit applications.**
 
 # Developer Commentary
+## Programmer SOP
+When adding new features to Firestar, the Screw Gravity! team (loosely) follows this procedure:
+1. The developer prototypes the feature, in part or in full, on a Linux system.
+2. After completion, a QEMU/KVM running Windows 10 w/ VC++ 2012 libs and the latest JDK is deployed to test Firestar on.
+3. Code refactoring is done to account for Windows bugs. 
+4. The final commit is pushed.
+
+Try to stick to these conventions:
+- Avoid allowing the user to interact with the main window (MissPiggy.java) while another menu is open that alters any data, and keep this window Always-on-top. This is usually done by passing the master JFrame as a parameter to the child and telling it to freeze the parent's JFrame until the user closes that menu.
+- Keep formatting consistent and readable. 
+    - `if` statements should have a space separating the conditions and code block.
+    - Use tabs instead of repeat spaces for indentation where possible and keep one indentation per layer, avoid flattening unless appropriate.
+    - Split up long equations and statements into new lines with an operator at the start of the new line.
+    - Divide really long functions into paragraph for certain major steps.
+
 ## Third Party Code
 Firestar is built on top of the following additional software:
 - *[WINE](https://www.winehq.org/), for running the below applications across platforms.
@@ -58,20 +102,20 @@ Firestar is built on top of the following additional software:
 - [pkg2zip](https://github.com/mmozeiko/pkg2zip) & [psvpfsparser](https://github.com/motoharu-gosuto/psvpfstools), for (legal) asset decryption from Playstation Network.
 - [libcurl](https://curl.se/libcurl/), allows psvpfsparser to communicate with Henkaku's F00D server.
 - psp2psarc, Sony's proprietary PSARC compression/decompression utility.
-- at9tool, Sony's proprietary ATRAC9 codec.  
-  
+- at9tool, Sony's proprietary ATRAC9 codec.
+
 *_WINE, ffmpeg, and the Java Runtime are pulled as package dependencies on Linux systems._  
-†_Libraries baked directly into the executable._  
+†_Libraries baked directly into the executable._
+
+All of these, save for psp2psarc, appear in Tetsuo (1.3) and onwards. The licenses for Sony's psp2psarc and at9tool are polar opposite from Firestar's own GPL, so you should not expect Firestar to be a completely "libre" application (but then again, you're a WipEout player, the free software movement clearly isn't a huge concern). The open source nature of Firestar is provided with the hopes of allowing others to critique, audit, and improve upon the software, not necessarily for idealogical reasons.
 
-All of these, save for psp2psarc, appear in Tetsuo (1.3) and onwards. The licenses for Sony's psp2psarc and at9tool are polar opposite from Firestar's own GPL, so you should not expect Firestar to be a completely "libre" application (but then again, you're a WipEout player, the free software movement clearly isn't a huge concern). The open source nature of Firestar is provided with the hopes of allowing others to critique, audit, and improve upon the software, not necessarily for idealogical reasons.  
-  
 Ideally, in the future, all of this functionality can be built into Firestar natively without any fancy tricks.
 ## Why use a leaked Playstation SDK?
 Because many third-party programs for opening PSARC files either have no ability to create new ones or are prone to corruption bugs. Using the one made by the developers of the file format is the best option as it's what the game developers would have used. Obviously this creates all kinds of legal grey areas, so I can't distribute Sony's proprietary software next to my code. It's downloaded separately during the setup process.
 
 ## Why Java?
-Cross-platform support with no hassle, a built-in UI framework, and I don't need to sell my soul like every Electron or React 'Native' developer is doing these days.  
-  
+Cross-platform support with no hassle, a built-in UI framework, and I don't need to sell my soul like every Electron or React 'Native' developer is doing these days.
+
 ## Why the name "Firestar"?
 Firestar was a secret track in the original WipEout which you unlocked after beating the game at least once, the mod manager is just named after that. Major versions are named after pilots or tracks. Internal class names are named after Muppets characters as this is the same naming convention that Sony used to codename parts inside the PSVita's SOC.
 

firestar/build.gradle

@@ -17,7 +17,9 @@ configurations {
 dependencies {
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.11.5'
     implementation group: 'org.json', name: 'json', version: '20240303'
-    implementation "io.github.java-diff-utils:java-diff-utils:4.12"
+    implementation group: 'io.github.java-diff-utils', name: 'java-diff-utils', version: '4.12'
+	implementation group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
+    implementation group: 'org.netbeans.external', name: 'org-apache-commons-io', version: 'RELEASE113'
 
     implementation 'com.jetbrains.intellij.java:java-gui-forms-rt:203.7148.30'
     antTask 'com.jetbrains.intellij.java:java-compiler-ant-tasks:203.7148.30'
@@ -30,14 +32,15 @@ java {
 }
 
 jar {
-  manifest {
-    attributes(
-      'Main-Class': 'Main'
-    )
-  }
-  from {
-    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-  }
+	manifest {
+		attributes(
+			'Main-Class': 'Main'
+		)
+	}
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	from {
+		configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+	}
 }
 
 application {

firestar/src/main/java/Beaker.form

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Beaker">
+  <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="772" height="129"/>
+    </constraints>
+    <properties>
+      <background color="-2271221"/>
+    </properties>
+    <border type="none"/>
+    <children>
+      <grid id="20b72" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="8" bottom="0" right="8"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="-1" height="20"/>
+            <preferred-size width="-1" height="80"/>
+            <maximum-size width="-1" height="80"/>
+          </grid>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <focusable value="false"/>
+          <font size="8"/>
+          <foreground color="-1"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <grid id="60002" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <opaque value="false"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <component id="9c218" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <focusable value="false"/>
+                  <font size="10"/>
+                  <foreground color="-1"/>
+                  <text value="© 2025 Canithesis Interactive"/>
+                </properties>
+              </component>
+              <component id="4c79f" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <font size="10"/>
+                  <foreground color="-1"/>
+                  <text value="This program is not endorsed by Sony Computer Entertainment."/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+          <grid id="da84a" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <opaque value="false"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <component id="c04e4" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <focusable value="false"/>
+                  <font size="10"/>
+                  <foreground color="-1"/>
+                  <text value="https://screwgravity.net/firestar/"/>
+                </properties>
+              </component>
+              <component id="b7dd0" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <font size="10"/>
+                  <foreground color="-1"/>
+                  <text value="Developed and GNU'd by bonkmaykr. FScript thanx to Wirlaburla"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <component id="19b7a" class="javax.swing.JLabel" binding="splashImg">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="640" height="400"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

firestar/src/main/java/Beaker.java

@@ -0,0 +1,59 @@
+/*
+ *     Firestar Mod Manager
+ *     Copyright (C) 2025  Canithesis Interactive
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+
+import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
+
+public class Beaker {
+    Image logo;
+    private JLabel splashImg;
+    JFrame frame = new JFrame();
+    JPanel frameContainer;
+
+    public Beaker() throws InterruptedException {
+        try {
+            logo = ImageIO.read(Main.class.getResourceAsStream("/splash"+(int)(Math.random()*10)+".png")).getScaledInstance(640, 400, Image.SCALE_SMOOTH);
+        } catch (IOException e) {
+            System.out.println("ERROR: Uhhhhhhhhhhh........... what?");
+            return;
+        }
+
+        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+        splashImg.setIcon(new ImageIcon(logo));splashImg.setText("");
+
+        // display window
+        frame.setSize(640, 450);
+        frame.setTitle("Firestar Mod Manager");
+        frame.setUndecorated(true);
+        frame.setResizable(false);
+        frame.setAlwaysOnTop(true);
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        frame.setLayout(new GridLayout());
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+
+        Thread.sleep(3000);
+
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        frame.dispose();
+    }
+}

firestar/src/main/java/Bert.form

@@ -63,7 +63,7 @@
                 <properties>
                   <font name="Exo 2"/>
                   <foreground color="-1"/>
-                  <text value=" If you add/remove DLC in the future, you will need to change this setting again."/>
+                  <text value="Downloading a game update will automatically download its previous versions."/>
                 </properties>
               </component>
             </children>
@@ -108,7 +108,7 @@
               </component>
             </children>
           </grid>
-          <grid id="1000f" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="1000f" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -120,55 +120,226 @@
             </properties>
             <border type="none"/>
             <children>
-              <component id="ec9c0" class="javax.swing.JCheckBox" binding="patchCheck">
-                <constraints>
-                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <background color="-15128227"/>
-                  <font name="Exo 2"/>
-                  <foreground color="-1"/>
-                  <horizontalTextPosition value="11"/>
-                  <text value="Updates"/>
-                </properties>
-              </component>
-              <component id="a6e9" class="javax.swing.JCheckBox" binding="baseCheck">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <background color="-15128227"/>
-                  <font name="Exo 2"/>
-                  <foreground color="-1"/>
-                  <horizontalTextPosition value="10"/>
-                  <text value="Base game"/>
-                </properties>
-              </component>
               <component id="f3723" class="javax.swing.JCheckBox" binding="hdCheck">
                 <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <background color="-15128227"/>
+                  <focusPainted value="false"/>
                   <font name="Exo 2"/>
                   <foreground color="-1"/>
                   <horizontalTextPosition value="10"/>
+                  <opaque value="false"/>
                   <text value="HD Add-On Pack"/>
+                  <verticalTextPosition value="0"/>
                 </properties>
               </component>
               <component id="5ed0c" class="javax.swing.JCheckBox" binding="furyCheck">
                 <constraints>
-                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <background color="-15128227"/>
+                  <focusPainted value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
+                  <horizontalTextPosition value="11"/>
+                  <opaque value="false"/>
+                  <selected value="false"/>
+                  <text value="Fury Add-On Pack"/>
+                  <verticalTextPosition value="0"/>
+                </properties>
+              </component>
+              <grid id="afeb1" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="1" anchor="2" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <background color="-15128227"/>
+                  <opaque value="false"/>
+                </properties>
+                <border type="none"/>
+                <children>
+                  <component id="6337e" class="javax.swing.JRadioButton" binding="baseCheck">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <background color="-15128227"/>
+                      <focusPainted value="false"/>
+                      <font name="Exo 2"/>
+                      <foreground color="-1"/>
+                      <horizontalAlignment value="0"/>
+                      <horizontalTextPosition value="11"/>
+                      <opaque value="false"/>
+                      <text value="Base Game"/>
+                    </properties>
+                  </component>
+                  <component id="5c733" class="javax.swing.JRadioButton" binding="patchCheck2">
+                    <constraints>
+                      <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <background color="-15128227"/>
+                      <focusPainted value="false"/>
+                      <font name="Exo 2"/>
+                      <foreground color="-1"/>
+                      <label value="v1.04 (Latest)"/>
+                      <opaque value="false"/>
+                      <selected value="true"/>
+                      <text value="v1.04 (Latest)"/>
+                    </properties>
+                  </component>
+                  <component id="f9b10" class="javax.swing.JRadioButton" binding="patchCheck1">
+                    <constraints>
+                      <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <background color="-15128227"/>
+                      <focusPainted value="false"/>
+                      <font name="Exo 2"/>
+                      <foreground color="-1"/>
+                      <opaque value="false"/>
+                      <text value="v1.01+"/>
+                    </properties>
+                  </component>
+                  <component id="826d4" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <background color="-15128227"/>
+                      <font name="Exo 2"/>
+                      <foreground color="-1"/>
+                      <opaque value="false"/>
+                      <text value="Select Game Version:"/>
+                    </properties>
+                  </component>
+                  <component id="26170" class="javax.swing.JCheckBox" binding="skipBaseCheck">
+                    <constraints>
+                      <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <background color="-15128227"/>
+                      <enabled value="false"/>
+                      <focusPainted value="false"/>
+                      <font name="Exo 2"/>
+                      <foreground color="-1"/>
+                      <label value="Don't redownload existing core game files"/>
+                      <text value="Don't redownload existing core game files"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <component id="45b94" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="2" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <background color="-15128227"/>
                   <font name="Exo 2"/>
                   <foreground color="-1"/>
-                  <horizontalTextPosition value="11"/>
-                  <selected value="false"/>
-                  <text value="Fury Add-On Pack"/>
+                  <opaque value="false"/>
+                  <text value="Select DLC Packs:"/>
                 </properties>
               </component>
+              <grid id="d53a4" binding="installedList" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="0" column="0" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <focusable value="false"/>
+                  <opaque value="false"/>
+                </properties>
+                <border type="line" title="Installed Packs" title-justification="2" title-position="1">
+                  <font name="Exo 2"/>
+                  <title-color color="-1"/>
+                  <color color="-1"/>
+                </border>
+                <children>
+                  <grid id="e1f58" binding="installedListMargin" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                    <margin top="4" left="16" bottom="4" right="16"/>
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <focusable value="false"/>
+                      <opaque value="false"/>
+                    </properties>
+                    <border type="none"/>
+                    <children>
+                      <component id="74ba9" class="javax.swing.JLabel" binding="ipcBase">
+                        <constraints>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <font name="Exo 2"/>
+                          <foreground color="-1"/>
+                          <horizontalAlignment value="2"/>
+                          <horizontalTextPosition value="11"/>
+                          <icon value="lightNegative.png"/>
+                          <text value="Base Game"/>
+                        </properties>
+                      </component>
+                      <component id="afce0" class="javax.swing.JLabel" binding="ipcPatch1">
+                        <constraints>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <font name="Exo 2"/>
+                          <foreground color="-1"/>
+                          <horizontalAlignment value="2"/>
+                          <horizontalTextPosition value="11"/>
+                          <icon value="lightNegative.png"/>
+                          <text value="Update v1.01"/>
+                        </properties>
+                      </component>
+                      <component id="209d6" class="javax.swing.JLabel" binding="ipcPatch2">
+                        <constraints>
+                          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <font name="Exo 2"/>
+                          <foreground color="-1"/>
+                          <horizontalAlignment value="2"/>
+                          <horizontalTextPosition value="11"/>
+                          <icon value="lightNegative.png"/>
+                          <text value="Update v1.04"/>
+                        </properties>
+                      </component>
+                      <component id="dbb59" class="javax.swing.JLabel" binding="ipcDlcHD">
+                        <constraints>
+                          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <font name="Exo 2"/>
+                          <foreground color="-1"/>
+                          <horizontalAlignment value="2"/>
+                          <horizontalTextPosition value="11"/>
+                          <icon value="lightNegative.png"/>
+                          <text value="HD Add-On Pack"/>
+                        </properties>
+                      </component>
+                      <component id="c1b3f" class="javax.swing.JLabel" binding="ipcDlcFury">
+                        <constraints>
+                          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <font name="Exo 2"/>
+                          <foreground color="-1"/>
+                          <horizontalAlignment value="2"/>
+                          <horizontalTextPosition value="11"/>
+                          <icon value="lightNegative.png"/>
+                          <text value="Fury Add-On Pack"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </grid>
+                </children>
+              </grid>
             </children>
           </grid>
         </children>

firestar/src/main/java/Bert.java

@@ -16,272 +16,354 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.util.ArrayList;
 
 public class Bert implements ActionListener {
-    BufferedImage windowIcon;
-    public JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JButton cancelbtn;
-    private JButton downloadbtn;
-    private JCheckBox patchCheck;
-    private JCheckBox baseCheck;
-    private JCheckBox hdCheck;
-    private JCheckBox furyCheck;
-    private ButtonGroup radios = new ButtonGroup();
+	public JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JButton cancelbtn;
+	private JButton downloadbtn;
+	private JRadioButton baseCheck;
+	private JRadioButton patchCheck1;
+	private JRadioButton patchCheck2;
+	private JCheckBox hdCheck;
+	private JCheckBox furyCheck;
+	private JCheckBox skipBaseCheck;
+	private JPanel installedList;
+	private JLabel ipcBase;
+	private JLabel ipcPatch1;
+	private JLabel ipcPatch2;
+	private JLabel ipcDlcHD;
+	private JLabel ipcDlcFury;
+	private JPanel installedListMargin;
+	private ButtonGroup radios = new ButtonGroup();
 
-    private JFrame invoker;
+	private JFrame invoker;
 
-    private boolean wilkinsDownloadFinished = false;
+	private boolean wilkinsDownloadFinished = false;
 
-    public Bert(JFrame parent) {
-        parent.setEnabled(false);
-        this.invoker = parent;
+	public Bert(JFrame parent) {
+		parent.setEnabled(false);
+		this.invoker = parent;
 
-        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
 
-        frame.setSize(600, 300); // 1280 800
-        frame.setTitle("Download Assets");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(parent);
-        frame.setAlwaysOnTop(true);
+		frame.setSize(600, 300); // 1280 800
+		frame.setTitle("Download Assets");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(parent);
+		frame.setAlwaysOnTop(true);
 
-        cancelbtn.addActionListener(this);
-        downloadbtn.addActionListener(this);
+		radios.add(baseCheck);
+		radios.add(patchCheck1);
+		radios.add(patchCheck2);
 
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
+		cancelbtn.addActionListener(this);
+		downloadbtn.addActionListener(this);
+		baseCheck.addActionListener(this);
+		patchCheck1.addActionListener(this);
+		patchCheck2.addActionListener(this);
 
-        frame.setVisible(true);
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                parent.setEnabled(true);
-                e.getWindow().dispose();
-            }
-        });
+		refreshChecklist();
 
-        if (!new File(Main.inpath + "pkg2zip.exe").exists() || !new File(Main.inpath + "psvpfsparser.exe").exists()) {
-            JOptionPane.showMessageDialog(frame, "The decryption tool is missing.\nPlease select \"Get Dependencies\" in the Options menu.", "Error", JOptionPane.ERROR_MESSAGE);
-            invoker.setEnabled(true);
-            frame.dispose();
-        }
-    }
+		frame.setIconImage(Main.windowIcon);
 
-    public boolean reportWhenDownloaded(WilkinsCoffee setup) {
-        while (frame.isActive() || !wilkinsDownloadFinished) {}
-        if (wilkinsDownloadFinished) { // intellij please shut the everloving FUCK up DON'T do this again or i will skin you alive
-            return true;
-        } else {
-            return false;
-        }
-    }
+		frame.setVisible(true);
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				parent.setEnabled(true);
+				e.getWindow().dispose();
+			}
+		});
 
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == cancelbtn) {
-            invoker.setEnabled(true);
-            frame.dispose();
-        } else if (actionEvent.getSource() == downloadbtn) {
-            ArrayList<Main.ArcTarget> arcs = new ArrayList<Main.ArcTarget>();
-            ArrayList<Main.ArcKey> keys = new ArrayList<Main.ArcKey>();
-            if (baseCheck.isSelected()) {
-                arcs.add(Main.ArcTarget.BASE);
-                keys.add(Main.ArcKey.BASE);
-                System.out.println("Begin download of data (Game version 1.0)");
-            }
-            if (patchCheck.isSelected()) {
-                arcs.add(Main.ArcTarget.LATEST);
-                keys.add(Main.ArcKey.LATEST);
-                System.out.println("Begin download of data2 (Game version 1.04)");
-            }
-            if (hdCheck.isSelected()) {
-                arcs.add(Main.ArcTarget.ADDON_HD);
-                keys.add(Main.ArcKey.ADDON_HD);
-                System.out.println("Begin download of dlc1 (HD DLC)");
-            }
-            if (furyCheck.isSelected()) {
-                arcs.add(Main.ArcTarget.ADDON_HD_FURY);
-                keys.add(Main.ArcKey.ADDON_HD_FURY);
-                System.out.println("Begin download of dlc2 (Fury DLC)");
-            }
-            if (arcs.isEmpty()) {
-                JOptionPane.showMessageDialog(invoker, "Select one or more asset packs.", "Error", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
+		if (!new File(Main.inpath + "pkg2zip.exe").exists() || !new File(Main.inpath + "psvpfsparser.exe").exists()) {
+			JOptionPane.showMessageDialog(frame, "The decryption tool is missing.\nPlease select \"Get Dependencies\" in the Options menu.", "Error", JOptionPane.ERROR_MESSAGE);
+			invoker.setEnabled(true);
+			frame.dispose();
+		}
 
-            frame.dispose();
-            invoker.setVisible(false);
+		if (new File(Main.inpath + "data2.psarc").exists())
+			skipBaseCheck.setEnabled(true);
+	}
 
-            Thread downloaderPopupThread = new Thread(new Runnable() { // run on separate thread to prevent GUI freezing
-                @Override
-                public void run() {
-                    for (Main.ArcTarget type : arcs) {
-                        String key = "";
-                        String arcname = "";
-                        switch (type) {
-                            case BASE :
-                                key = Main.ArcKey.BASE.toString();
-                                arcname = "Base game";
-                                break;
-                            case LATEST :
-                                key = Main.ArcKey.LATEST.toString();
-                                arcname = "Updates";
-                                break;
-                            case ADDON_HD :
-                                key = Main.ArcKey.ADDON_HD.toString();
-                                arcname = "HD Add-On Pack";
-                                break;
-                            case ADDON_HD_FURY :
-                                key = Main.ArcKey.ADDON_HD_FURY.toString();
-                                arcname = "Fury Add-On Pack";
-                                break;
-                        }
-                        if (key.isEmpty()) {
-                            System.out.println("Internal Error: Bert got dementia. Get a programmer!");
-                            JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                            return;
-                        }
+	public boolean reportWhenDownloaded(WilkinsCoffee setup) {
+		while (frame.isActive() || !wilkinsDownloadFinished) {}
+		if (wilkinsDownloadFinished) { // intellij please shut the everloving FUCK up DON'T do this again or i will skin you alive
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-                        // download file
-                        Fozzie downloaderHandler = new Fozzie();
-                        boolean downloader = downloaderHandler.DownloadFile(type.toString(), Main.inpath, "asset.pkg", arcname);
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		if (actionEvent.getSource() == baseCheck)
+			skipBaseCheck.setEnabled(new File(Main.inpath + "data.psarc").exists()); else
+		if (actionEvent.getSource() == patchCheck1)
+			skipBaseCheck.setEnabled(new File(Main.inpath + "data1.psarc").exists()); else
+		if (actionEvent.getSource() == patchCheck2)
+			skipBaseCheck.setEnabled(new File(Main.inpath + "data2.psarc").exists()); else
+		if (actionEvent.getSource() == cancelbtn) {
+			invoker.setEnabled(true);
+			frame.dispose();
+		} else if (actionEvent.getSource() == downloadbtn) {
+			ArrayList<Main.ArcTarget> arcs = new ArrayList<Main.ArcTarget>();
+			ArrayList<Main.ArcKey> keys = new ArrayList<Main.ArcKey>();
 
-                        if (!downloader) {
-                            // cleanup
-                            new File(Main.inpath + "asset.pkg").delete();
+			// Always download predecessors to ensure no missing files
+			// Probably not necessary since I will be adding selective extraction to Gonzo,
+			// and throw errors when a lower PSARC doesn't exist, but there's no real reason not to.
+			//
+			// Of course, to avoid additional download times, we should probably
+			// avoid adding to the download list if a file already exists, unless explicitly
+			// selected (the exact radio button). The user can redownload one at a time
+			// but Firestar will not overwrite existing PSARCs otherwise.
+			if (baseCheck.isSelected()) { // I have the base game
+				if (!skipBaseCheck.isSelected() || !new File(Main.inpath + "data.psarc").exists()) {
+					arcs.add(Main.ArcTarget.BASE);
+					keys.add(Main.ArcKey.BASE);
+					System.out.println("Queued download of data (Game version 1.0)");
+				}
+			}
+			if (patchCheck1.isSelected()) { // I updated it once after it came out and then didn't turn my vita on for thousands of years
+				if (!new File(Main.inpath + "data.psarc").exists()) {
+					arcs.add(Main.ArcTarget.BASE);
+					keys.add(Main.ArcKey.BASE);
+					System.out.println("Queued download of data (Game version 1.0)");
+				}
+				if (!skipBaseCheck.isSelected() || !new File(Main.inpath + "data1.psarc").exists()) {
+					arcs.add(Main.ArcTarget.FIRST);
+					keys.add(Main.ArcKey.FIRST);
+					System.out.println("Queued download of data1 (Game version 1.01)");
+				}
+			}
+			if (patchCheck2.isSelected()) { // I'm a normal fucking person
+				if (!new File(Main.inpath + "data.psarc").exists()) {
+					arcs.add(Main.ArcTarget.BASE);
+					keys.add(Main.ArcKey.BASE);
+					System.out.println("Queued download of data (Game version 1.0)");
+				}
+				if (!new File(Main.inpath + "data1.psarc").exists()) {
+					arcs.add(Main.ArcTarget.FIRST);
+					keys.add(Main.ArcKey.FIRST);
+					System.out.println("Queued download of data1 (Game version 1.01)");
+				}
+				if (!skipBaseCheck.isSelected() || !new File(Main.inpath + "data2.psarc").exists()) {
+					arcs.add(Main.ArcTarget.LATEST);
+					keys.add(Main.ArcKey.LATEST);
+					System.out.println("Queued download of data2 (Game version 1.04)");
+				}
+			}
 
-                            // restore controls
-                            invoker.setEnabled(true);
-                            invoker.setVisible(true);
-                            invoker.toFront();
-                            invoker.repaint();
-                            return;
-                        }
+			// DLC are installed arbitrarily, separate of the game, and can remain as checkboxes with the old logic.
+			// Likewise, the old overwrite policy applies. If the user selects these, it WILL download with no question.
+			if (hdCheck.isSelected()) {
+				arcs.add(Main.ArcTarget.ADDON_HD);
+				keys.add(Main.ArcKey.ADDON_HD);
+				System.out.println("Queued download of dlc1 (HD DLC)");
+			}
+			if (furyCheck.isSelected()) {
+				arcs.add(Main.ArcTarget.ADDON_HD_FURY);
+				keys.add(Main.ArcKey.ADDON_HD_FURY);
+				System.out.println("Queued download of dlc2 (Fury DLC)");
+			}
+			if (arcs.isEmpty()) {
+				frame.setVisible(false);
+				JOptionPane.showMessageDialog(invoker, "Select one or more asset packs.", "Error", JOptionPane.ERROR_MESSAGE);
+				frame.setVisible(true);
+				return;
+			}
 
-                        // dump contents
-                        System.out.println("Extracting " + arcname);
-                        Fozzie popup = new Fozzie();
-                        popup.displayTextOnly("Extracting " + arcname + "...", "Extracting");
-                        try {
-			    Process p = Main.exec(new String[]{"pkg2zip.exe", "-x", "asset.pkg", key.toString()}, Main.inpath);
-                            InputStream debugin = new BufferedInputStream(p.getInputStream());
-                            OutputStream debugout = new BufferedOutputStream(System.out);
-                            int c;
-                            while ((c = debugin.read()) != -1) {
-                                debugout.write(c);
-                            }
-                            debugin.close();
-                            debugout.close();
-                            p.waitFor();
-                        } catch (Exception e) {
-                            System.out.println(e.getMessage());
-                            JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                            new File(Main.inpath + "asset.pkg").delete();
-                            invoker.setEnabled(true);
-                            invoker.setVisible(true);
-                            invoker.toFront();
-                            invoker.repaint();
-                            return;
-                        }
+			frame.dispose();
+			invoker.setVisible(false);
 
-                        // decrypt
-                        System.out.println("Decrypting asset.pkg");
-                        String extracted;
-                        String name;
-                        if (type == Main.ArcTarget.BASE) {
-                            extracted = "app/PCSA00015";
-                            name = "data.psarc";
-                        } else if (type == Main.ArcTarget.LATEST) {
-                            extracted = "patch/PCSA00015";
-                            name = "data2.psarc";
-                        } else if (type == Main.ArcTarget.ADDON_HD) {
-                            extracted = "addcont/PCSA00015/DLC1W2048PACKAGE";
-                            name = "dlc1.psarc";
-                        } else if (type == Main.ArcTarget.ADDON_HD_FURY) { // this is not "always true" - intellij is actually very dumj
-                            extracted = "addcont/PCSA00015/DLC2W2048PACKAGE";
-                            name = "dlc2.psarc";
-                        } else {
-                            System.out.println("Internal Error: Bert got dementia. Get a programmer!");
-                            JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                            new File(Main.inpath + "asset.pkg").delete();
-                            Main.deleteDir(new File(Main.inpath + "app/"));
-                            Main.deleteDir(new File(Main.inpath + "patch/"));
-                            Main.deleteDir(new File(Main.inpath + "addcont/"));
-                            invoker.setEnabled(true);
-                            invoker.setVisible(true);
-                            invoker.toFront();
-                            invoker.repaint();
-                            return;
-                        }
+			Thread downloaderPopupThread = new Thread(new Runnable() { // run on separate thread to prevent GUI freezing
+				@Override
+				public void run() {
+					for (Main.ArcTarget type : arcs) {
+						String key = "";
+						String arcname = "";
+						switch (type) {
+							case BASE :
+								key = Main.ArcKey.BASE.toString();
+								arcname = "Base game";
+								break;
+							case FIRST :
+								key = Main.ArcKey.FIRST.toString();
+								arcname = "Update 1.01";
+								break;
+							case LATEST :
+								key = Main.ArcKey.LATEST.toString();
+								arcname = "Update 1.04";
+								break;
+							case ADDON_HD :
+								key = Main.ArcKey.ADDON_HD.toString();
+								arcname = "HD Add-On Pack";
+								break;
+							case ADDON_HD_FURY :
+								key = Main.ArcKey.ADDON_HD_FURY.toString();
+								arcname = "Fury Add-On Pack";
+								break;
+						}
+						if (key.isEmpty()) {
+							System.out.println("Internal Error: Bert got dementia. Get a programmer!");
+							JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+							return;
+						}
 
-                        popup.setText("<html>Decrypting protected PFS:<br/>" + extracted + "</html>", "Decrypting");
+						// download file
+						Fozzie downloaderHandler = new Fozzie();
+						boolean downloader = downloaderHandler.DownloadFile(type.toString(), Main.inpath, "asset.pkg", arcname);
 
-                        try {
-			    Process p = Main.exec(new String[]{"psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, Main.inpath);
-                            InputStream debugin = new BufferedInputStream(p.getInputStream());
-                            OutputStream debugout = new BufferedOutputStream(System.out);
-                            int c;
-                            while ((c = debugin.read()) != -1) {
-                                debugout.write(c);
-                            }
-                            debugin.close();
-                            debugout.close();
-                            p.waitFor();
-                        } catch (Exception e) {
-                            System.out.println(e.getMessage());
-                            JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                            new File(Main.inpath + "asset.pkg").delete();
-                            Main.deleteDir(new File(Main.inpath + "app/"));
-                            Main.deleteDir(new File(Main.inpath + "patch/"));
-                            Main.deleteDir(new File(Main.inpath + "addcont/"));
-                            invoker.setEnabled(true);
-                            invoker.setVisible(true);
-                            invoker.toFront();
-                            invoker.repaint();
-                            return;
-                        }
+						if (!downloader) {
+							// cleanup
+							new File(Main.inpath + "asset.pkg").delete();
 
-                        popup.setText("Deleting temporary files...", "Cleaning Up");
+							// restore controls
+							invoker.setEnabled(true);
+							invoker.setVisible(true);
+							invoker.toFront();
+							invoker.repaint();
+							return;
+						}
 
-                        // stage & cleanup
-                        System.out.println("Cleaning up");
-                        new File(Main.inpath + "asset.pkg").delete();
-                        new File(Main.inpath + "temp/PSP2/" + name).renameTo(new File(Main.inpath + name));
-                        Main.deleteDir(new File(Main.inpath + "app/"));
-                        Main.deleteDir(new File(Main.inpath + "patch/"));
-                        Main.deleteDir(new File(Main.inpath + "addcont/"));
-                        Main.deleteDir(new File(Main.inpath + "temp/"));
+						// dump contents
+						System.out.println("Extracting " + arcname);
+						Fozzie popup = new Fozzie();
+						popup.displayTextOnly("Extracting " + arcname + "...", "Extracting");
+						try {
+							Process p = Main.exec(new String[]{Main.inpath + "pkg2zip.exe", "-x", "asset.pkg", key.toString()}, Main.inpath);
+							InputStream debugin = new BufferedInputStream(p.getInputStream());
+							OutputStream debugout = new BufferedOutputStream(System.out);
+							int c;
+							while ((c = debugin.read()) != -1) {
+								debugout.write(c);
+							}
+							debugin.close();
+							debugout.close();
+							p.waitFor();
+						} catch (Exception e) {
+							System.out.println(e.getMessage());
+							JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+							new File(Main.inpath + "asset.pkg").delete();
+							invoker.setEnabled(true);
+							invoker.setVisible(true);
+							invoker.toFront();
+							invoker.repaint();
+							return;
+						}
 
-                        popup.destroyDialog();
-                    }
+						// decrypt
+						System.out.println("Decrypting asset.pkg");
+						String extracted;
+						String name;
+						if (type == Main.ArcTarget.BASE) {
+							extracted = "app/PCSA00015";
+							name = "data.psarc";
+						} else if (type == Main.ArcTarget.FIRST) {
+							extracted = "patch/PCSA00015";
+							name = "data1.psarc";
+						} else if (type == Main.ArcTarget.LATEST) {
+							extracted = "patch/PCSA00015";
+							name = "data2.psarc";
+						} else if (type == Main.ArcTarget.ADDON_HD) {
+							extracted = "addcont/PCSA00015/DLC1W2048PACKAGE";
+							name = "dlc1.psarc";
+						} else if (type == Main.ArcTarget.ADDON_HD_FURY) { // this is not "always true" - intellij is actually very dumj
+							extracted = "addcont/PCSA00015/DLC2W2048PACKAGE";
+							name = "dlc2.psarc";
+						} else {
+							System.out.println("Internal Error: Bert got dementia. Get a programmer!");
+							JOptionPane.showMessageDialog(invoker, "Internal Error: Bert got dementia. Get a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+							new File(Main.inpath + "asset.pkg").delete();
+							Main.deleteDir(new File(Main.inpath + "app/"));
+							Main.deleteDir(new File(Main.inpath + "patch/"));
+							Main.deleteDir(new File(Main.inpath + "addcont/"));
+							invoker.setEnabled(true);
+							invoker.setVisible(true);
+							invoker.toFront();
+							invoker.repaint();
+							return;
+						}
 
-                    // restore controls
-                    JOptionPane.showMessageDialog(frame, "Assets downloaded successfully.", "Download Complete", JOptionPane.INFORMATION_MESSAGE);
-                    invoker.setEnabled(true);
-                    invoker.setVisible(true);
-                    invoker.toFront();
-                    invoker.repaint();
-                    wilkinsDownloadFinished = true;
-                }
-            });
-            downloaderPopupThread.start();
-        }
-    }
+						popup.setText("<html>Decrypting protected PFS:<br/>" + extracted + "</html>", "Decrypting");
+
+						try {
+							Process p = Main.exec(new String[]{Main.inpath + "psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, Main.inpath);
+							InputStream debugin = new BufferedInputStream(p.getInputStream());
+							OutputStream debugout = new BufferedOutputStream(System.out);
+							int c;
+							while ((c = debugin.read()) != -1) {
+								debugout.write(c);
+							}
+							debugin.close();
+							debugout.close();
+							p.waitFor();
+						} catch (Exception e) {
+							System.out.println(e.getMessage());
+							JOptionPane.showMessageDialog(invoker, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+							new File(Main.inpath + "asset.pkg").delete();
+							Main.deleteDir(new File(Main.inpath + "app/"));
+							Main.deleteDir(new File(Main.inpath + "patch/"));
+							Main.deleteDir(new File(Main.inpath + "addcont/"));
+							invoker.setEnabled(true);
+							invoker.setVisible(true);
+							invoker.toFront();
+							invoker.repaint();
+							return;
+						}
+
+						popup.setText("Deleting temporary files...", "Cleaning Up");
+
+						// stage & cleanup
+						System.out.println("Cleaning up");
+						new File(Main.inpath + "asset.pkg").delete();
+						new File(Main.inpath + "temp/PSP2/" + name).renameTo(new File(Main.inpath + name));
+						Main.deleteDir(new File(Main.inpath + "app/"));
+						Main.deleteDir(new File(Main.inpath + "patch/"));
+						Main.deleteDir(new File(Main.inpath + "addcont/"));
+						Main.deleteDir(new File(Main.inpath + "temp/"));
+
+						popup.destroyDialog();
+					}
+
+					// restore controls
+					JOptionPane.showMessageDialog(frame, "Assets downloaded successfully.", "Download Complete", JOptionPane.INFORMATION_MESSAGE);
+					invoker.setEnabled(true);
+					invoker.setVisible(true);
+					invoker.toFront();
+					invoker.repaint();
+					wilkinsDownloadFinished = true;
+				}
+			});
+			downloaderPopupThread.start();
+		}
+	}
+
+	private void refreshChecklist() {
+		ImageIcon positive = new ImageIcon(Main.class.getResource("/lightPositive.png"));
+		ImageIcon negative = new ImageIcon(Main.class.getResource("/lightNegative.png"));
+
+		if(new File(Main.inpath + "data.psarc").exists())
+			ipcBase.setIcon(positive); else ipcBase.setIcon(negative);
+		if(new File(Main.inpath + "data1.psarc").exists())
+			ipcPatch1.setIcon(positive); else ipcPatch1.setIcon(negative);
+		if(new File(Main.inpath + "data2.psarc").exists())
+			ipcPatch2.setIcon(positive); else ipcPatch2.setIcon(negative);
+		if(new File(Main.inpath + "dlc1.psarc").exists())
+			ipcDlcHD.setIcon(positive); else ipcDlcHD.setIcon(negative);
+		if(new File(Main.inpath + "dlc2.psarc").exists())
+			ipcDlcFury.setIcon(positive); else ipcDlcFury.setIcon(negative);
+	}
 }

firestar/src/main/java/Clifford.java

@@ -20,217 +20,253 @@ import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import org.json.JSONObject;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
-import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.IOException;
+import java.util.ArrayList;
 
 import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
 
 public class Clifford implements ActionListener {
-    private JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JTextField fName;
-    private JTextField fAuthor;
-    private JTextField fVersion;
-    private JTextPane fDescription;
-    private JButton savebtn;
-    private JButton cancelbtn;
+	private JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JTextField fName;
+	private JTextField fAuthor;
+	private JTextField fVersion;
+	private JTextPane fDescription;
+	private JButton savebtn;
+	private JButton cancelbtn;
 
-    JFrame invoker;
-    MissPiggy invokerPig;
-    boolean isPig = false;
-    Main.Mod mod;
-    int index;
-    File directory;
+	JFrame invoker;
+	MissPiggy invokerPig;
+	boolean isPig = false;
+	Main.Mod mod;
+	int index;
+	File directory;
+	boolean isSoundtrack = false;
 
-    boolean creating;
+	boolean creating;
 
-    public void Action(MissPiggy inv, int modindex) {
-        invokerPig = inv;
-        invoker = invokerPig.frame;
-        mod = Main.Mods.get(modindex);
-        index = modindex;
-        creating = false;
+	public void Action(MissPiggy inv, int modindex) {
+		invokerPig = inv;
+		invoker = invokerPig.frame;
+		mod = Main.Mods.get(modindex);
+		index = modindex;
+		creating = false;
 
-        isPig = true;
+		isPig = true;
 
-        Action(invoker, modindex);
-    }
+		Action(invoker, modindex);
+	}
 
-    public void Action(MissPiggy inv, File dir) {
-        invokerPig = inv;
-        invoker = invokerPig.frame;
-        directory = dir;
-        creating = true;
+	public void Action(MissPiggy inv, File dir) {
+		invokerPig = inv;
+		invoker = invokerPig.frame;
+		directory = dir;
+		creating = true;
 
-        isPig = true;
+		isPig = true;
 
-        Action(invoker, dir);
-    }
+		Action(invoker, dir);
+	}
 
-    public void Action(JFrame inv, int modindex) { // Editor
-        invoker = inv;
-        mod = Main.Mods.get(modindex);
-        index = modindex;
-        creating = false;
+	public void Action(JFrame inv, int modindex) { // Editor
+		invoker = inv;
+		mod = Main.Mods.get(modindex);
+		index = modindex;
+		creating = false;
 
-        frame.add(frameContainer);
-        try {
-            BufferedImage windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find resource titleIcon.png. Window will not have an icon.");
-        }
-        frame.setSize(600, 300); // 1280 800
-        frame.setMinimumSize(new Dimension(200,100));
-        frame.setTitle("Options");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(inv);
-        frame.setAlwaysOnTop(true);
+		frame.add(frameContainer);
+		frame.setIconImage(Main.windowIcon);
+		frame.setSize(600, 300); // 1280 800
+		frame.setMinimumSize(new Dimension(200,100));
+		frame.setTitle("Options");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(inv);
+		frame.setAlwaysOnTop(true);
 
-        fName.setText(mod.friendlyName);
-        fAuthor.setText(mod.author);
-        fVersion.setText(String.valueOf(mod.version));
-        fDescription.setText(mod.description);
+		fName.setText(mod.friendlyName);
+		fAuthor.setText(mod.author);
+		fVersion.setText(String.valueOf(mod.version));
+		fDescription.setText(mod.description);
 
-        cancelbtn.addActionListener(this);
-        savebtn.addActionListener(this);
+		cancelbtn.addActionListener(this);
+		savebtn.addActionListener(this);
 
-        frame.setVisible(true);
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                invoker.setEnabled(true);
-                e.getWindow().dispose();
-            }
-        });
-    }
+		frame.setVisible(true);
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				invoker.setEnabled(true);
+				e.getWindow().dispose();
+			}
+		});
+	}
 
-    public void Action(JFrame inv, File dir) { // Generator
-        invoker = inv;
-        directory = dir;
-        creating = true;
+	public void Action(JFrame inv, File dir) { // Generator
+		invoker = inv;
+		directory = dir;
+		creating = true;
 
-        frame.add(frameContainer);
-        frame.setSize(600, 200); // 1280 800
-        frame.setMinimumSize(new Dimension(200,100));
-        frame.setTitle("Options");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
-        frame.setAlwaysOnTop(true);
+		frame.add(frameContainer);
+		frame.setSize(600, 200); // 1280 800
+		frame.setMinimumSize(new Dimension(200,100));
+		frame.setTitle("Options");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(null);
+		frame.setAlwaysOnTop(true);
 
-        cancelbtn.addActionListener(this);
-        savebtn.addActionListener(this);
+		cancelbtn.addActionListener(this);
+		savebtn.addActionListener(this);
 
-        frame.setVisible(true);
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                invoker.setEnabled(true);
-                e.getWindow().dispose();
-            }
-        });
-    }
+		frame.setVisible(true);
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+				invoker.setEnabled(true);
+				e.getWindow().dispose();
+			}
+		});
+	}
 
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == cancelbtn) {
-            invoker.setEnabled(true);
-            frame.dispose();
-        } else if (actionEvent.getSource() == savebtn && !creating) {
-            try {
-                mod.version = Integer.parseInt(fVersion.getText());
-            } catch (NumberFormatException e) {
-                JOptionPane.showMessageDialog(frame, "Mod version must be a valid integer.", "Error", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            mod.friendlyName = fName.getText();
-            mod.author = fAuthor.getText();
-            mod.description = fDescription.getText();
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		if (actionEvent.getSource() == cancelbtn) {
+			Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+			invoker.setEnabled(true);
+			frame.dispose();
+		} else if (actionEvent.getSource() == savebtn && !creating) {
+			try {
+				mod.version = Integer.parseInt(fVersion.getText());
+			} catch (NumberFormatException e) {
+				JOptionPane.showMessageDialog(frame, "Mod version must be a valid integer.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			mod.friendlyName = fName.getText();
+			mod.author = fAuthor.getText();
+			mod.description = fDescription.getText();
 
-            JSONObject container = new JSONObject();
-            if (mod.friendlyName.isEmpty()) {
-                JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            container.put("version", mod.version);
-            container.put("friendlyName", mod.friendlyName);
-            container.put("author", mod.author);
-            container.put("description", mod.description);
-            container.put("loaderversion", mod.loaderversion);
-            container.put("game", mod.game);
+			JSONObject container = new JSONObject();
+			if (mod.friendlyName.isEmpty()) {
+				JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
 
-            try {
-                new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + mod.path.trim()).setComment(container.toString());
-            } catch (ZipException e) {
-                System.out.println(e.getMessage());
-                JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-            }
+			container.put("version", mod.version);
+			container.put("friendlyName", mod.friendlyName);
+			container.put("author", mod.author);
+			container.put("description", mod.description);
+			container.put("loaderversion", mod.loaderversion);
+			container.put("game", mod.game);
+			if (!mod.requires.isEmpty()) container.put("requires", mod.requires);
+			if (!mod.extracts.isEmpty()) container.put("extracts", mod.extracts);
 
-            Main.Mods.set(index, mod);
-            invoker.setEnabled(true);
-            if (isPig) {invokerPig.InitializeModListInGUI();}
-            frame.dispose();
-        } else if (actionEvent.getSource() == savebtn && creating) {
-            if (fName.getText().isEmpty()) {
-                JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            try {
-                Integer.parseInt(fVersion.getText());
-            } catch (NumberFormatException e) {
-                JOptionPane.showMessageDialog(frame, "Mod version must be a valid integer.", "Error", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
+			try {
+				new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + mod.path.trim()).setComment(container.toString());
+			} catch (ZipException e) {
+				System.out.println(e.getMessage());
+				JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+			}
 
-            JFileChooser fileChooser = new JFileChooser();
-            fileChooser.setFileFilter(new FileNameExtensionFilter("Firestar Mod Package", "fstar"));
-            if (fileChooser.showSaveDialog(frame) == JFileChooser.APPROVE_OPTION) {
-                ZipFile zip = new ZipFile(fileChooser.getSelectedFile());
-                try {
-                    zip.addFolder(new File(directory.getAbsolutePath() + "/data"));
-                    if (new File(directory.getAbsolutePath() + "/delete.txt").exists()) {
-                        zip.addFile(new File(directory.getAbsolutePath() + "/delete.txt"));
-                    }
-                    if (new File(directory.getAbsolutePath() + "/pack.png").exists()) {
-                        zip.addFile(new File(directory.getAbsolutePath() + "/pack.png"));
-                    }
+			Main.Mods.set(index, mod);
+			invoker.setEnabled(true);
+			if (isPig) {invokerPig.InitializeModListInGUI();}
+			frame.dispose();
+		} else if (actionEvent.getSource() == savebtn && creating) {
+			if (fName.getText().isEmpty()) {
+				JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			try {
+				Integer.parseInt(fVersion.getText());
+			} catch (NumberFormatException e) {
+				JOptionPane.showMessageDialog(frame, "Mod version must be a valid integer.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
 
-                    JSONObject container = new JSONObject();
-                    container.put("version", Integer.parseInt(fVersion.getText()));
-                    container.put("friendlyName", fName.getText());
-                    container.put("author", fAuthor.getText());
-                    container.put("description", fDescription.getText());
-                    container.put("loaderversion", 0); // TODO for later versions: Change depending on features inside of mod folder
-                    container.put("game", "2048");
+			JFileChooser fileChooser = new JFileChooser();
+			fileChooser.setFileFilter(new FileNameExtensionFilter("Firestar Mod Package", "fstar"));
+			if (fileChooser.showSaveDialog(frame) == JFileChooser.APPROVE_OPTION) {
+				File modFile = fileChooser.getSelectedFile();
+				if (!modFile.getName().endsWith(".fstar")) modFile = new File(modFile.toString() + ".fstar");
+				ZipFile zip = new ZipFile(modFile);
+				boolean hasScript = false;
+				try {
+					zip.addFolder(new File(directory.getAbsolutePath() + "/data"));
+					if (new File(directory.getAbsolutePath() + "/delete.txt").exists()) {
+						zip.addFile(new File(directory.getAbsolutePath() + "/delete.txt"));
+					}
+					if (new File(directory.getAbsolutePath() + "/pack.png").exists()) {
+						zip.addFile(new File(directory.getAbsolutePath() + "/pack.png"));
+					}
+					if (new File(directory.getAbsolutePath() + "/fscript").exists()) {
+						zip.addFile(new File(directory.getAbsolutePath() + "/fscript"));
+						hasScript = true;
+					}
 
-                    zip.setComment(container.toString());
-                    zip.close();
-                } catch (Exception e) {
-                    fileChooser.getSelectedFile().delete(); //cleanup
-                    System.out.println(e.getMessage());
-                    JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-                    return;
-                }
-                JOptionPane.showMessageDialog(frame, "Mod file created", "Success", JOptionPane.INFORMATION_MESSAGE);
-                invoker.setEnabled(true);
-                frame.dispose();
-            }
-        }
-    }
+					ArrayList<String> requires = new ArrayList<>();
+					ArrayList<String> extracts = new ArrayList<>();
+					if (isSoundtrack) {
+						requires.add("data2.psarc");
+						extracts.add("data/plugins/music/Definition.xml");
+						extracts.add("data/plugins/languages/american/entries.xml");
+						extracts.add("data/plugins/languages/danish/entries.xml");
+						extracts.add("data/plugins/languages/dutch/entries.xml");
+						extracts.add("data/plugins/languages/english/entries.xml");
+						extracts.add("data/plugins/languages/finnish/entries.xml");
+						extracts.add("data/plugins/languages/french/entries.xml");
+						extracts.add("data/plugins/languages/german/entries.xml");
+						extracts.add("data/plugins/languages/italian/entries.xml");
+						extracts.add("data/plugins/languages/japanese/entries.xml");
+						extracts.add("data/plugins/languages/norwegian/entries.xml");
+						extracts.add("data/plugins/languages/polish/entries.xml");
+						extracts.add("data/plugins/languages/portuguese/entries.xml");
+						extracts.add("data/plugins/languages/russian/entries.xml");
+						extracts.add("data/plugins/languages/spanish/entries.xml");
+						extracts.add("data/plugins/languages/swedish/entries.xml");
+					}
+
+					JSONObject container = new JSONObject();
+					container.put("version", Integer.parseInt(fVersion.getText()));
+					container.put("friendlyName", fName.getText());
+					container.put("author", fAuthor.getText());
+					container.put("description", fDescription.getText());
+					if (!requires.isEmpty()) container.put("requires", requires);
+					if (!extracts.isEmpty()) container.put("extracts", extracts);
+					// todo later versions: handle logic for setting this depending on the fscript version too.
+					// firestar 1.3 can't generate any version other than v1 so this is not necessary right now, but will become necessary when fscript features are added.
+					if (hasScript) {
+						container.put("loaderversion", 1);
+					} else {
+						container.put("loaderversion", 0);
+					}
+					container.put("game", "2048");
+
+					zip.setComment(container.toString());
+					zip.close();
+				} catch (Exception e) {
+					fileChooser.getSelectedFile().delete(); //cleanup
+					System.out.println(e.getMessage());
+					JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+					return;
+				}
+				JOptionPane.showMessageDialog(frame, "Mod file created", "Success", JOptionPane.INFORMATION_MESSAGE);
+				Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+				invoker.setEnabled(true);
+				frame.dispose();
+			}
+		}
+	}
 }

firestar/src/main/java/Ernie.java

@@ -21,7 +21,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -33,7 +32,6 @@ import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.imageio.ImageIO;
 import javax.swing.JButton;
 import javax.swing.JEditorPane;
 import javax.swing.JFrame;
@@ -46,153 +44,150 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 public class Ernie implements ActionListener {
-    // Base URL for Gitea API
-    public static final String gitapi = "https://git.worlio.com/api/v1/repos/bonkmaykr/firestar";
-    public static final String changelog = "https://bonkmaykr.worlio.com/http/firestar/changelog.htm";
-    
-    private HttpURLConnection httpConn;
-    private int contentLength;
-    private InputStream inputStream;
-    
-    private JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JEditorPane changelogDisplay;
-    private JButton notnowbtn;
-    private JButton surebtn;
-    
-    public boolean backgroundDone = false;
-    private BufferedImage windowIcon;
+	// Base URL for Gitea API
+	public static final String gitapi = "https://git.worlio.com/api/v1/repos/bonkmaykr/firestar";
+	public static final String changelog = "https://bonkmaykr.worlio.com/http/firestar/changelog.htm";
+	
+	private HttpURLConnection httpConn;
+	private int contentLength;
+	private InputStream inputStream;
+	
+	private JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JEditorPane changelogDisplay;
+	private JButton notnowbtn;
+	private JButton surebtn;
+	
+	public boolean backgroundDone = false;
 
-    private JFrame parent;
+	private JFrame parent;
 
-    public Ernie(JFrame parent) {
-        this.parent = parent;
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-	byte[] urlraw = getFile(gitapi+"/releases?draft=false&pre-release=false");
-	if (urlraw.length <= 0) {
-	   JOptionPane.showMessageDialog(frame, "Internal Error: Couldn't check for updates.", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-	} else {
-	    try {
-		JSONArray releases = new JSONArray(new String(urlraw, Charset.forName("utf-8")));
-        System.out.println("Updater: latest release is " + ((JSONObject)releases.get(0)).get("tag_name"));
-		if (releases.length() >= 1 && !((JSONObject)releases.get(0)).get("tag_name").equals(Main.vtag)) {
-            System.out.println("Updater: Your version is out of date.");
-		    frame.add(frameContainer);
-		    notnowbtn.addActionListener(this);
-		    surebtn.addActionListener(this);
-		    changelogDisplay.setEditable(false);
-		    changelogDisplay.setPage(changelog);
-            changelogDisplay.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE); // makes text smaller than joe biden's windmill if font set manually. wtf??
-		    
-		    frame.setTitle("An update is available!");
-		    frame.setSize(450, 400);
-		    frame.setResizable(false);
-            frame.setLocationRelativeTo(parent);
-		    frame.setAlwaysOnTop(true);
-            frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-            parent.setEnabled(false);
-            frame.addWindowListener(new WindowAdapter() {
-                @Override
-                public void windowClosing(WindowEvent e)
-                {
-                    parent.setEnabled(true);
-                    e.getWindow().dispose();
-                }
-            });
-		    frame.setVisible(true);
-		} else { System.out.println("Updater: No updates."); }
-	    } catch (IOException ex) {
-		Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
-	    } catch (JSONException ex) {
-		Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
-	    }
-	}
-    }
-    
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == notnowbtn) {
-            parent.setEnabled(true);
-            frame.dispose();
-        } else
-        if (actionEvent.getSource() == surebtn) {
-	    if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-		String releasepage = "https://git.worlio.com/bonkmaykr/firestar/releases";
-		try {
-		    Desktop.getDesktop().browse(new URI(releasepage));
-            parent.setEnabled(true);
-            frame.dispose();
-		} catch (Exception ex) {
-		    JOptionPane.showMessageDialog(frame, "Couldn't open your web browser!\nYou can check out the latest release at the URL below:\n"+releasepage, "Error", JOptionPane.ERROR_MESSAGE);
+	public Ernie(JFrame parent, boolean isManual) {
+		this.parent = parent;
+		frame.setIconImage(Main.windowIcon);
+		byte[] urlraw = getFile(gitapi+"/releases?draft=false&pre-release=false");
+		if (urlraw.length <= 0) {
+		   JOptionPane.showMessageDialog(frame, "Internal Error: Couldn't check for updates.", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+		} else {
+			try {
+				JSONArray releases = new JSONArray(new String(urlraw, Charset.forName("utf-8")));
+				System.out.println("Updater: latest release is " + ((JSONObject)releases.get(0)).get("tag_name"));
+				if (releases.length() >= 1
+				&& (!Main.isNightly && (!((JSONObject)releases.get(0)).get("tag_name").equals(Main.vtag))
+				|| (Main.isNightly && !((JSONObject)releases.get(0)).get("tag_name").equals(Main.vtagPrevious)))) {
+					System.out.println("Updater: Your version is out of date.");
+					frame.add(frameContainer);
+					notnowbtn.addActionListener(this);
+					surebtn.addActionListener(this);
+					changelogDisplay.setEditable(false);
+					changelogDisplay.setPage(changelog);
+					changelogDisplay.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE); // makes text smaller than joe biden's windmill if font set manually. wtf??
+
+					frame.setTitle("An update is available!");
+					frame.setSize(450, 400);
+					frame.setResizable(false);
+					frame.setLocationRelativeTo(parent);
+					frame.setAlwaysOnTop(true);
+					frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+					parent.setEnabled(false);
+					frame.addWindowListener(new WindowAdapter() {
+						@Override
+						public void windowClosing(WindowEvent e)
+						{
+							parent.setEnabled(true);
+							e.getWindow().dispose();
+						}
+					});
+					frame.setVisible(true);
+				} else {
+					System.out.println("Updater: No updates.");
+					if (isManual) {JOptionPane.showMessageDialog(frame, "There are no updates at this time.", "Check for Updates", JOptionPane.INFORMATION_MESSAGE);}
+				}
+			} catch (IOException | JSONException ex) {
+				Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
+			}
 		}
-	    }
 	}
-    }
-    
-    byte[] getFile(String url) {
-	try {
-	    URL fileURL = new URL(url);
-	    httpConn = (HttpURLConnection) fileURL.openConnection();
-	    int response = httpConn.getResponseCode();
+	
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		if (actionEvent.getSource() == notnowbtn) {
+			parent.setEnabled(true);
+			frame.dispose();
+		} else
+		if (actionEvent.getSource() == surebtn) {
+			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+				String releasepage = "https://git.worlio.com/bonkmaykr/firestar/releases";
+				try {
+					Desktop.getDesktop().browse(new URI(releasepage));
+					parent.setEnabled(true);
+					frame.dispose();
+				} catch (Exception ex) {
+					JOptionPane.showMessageDialog(frame, "Couldn't open your web browser!\nYou can check out the latest release at the URL below:\n"+releasepage, "Error", JOptionPane.ERROR_MESSAGE);
+				}
+			}
+		}
+	}
+	
+	byte[] getFile(String url) {
+		try {
+			URL fileURL = new URL(url);
+			httpConn = (HttpURLConnection) fileURL.openConnection();
+			int response = httpConn.getResponseCode();
 
-            if (response == HttpURLConnection.HTTP_OK) {
-                contentLength = httpConn.getContentLength();
-                inputStream = httpConn.getInputStream();
-            } else if (response == 404) {
-                throw new IOException(
-                        "File missing from remote server.");
-            } else {
-                throw new IOException(
-                        "Unexpected response; Server replied with " + response);
-            }
-	    ErnieDownloader ed = new ErnieDownloader(this, url, httpConn.getContentLength());
-	    ed.doInBackground();
-            while (!backgroundDone) {}
+			if (response == HttpURLConnection.HTTP_OK) {
+				contentLength = httpConn.getContentLength();
+				inputStream = httpConn.getInputStream();
+			} else if (response == 404) {
+				throw new IOException(
+						"File missing from remote server.");
+			} else {
+				throw new IOException(
+						"Unexpected response; Server replied with " + response);
+			}
+			ErnieDownloader ed = new ErnieDownloader(this, url, httpConn.getContentLength());
+			ed.doInBackground();
+			while (!backgroundDone) {}
 
-            inputStream.close();
-            httpConn.disconnect();
-            frame.dispose();
-            return ed.output;
-	} catch (MalformedURLException e) {
-            JOptionPane.showMessageDialog(frame, "Internal Error: URL given to Ernie is not valid.\nGet a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.dispose();
-            return new byte[]{};
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(frame, "Error: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.dispose();
-            return new byte[]{};
-        }
-    }
+			inputStream.close();
+			httpConn.disconnect();
+			frame.dispose();
+			return ed.output;
+		} catch (MalformedURLException e) {
+			JOptionPane.showMessageDialog(frame, "Internal Error: URL given to Ernie is not valid.\nGet a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.dispose();
+			return new byte[]{};
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(frame, "Error: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.dispose();
+			return new byte[]{};
+		}
+	}
 }
 
 class ErnieDownloader extends SwingWorker<Void, Void> {
-    private static final int BUFFER_SIZE = 4096;
-    private String downloadURL;
-    private final Ernie gui;
-    public byte[] output;
+	private static final int BUFFER_SIZE = 4096;
+	private String downloadURL;
+	private final Ernie gui;
+	public byte[] output;
 
-    public ErnieDownloader(Ernie gui, String downloadURL, long size) {
-        this.gui = gui;
-        this.downloadURL = downloadURL;
-    }
+	public ErnieDownloader(Ernie gui, String downloadURL, long size) {
+		this.gui = gui;
+		this.downloadURL = downloadURL;
+	}
 
-    @Override
-    protected Void doInBackground() throws Exception {
-        BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-	byte[] data = new byte[16384];
-	int x;
-	while ((x = in.read(data, 0, data.length)) != -1) {
-	    buffer.write(data, 0, x);
+	@Override
+	protected Void doInBackground() throws Exception {
+		BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
+		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+		byte[] data = new byte[16384];
+		int x;
+		while ((x = in.read(data, 0, data.length)) != -1) {
+			buffer.write(data, 0, x);
+		}
+		output = buffer.toByteArray();
+		in.close();
+		gui.backgroundDone = true;
+		return null;
 	}
-	output = buffer.toByteArray();
-        in.close();
-        gui.backgroundDone = true;
-        return null;
-    }
 }

firestar/src/main/java/FirescriptFormatException.java

@@ -0,0 +1,31 @@
+/*
+ *     Firestar Mod Manager
+ *     Copyright (C) 2024  bonkmaykr
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+public class FirescriptFormatException extends Exception {
+	public FirescriptFormatException() {
+		super();
+	}
+	
+	public FirescriptFormatException(String msg) {
+		super(msg);
+	}
+	
+	public FirescriptFormatException(String cmd, String msg) {
+		super(cmd + ": " + msg);
+	}
+}

firestar/src/main/java/Fozzie.java

@@ -16,176 +16,159 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.Optional;
 
 public class Fozzie {
-    BufferedImage windowIcon;
-    private JFrame frame = new JFrame();
-    public JProgressBar progressBar;
-    private JPanel frameContainer;
-    private JLabel label;
+	private JFrame frame = new JFrame();
+	public JProgressBar progressBar;
+	private JPanel frameContainer;
+	private JLabel label;
 
-    private HttpURLConnection httpConn;
-    private int contentLength;
-    private InputStream inputStream;
+	private HttpURLConnection httpConn;
+	private int contentLength;
+	private InputStream inputStream;
 
-    public boolean backgroundDone = false;
+	public boolean backgroundDone = false;
 
-    boolean DownloadFile(String url, String odir, String oname) {
-        return DownloadFile(url, odir, oname, oname);
-    }
+	boolean DownloadFile(String url, String odir, String oname) {
+		return DownloadFile(url, odir, oname, oname);
+	}
 
-    boolean DownloadFile(String url, String odir, String oname, String dname) {
-        frame.add(frameContainer);
-        frame.setSize(300, 100);
-        frame.setTitle("Download in Progress");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
-        frame.setAlwaysOnTop(true);
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-        frame.setVisible(true);
+	boolean DownloadFile(String url, String odir, String oname, String dname) {
+		frame.add(frameContainer);
+		frame.setSize(300, 100);
+		frame.setTitle("Download in Progress");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(null);
+		frame.setAlwaysOnTop(true);
+		frame.setIconImage(Main.windowIcon);
+		frame.setVisible(true);
 
-        label.setText("Downloading \"" + dname + "\"");
+		label.setText("Downloading " + dname);
 
-        try {
-            URL fileURL = new URL(url);
-            httpConn = (HttpURLConnection) fileURL.openConnection();
-            int response = httpConn.getResponseCode();
+		try {
+			URL fileURL = new URL(url);
+			httpConn = (HttpURLConnection) fileURL.openConnection();
+			int response = httpConn.getResponseCode();
 
-            if (response == HttpURLConnection.HTTP_OK) {
-                String disposition = httpConn.getHeaderField("Content-Disposition");
-                String contentType = httpConn.getContentType();
-                contentLength = httpConn.getContentLength();
+			if (response == HttpURLConnection.HTTP_OK) {
+				String disposition = httpConn.getHeaderField("Content-Disposition");
+				String contentType = httpConn.getContentType();
+				contentLength = httpConn.getContentLength();
 
-                inputStream = httpConn.getInputStream();
-            } else if (response == 404) {
-                throw new IOException(
-                        "File missing from remote server.");
-            } else {
-                throw new IOException(
-                        "Unexpected response; Server replied with " + response);
-            }
-            new FozzieDownloader(this, url, odir, oname, httpConn.getContentLength()).doInBackground();
-            while (!backgroundDone) {}
+				inputStream = httpConn.getInputStream();
+			} else if (response == 404) {
+				throw new IOException(
+						"File missing from remote server.");
+			} else {
+				throw new IOException(
+						"Unexpected response; Server replied with " + response);
+			}
+			new FozzieDownloader(this, url, odir, oname, httpConn.getContentLength()).doInBackground();
+			while (!backgroundDone) {}
 
-            inputStream.close();
-            httpConn.disconnect();
-            frame.dispose();
-            return true;
-        } catch (MalformedURLException e) {
-            JOptionPane.showMessageDialog(frame, "Internal Error: URL given to Fozzie is not valid.\nGet a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.dispose();
-            return false;
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(frame, "Error: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.dispose();
-            return false;
-        }
-    }
+			inputStream.close();
+			httpConn.disconnect();
+			frame.dispose();
+			return true;
+		} catch (MalformedURLException e) {
+			JOptionPane.showMessageDialog(frame, "Internal Error: URL given to Fozzie is not valid.\nGet a programmer!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.dispose();
+			return false;
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(frame, "Error: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.dispose();
+			return false;
+		}
+	}
 
-    public void displayTextOnly(String text, String title) {
-        frame.add(frameContainer);
-        frame.setSize(300, 100);
-        frame.setTitle(title);
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
-        frame.setAlwaysOnTop(true);
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-        frame.setVisible(true);
+	public void displayTextOnly(String text, String title) {
+		frame.add(frameContainer);
+		frame.setSize(300, 100);
+		frame.setTitle(title);
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(null);
+		frame.setAlwaysOnTop(true);
+		frame.setIconImage(Main.windowIcon);
+		frame.setVisible(true);
 
-        label.setText(text);
+		label.setText(text);
 
-        progressBar.setVisible(false);
-    }
+		progressBar.setVisible(false);
+	}
 
-    public void setText(String text, String title) {
-        label.setText(text);
-        frame.setTitle(title);
-    }
+	public void setText(String text, String title) {
+		label.setText(text);
+		frame.setTitle(title);
+	}
 
-    public void destroyDialog() {
-        frame.setVisible(false);
-        frame.dispose();
-    }
+	public void destroyDialog() {
+		frame.setVisible(false);
+		frame.dispose();
+	}
 
-    public void disconnect() throws IOException {
-        inputStream.close();
-        httpConn.disconnect();
-    }
+	public void disconnect() throws IOException {
+		inputStream.close();
+		httpConn.disconnect();
+	}
 
-    public int getContentLength() {
-        return this.contentLength;
-    }
+	public int getContentLength() {
+		return this.contentLength;
+	}
 
-    public InputStream getInputStream() {
-        return this.inputStream;
-    }
+	public InputStream getInputStream() {
+		return this.inputStream;
+	}
 }
 
 class FozzieDownloader extends SwingWorker<Void, Void> {
-    private static final int BUFFER_SIZE = 4096;
-    private String downloadURL;
-    private String saveDirectory;
-    private String saveName;
-    private final Fozzie gui;
-    private final long completeSize;
+	private static final int BUFFER_SIZE = 4096;
+	private String downloadURL;
+	private String saveDirectory;
+	private String saveName;
+	private final Fozzie gui;
+	private final long completeSize;
 
-    public FozzieDownloader(Fozzie gui, String downloadURL, String saveDirectory, String saveName, long size) {
-        this.gui = gui;
-        this.downloadURL = downloadURL;
-        this.saveDirectory = saveDirectory;
-        this.saveName = saveName;
-        this.completeSize = size;
-    }
+	public FozzieDownloader(Fozzie gui, String downloadURL, String saveDirectory, String saveName, long size) {
+		this.gui = gui;
+		this.downloadURL = downloadURL;
+		this.saveDirectory = saveDirectory;
+		this.saveName = saveName;
+		this.completeSize = size;
+	}
 
-    @Override
-    protected Void doInBackground() throws Exception {
-        long downloadedSize = 0;
-        File downloadLocationDir = new File(saveDirectory);
-        File downloadLocation = new File(saveDirectory + "/" + saveName);
-        downloadLocationDir.mkdirs();
-        if (!downloadLocation.isFile()) {
-            downloadLocation.createNewFile();
-        }
-        BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
-        FileOutputStream fos = new FileOutputStream(saveDirectory + "/" + saveName);
-        BufferedOutputStream out = new BufferedOutputStream(fos,1024);
-        byte[] data = new byte[1024];
-        int x = 0;
-        while ((x = in.read(data,0,1024))>=0) {
-            downloadedSize += x;
-            int progress = (int) ((((double)downloadedSize) / ((double)completeSize)) * 100d);
-            gui.progressBar.setValue(progress);
-            out.write(data, 0, x);
-        }
-        out.close();
-        in.close();
-        gui.backgroundDone = true;
-        return null;
-    }
+	@Override
+	protected Void doInBackground() throws Exception {
+		long downloadedSize = 0;
+		File downloadLocationDir = new File(saveDirectory);
+		File downloadLocation = new File(saveDirectory + "/" + saveName);
+		downloadLocationDir.mkdirs();
+		if (!downloadLocation.isFile()) {
+			downloadLocation.createNewFile();
+		}
+		BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
+		FileOutputStream fos = new FileOutputStream(saveDirectory + "/" + saveName);
+		BufferedOutputStream out = new BufferedOutputStream(fos,1024);
+		byte[] data = new byte[1024];
+		int x = 0;
+		while ((x = in.read(data,0,1024))>=0) {
+			downloadedSize += x;
+			int progress = (int) ((((double)downloadedSize) / ((double)completeSize)) * 100d);
+			gui.progressBar.setValue(progress);
+			out.write(data, 0, x);
+		}
+		out.close();
+		in.close();
+		gui.backgroundDone = true;
+		return null;
+	}
 }

firestar/src/main/java/Gonzo.java

@@ -16,360 +16,404 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import com.github.difflib.DiffUtils;
-import com.github.difflib.UnifiedDiffUtils;
-import com.github.difflib.patch.Patch;
 import net.lingala.zip4j.ZipFile;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.text.DefaultCaret;
 import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.*;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Stream;
 
 public class Gonzo {
-    JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JTextArea consoleDisplay;
-    private JScrollPane scrollPane;
-    public boolean data0;
-    public boolean data1;
-    public boolean data2;
-    public boolean dlc1;
-    public boolean dlc2;
-    private MissPiggy invoker;
-    public String oArcTarget = "dlc2.psarc"; // which psarc to rebuild the assets in
+	JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JTextArea consoleDisplay;
+	private JScrollPane scrollPane;
+	public boolean data0;
+	public boolean data1;
+	public boolean data2;
+	public boolean dlc1;
+	public boolean dlc2;
+	private MissPiggy invoker;
+	public String oArcTarget = "dlc2.psarc"; // which psarc to rebuild the assets in
 
-    public void DeployMods(MissPiggy inv) {
-        invoker = inv;
-        System.out.println("\n\nStarting mod deployment\n\n");
+	// TODO 1.3: Implement requires boolean[] from Main.Mod
+	// Rework system to choose the last PSARC and then add more before it when called by requires[]
+	// Instead of the current system where it simply grabs them all and bloats the file.
+	//
+	// EDIT: requires[] is now an arraylist of booleans[], each a supported minimum combination of PSARCs.
+	// if any one of them is met, gonzo may continue
+	// for example:
+	// [false, true, false, false], [true, false, false, false] // user only needs either base psarc or patches PSARC, one or the other (having both is OK)
+	// [true, true, false, false] // user needs both base and patches
+	// [false, false, true, true] // user needs the HD DLC and the Fury DLC
+	//
+	// if none is found, assume "new boolean[]{false, false, false, false}" (no PSARCs required)
+	// (at least one of any 4 psarcs will already be checked for by MissPiggy so this is an okay way to implement it.)
 
-        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+	public void DeployMods(MissPiggy inv) {
+		invoker = inv;
+		System.out.println("\n\nStarting mod deployment\n\n");
 
-        try {
-            BufferedImage windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-        frame.setSize(800, 400);
-        frame.setMinimumSize(new Dimension(600,400));
-        frame.setTitle("Mod Installation");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(inv.frame);
-        frame.setAlwaysOnTop(true);
-        frame.setVisible(true);
+		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
 
-        File psarcHandle = new File(Main.inpath + "data.psarc");
-        data0 = psarcHandle.isFile();
-        psarcHandle = new File(Main.inpath + "data1.psarc");
-        data1 = psarcHandle.isFile();
-        psarcHandle = new File(Main.inpath + "data2.psarc");
-        data2 = psarcHandle.isFile();
-        psarcHandle = new File(Main.inpath + "dlc1.psarc");
-        dlc1 = psarcHandle.isFile();
-        psarcHandle = new File(Main.inpath + "dlc2.psarc");
-        dlc2 = psarcHandle.isFile();
+		frame.setIconImage(Main.windowIcon);
+		frame.setSize(800, 400);
+		frame.setMinimumSize(new Dimension(600,400));
+		frame.setTitle("Mod Installation");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(inv.frame);
+		frame.setAlwaysOnTop(true);
+		frame.setVisible(true);
 
-        System.out.println("Source files discovered: data " + data0 + ", data1 " + data1 + ", data2 " + data2 + ", dlc1 " + dlc1 + ", dlc2 " + dlc2);
+		DefaultCaret caret = (DefaultCaret) consoleDisplay.getCaret();
+		caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
 
-        final Thread managerThread = new Thread() {
-            @Override
-            public void run() {
-                if (/*Main.repatch*/true) { //todo implement fast mode correctly or remove
-                    CompatibilityRoutine();
-                } else {
-                    FastRoutine();
-                }
-            }
-        };
-        managerThread.start();
-    }
+		File psarcHandle = new File(Main.inpath + "data.psarc");
+		data0 = psarcHandle.isFile();
+		psarcHandle = new File(Main.inpath + "data1.psarc");
+		data1 = psarcHandle.isFile();
+		psarcHandle = new File(Main.inpath + "data2.psarc");
+		data2 = psarcHandle.isFile();
+		psarcHandle = new File(Main.inpath + "dlc1.psarc");
+		dlc1 = psarcHandle.isFile();
+		psarcHandle = new File(Main.inpath + "dlc2.psarc");
+		dlc2 = psarcHandle.isFile();
 
-    private void CompatibilityRoutine() {
-        // create temporary working area for asset dump
-        new File(System.getProperty("user.home") + "/.firestar/temp/").mkdirs();
+		System.out.println("Source files discovered: data " + data0 + ", data1 " + data1 + ", data2 " + data2 + ", dlc1 " + dlc1 + ", dlc2 " + dlc2);
 
-        // decide which files to dump
-        List<String> dumpThese = new ArrayList<String>();
-        if (data0) {dumpThese.add("data.psarc");oArcTarget = "data.psarc";}
-        if (data1) {dumpThese.add("data1.psarc");oArcTarget = "data1.psarc";}
-        if (data2) {dumpThese.add("data2.psarc");oArcTarget = "data2.psarc";}
-        if (dlc1) {dumpThese.add("dlc1.psarc");oArcTarget = "dlc1.psarc";}
-        if (dlc2) {dumpThese.add("dlc2.psarc");oArcTarget = "dlc2.psarc";}
-
-        // dump all assets to working area
-        for (String s : dumpThese) {
-            try {
-                System.out.println("Firestar is extracting " + s);
-                consoleDisplay.append("Firestar is extracting " + s + "\n");
-                //Process p = Runtime.getRuntime().exec(new String[]{"bash","-c","aplay /home/bonkyboo/kittens_loop.wav"}); // DEBUG
-                Process p = Main.exec(new String[]{"../psp2psarc.exe", "extract", "-y", "../"+s}, System.getProperty("user.home") + "/.firestar/temp/");
-                final Thread ioThread = new Thread() {
-                    @Override
-                    public void run() {
-                        try {
-                            final BufferedReader reader = new BufferedReader(
-                                    new InputStreamReader(p.getInputStream()));
-                            String line = null;
-                            while ((line = reader.readLine()) != null) {
-                                System.out.println(line);
-                                consoleDisplay.append(line + "\n");
-                                try {scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());}
-                                catch (Exception e) {System.out.println("WARNING: Swing failed to paint window due to race condition. You can safely ignore this.\n" + e.getMessage());}
-                            }
-                            reader.close();
-                        } catch (final Exception e) {
-                            e.printStackTrace(); // will probably definitely absolutely for sure hang firestar unless we do something. Too bad!
-                        }
-                    }
-                };
-                ioThread.start();
-                p.waitFor();
-            } catch (IOException | InterruptedException e) {
-                System.out.println(e.getMessage());
-                consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
-                JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-                AllowExit();
-                return;
-            }
-        }
-
-        // overwrite assets with custom ones from each mod and/or perform operations as specified in mod's delete list
-        // todo: implement RegEx functions after delete.txt
-        for (Main.Mod m : Main.Mods) {
-            if (m.enabled) {
-                try {
-                    System.out.println("Firestar is extracting " + m.friendlyName + " by " + m.author);
-                    consoleDisplay.append("Firestar is extracting " + m.friendlyName + " by " + m.author + "\n");
-                    new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + m.path).extractAll(System.getProperty("user.home") + "/.firestar/temp/");
-
-		    try (Stream<Path> walkStream = Files.walk(Paths.get(System.getProperty("user.home") + "/.firestar/temp/"))) {
-			walkStream.filter(p -> p.toFile().isFile()).forEach(f -> {
-			    if (f.toString().endsWith(".patch")) {
-				System.out.println("Patching " + f.toString() + "...");
-				consoleDisplay.append("Patching " + f.toString() + "...\n");
-				String mainFile = f.toString().substring(0, f.toString().length() - 6);
-				
-				try {
-				    List<String> original = Files.readAllLines(new File(mainFile).toPath());
-				    List<String> patched = Files.readAllLines(f);
-				    
-				    Patch<String> patch = UnifiedDiffUtils.parseUnifiedDiff(patched);
-				    List<String> result = DiffUtils.patch(original, patch);
-				    
-				    try (FileWriter fileWriter = new FileWriter(mainFile)) {
-					for (String str : result) {
-					    fileWriter.write(str + "\r\n");
-					}
-				    }
-				    new File(f.toString()).delete();
-				} catch (Exception ex) {
-				    Logger.getLogger(Gonzo.class.getName()).log(Level.SEVERE, null, ex);
-				    System.out.println(ex.getMessage());
-				    consoleDisplay.append("CRITICAL FAILURE: " + ex.getMessage());
+		final Thread managerThread = new Thread() {
+			@Override
+			public void run() {
+				if (/*Main.repatch*/true) { //todo implement fast mode correctly or remove
+					CompatibilityRoutine();
+				} else {
+					FastRoutine();
 				}
-			    }
-			});
-		    }
-		    
-                    if (new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").isFile()) {
-                        System.out.println("Firestar is deleting files that conflict with " + m.friendlyName + " by " + m.author);
-                        consoleDisplay.append("Firestar is deleting files that conflict with " + m.friendlyName + " by " + m.author + "\n");
+			}
+		};
+		managerThread.start();
+	}
+
+	private void CompatibilityRoutine() {
+		// cleanup any failed deploys to avoid scripts running when they are not supposed to be
+		Main.deleteDir(new File(System.getProperty("user.home") + "/.firestar/temp/"));
+
+		// create temporary working area for asset dump
+		new File(System.getProperty("user.home") + "/.firestar/temp/").mkdirs();
+		new File(System.getProperty("user.home") + "/.firestar/temparcs/").mkdirs();
+
+		// Work from bottom to top, mods on top always overwrite the ones on the bottom.
+		List<Main.Mod> modsFlipped = new ArrayList<>(Main.Mods);
+		Collections.reverse(modsFlipped);
+
+		// decide which files to dump
+		List<String> dumpThese = new ArrayList<String>();
+		for (Main.Mod m : modsFlipped) {
+			if (m.enabled) {
+				System.out.println(m.friendlyName + " : " + m.requires.toString() + " : " + m.extracts.toString());
+				for (String r : m.requires) if (!dumpThese.contains(r)) dumpThese.add(r);
+			}
+		}
+		if (data0) oArcTarget = "data.psarc";
+		if (data1) oArcTarget = "data1.psarc";
+		if (data2) oArcTarget = "data2.psarc";
+		if (dlc1) oArcTarget = "dlc1.psarc";
+		if (dlc2) oArcTarget = "dlc2.psarc";
+		dumpThese.remove(oArcTarget); dumpThese.add(oArcTarget); // Always dump the base game last. TODO should we allow mods to specify otherwise??
+		System.out.println("List of files to dump: " + dumpThese);
+
+		// dump all assets to working area
+		for (String s : dumpThese) {
+			try {
+				if (!(new File(Main.inpath + s).exists()))
+					throw new IOException("A mod requested access to the archive \"" + s + "\" but it doesn't exist!");
+
+				System.out.println("Firestar is extracting " + s);
+				consoleDisplay.append("Firestar is extracting " + s + "\n");
+				Process p;
+				if (s.equals(oArcTarget)) p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../"+s}, System.getProperty("user.home") + "/.firestar/temp/");
+				else {
+					new File(System.getProperty("user.home") + "/.firestar/temparcs/" + s + "/").mkdirs();
+					p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../../"+s}, System.getProperty("user.home") + "/.firestar/temparcs/" + s + "/");
+				}
+				final Thread ioThread = new Thread() {
+					@Override
+					public void run() {
+						try {
+							final BufferedReader reader = new BufferedReader(
+									new InputStreamReader(p.getInputStream()));
+							String line = null;
+							while ((line = reader.readLine()) != null) {
+								System.out.println(line);
+								consoleDisplay.append(line + "\n");
+								try {scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());}
+								catch (Exception e) {System.out.println("WARNING: Swing failed to paint window due to race condition. You can safely ignore this.\n" + e.getMessage());}
+							}
+							reader.close();
+						} catch (final Exception e) {
+							e.printStackTrace(); // will probably definitely absolutely for sure hang firestar unless we do something. Too bad!
+						}
+					}
+				};
+				ioThread.start();
+				p.waitFor();
+			} catch (IOException | InterruptedException e) {
+				System.out.println(e.getMessage());
+				consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
+				JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+				frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+				AllowExit();
+				return;
+			}
+		}
+
+		// overwrite assets with custom ones from each mod and/or perform operations as specified in mod's delete list
+		// todo: implement RegEx functions after delete.txt
+		for (Main.Mod m : modsFlipped) {
+			if (m.enabled) {
+				try {
+					System.out.println("Firestar is extracting " + m.friendlyName + " by " + m.author);
+					consoleDisplay.append("Firestar is extracting " + m.friendlyName + " by " + m.author + "\n");
+					new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + m.path).extractAll(System.getProperty("user.home") + "/.firestar/temp/");
+
+					if (!m.requires.isEmpty() && !m.extracts.isEmpty()) {
+						for (String r : m.requires) {
+							for (String e : m.extracts) {
+								File f = new File(Main.inpath + "temparcs/" + r + "/" + e);
+								File f2 = new File(Main.inpath + "temp/" + e);
+								if (f2.exists()) {
+									System.out.println("File \"" + e + "\" already exists in master PSARC. Ignoring.");
+									consoleDisplay.append("File \"" + e + "\" already exists in master PSARC. Ignoring." + "\n");
+								}
+								else if (f.exists()) {
+									Path src = Paths.get(Main.inpath + "temparcs/" + r + "/" + e);
+									Path dest = Paths.get(Main.inpath + "temp/" + e);
+									System.out.println("Copying extra file " + e + " from " + r);
+									consoleDisplay.append("Copying extra file " + e + " from " + r + "\n");
+									new File(dest.getParent().toString()).mkdirs();
+									Files.copy(src, dest, StandardCopyOption.COPY_ATTRIBUTES);
+								} else throw new IOException("A mod requested access to the file \"" + e + "\" from archive " + r + " but it wasn't there!");
+							}
+						}
+					} else if (!m.extracts.isEmpty()) {
+						System.out.println("WARNING: " + m.friendlyName + " by " + m.author + "tried to extract individual files without specifying a source PSARC in requires[]. Ignoring.");
+						consoleDisplay.append("WARNING: " + m.friendlyName + " by " + m.author + "tried to extract individual files without specifying a source PSARC in requires[]. Ignoring." + "\n");
+					}
+
+					File fscript = new File(Main.inpath + "temp/fscript");
+					if (fscript.exists()) {
+						System.out.println("Firestar is applying patches from " + m.friendlyName + " by " + m.author);
+						consoleDisplay.append("Firestar is applying patches from " + m.friendlyName + " by " + m.author + "\n");
+						new Rizzo(new FileInputStream(fscript), Main.inpath + "temp/"); // Lets rizz this mod up
+						fscript.delete();
+					}
 			
-                        String deleteQueue = new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/temp/delete.txt")));
-                        if (Main.windows) {deleteQueue = new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "\\.firestar\\temp\\delete.txt")));} // might be unnecessary
-                        String[] dQarray = deleteQueue.split("\n");
-                        Arrays.sort(dQarray);
-                        System.out.println("The deletion queue is " + dQarray.length + " files long!"); //debug
+					if (new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").isFile()) {
+						System.out.println("Firestar is deleting files that conflict with " + m.friendlyName + " by " + m.author);
+						consoleDisplay.append("Firestar is deleting files that conflict with " + m.friendlyName + " by " + m.author + "\n");
+						System.out.println("WARNING: delete.txt is DEPRECATED. If using a mod with loaderversion >= 1 then this is bad practice, please use FSCRIPTs instead.");
+						consoleDisplay.append("WARNING: delete.txt is DEPRECATED. If using a mod with loaderversion >= 1 then this is bad practice, please use FSCRIPTs instead.");
+			
+						String deleteQueue = new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/temp/delete.txt")));
+						if (Main.windows) {deleteQueue = new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "\\.firestar\\temp\\delete.txt")));} // might be unnecessary
+						String[] dQarray = deleteQueue.split("\n");
+						Arrays.sort(dQarray);
+						System.out.println("The deletion queue is " + dQarray.length + " files long!"); //debug
 
-                        for (String file : dQarray) {
-                            if(file.contains("..")) { //todo: is this safe enough?
-                                System.out.println("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!");
-                                consoleDisplay.append("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!\n");
-                            } else {
-                                if (!Main.windows) {
-                                    System.out.println("Deleting " + System.getProperty("user.home") + "/.firestar/temp/data/" + file);
-                                    consoleDisplay.append("Deleting " + System.getProperty("user.home") + "/.firestar/temp/data/" + file + "\n");
-                                    new File(System.getProperty("user.home") + "/.firestar/temp/data" + file).delete();}
-                                else {
-                                    System.out.println("Deleting " + new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\"));
-                                    consoleDisplay.append("Deleting " + new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\") + "\n");
-                                    new File(new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\")).delete();
-                                }
-                            }
-                        }
+						for (String file : dQarray) {
+							if(file.contains("..")) { //todo: is this safe enough?
+								System.out.println("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!");
+								consoleDisplay.append("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!\n");
+							} else {
+								if (!Main.windows) {
+									System.out.println("Deleting " + System.getProperty("user.home") + "/.firestar/temp/data/" + file);
+									consoleDisplay.append("Deleting " + System.getProperty("user.home") + "/.firestar/temp/data/" + file + "\n");
+									new File(System.getProperty("user.home") + "/.firestar/temp/data" + file).delete();}
+								else {
+									System.out.println("Deleting " + new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\"));
+									consoleDisplay.append("Deleting " + new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\") + "\n");
+									new File(new String(System.getProperty("user.home") + "\\.firestar\\temp\\data" + file).replace("/", "\\")).delete();
+								}
+							}
+						}
 
-                        // cleanup so we don't run it again for the next mod unless needed
-                        // this is not necessary but good practice
-                        new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").delete();
-                    }
-                } catch (Exception e) {
-                    System.out.println(e.getMessage());
-                    consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
-                    JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-                    frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-                    AllowExit();
-                    return;
-                }
-            }
-        }
+						// cleanup so we don't run it again for the next mod
+						new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").delete();
+					}
+				} catch (Exception e) {
+					System.out.println(e.getMessage());
+					consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
+					if (e instanceof FirescriptFormatException) {JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage() + "\nOne of your mods has a broken FSCRIPT. It cannot be installed.", "Fatal Error", JOptionPane.ERROR_MESSAGE);} else {
+						JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+					}
+					frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+					AllowExit();
+					return;
+				}
+			}
+		}
+	
+		// Post fscript changes
+		try (InputStream is = Main.class.getResourceAsStream("/post.fscript")) {
+			new Rizzo(is, Main.inpath + "temp/");
+		} catch (IOException | FirescriptFormatException e) {
+			System.out.println(e.getMessage());
+			consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
+			JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: Internal FSCRIPT Error. " + e.getMessage() + "\nThis may indicate that Firestar has been corrupted and needs reinstalling.", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+			AllowExit();
+			return;
+		}
 
-        // create a list of the contents of data/ for psp2psarc.exe to read from
-        List<String> oFilesList = new ArrayList<String>();
-        List<String> oFilesList2 = new ArrayList<String>();
-        try {
-            listAllFiles(Paths.get(System.getProperty("user.home") + "/.firestar/temp/data/"), oFilesList);
-            for (String p : oFilesList) {
-                // We need to clean up the path here on Linux to avoid psp2psarc getting confused about where the hell "/" is.
-                // In WINE it should see it as Z: by default, but if it's somewhere else then I don't have an elegant way of knowing what drive letter it's on, so
-                // relative paths are kind of the only choice here. This can be extended to Windows too as it works there, though completely unnecessary.
-                if (!Main.windows) {oFilesList2.add(p.replace("\\", "/").split(new String(System.getProperty("user.home") + "/.firestar/temp/"))[1]);}
-                else {oFilesList2.add(p.split(new String(System.getProperty("user.home") + "\\.firestar\\temp\\").replace("\\", "\\\\"))[1]);} // path wont match regex unless adjusted for windows here
-            }
-            //oFilesList2.forEach(System.out::println); //debug
-            File oFilesListO = new File(System.getProperty("user.home") + "/.firestar/temp/list.txt");
-            if (oFilesListO.isFile()) {oFilesListO.delete();}
-            FileWriter oFilesListWr = new FileWriter(oFilesListO, true);
-            int i = 0;
-            for (String p : oFilesList2) {
-                oFilesListWr.append(p);
-                if (i != oFilesList2.size()) {
-                    oFilesListWr.append("\n");
-                }
-                i++;
-            }
-            oFilesListWr.close();
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-            consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
-            JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-            AllowExit();
-            return;
-        }
+		// create a list of the contents of data/ for psp2psarc.exe to read from
+		List<String> oFilesList = new ArrayList<String>();
+		List<String> oFilesList2 = new ArrayList<String>();
+		try {
+			listAllFiles(Paths.get(System.getProperty("user.home") + "/.firestar/temp/data/"), oFilesList);
+			for (String p : oFilesList) {
+				// We need to clean up the path here on Linux to avoid psp2psarc getting confused about where the hell "/" is.
+				// In WINE it should see it as Z: by default, but if it's somewhere else then I don't have an elegant way of knowing what drive letter it's on, so
+				// relative paths are kind of the only choice here. This can be extended to Windows too as it works there, though completely unnecessary.
+				if (!Main.windows) {oFilesList2.add(p.replace("\\", "/").split(new String(System.getProperty("user.home") + "/.firestar/temp/"))[1]);}
+				else {oFilesList2.add(p.split(new String(System.getProperty("user.home") + "\\.firestar\\temp\\").replace("\\", "\\\\"))[1]);} // path wont match regex unless adjusted for windows here
+			}
+			//oFilesList2.forEach(System.out::println); //debug
+			File oFilesListO = new File(System.getProperty("user.home") + "/.firestar/temp/list.txt");
+			if (oFilesListO.isFile()) {oFilesListO.delete();}
+			FileWriter oFilesListWr = new FileWriter(oFilesListO, true);
+			int i = 0;
+			for (String p : oFilesList2) {
+				oFilesListWr.append(p);
+				if (i != oFilesList2.size()) {
+					oFilesListWr.append("\n");
+				}
+				i++;
+			}
+			oFilesListWr.close();
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+			consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
+			JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+			AllowExit();
+			return;
+		}
 
-        // invoke psp2psarc.exe one final time to reconstruct the assets
-        try {
-            System.out.println("Firestar is compiling the final build");
-            consoleDisplay.append("Firestar is compiling the final build" + "\n");
-            Process p = Main.exec(new String[]{"../psp2psarc.exe", "create", "--skip-missing-files", "-j12", "-a", "-i", "-y", "--input-file=list.txt", "-o" + oArcTarget}, System.getProperty("user.home") + "/.firestar/temp/");
-            final Thread ioThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        final BufferedReader reader = new BufferedReader(
-                                new InputStreamReader(p.getInputStream()));
-                        String line = null;
-                        while ((line = reader.readLine()) != null) {
-                            System.out.println(line);
-                            consoleDisplay.append(line + "\n");
-                            try {scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());}
-                            catch (Exception e) {System.out.println("WARNING: Swing failed to paint window due to race condition.\n" + e.getMessage());}
-                        }
-                        reader.close();
-                    } catch (final Exception e) {
-                        e.printStackTrace(); // will probably definitely absolutely for sure hang firestar unless we do something. Too bad!
-                    }
-                }
-            };
-            ioThread.start();
-            p.waitFor();
-        } catch (IOException | InterruptedException e) {
-            System.out.println(e.getMessage());
-            consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
-            JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-            AllowExit();
-            return;
-        }
+		// invoke psp2psarc.exe one final time to reconstruct the assets
+		try {
+			System.out.println("Firestar is compiling the final build");
+			consoleDisplay.append("Firestar is compiling the final build" + "\n");
+			Process p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "create", "--skip-missing-files", "-j12", "-a", "-i", "-y", "--input-file=list.txt", "-o" + oArcTarget}, System.getProperty("user.home") + "/.firestar/temp/");
+			final Thread ioThread = new Thread() {
+				@Override
+				public void run() {
+					try {
+						final BufferedReader reader = new BufferedReader(
+								new InputStreamReader(p.getInputStream()));
+						String line = null;
+						while ((line = reader.readLine()) != null) {
+							System.out.println(line);
+							consoleDisplay.append(line + "\n");
+							try {scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());}
+							catch (Exception e) {System.out.println("WARNING: Swing failed to paint window due to race condition.\n" + e.getMessage());}
+						}
+						reader.close();
+					} catch (final Exception e) {
+						e.printStackTrace(); // will probably definitely absolutely for sure hang firestar unless we do something. Too bad!
+					}
+				}
+			};
+			ioThread.start();
+			p.waitFor();
+		} catch (IOException | InterruptedException e) {
+			System.out.println(e.getMessage());
+			consoleDisplay.append("CRITICAL FAILURE: " + e.getMessage());
+			JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: " + e.getMessage(), "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+			AllowExit();
+			return;
+		}
 
-        // cleanup
-        boolean one = new File(Main.outpath).mkdirs();
-        boolean two;
-        System.out.println("created export folder: " + one);
-        if (new File(Main.outpath + oArcTarget).exists()) {System.out.println("deleting existing file: " + Main.outpath + oArcTarget); new File(Main.outpath + oArcTarget).delete();} //hackjob
-        if (!Main.windows) {two = new File(System.getProperty("user.home") + "/.firestar/temp/" + oArcTarget).renameTo(new File(Main.outpath + oArcTarget));}
-        else {two = new File(System.getProperty("user.home") + "\\.firestar\\temp\\" + oArcTarget).renameTo(new File(Main.outpath + oArcTarget));}
-        System.out.println("moved file to destination: " + two);
-        if (two) {System.out.println("file should be located at " + Main.outpath + oArcTarget);} else {
-            System.out.println("CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!");
-            consoleDisplay.append("CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!");
-            JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
-            frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-            AllowExit();
-            return;
-        }
-        try {
-            File tmp = new File(System.getProperty("user.home") + "/.firestar/temp/");
-            Main.deleteDir(tmp);
-        } catch (Exception e) {
-            System.out.println("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage());
-            consoleDisplay.append("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage());
-        }
+		// cleanup
+		boolean one = new File(Main.outpath).mkdirs();
+		boolean two;
+		System.out.println("created export folder: " + one);
+		if (new File(Main.outpath + oArcTarget).exists()) {System.out.println("deleting existing file: " + Main.outpath + oArcTarget); new File(Main.outpath + oArcTarget).delete();} //hackjob
+		if (!Main.windows) {two = new File(System.getProperty("user.home") + "/.firestar/temp/" + oArcTarget).renameTo(new File(Main.outpath + oArcTarget));}
+		else {two = new File(System.getProperty("user.home") + "\\.firestar\\temp\\" + oArcTarget).renameTo(new File(Main.outpath + oArcTarget));}
+		System.out.println("moved file to destination: " + two);
+		if (two) {System.out.println("file should be located at " + Main.outpath + oArcTarget);} else {
+			System.out.println("CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!");
+			consoleDisplay.append("CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!");
+			JOptionPane.showMessageDialog(this.frame, "CRITICAL FAILURE: Please check that your output path is correct and that you have write permissions!", "Fatal Error", JOptionPane.ERROR_MESSAGE);
+			frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+			AllowExit();
+			return;
+		}
+		try {
+			File tmp = new File(System.getProperty("user.home") + "/.firestar/temp/");
+			File tmp2 = new File(System.getProperty("user.home") + "/.firestar/temparcs/");
+			Main.deleteDir(tmp);
+			Main.deleteDir(tmp2);
+		} catch (Exception e) {
+			System.out.println("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage());
+			consoleDisplay.append("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage());
+		}
 
-        // done!
-        try {
-            TimeUnit.SECONDS.sleep(1); // avoid race condition when logging
-        } catch (InterruptedException e) {
-            //ignore
-        }
+		// done!
+		try {
+			TimeUnit.SECONDS.sleep(1); // avoid race condition when logging
+		} catch (InterruptedException e) {
+			//ignore
+		}
 
-        ((TitledBorder)scrollPane.getBorder()).setTitle("DONE! Close this pop-up to continue.");
-        scrollPane.repaint();
+		((TitledBorder)scrollPane.getBorder()).setTitle("DONE! Close this pop-up to continue.");
+		scrollPane.repaint();
 
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        AllowExit();
-    }
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		AllowExit();
+	}
 
-    private void FastRoutine() {
+	private void FastRoutine() {
 
-    }
+	}
 
-    public void AllowExit() {
-        System.out.println("\n\nYou may now close the pop-up window.");
-        consoleDisplay.append("\n\n\nYou may now close the pop-up window.");
-        try {TimeUnit.MILLISECONDS.sleep(200);} catch (InterruptedException e) {} //ignore
-        scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                invoker.wrapUpDeployment();
-                e.getWindow().dispose();
-            }
-        });
-    }
+	public void AllowExit() {
+		System.out.println("\n\nYou may now close the pop-up window.");
+		consoleDisplay.append("\n\n\nYou may now close the pop-up window.");
+		try {TimeUnit.MILLISECONDS.sleep(200);} catch (InterruptedException e) {} //ignore
+		scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				Main.deleteDir(new File(System.getProperty("user.home") + "/.firestar/temp/"));
+				invoker.wrapUpDeployment();
+				e.getWindow().dispose();
+			}
+		});
+	}
 
-    private static void listAllFiles(Path currentPath, List<String> allFiles)
-            throws IOException
-    {
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(currentPath))
-        {
-            for (Path entry : stream) {
-                if (Files.isDirectory(entry)) {
-                    listAllFiles(entry, allFiles);
-                } else {
-                    allFiles.add(entry.toString());
-                }
-            }
-        }
-    }
+	private static void listAllFiles(Path currentPath, List<String> allFiles) throws IOException {
+		try (DirectoryStream<Path> stream = Files.newDirectoryStream(currentPath)) {
+			for (Path entry : stream) {
+				if (Files.isDirectory(entry)) {
+					listAllFiles(entry, allFiles);
+				} else {
+					allFiles.add(entry.toString());
+				}
+			}
+		}
+	}
 }

firestar/src/main/java/Kermit.java

@@ -1,476 +0,0 @@
-/*
- *     Firestar Mod Manager
- *     Copyright (C) 2024  bonkmaykr
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see https://www.gnu.org/licenses/.
- */
-
-import javax.swing.*;
-import javax.swing.text.StyleConstants;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.*;
-import java.math.BigInteger;
-import java.net.URL;
-import java.nio.file.*;
-import java.security.*;
-
-// handles setup window
-public class Kermit implements ActionListener {
-    public enum Pages {
-        AGREEMENT(0),
-        EXPORT_MODE(1),
-        SDK_INSTALL(2),
-        SDK_FAILURE(3),
-        WHAT_OS(4),
-        EXPORT_LOCATION(5),
-        IMPORT_LOCATION(6),
-        DONE(7);
-
-        public final int value;
-
-        private Pages(int i) {
-            this.value = i;
-        }
-    }
-
-    JDialog frame = new JDialog();
-    JButton button = new JButton("Next");
-    JButton button2 = new JButton("Quit");
-    JButton button3 = new JButton("Cancel");
-    JButton button4 = new JButton("Back");
-    JTextPane dialogText = new JTextPane();
-    JRadioButton buttonCompat = new JRadioButton("Compatibility (for consoles)");
-    JRadioButton buttonFast = new JRadioButton("Fast Mode (for Vita3K emulator)");
-    ButtonGroup radg1 = new ButtonGroup();
-    JRadioButton buttonNoWine = new JRadioButton("No, I use Microsoft Windows");
-    JRadioButton buttonHaveWine = new JRadioButton("Yes, I have a POSIX system with WINE.");
-    ButtonGroup radg2 = new ButtonGroup();
-    JTextField pathInput = new JTextField();
-    JButton openconfigfolderbutton = new JButton("Open Firestar Folder");
-    Pages page = Pages.AGREEMENT;
-    javax.swing.text.StyledDocument document = dialogText.getStyledDocument();
-    javax.swing.text.SimpleAttributeSet align= new javax.swing.text.SimpleAttributeSet();
-
-    public void setup(File fConf) { //File variable is redundant. unused
-        frame.getContentPane().setBackground(Color.WHITE);
-        radg1.add(buttonCompat);
-        radg1.add(buttonFast);
-        radg2.add(buttonNoWine);
-        radg2.add(buttonHaveWine);
-
-        button.addActionListener(this);
-        button2.addActionListener(this);
-        button3.addActionListener(this);
-        button4.addActionListener(this);
-        buttonCompat.addActionListener(this);
-        buttonFast.addActionListener(this);
-        buttonNoWine.addActionListener(this);
-        buttonHaveWine.addActionListener(this);
-        openconfigfolderbutton.addActionListener(this);
-
-        changePage(Pages.AGREEMENT);
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == button2){
-            System.exit(0);
-        } else if (actionEvent.getSource() == button){
-            //frame.removeAll(); freezes??
-            switch (page) {
-                case AGREEMENT:
-                    button.setVisible(false);frame.remove(button);
-                    button2.setVisible(false);frame.remove(button2);
-                    dialogText.setVisible(false);frame.remove(dialogText);
-                    changePage(Pages.SDK_INSTALL); // EXPORT_MODE
-                    break;
-                case EXPORT_MODE:
-                    button.setVisible(false);frame.remove(button);
-                    button3.setVisible(false);frame.remove(button3);
-                    dialogText.setVisible(false);frame.remove(dialogText);
-                    buttonCompat.setVisible(false);frame.remove(buttonCompat);
-                    buttonFast.setVisible(false);frame.remove(buttonFast);
-                    if (Main.repatch) {
-                        changePage(Pages.SDK_INSTALL);
-                    } else {changePage(Pages.EXPORT_LOCATION);}
-                    break;
-                case SDK_INSTALL:
-                    break;
-                case SDK_FAILURE:
-                    break;
-                case WHAT_OS:
-                    button.setVisible(false);frame.remove(button);
-                    button3.setVisible(false);frame.remove(button3);
-                    dialogText.setVisible(false);frame.remove(dialogText);
-                    break;
-                case EXPORT_LOCATION:
-                    button.setVisible(false);frame.remove(button);
-                    button3.setVisible(false);frame.remove(button3);
-                    dialogText.setVisible(false);frame.remove(dialogText);
-                    buttonNoWine.setVisible(false);frame.remove(buttonNoWine);
-                    buttonHaveWine.setVisible(false);frame.remove(buttonHaveWine);
-                    changePage(Pages.IMPORT_LOCATION);
-                    break;
-                case IMPORT_LOCATION:
-                    Main.outpath = pathInput.getText();
-                    pathInput.setText("");
-                    dialogText.setVisible(false);frame.remove(dialogText);
-                    pathInput.setVisible(false);frame.remove(pathInput);
-                    changePage(Pages.DONE);
-                    break;
-                case DONE:
-                    if (new File(Main.inpath + "psp2psarc.exe").exists()) { // we may have been here before
-                        new MissPiggy().Action(false);
-                    } else {
-                        new MissPiggy().Action(true);
-                    }
-
-                    page = Pages.AGREEMENT; //set it here since we're disposing of the entire thing
-                    frame.dispose();
-                    break;
-                default:
-                    throw new UnsupportedOperationException("ERROR: Undefined behavior in Kermit's event listener. Get a programmer!");
-                    //JOptionPane OhShit = new JOptionPane.showMessageDialog(null, "Fuck");
-            }
-        } else if (actionEvent.getSource() == button4){
-            //frame.removeAll(); freezes??
-            switch (page) { // todo remove elements when going to previous page
-                case EXPORT_MODE:
-                    changePage(Pages.AGREEMENT);
-                    break;
-                case SDK_INSTALL:
-                    changePage(Pages.EXPORT_MODE);
-                    break;
-                case SDK_FAILURE:
-                    break;
-                case WHAT_OS:
-                    changePage(Pages.SDK_INSTALL);
-                    break;
-                case EXPORT_LOCATION:
-                    if (Main.repatch) {changePage(Pages.WHAT_OS);} else {changePage(Pages.EXPORT_MODE);}
-                    break;
-                case IMPORT_LOCATION:
-                    changePage(Pages.EXPORT_LOCATION);
-                    break;
-                default:
-                    throw new UnsupportedOperationException("ERROR: Undefined behavior in Kermit's event listener. Get a programmer!");
-                    //JOptionPane OhShit = new JOptionPane.showMessageDialog(null, "Fuck");
-            }
-        } else if (actionEvent.getSource() == buttonCompat) {
-            Main.repatch = true;
-            button.setEnabled(true);
-        } else if (actionEvent.getSource() == buttonFast) {
-            Main.repatch = false;
-            button.setEnabled(true);
-        } else if (actionEvent.getSource() == buttonHaveWine) {
-            Main.windows = true;
-            button.setEnabled(true);
-        } else if (actionEvent.getSource() == buttonNoWine) {
-            Main.windows = false;
-            button.setEnabled(true);
-        }else if (actionEvent.getSource() == openconfigfolderbutton) {
-            try {
-                Desktop.getDesktop().open(new File(Main.inpath));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public void changePage(Pages GoTo){
-        switch (GoTo) {
-            case AGREEMENT:
-                page = Pages.AGREEMENT;
-
-                button.setVisible(true);
-                button.setBounds(292, 343, 300, 30);
-                frame.add(button);
-
-                button2.setVisible(true);
-                button2.setBounds(0, 343, 292, 30);
-                frame.add(button2);
-
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(0, 0, 592, 343);
-                //dialogText.setAlignmentX(JComponent.CENTER_ALIGNMENT);
-                //dialogText.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                //dialogText.setText("Aww Fiddlesticks, what now?");
-                dialogText.setText("WELCOME TO FIRESTAR\n\n" +
-                        "This initial setup guide will help you prepare your Playstation Vita, Playstation TV, or Vita3K emulator to play WipEout mods.\n\n Before continuing, please read the decryption guide at:\nhttps://git.worlio.com/bonkmaykr/firestar/wiki/Decrypting-Original-PSARC-Files\nsince you will need these files in order to use Firestar.\n\n" +
-                        "If you encounter any issues while using Firestar you may contact the author at bonkmaykr@screwgravity.net");
-                frame.add(dialogText);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setVisible(true);
-                break;
-            case EXPORT_MODE:
-                page = Pages.EXPORT_MODE;
-
-                button.setVisible(true);
-                button.setEnabled(false);
-                button.setBounds(292, 343, 300, 30);
-                frame.add(button);
-
-                button3.setVisible(false);
-                button3.setBounds(0, 343, 292, 30);
-                frame.add(button3);
-
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(0, 40, 592, 150);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                dialogText.setText("Please choose how Firestar will deploy your mods.\n\n" +
-                        "Compatibility mode requires software from the PSVita SDK, but works on real hardware.\n" +
-                        "Fast mode is easiest, but won't work on FAT32/exFAT drives like what the Vita uses.");
-                frame.add(dialogText);
-
-                buttonCompat.setBounds(40, 200, 300, 25);
-                buttonFast.setBounds(40, 230, 300, 25);
-                buttonCompat.setBackground(Color.WHITE);
-                buttonFast.setBackground(Color.WHITE);
-                buttonCompat.setVisible(true);
-                buttonFast.setVisible(true);
-                frame.add(buttonCompat);
-                frame.add(buttonFast);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setLocationRelativeTo(null);
-                frame.setVisible(true);
-                break;
-            case SDK_INSTALL:
-                page = Pages.SDK_INSTALL;
-
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(0, 40, 592, 300);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                dialogText.setText("Firestar is downloading important dependencies. Please wait."); //some kind of race condition prevents this from displaying?
-                frame.add(dialogText);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setVisible(true);
-
-                //md5 checksum 4ef707b2dba6944a726d46950aaddfd2
-                try {
-                    File downloadLocationDir = new File(System.getProperty("user.home") + "/.firestar/");
-                    File downloadLocation = new File(System.getProperty("user.home") + "/.firestar/psp2psarc.exe");
-                    downloadLocationDir.mkdirs();
-                    if (!downloadLocation.isFile()) {
-                        downloadLocation.createNewFile();
-                    }
-                    BufferedInputStream in = new BufferedInputStream(new URL("http://bonkmaykr.worlio.com/http/firestar/psp2psarc.exe").openStream());
-                    //FileOutputStream downloadOutput = new FileOutputStream(new File(System.getProperty("user.home") + "/.firestar/psp2psarc.exe"));
-                    Files.copy(in, Paths.get(System.getProperty("user.home") + "/.firestar/psp2psarc.exe"), StandardCopyOption.REPLACE_EXISTING);
-
-                    int tests = 0;
-                    String checksum ="";
-                    while (tests < 60 /*while(true)*/) {
-                        byte[] hash = MessageDigest.getInstance("MD5").digest(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/psp2psarc.exe")));
-                        checksum = new BigInteger(1, hash).toString(16);
-                        System.out.println("Downloaded psp2psarc.exe successfully.");
-                        if(checksum.equals("4ef707b2dba6944a726d46950aaddfd2")) {changePage(Pages.WHAT_OS);break;}
-                        Thread.sleep(20);
-                        tests++;
-                    }
-
-                    if(checksum.equals("4ef707b2dba6944a726d46950aaddfd2")) {changePage(Pages.WHAT_OS);} else {
-                        System.out.println("ERROR: Failed to download PSARC tool. Check connection and ensure the file is not corrupt or infected.");
-                        dialogText.setText("Firestar tried to download important files needed for operation, but they were either corrupted or did not finish.\n" + "\n\nYou will need to manually install psp2psarc.exe into your Firestar config folder after setup is complete! Or, you can retry the download later.");
-                        //frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-
-                        button.setVisible(true);
-                        button.setBounds(292, 343, 300, 30);
-                        frame.add(button);
-                    }
-                } catch (Exception e) {
-                    System.out.println("Failed to download PSARC tool due to an internal error:" + e.getMessage());
-                    dialogText.setText("An error has occured.\n" + e.getMessage() + "\n\nYou will need to manually install psp2psarc.exe into your Firestar config folder after setup is complete!!!");
-                    //frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-
-                    button.setVisible(true);
-                    button.setBounds(292, 343, 300, 30);
-                    frame.add(button);
-                }
-
-                break;
-            case SDK_FAILURE:
-                page = Pages.SDK_FAILURE; //unused
-                break;
-            case WHAT_OS:
-                page = Pages.WHAT_OS;
-
-                //do window clear here since the page is never called by the event handler
-                button.setVisible(false);frame.remove(button);
-                button3.setVisible(false);frame.remove(button3);
-                dialogText.setVisible(false);frame.remove(dialogText);
-
-                //check if this is windows or not
-                if(System.getProperty("os.name").contains("Windows")) {Main.windows = true;System.out.println("Assuming we should NOT use WINE based on known system variables.");changePage(Pages.EXPORT_LOCATION);}
-                else {Main.windows = false;System.out.println("Assuming we should use WINE based on known system variables.");changePage(Pages.EXPORT_LOCATION);}
-
-            case EXPORT_LOCATION:
-                page = Pages.EXPORT_LOCATION;
-
-                button.setVisible(true);
-                button.setBounds(292, 343, 300, 30);
-                frame.add(button);
-
-                button3.setVisible(false);
-                button3.setBounds(0, 343, 292, 30);
-                frame.add(button3);
-
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(30, 40, 542, 150);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                dialogText.setText("Now enter the location of your game's asset folder.\n" +
-                        "This can be your install directory on your emulator, your repatch folder on your Vita memory card, or a temporary directory you'd like to copy over yourself.\n\n" +
-                        "PLEASE DO NOT POINT THIS DIRECTLY TO WHERE THE GAME IS INSTALLED ON A REAL VITA\n" +
-                        "(ux0:/app, ux0:/patch or ux0:/addcont)\n" +
-                        "AS THIS WILL CORRUPT YOUR GAME AND YOU WILL NEED TO REINSTALL IT.\nDoing this on an emulator is fine.");
-                frame.add(dialogText);
-
-                pathInput.setVisible(true);
-                pathInput.setBounds(30,200,542,30);
-                frame.add(pathInput);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setVisible(true);
-                break;
-            case IMPORT_LOCATION:
-                // I think for Fast Mode this step may be unnecessary? look into alternatives perhaps
-
-                page = Pages.IMPORT_LOCATION;
-                pathInput.setVisible(false); //GET OUT OF MY HEAD
-
-                button.setVisible(true);
-                button.setBounds(292, 343, 300, 30);
-                frame.add(button);
-
-                button3.setVisible(false);
-                button3.setBounds(0, 343, 292, 30);
-                frame.add(button3);
-
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(30, 40, 542, 200);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                dialogText.setText("You're almost done!\n\n" +
-                        "Please move all of your original PSARC files for WipEout (base game, patches, and HD Fury DLC) to the config folder and press Next when you are done.\n" +
-                        "Firestar will use these to generate new PSARCs in place of the old ones.\n\n" +
-                        "If you do not already have these files, please read:\nhttps://git.worlio.com/bonkmaykr/firestar/wiki/Decrypting-Original-PSARC-Files\nto acquire them.");
-                frame.add(dialogText);
-
-                //pathInput.setVisible(true);
-                //pathInput.setBounds(30,200,542,30);
-                //frame.add(pathInput);
-                openconfigfolderbutton.setVisible(true);
-                openconfigfolderbutton.setBounds(30,250,542,30);
-                frame.add(openconfigfolderbutton);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setVisible(true);
-                break;
-            case DONE:
-                page = Pages.DONE;
-
-                Main.writeConf(); // save changes
-
-                //SERIOUS!!!!!!!!!!!!!! cleanup
-                button.setVisible(false);frame.remove(button);
-                button2.setVisible(false);frame.remove(button2);
-                button3.setVisible(false);frame.remove(button3);
-                button4.setVisible(false);frame.remove(button4);
-                openconfigfolderbutton.setVisible(false);frame.remove(openconfigfolderbutton);
-                pathInput.setVisible(false);frame.remove(pathInput);
-                buttonFast.setVisible(false);frame.remove(buttonFast);
-                buttonCompat.setVisible(false);frame.remove(buttonCompat);
-                buttonHaveWine.setVisible(false);frame.remove(buttonHaveWine);
-                buttonNoWine.setVisible(false);frame.remove(buttonNoWine);
-
-                //congrations, your did it (party time)
-                dialogText.setVisible(true);
-                dialogText.setHighlighter(null);
-                dialogText.getCaret().setVisible(false);
-                dialogText.setFocusable(false);
-                dialogText.setBounds(30, 40, 542, 200);
-                StyleConstants.setAlignment(align, StyleConstants.ALIGN_CENTER);
-                document.setParagraphAttributes(0, document.getLength(), align, false);
-                dialogText.setText("Firestar is ready!\n\n" +
-                        "For technical support, see Help > Manual.");
-                frame.add(dialogText);
-
-                button.setVisible(true);
-                button.setBounds(292, 343, 300, 30);
-                button.setText("OK");
-                frame.add(button);
-
-                frame.setSize(600, 400);
-                frame.setTitle("Initial Setup");
-                frame.setAlwaysOnTop(true);
-                frame.setDefaultCloseOperation(0);
-                frame.setResizable(false);
-                frame.setLayout(null);
-                frame.setVisible(true);
-                break;
-            default:
-                throw new UnsupportedOperationException("ERROR: Undefined behavior in Kermit.changePage(). Get a programmer!");
-                //JOptionPane OhShit = new JOptionPane.showMessageDialog(null, "Fuck");
-        }
-    }
-}

firestar/src/main/java/Main.java

@@ -18,236 +18,288 @@
 
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
+import org.apache.commons.io.IOUtils;
 import org.json.*;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.List;
 import javax.imageio.ImageIO;
 import javax.swing.*;
 
 public class Main {
-    // Build Information
-    public static final String vstr = "Release 1.3";
-    public static final String vcode = "Tetsuo";
-    public static final String vtag = "tetsuo-1.3"; // set to dekka-1.1 for testing
-    public static final int vint = 1;
+	// Build Information
+	public static String vstr = "Release 1.3.1";
+	public static final String vcode = "Tetsuo";
+	public static final String vtag = "tetsuo-1.3.1"; // set to dekka-1.1 for testing
+	public static final int vint = 1;
 
-    // User Settings
-    public static String outpath = System.getProperty("user.home") + "/.firestar/out/"; //game assets location
-    public final static String inpath = System.getProperty("user.home") + "/.firestar/"; //firestar folder -- do not change this
-    public static boolean repatch; //are we in compat mode?
-    public static boolean windows; //True = windows
-    public static int confvint = vint;
-    public static boolean checkUpdates = true;
-    //public static String psarc; //sdk location
+	// Jenkins Build Information
+	public static boolean isNightly = false;
+	public static final String vtagPrevious = "tetsuo-1.3.1";
+	public static String dateOfCompile = null;
 
-    public enum ArcTarget { // install target for 2048, type used by downloader
-        BASE("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/NYEoaBGfiWymSEVZKxoyrKyBFsZNoFqxdyAIpZayZYuLLbCAArYrYXjPNhKCfXcONmhIZzZEeArycSrjiJOuNMWuWsDONUxMIQtMk.pkg"),
-        LATEST("http://gs.ww.np.dl.playstation.net/ppkg/np/PCSA00015/PCSA00015_T5/a4b7d9e35ed56e86/UP9000-PCSA00015_00-WIPEOUT2048BASE0-A0104-V0100-059564fcab8ce66d19b5a563e92677e581313205-PE.pkg"),
-        ADDON_HD("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/JYMqGNXUKqHEyNLjbOgrWcJdnQJUMzgadRFWekbWFBXAwMeGikOyiHkXKogKIfqGhtNwKgmNWwwcrJORmRUTDzylBPwjGVnVjyDfh.pkg"),
-        ADDON_HD_FURY("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/IAoJQaDpySenBmQCKiqecEPMzSdPfPcdXupxZXLTYYTuRgtsdTaHxbeejwGKRQpjJOKBdMMFzSoeEhsHYxNUasQrEzkZPeBxUEqnp.pkg");
+	// User Settings
+	public static String outpath = System.getProperty("user.home") + "/.firestar/out/"; //game assets location
+	public final static String inpath = System.getProperty("user.home") + "/.firestar/"; //firestar folder -- do not change this
+	public static boolean repatch; //are we in compat mode?
+	public static boolean windows; //True = windows
+	public static int confvint = vint;
+	public static boolean checkUpdates = true;
+	//public static String psarc; //sdk location
 
-        private final String value;
-        ArcTarget(final String value) {this.value = value;}
+	public enum ArcTarget { // install target for 2048, type used by downloader
+		BASE("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/NYEoaBGfiWymSEVZKxoyrKyBFsZNoFqxdyAIpZayZYuLLbCAArYrYXjPNhKCfXcONmhIZzZEeArycSrjiJOuNMWuWsDONUxMIQtMk.pkg"),
+		FIRST("http://gs.ww.np.dl.playstation.net/ppkg/np/PCSA00015/PCSA00015_T5/a4b7d9e35ed56e86/UP9000-PCSA00015_00-WIPEOUT2048BASE0-A0104-V0100-059564fcab8ce66d19b5a563e92677e581313205-PE.pkg"),
+		LATEST("http://gs.ww.np.dl.playstation.net/ppkg/np/PCSA00015/PCSA00015_T5/a4b7d9e35ed56e86/UP9000-PCSA00015_00-WIPEOUT2048BASE0-A0104-V0100-059564fcab8ce66d19b5a563e92677e581313205-PE.pkg"),
+		ADDON_HD("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/JYMqGNXUKqHEyNLjbOgrWcJdnQJUMzgadRFWekbWFBXAwMeGikOyiHkXKogKIfqGhtNwKgmNWwwcrJORmRUTDzylBPwjGVnVjyDfh.pkg"),
+		ADDON_HD_FURY("http://zeus.dl.playstation.net/cdn/UP9000/PCSA00015_00/IAoJQaDpySenBmQCKiqecEPMzSdPfPcdXupxZXLTYYTuRgtsdTaHxbeejwGKRQpjJOKBdMMFzSoeEhsHYxNUasQrEzkZPeBxUEqnp.pkg");
 
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
+		private final String value;
+		ArcTarget(final String value) {this.value = value;}
 
-    public enum ArcKey { // install target for 2048, type used by downloader
-        BASE("KO5ifR1dQ+eHBlgi6TI0Bdkf7hng6h8aYmRgYuHkCLQNn/9ufV+01fmzjNSmwuVHnO4dEBuN8cENACqVFcgA"),
-        LATEST("KO5ifR1dQ+eHBlgi6TI0Bdkf7hng6h8aYmRgYuHkCLQNn/9ufV+01fmzjNSmwuVHnO4dEBuN8cENACqVFcgA"),
-        ADDON_HD("KO5ifR1dQ+eHBlgi6TI0Bdnv4uNsGG5kYGIR4Ojs7ejuis9/anXfuudVNvzgdu+9z1z+asJojA9uAACgRhTl"),
-        ADDON_HD_FURY("KO5ifR1dQ+eHBlgi6TI0Bdnv4uNsFG5kYGIR4Ojs7ejuis9/3fydBRm3eCJX7biz/vVTm/2jMT64AQCCYhVy");
-
-        private final String value;
-        ArcKey(final String value) {this.value = value;}
-
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
-
-    public class Mod {
-        public String path; // file name
-        public int version = 1;
-        public int priority = 0; //unused
-        public String friendlyName;
-        public String description = "";
-        public String game; //TODO for multi game support
-        public int loaderversion = 0; //minimum required vint or feature level from Firestar
-        public String author; // if null, "Author is unknown."
-        public boolean enabled = true;
-        public boolean[] requires = new boolean[]{false, false, false, false};  // TODO: load optional "requires" array from mod meta if it exists. it will be base, patches, hd dlc, and fury dlc in that order.
-                                                                                // TODO: save 'true true false false' in ost gen if neccessary (patches change localization)
-    }
-
-    // Mods
-    public static List<Mod> Mods = new ArrayList<Mod>();
-
-    // UI Global Assets
-    public static Font fExo2;
-    public static BufferedImage windowIcon;
-
-    public static void main(String[] args) {
-        // license string
-        System.out.printf("FIRESTAR MOD MANAGER for WipEout 2048\nversion " + vstr + " (codename " + vcode + ") major " + vint + "\n" +
-                "JVM host appears to be " + System.getProperty("os.name") +
-                "\nRunning from " + System.getProperty("user.dir") +
-                "\nCopyright (C) 2024  bonkmaykr\n\nThis program is free software: you can redistribute it and/or modify\n" +
-                "it under the terms of the GNU General Public License as published by\n" +
-                "the Free Software Foundation, either version 3 of the License, or\n" +
-                "(at your option) any later version.\n" +
-                "\n" +
-                "This program is distributed in the hope that it will be useful,\n" +
-                "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
-                "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
-                "GNU General Public License for more details.\n" +
-                "\n" +
-                "You should have received a copy of the GNU General Public License\n" +
-                "along with this program.  If not, see https://www.gnu.org/licenses/.\n\n\n\n");
-
-        //begin
-        // load global assets
-        try {
-            fExo2 = Font.createFont(Font.TRUETYPE_FONT, Main.class.getResourceAsStream("/exo2.ttf"));
-        } catch (Exception e) {
-            System.out.println("Font \"Exo 2\" is missing!");
-            fExo2 = new Font("Arial", Font.PLAIN, 12);
-        }
+		@Override
+		public String toString() {
+			return value;
+		}
+	}
+
+	public enum ArcKey { // decryption keys for 2048, type used by downloader
+		BASE("KO5ifR1dQ+eHBlgi6TI0Bdkf7hng6h8aYmRgYuHkCLQNn/9ufV+01fmzjNSmwuVHnO4dEBuN8cENACqVFcgA"),
+		FIRST("KO5ifR1dQ+eHBlgi6TI0Bdkf7hng6h8aYmRgYuHkCLQNn/9ufV+01fmzjNSmwuVHnO4dEBuN8cENACqVFcgA"),
+		LATEST("KO5ifR1dQ+eHBlgi6TI0Bdkf7hng6h8aYmRgYuHkCLQNn/9ufV+01fmzjNSmwuVHnO4dEBuN8cENACqVFcgA"),
+		ADDON_HD("KO5ifR1dQ+eHBlgi6TI0Bdnv4uNsGG5kYGIR4Ojs7ejuis9/anXfuudVNvzgdu+9z1z+asJojA9uAACgRhTl"),
+		ADDON_HD_FURY("KO5ifR1dQ+eHBlgi6TI0Bdnv4uNsFG5kYGIR4Ojs7ejuis9/3fydBRm3eCJX7biz/vVTm/2jMT64AQCCYhVy");
+
+		private final String value;
+		ArcKey(final String value) {this.value = value;}
+
+		@Override
+		public String toString() {
+			return value;
+		}
+	}
+
+	public class Mod {
+		public String path; // file name
+		public int version = 1;
+		public int priority = 0; //unused
+		public String friendlyName;
+		public String description = "";
+		public String game; //TODO for multi game support
+		public int loaderversion = 0; //minimum required vint or feature level from Firestar
+		public String author; // if null, "Author is unknown."
+		public boolean enabled = true;
+		public List<String> requires = new ArrayList<>();
+		public List<String> extracts = new ArrayList<>();
+	}
+
+	// Mods
+	public static List<Mod> Mods = new ArrayList<Mod>();
+
+	// UI Global Assets
+	public static Font fExo2;
+	public static BufferedImage windowIcon;
+
+	public static void main(String[] args) throws InterruptedException {
+		// get Nightly information from Jenkins automatic builds
+		if (Main.class.getResource("/jenkinsVersionString") != null) {
+			System.out.println("=== This is a NIGHTLY BUILD! ===\n");
+			try {
+				vstr = "Nightly " + IOUtils.toString(Main.class.getResourceAsStream("/jenkinsVersionString"), StandardCharsets.UTF_8);
+				dateOfCompile = IOUtils.toString(Main.class.getResourceAsStream("/jenkinsBuildDate"), StandardCharsets.UTF_8);
+				System.out.println("Compiled on " + dateOfCompile);
+				isNightly = true;
+			} catch (Exception e) {
+				System.out.println("ERROR: Something went wrong trying to get the autobuild information! defaulting to Release values\n\n");
+				isNightly = false;
+			}
+		}
+
+		// license string
+		System.out.printf("FIRESTAR MOD MANAGER for WipEout 2048\n" + vstr + " (codename " + vcode + ") major " + vint + "\n" +
+				"JVM host appears to be " + System.getProperty("os.name") +
+				"\nRunning from " + System.getProperty("user.dir") +
+				"\nCopyright (C) 2025 Canithesis Interactive\n\nThis program is free software: you can redistribute it and/or modify\n" +
+				"it under the terms of the GNU General Public License as published by\n" +
+				"the Free Software Foundation, either version 3 of the License, or\n" +
+				"(at your option) any later version.\n" +
+				"\n" +
+				"This program is distributed in the hope that it will be useful,\n" +
+				"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+				"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
+				"GNU General Public License for more details.\n" +
+				"\n" +
+				"You should have received a copy of the GNU General Public License\n" +
+				"along with this program.  If not, see https://www.gnu.org/licenses/.\n\n\n\n");
+
+		// display splash screen
+		new Beaker();
+
+		// load global assets
+		try {
+			fExo2 = Font.createFont(Font.TRUETYPE_FONT, Main.class.getResourceAsStream("/exo2.ttf"));
+		} catch (Exception e) {
+			System.out.println("Font \"Exo 2\" is missing!");
+			fExo2 = new Font("Arial", Font.PLAIN, 12);
+		}
 	
-	// load global window icon
-	try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find titleIcon.png. Window will not have an icon.");
-        }
-
-        // check and load configs
-        File fConf = new File(System.getProperty("user.home") + "/.firestar/firestar.conf");
-        if (!fConf.isFile()) {
-            System.out.println("No configuration was found. Starting the initial setup");
-            new WilkinsCoffee().setup();
-        } else {
-            new MissPiggy().Action(); // Quick! Start singing Firework by Katy Perry! (or open the main window i guess...)
-        }
-    }
-
-    public static void writeConf(){
-        JSONObject container = new JSONObject();
-        container.put("version", vint);
-        container.put("2048path", outpath);
-        container.put("HDpath", "TODO"); // proposed hd/fury support for ps3, will use very simplified Fast Mode due to less difficulty installing
-        container.put("safemode", repatch);
-        container.put("isWin32", windows);
-	    container.put("checkUpdates", checkUpdates);
-        container.put("currentPlaylist", "TODO"); // proposed feature: store separate mod lists in lists/ to load/save later?
-
-        try {
-            Files.write(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"), container.toString().getBytes());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static void loadConf(){
-        try {
-            JSONObject container = new JSONObject(new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"))));
-            System.out.println(container.toString()); // debug
-            confvint = (int) container.get("version"); // used for converting configs between program versions later down the line
-            outpath = container.get("2048path").toString();
-            repatch = (boolean) container.get("safemode");
-            windows = (boolean) container.get("isWin32");
-	    try {
-		checkUpdates = (boolean) container.get("checkUpdates");
-	    } catch (JSONException e) {
-		checkUpdates = true;
-	    }
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to load firestar.conf");
-            System.out.println(e.getMessage());
-        }
-    }
-
-    public static void loadConf(MissPiggy w){
-        try {
-            JSONObject container = new JSONObject(new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"))));
-            System.out.println(container.toString()); // debug
-            confvint = (int) container.get("version"); // used for converting configs between program versions later down the line
-            outpath = container.get("2048path").toString();
-            repatch = (boolean) container.get("safemode");
-            windows = (boolean) container.get("isWin32");
-	    try {
-		checkUpdates = (boolean) container.get("checkUpdates");
-	    } catch (JSONException e) {
-		checkUpdates = true;
-	    }
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(w.frame, "Firestar couldn't load your config file. Tread lightly.\n\n" + e.getMessage(), "Critical Error", JOptionPane.ERROR_MESSAGE);
-            System.out.println("ERROR: Failed to load firestar.conf");
-            System.out.println(e.getMessage());
-        }
-    }
-
-    public static void deleteDir(File file) { // https://stackoverflow.com/a/29175213/9259829
-        File[] contents = file.listFiles();
-        if (contents != null) {
-            for (File f : contents) {
-                if (! Files.isSymbolicLink(f.toPath())) {
-                    deleteDir(f);
-                }
-            }
-        }
-        file.delete();
-    }
-
-    public static void downloadDependenciesBeforeSetVisible(JFrame invoker) {
-        invoker.setVisible(false);
-        Main.downloadDependencies();
-        invoker.setVisible(true);
-        confvint = vint;
-        Main.writeConf();
-    }
-
-    public static boolean downloadDependencies () { // todo: CHECKSUM!!!! THESE ARE EXECUTABLES!!!!!!!!!!! DON'T ALLOW MALWARE!!!!
-        boolean downloader = new Fozzie().DownloadFile("https://bonkmaykr.worlio.com/http/firestar/firesdk.zip", System.getProperty("user.home") + "/.firestar/", "firesdk.zip");
-        if (!downloader) {return false;}
-
-        ZipFile sdk = new ZipFile(System.getProperty("user.home") + "/.firestar/firesdk.zip");
-        try {
-            sdk.extractAll(System.getProperty("user.home") + "/.firestar/");
-        } catch (ZipException e) {
-            JOptionPane.showMessageDialog(new JFrame(), e.getMessage(), "Critical Error", JOptionPane.ERROR_MESSAGE);
-            System.out.println(e.getMessage());
-            return false;
-        }
-        sdk.getFile().delete(); // cleanup
-
-        return true;
-    }
-
-    public static boolean callDownloaderStatically (String url, String folder, String name) {
-        return new Fozzie().DownloadFile(url, folder, name);
-    }
-    
-    public static Process exec(String[] cmd, String cwd) throws IOException {
-	Process p;
-	String[] pcmd;
-	if (!Main.windows) {
-	    pcmd = new String[cmd.length + 1];
-	    pcmd[0] = "wine";
-	    System.arraycopy(cmd, 0, pcmd, 1, cmd.length);
-	    p = Runtime.getRuntime().exec(pcmd, null, new File(cwd));
-	} else {
-	    p = Runtime.getRuntime().exec(cmd, null, new File(cwd.replace("/", "\\")));
+		// load global window icon
+		try {
+			windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
+		} catch (IOException e) {
+			System.out.println("ERROR: Failed to find titleIcon.png. Window will not have an icon.");
+		}
+
+		// check and load configs
+		File fConf = new File(System.getProperty("user.home") + "/.firestar/firestar.conf");
+		if (!fConf.isFile()) {
+			System.out.println("No configuration was found. Starting the initial setup");
+			new WilkinsCoffee().setup();
+		} else {
+			new MissPiggy().Action(); // Quick! Start singing Firework by Katy Perry! (or open the main window i guess...)
+		}
+	}
+
+	public static void writeConf(){
+		JSONObject container = new JSONObject();
+		container.put("version", vint);
+		container.put("2048path", outpath);
+		container.put("HDpath", "TODO"); // proposed hd/fury support for ps3, will use very simplified Fast Mode due to less difficulty installing
+		container.put("safemode", repatch);
+		container.put("isWin32", windows);
+		container.put("checkUpdates", checkUpdates);
+		container.put("currentPlaylist", "TODO"); // proposed feature: store separate mod lists in lists/ to load/save later?
+
+		try {
+			Files.write(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"), container.toString().getBytes());
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void loadConf(){
+		try {
+			JSONObject container = new JSONObject(new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"))));
+			System.out.println(container.toString()); // debug
+			confvint = (int) container.get("version"); // used for converting configs between program versions later down the line
+			outpath = container.get("2048path").toString();
+			repatch = (boolean) container.get("safemode");
+			windows = (boolean) container.get("isWin32");
+			try {
+				checkUpdates = (boolean) container.get("checkUpdates");
+			} catch (JSONException e) {
+				checkUpdates = true;
+			}
+		} catch (IOException e) {
+			System.out.println("ERROR: Failed to load firestar.conf");
+			System.out.println(e.getMessage());
+		}
+	}
+
+	public static void loadConf(MissPiggy w){
+		try {
+			JSONObject container = new JSONObject(new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/firestar.conf"))));
+			System.out.println(container.toString()); // debug
+			confvint = (int) container.get("version"); // used for converting configs between program versions later down the line
+			outpath = container.get("2048path").toString();
+			repatch = (boolean) container.get("safemode");
+			windows = (boolean) container.get("isWin32");
+			try {
+				checkUpdates = (boolean) container.get("checkUpdates");
+			} catch (JSONException e) {
+				checkUpdates = true;
+			}
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(w.frame, "Firestar couldn't load your config file. Tread lightly.\n\n" + e.getMessage(), "Critical Error", JOptionPane.ERROR_MESSAGE);
+			System.out.println("ERROR: Failed to load firestar.conf");
+			System.out.println(e.getMessage());
+		}
+	}
+
+	public static void deleteDir(File file) { // https://stackoverflow.com/a/29175213/9259829
+		File[] contents = file.listFiles();
+		if (contents != null) {
+			for (File f : contents) {
+				if (! Files.isSymbolicLink(f.toPath())) {
+					deleteDir(f);
+				}
+			}
+		}
+		file.delete();
+	}
+
+	public static void downloadDependenciesBeforeSetVisible(JFrame invoker) {
+		invoker.setVisible(false);
+		Main.downloadDependencies();
+		invoker.setVisible(true);
+		confvint = vint;
+		Main.writeConf();
+	}
+
+	public static boolean downloadDependencies () {
+		boolean downloader = new Fozzie().DownloadFile("https://bonkmaykr.worlio.com/http/firestar/fire13.zip", System.getProperty("user.home") + "/.firestar/", "firesdk.zip", "Firestar dependencies");
+		if (!downloader) {return false;}
+
+        final String expectedMD5Hash = "306807955266724172476879569959042600238";  // Prevent a malicious web server takeover from installing malware on the user's computer.
+		String downloadedMD5Hash = "";											   // if this number does not match for ANY reason, cancel immediately and get a programmer.
+		try {downloadedMD5Hash = new BigInteger(1, MessageDigest.getInstance("MD5").digest(Files.readAllBytes(Paths.get(Main.inpath + "firesdk.zip")))).toString();}
+		catch (Exception e) {
+			System.out.println("ERROR: Failed to download PSARC tool due to an internal problem.\n" + e.getMessage());
+			JOptionPane.showMessageDialog(null, "The file failed to download.\nPlease check your network connection and try again.\n\n" + e.getMessage(), "Download Failed", JOptionPane.WARNING_MESSAGE);
+		}
+		if (!downloadedMD5Hash.equals(expectedMD5Hash)) {
+			System.out.println("ERROR: Downloaded PSARC tool is invalid. Check your network connection and ensure the file is not corrupt or infected.");
+			//Object[] options = {"Abort", "Retry"};
+			//int result = JOptionPane.showOptionDialog(new JFrame(), "The downloaded file failed a security check.\nPlease ensure your network connection is stable.\n\nIf this issue persists, send an email to tech support\nat bonkmaykr@screwgravity.net.", "Download Cancelled", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+			JOptionPane.showMessageDialog(null, "The downloaded file failed a security check.\nPlease ensure your network connection is stable.\n\nIf this issue persists, send an email to tech support\nat bonkmaykr@screwgravity.net.", "Download Cancelled", JOptionPane.WARNING_MESSAGE);
+			return false;
+		}
+
+		ZipFile sdk = new ZipFile(System.getProperty("user.home") + "/.firestar/firesdk.zip");
+		try {
+			sdk.extractAll(System.getProperty("user.home") + "/.firestar/");
+		} catch (ZipException e) {
+			JOptionPane.showMessageDialog(new JFrame(), e.getMessage(), "Critical Error", JOptionPane.ERROR_MESSAGE);
+			System.out.println(e.getMessage());
+			return false;
+		}
+		sdk.getFile().delete(); // cleanup
+
+		JOptionPane.showMessageDialog(null, "All remote dependencies satisfied.", "Download Completed", JOptionPane.INFORMATION_MESSAGE);
+		return true;
+	}
+	
+	public static Process exec(String[] cmd, String cwd) throws IOException {
+		Process p;
+		String[] pcmd;
+		if (!Main.windows) {
+			pcmd = new String[cmd.length + 1];
+			pcmd[0] = "wine";
+			System.arraycopy(cmd, 0, pcmd, 1, cmd.length);
+			p = Runtime.getRuntime().exec(pcmd, null, new File(cwd));
+		} else {
+			p = Runtime.getRuntime().exec(cmd, null, new File(cwd.replace("/", "\\")));
+		}
+		return p;
+	}
+
+	public static void printProcessLogToStdOut(Process p) {
+		try {
+			final BufferedReader reader = new BufferedReader(
+					new InputStreamReader(p.getInputStream()));
+			String line = null;
+			while ((line = reader.readLine()) != null) {System.out.println(line);}
+			reader.close();
+		} catch (final Exception e) {
+			return;
+		}
 	}
-	return p;
-    }
 }

firestar/src/main/java/NaturalOrderComparator.java

@@ -0,0 +1,185 @@
+/*
+ * <copyright>
+ *
+ *  Copyright 1997-2007 BBNT Solutions, LLC
+ *  under sponsorship of the Defense Advanced Research Projects
+ *  Agency (DARPA).
+ *
+ *  You can redistribute this software and/or modify it under the
+ *  terms of the Cougaar Open Source License as published on the
+ *  Cougaar Open Source Website (www.cougaar.org).
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * </copyright>
+ */
+/*
+NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.
+Copyright (C) 2003 by Pierre-Luc Paour <natorder@paour.com>
+
+Based on the C version by Martin Pool, of which this is more or less a straight conversion.
+Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+ */
+
+//CHANGES: KD - added case sensitive ordering capability
+// Made comparison so it doesn't treat spaces as special characters
+
+import java.util.Comparator;
+
+/**
+ * A sorting comparator to sort strings numerically,
+ * ie [1, 2, 10], as opposed to [1, 10, 2].
+ */
+public final class NaturalOrderComparator<T> implements  Comparator<T> {
+
+    public static final Comparator<String> NUMERICAL_ORDER = new NaturalOrderComparator<String>(false);
+    public static final Comparator<String> CASEINSENSITIVE_NUMERICAL_ORDER = new NaturalOrderComparator<String>(true);
+
+    private final boolean caseInsensitive;
+
+    public NaturalOrderComparator(boolean caseInsensitive) {
+        this.caseInsensitive = caseInsensitive;
+    }
+
+    int compareRight(String a, String b) {
+        int bias = 0;
+        int ia = 0;
+        int ib = 0;
+
+        // The longest run of digits wins.  That aside, the greatest
+        // value wins, but we can't know that it will until we've scanned
+        // both numbers to know that they have the same magnitude, so we
+        // remember it in BIAS.
+        for (;; ia++, ib++) {
+            char ca = charAt(a, ia);
+            char cb = charAt(b, ib);
+
+            if (!Character.isDigit(ca) && !Character.isDigit(cb)) {
+                return bias;
+            } else if (!Character.isDigit(ca)) {
+                return -1;
+            } else if (!Character.isDigit(cb)) {
+                return +1;
+            } else if (ca < cb) {
+                if (bias == 0) {
+                    bias = -1;
+                }
+            } else if (ca > cb) {
+                if (bias == 0)
+                    bias = +1;
+            } else if (ca == 0 && cb == 0) {
+                return bias;
+            }
+        }
+    }
+
+    public int compare(T o1, T o2) {
+        String a = o1.toString();
+        String b = o2.toString();
+
+        int ia = 0, ib = 0;
+        int nza = 0, nzb = 0;
+        char ca, cb;
+        int result;
+
+        while (true) {
+            // only count the number of zeroes leading the last number compared
+            nza = nzb = 0;
+
+            ca = charAt(a, ia);
+            cb = charAt(b, ib);
+
+            // skip over leading zeros
+            while (ca == '0') {
+                if (ca == '0') {
+                    nza++;
+                } else {
+                    // only count consecutive zeroes
+                    nza = 0;
+                }
+
+                // if the next character isn't a digit, then we've had a run of only zeros
+                // we still need to treat this as a 0 for comparison purposes
+                if (!Character.isDigit(charAt(a, ia+1)))
+                    break;
+
+                ca = charAt(a, ++ia);
+            }
+
+            while (cb == '0') {
+                if (cb == '0') {
+                    nzb++;
+                } else {
+                    // only count consecutive zeroes
+                    nzb = 0;
+                }
+
+                // if the next character isn't a digit, then we've had a run of only zeros
+                // we still need to treat this as a 0 for comparison purposes
+                if (!Character.isDigit(charAt(b, ib+1)))
+                    break;
+
+                cb = charAt(b, ++ib);
+            }
+
+            // process run of digits
+            if (Character.isDigit(ca) && Character.isDigit(cb)) {
+                if ((result = compareRight(a.substring(ia), b
+                        .substring(ib))) != 0) {
+                    return result;
+                }
+            }
+
+            if (ca == 0 && cb == 0) {
+                // The strings compare the same.  Perhaps the caller
+                // will want to call strcmp to break the tie.
+                return nza - nzb;
+            }
+
+            if (ca < cb) {
+                return -1;
+            } else if (ca > cb) {
+                return +1;
+            }
+
+            ++ia;
+            ++ib;
+        }
+    }
+
+    private char charAt(String s, int i) {
+        if (i >= s.length()) {
+            return 0;
+        } else {
+            return caseInsensitive ? Character.toUpperCase(s.charAt(i)) : s.charAt(i);
+        }
+    }
+
+
+}

firestar/src/main/java/ReplacingInputStream.java

@@ -0,0 +1,136 @@
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
+
+/*
+ *     Created by simon on 8/29/17.
+ *     Copyright 2017 Simon Haoran Liang
+ *
+ *     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ *     associated documentation files (the "Software"), to deal in the Software without restriction, including
+ *     without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *     copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
+ *     following conditions:
+ *
+ *     The above copyright notice and this permission notice shall be included in all copies or substantial
+ *     portions of the Software.
+ * 
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *     LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *     NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+public class ReplacingInputStream extends FilterInputStream {
+
+	private Queue<Integer> inQueue, outQueue;	
+	private final byte[] search, replacement;
+	private boolean caseSensitive = true;
+	
+	public ReplacingInputStream(InputStream in, String search, String replacement) {
+		super(in);
+
+		this.inQueue = new LinkedList<>();
+		this.outQueue = new LinkedList<>();
+
+		this.search = search.getBytes();
+		this.replacement = replacement.getBytes();
+	}
+
+	public ReplacingInputStream(InputStream in, String search, String replacement, boolean caseSensitive) {
+		super(in);
+
+		this.inQueue = new LinkedList<>();
+		this.outQueue = new LinkedList<>();
+
+		this.search = search.getBytes();
+		this.replacement = replacement.getBytes();
+		this.caseSensitive = caseSensitive;
+	}
+
+	private boolean isMatchFound() {
+		Iterator<Integer> iterator = inQueue.iterator();
+
+		for (byte b : search) {
+			if (!iterator.hasNext()) return false;
+			Integer i = iterator.next();
+			if (caseSensitive && b != i) return false;
+			else if (Character.toLowerCase(b) != Character.toLowerCase(i.byteValue())) return false;
+		}
+
+		return true;
+	}
+
+	private void readAhead() throws IOException {
+		// Work up some look-ahead.
+		while (inQueue.size() < search.length) {
+			int next = super.read();
+			inQueue.offer(next);
+
+			if (next == -1) {
+				break;
+			}
+		}
+	}
+
+	@Override
+	public int read() throws IOException {
+		// Next byte already determined.
+
+		while (outQueue.isEmpty()) {
+			readAhead();
+
+			if (isMatchFound()) {
+				for (byte a : search) {
+					inQueue.remove();
+				}
+
+				for (byte b : replacement) {
+					outQueue.offer((int) b);
+				}
+			} else {
+				outQueue.add(inQueue.remove());
+			}
+		}
+
+		return outQueue.remove();
+	}
+
+	@Override
+	public int read(byte b[]) throws IOException {
+		return read(b, 0, b.length);
+	}
+
+	// copied straight from InputStream inplementation, just needed to to use `read()` from this class
+	@Override
+	public int read(byte b[], int off, int len) throws IOException {
+		if (b == null) {
+			throw new NullPointerException();
+		} else if (off < 0 || len < 0 || len > b.length - off) {
+			throw new IndexOutOfBoundsException();
+		} else if (len == 0) {
+			return 0;
+		}
+
+		int c = read();
+		if (c == -1) {
+			return -1;
+		}
+		b[off] = (byte)c;
+
+		int i = 1;
+		try {
+			for (; i < len ; i++) {
+				c = read();
+				if (c == -1) {
+					break;
+				}
+				b[off + i] = (byte)c;
+			}
+		} catch (IOException ee) { }
+		return i;
+	}
+}

firestar/src/main/java/Rizzo.java

@@ -0,0 +1,459 @@
+/*
+ *     Firestar Mod Manager
+ *     Copyright (C) 2024  bonkmaykr
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Scanner;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.OutputKeys;
+
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+import org.apache.commons.text.StringEscapeUtils;
+
+public class Rizzo {
+	private final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+	private Scanner scanner;
+	private final int maxVer = 1;
+	private int ver = 1;
+	private String workingDir;
+	
+	public Rizzo(InputStream infile, String workingDir) throws FileNotFoundException, FirescriptFormatException {
+		if (!workingDir.endsWith("/")) this.workingDir = workingDir + "/";
+		else this.workingDir = workingDir;
+		scanner = new Scanner(infile);
+		parseScript(null);
+	}
+	
+	private void parseScript(Object context) throws FirescriptFormatException {
+		while (scanner.hasNextLine()) {
+			String line = scanner.nextLine().trim();
+			if (line.startsWith("#") || line.length() < 1) continue;
+			if (!parseArgs(translateCommandline(line), context)) break;
+		}
+	}
+	
+	private boolean parseArgs(String[] args, Object context) throws FirescriptFormatException {
+		if (args.length > 0) {
+			if (context == null) {
+				System.out.println("Parsing Command: " + Arrays.toString(args));
+				if (args[0].equalsIgnoreCase("fscript")) {
+					ver = Integer.parseInt(args[1]); // We'll do shit with this later
+					if (ver > maxVer) throw new FirescriptFormatException(args[0], "script too new");
+				} else if (args[0].equalsIgnoreCase("file")) {
+					File newCtx = new File(workingDir + args[1]);
+					System.out.println("Calling new parse: " + Arrays.toString(Arrays.copyOfRange(args, 2, args.length)));
+					parseArgs(Arrays.copyOfRange(args, 2, args.length), newCtx);
+				} else throw new FirescriptFormatException("fscript", "command '" + args[0] + "' is unknown or used in inappropriate context");
+			} else {
+				System.out.println("Parsing Command: " + Arrays.toString(args) + " using context: " + context.getClass().getName() + "@" + context.hashCode());
+				if (args[0].equals("{")) {
+					System.out.println("New context block: " + context.getClass().getName() + "@" + context.hashCode());
+					parseScript(context);
+				} else if (args[0].equals("}")) {
+					System.out.println("Ending context block: " + context.getClass().getName() + "@" + context.hashCode());
+					return false;
+				} else if (context instanceof File file) {
+					if (file.exists()) {
+						if (args[0].equalsIgnoreCase("delete")) {
+							System.out.println("Deleting: " + file.getPath());
+							if (file.getAbsolutePath().startsWith(workingDir)) {
+								if (file.isDirectory()) Main.deleteDir(file);
+								else file.delete();
+							}
+						} else if (args[0].equalsIgnoreCase("xml")) {
+							try {
+								DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+								// Mmmm, love me some INVALID XML corrections.
+								ReplacingInputStream ris = new ReplacingInputStream(new ReplacingInputStream(new ReplacingInputStream(new FileInputStream(file), "\r\n", ""), "&", "&amp;"), "\n", "&#10;");
+								Document doc = docBuilder.parse(ris);
+								parseArgs(Arrays.copyOfRange(args, 1, args.length), doc);
+								try {
+									FileOutputStream output = new FileOutputStream(file);
+									Transformer transformer = TransformerFactory.newInstance().newTransformer();
+
+									StreamResult result = new StreamResult(new StringWriter());
+									DOMSource source = new DOMSource(doc);
+									
+									// WipEout 2048 will pretend to be happy with these self-closed tags but in actuality, it is screaming on the inside.
+									transformer.setOutputProperty(OutputKeys.METHOD, "html");
+									transformer.transform(source, result);
+									// Look ma, I'm breaking XML standards!
+									String xmlString = StringEscapeUtils.unescapeHtml4(result.getWriter().toString());
+									try (PrintStream ps = new PrintStream(output)) {
+										ps.print(xmlString);
+									}
+								} catch (TransformerException ex) {
+									Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, null, ex);
+								}
+							} catch (SAXException | IOException | ParserConfigurationException ex) {
+								Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, "This usually means there's non-standard formatting from the game developer which your FSCRIPT does not account for.", ex);
+							}
+						} else if (args[0].equalsIgnoreCase("str") || args[0].equalsIgnoreCase("xstr")) {
+							try {
+								FileInputStream fis = new FileInputStream(file);
+								ByteArrayInputStream bais = new ByteArrayInputStream(fis.readAllBytes());
+								fis.close();
+								FileOutputStream fos = new FileOutputStream(file);
+								if (args[1].equalsIgnoreCase("append")) {
+									bais.transferTo(fos);
+									for (int s = 0; s < args[2].length(); s++) {
+									char c = args[2].charAt(s);
+									fos.write(c);
+									}
+								} else if (args[1].equalsIgnoreCase("replace") || args[1].equalsIgnoreCase("delete")) {
+									String replacement = "";
+									if (args[1].equalsIgnoreCase("replace")) replacement = args[3];
+									ReplacingInputStream ris;
+									if (args[0].equalsIgnoreCase("xstr")) ris = new ReplacingInputStream(bais, args[2], replacement, false);
+									else ris = new ReplacingInputStream(bais, args[2], replacement);
+									ris.transferTo(fos);
+									ris.close();
+								}
+								fos.flush();
+								fos.close();
+							} catch (IOException ex) {
+								Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, null, ex);
+							}
+						} else if (args[0].equalsIgnoreCase("binedit")) {
+							int offset = Integer.parseInt(args[1]);
+							String bytes = args[2];
+							if (bytes.length() % 2 != 0) throw new FirescriptFormatException(args[0], "invalid length of bytes");
+							try {
+								byte[] ba;
+								try (FileInputStream fis = new FileInputStream(file)) {
+									ba = fis.readAllBytes();
+								}
+								if (offset >= ba.length) throw new FirescriptFormatException(args[0], "offset is larger than file size");
+								else {
+									byte[] in = HexFormat.of().parseHex(bytes);
+									System.arraycopy(in, 0, ba, offset, in.length);
+									try (FileOutputStream fos = new FileOutputStream(file)) {
+									fos.write(ba);
+									fos.flush();
+									}
+								}
+							} catch (IOException ex) {
+								Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, null, ex);
+							}
+						} else if (args[0].equalsIgnoreCase("patch")) {
+							try {
+								List<String> original = Files.readAllLines(file.toPath());
+								File patchFile = new File(workingDir + args[1]);
+								if (!patchFile.exists()) throw new FirescriptFormatException(args[0], "patch file doesn't exist");
+								List<String> patched = Files.readAllLines(patchFile.toPath());
+
+								Patch<String> patch = UnifiedDiffUtils.parseUnifiedDiff(patched);
+								List<String> result = DiffUtils.patch(original, patch);
+
+								try (FileWriter fileWriter = new FileWriter(file)) {
+									for (String str : result) {
+										fileWriter.write(str + "\r\n");
+									}
+								}
+							} catch (FirescriptFormatException | PatchFailedException | IOException ex) {
+								Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, null, ex);
+							}
+						} else throw new FirescriptFormatException("file", "command '" + args[0] + "' is unknown or used in inappropriate context");
+					} else if (args[0].equalsIgnoreCase("xml")) {
+						System.out.println("fscript: XML called but file does not exist. Using placebo...");
+						try {
+							DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+							parseArgs(Arrays.copyOfRange(args, 1, args.length), docBuilder.newDocument());
+						} catch (ParserConfigurationException ex1) {
+							Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, null, ex1);
+							throw new FirescriptFormatException("xml", "critical document failure");
+						}
+					} else System.out.println("fscript: file context not found, skipping.");
+				} else if (context instanceof Document document) {
+					if (document.hasChildNodes()) {
+						if (args[0].equalsIgnoreCase("modify")) {
+							Element elem = (Element)traverse(document, args[1]);
+							parseArgs(Arrays.copyOfRange(args, 2, args.length), elem);
+						} else if (args[0].equalsIgnoreCase("create")) {
+							String newTag = args[1].substring(args[1].lastIndexOf(".")+1);
+							String newID = "";
+							if (newTag.contains("#")) {
+								newID = newTag.substring(newTag.indexOf("#")+1);
+								newTag = newTag.substring(0, newTag.indexOf("#"));
+							}
+							Element newElem = document.createElement(newTag);
+							if (newID != null && newID.length() > 0) newElem.setAttribute("id", newID);
+							traverse(document, args[1].substring(0, args[1].lastIndexOf("."))).appendChild(newElem);
+							parseArgs(Arrays.copyOfRange(args, 2, args.length), newElem);
+						} else if (args[0].equalsIgnoreCase("delete")) {
+							Element elem = (Element)traverse(document, args[1]);
+							elem.getParentNode().removeChild(elem);
+						} else if (args[0].equalsIgnoreCase("merge")) {
+							// We're basically copying the file context xml command but with another xml document.
+							try {
+								DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+								ReplacingInputStream ris = new ReplacingInputStream(new ReplacingInputStream(new ReplacingInputStream(new FileInputStream(new File(workingDir + args[1])), "\r\n", ""), "&", "&amp;"), "\n", "&#10;");
+								Document outDoc = docBuilder.parse(ris); // throw new FirescriptFormatException("xml", "javax.xml.parsers self-destructed with error:\n" + e.getMessage() + "\nThis usually means you used a bad FSCRIPT, or there was non-standard formatting from the game developer.");
+
+								NamedNodeMap nnm = outDoc.getDocumentElement().getAttributes();
+								for (int x = 0; x < nnm.getLength(); x++) {
+									Attr importedNode = (Attr) document.importNode(nnm.item(x), true);
+									document.getDocumentElement().setAttributeNodeNS(importedNode);
+								}
+
+								NodeList cn = outDoc.getDocumentElement().getChildNodes();
+								for (int x = 0; x < cn.getLength(); x++) {
+									Node importedNode = document.importNode(cn.item(x), true);
+									document.getDocumentElement().appendChild(importedNode);
+								}
+							} catch (SAXException | IOException | ParserConfigurationException ex) {
+								Logger.getLogger(Rizzo.class.getName()).log(Level.SEVERE, "This usually means there's non-standard formatting from the game developer which your FSCRIPT does not account for.", ex);
+							}
+						} else throw new FirescriptFormatException("xml", "command '" + args[0] + "' is unknown or used in inappropriate context");
+					} else {
+						System.out.println("fscript: XML document has no child nodes. Skipping...");
+						parseArgs(Arrays.copyOfRange(args, 1, args.length), document);
+					}
+				} else if (context instanceof Element element) {
+					if (args[0].equalsIgnoreCase("set")) {
+						if (args[1].equalsIgnoreCase("attribute"))
+							// We replace newlines on XML write.
+							element.setAttribute(args[2], args[3].replace("\\n", "&#10;"));
+						else if (args[1].equalsIgnoreCase("value"))
+							element.setNodeValue(args[2]);
+					} else if (args[0].equalsIgnoreCase("create")) {
+						String finalTag = args[1];
+						String path = "";
+						if (finalTag.lastIndexOf(".") > 0) {
+							path = args[1].substring(0, finalTag.lastIndexOf("."));
+							finalTag = args[1].substring(finalTag.lastIndexOf(".")+1);
+						}
+						String id = "";
+						String name = "";
+						if (finalTag.contains("#")) {
+							id = finalTag.substring(finalTag.indexOf("#")+1);
+							finalTag = finalTag.substring(0, finalTag.indexOf("#"));
+						} else if (finalTag.contains("$")) {
+							name = finalTag.substring(finalTag.indexOf("$")+1);
+							finalTag = finalTag.substring(0, finalTag.indexOf("$"));
+						}
+						Element finalElem = element.getOwnerDocument().createElement(finalTag);
+						if (id != null && id.length() > 0) finalElem.setAttribute("id", id);
+						if (name != null && name.length() > 0) finalElem.setAttribute("name", name);
+						traverse(element, path).appendChild(finalElem);
+						parseArgs(Arrays.copyOfRange(args, 2, args.length), finalElem);
+					} else if (args[0].equalsIgnoreCase("create-at")) {
+						int index = Integer.parseInt(args[1]);
+						String finalTag = args[2];
+						String id = "";
+						String name = "";
+						if (finalTag.contains("#")) {
+							id = finalTag.substring(finalTag.indexOf("#")+1);
+							finalTag = finalTag.substring(0, finalTag.indexOf("#"));
+						} else if (finalTag.contains("$")) {
+							name = finalTag.substring(finalTag.indexOf("$")+1);
+							finalTag = finalTag.substring(0, finalTag.indexOf("$"));
+						}
+						Element finalElem = element.getOwnerDocument().createElement(finalTag);
+						if (id != null && id.length() > 0) finalElem.setAttribute("id", id);
+						if (name != null && name.length() > 0) finalElem.setAttribute("name", name);
+						element.insertBefore(finalElem, element.getChildNodes().item(index));
+						parseArgs(Arrays.copyOfRange(args, 3, args.length), finalElem);
+					} else throw new FirescriptFormatException("xml", "unknown element command '" + args[0] + "'");
+				} else throw new FirescriptFormatException("context is unknown");
+			}
+		}
+		return true;
+	}
+	
+	private Node traverse(Node owner, String selector) throws FirescriptFormatException {
+		if (selector == null || selector.length() == 0 || owner == null) {
+			return owner;
+		}
+		String[] elems = selector.split("\\.");
+		Node parent = owner;
+		for (String tag : elems) {
+			Node newParent = null;
+			int index = 0;
+			if (tag.contains("[")) {
+				index = Integer.parseInt(tag.substring(tag.indexOf("[")+1, tag.lastIndexOf("]")));
+				tag = tag.substring(0, tag.indexOf("["));
+			}
+
+			String id = "";
+			if (tag.contains("#")) {
+				id = tag.substring(tag.indexOf("#")+1);
+				tag = tag.substring(0, tag.indexOf("#"));
+			}
+			String name = "";
+			if (tag.contains("$")) {
+				name = tag.substring(tag.indexOf("$")+1);
+				tag = tag.substring(0, tag.indexOf("$"));
+			}
+			if (id.length() > 0) {
+				NodeList ns;
+				if (parent instanceof Document document) 
+					ns = document.getElementsByTagName(tag);
+				else
+					ns = ((Element)parent).getElementsByTagName(tag); 
+				for (int i = 0; i < ns.getLength(); i++) {
+					Node n = ns.item(i);
+					if (n.getNodeName().equals("#text")) continue;
+					if (((Element)n).getAttribute("id").equals(id)) {
+						newParent = (Element)n;
+						break;
+					}
+				}
+			} else if (name.length() > 0) {
+				NodeList ns;
+				if (parent instanceof Document document) 
+					ns = document.getChildNodes();
+				else
+					ns = ((Element)parent).getChildNodes(); 
+				for (int i = 0; i < ns.getLength(); i++) {
+					Node n = ns.item(i);
+					if (n instanceof Comment) continue;
+					if (n.getNodeName().equals("#text")) continue;
+					if (((Element)n).getAttribute("name").equals(name)) {
+						newParent = (Element)n;
+						break;
+					}
+				}
+			} else {
+				if (parent instanceof Document document) 
+					newParent = document.getElementsByTagName(tag).item(index);
+				else
+					newParent = ((Element)parent).getElementsByTagName(tag).item(index);
+			}
+			if (newParent == null) throw new FirescriptFormatException("xml: selector is invalid");
+			else parent = newParent;
+		}
+		return parent;
+	}
+	
+	private static String[] translateCommandline(String line) throws FirescriptFormatException {
+		if (line == null || line.length() == 0) {
+			return new String[0];
+		}
+
+		final int normal = 0;
+		final int inQuote = 1;
+		final int inDoubleQuote = 2;
+		int state = normal;
+		final ArrayList<String> result = new ArrayList<String>();
+		final StringBuilder current = new StringBuilder();
+		boolean lastTokenHasBeenQuoted = false;
+		boolean lastTokenWasEscaped = false;
+
+		for (int i = 0; i < line.length(); i++) {
+			char nextTok = line.charAt(i);
+			switch (state) {
+				case inQuote -> {
+					if (nextTok == '\\') {
+						lastTokenWasEscaped = true;
+					} else if (nextTok == '\'' && !lastTokenWasEscaped) {
+						lastTokenHasBeenQuoted = true;
+						state = normal;
+					} else {
+						if (lastTokenWasEscaped) {
+							if (nextTok == 't') nextTok = '\t';
+							if (nextTok == 'b') nextTok = '\b';
+							if (nextTok == 'n') nextTok = '\n';
+							if (nextTok == 'r') nextTok = '\r';
+							if (nextTok == 'f') nextTok = '\f';
+						}
+						current.append(nextTok);
+						lastTokenWasEscaped = false;
+					}
+				}
+				case inDoubleQuote -> {
+					if (nextTok == '\\') {
+						lastTokenWasEscaped = true;
+					} else if (nextTok == '\"' && !lastTokenWasEscaped) {
+						lastTokenHasBeenQuoted = true;
+						state = normal;
+					} else {
+						if (lastTokenWasEscaped) {
+							if (nextTok == 't') nextTok = '\t';
+							if (nextTok == 'b') nextTok = '\b';
+							if (nextTok == 'n') nextTok = '\n';
+							if (nextTok == 'r') nextTok = '\r';
+							if (nextTok == 'f') nextTok = '\f';
+						}
+						current.append(nextTok);
+						lastTokenWasEscaped = false;
+					}
+				}
+				default -> {
+					switch (nextTok) {
+						case '\\' -> lastTokenWasEscaped = true;
+						case '\'' -> state = inQuote;
+						case '\"' -> state = inDoubleQuote;
+						case ' ' -> {
+							if (!lastTokenWasEscaped && (lastTokenHasBeenQuoted || current.length() != 0)) {
+							result.add(current.toString());
+							current.setLength(0);
+							}
+						}
+						default -> {
+							if (lastTokenWasEscaped) {
+							if (nextTok == 't') nextTok = '\t';
+							if (nextTok == 'b') nextTok = '\b';
+							if (nextTok == 'n') nextTok = '\n';
+							if (nextTok == 'r') nextTok = '\r';
+							if (nextTok == 'f') nextTok = '\f';
+							lastTokenWasEscaped = false;
+							}
+							current.append(nextTok);
+						}
+					}
+					lastTokenHasBeenQuoted = false;
+				}
+			}
+		}
+		if (lastTokenHasBeenQuoted || current.length() != 0) {
+			result.add(current.toString());
+		}
+		if (state == inQuote || state == inDoubleQuote) {
+			throw new FirescriptFormatException("unbalanced quotes in " + line);
+		}
+		return result.toArray(new String[result.size()]);
+	}
+}

firestar/src/main/java/Rowlf.java

@@ -19,64 +19,57 @@
 import javax.imageio.*;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.*;
-import java.io.File;
 import java.io.IOException;
 
 import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
 
 public class Rowlf {
-    private BufferedImage windowIcon;
-    JFrame frame = new JFrame();
-    JPanel frameContainer;
-    Image logo;
-    JLabel picLabel;
-    private JTextField informationText;
-    private JLabel versionLabel;
-    private JLabel environmentLabel;
+	JFrame frame = new JFrame();
+	JPanel frameContainer;
+	Image logo;
+	JLabel picLabel;
+	private JTextField informationText;
+	private JLabel versionLabel;
+	private JLabel environmentLabel;
 
-    public Rowlf(JFrame parent) {
-        try {
-            logo = ImageIO.read(Main.class.getResourceAsStream("/logo.png")).getScaledInstance(333, 100, Image.SCALE_SMOOTH);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to open About screen because we couldn't find an image needed to display the page.");
-            throw new RuntimeException(e);
-        }
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
+	public Rowlf(JFrame parent) {
+		try {
+			logo = ImageIO.read(Main.class.getResourceAsStream("/logo.png")).getScaledInstance(333, 100, Image.SCALE_SMOOTH);
+		} catch (IOException e) {
+			System.out.println("ERROR: Failed to open About screen because we couldn't find an image needed to display the page.");
+			throw new RuntimeException(e);
+		}
+		frame.setIconImage(Main.windowIcon);
 
-        //frame.add(picLabel);
-        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
-        picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
+		//frame.add(picLabel);
+		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+		picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
 
-        informationText.getDocument().putProperty("filterNewlines", Boolean.FALSE);
-        informationText.setHorizontalAlignment(JTextField.CENTER);
-        informationText.setText("Created by bonkmaykr, a.k.a. \"Downforce Agent\"\n" +
-                "\n" +
-                "Special thanks to:\n" +
-                "ThatOneBonk, for Thallium and for modding help\n" +
-                "Wirlaburla, for web hosting and code assistance\n" +
-                "Psygnosis, for making our favorite game ever\n" +
-                "and to all the PSVita hackers who made this possible");
-        informationText.setHighlighter(null);
-        informationText.getCaret().setVisible(false);
-        informationText.setFocusable(false);
+		informationText.getDocument().putProperty("filterNewlines", Boolean.FALSE);
+		informationText.setHorizontalAlignment(JTextField.CENTER);
+		informationText.setText("Created by bonkmaykr & Wirlaburla\n" +
+				"\n" +
+				"Special thanks to:\n" +
+				"ThatOneBonk, ChaCheeChoo, and the AGRF community\n" +
+				"Psygnosis / Studio Liverpool, SCE Europe\n" +
+				"Yifan Lu & FailOverflow, TheRadziu, NoPayStation\n" +
+				"and to all the PSVita hackers who made this possible");
+		informationText.setHighlighter(null);
+		informationText.getCaret().setVisible(false);
+		informationText.setFocusable(false);
 
-        versionLabel.setText("Version " + Main.vstr + " (" + Main.vcode + ")");
-        environmentLabel.setText("Running on Java " + System.getProperty("java.version") + " for " + System.getProperty("os.name"));
+		versionLabel.setText(Main.vstr + " (" + Main.vcode + ")");
+		//if (Main.isNightly) {versionLabel.setText(versionLabel.getText() + " built " + Main.dateOfCompile);}
+		environmentLabel.setText("Running on Java " + System.getProperty("java.version") + " for " + System.getProperty("os.name"));
 
-        // display window
-        frame.setSize(400, 320);
-        frame.setTitle("About Firestar");
-        frame.setResizable(false);
-        frame.setAlwaysOnTop(true);
-        frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(parent);
-        frame.setVisible(true);
-    }
+		// display window
+		frame.setSize(400, 320);
+		frame.setTitle("About Firestar");
+		frame.setResizable(false);
+		frame.setAlwaysOnTop(true);
+		frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(parent);
+		frame.setVisible(true);
+	}
 }

firestar/src/main/java/Scooter.form

@@ -24,7 +24,7 @@
           <borderPainted value="false"/>
           <foreground color="-2271221"/>
           <indeterminate value="false"/>
-          <stringPainted value="true"/>
+          <stringPainted value="false"/>
           <value value="0"/>
         </properties>
       </component>

firestar/src/main/java/Scooter.java

@@ -16,64 +16,61 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
 
 public class Scooter {
-    private JFrame frame = new JFrame();
-    public JProgressBar progressBar;
-    private JPanel frameContainer;
-    private JLabel label;
+	private JFrame frame = new JFrame();
+	public JProgressBar progressBar;
+	private JPanel frameContainer;
+	private JLabel label;
 
-    public void showDialog(String title) {
-	frame.add(frameContainer);
-        frame.setSize(300, 100);
-        frame.setTitle(title);
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
-        frame.setAlwaysOnTop(true);
-        frame.setIconImage(Main.windowIcon);
+	public void showDialog(String title) {
+		frame.add(frameContainer);
+		frame.setSize(300, 100);
+		frame.setTitle(title);
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(null);
+		frame.setAlwaysOnTop(true);
+		frame.setIconImage(Main.windowIcon);
 	
-	progressBar.setStringPainted(true);
+		progressBar.setStringPainted(true);
 	
-        frame.setVisible(true);
-    }
-    
-    public void setProgressMin(int i) {
-	progressBar.setMinimum(i);
-    }
-    
-    public void setProgressValue(int i) {
-	progressBar.setValue(i);
-    }
-    
-    public void setProgressMax(int i) {
-	progressBar.setMaximum(i);
-    }
-    
-    public int getProgressMin() {
-	return progressBar.getMinimum();
-    }
-    
-    public int getProgressValue() {
-	return progressBar.getValue();
-    }
-    
-    public int getProgressMax() {
-	return progressBar.getMaximum();
-    }
+		frame.setVisible(true);
+	}
+	
+	public void setProgressMin(int i) {
+		progressBar.setMinimum(i);
+	}
+	
+	public void setProgressValue(int i) {
+		progressBar.setValue(i);
+	}
+	
+	public void setProgressMax(int i) {
+		progressBar.setMaximum(i);
+	}
+	
+	public int getProgressMin() {
+		return progressBar.getMinimum();
+	}
+	
+	public int getProgressValue() {
+		return progressBar.getValue();
+	}
+	
+	public int getProgressMax() {
+		return progressBar.getMaximum();
+	}
 
-    public void setText(String text) {
-        label.setText(text);
-    }
+	public void setText(String text) {
+		label.setText(text);
+	}
 
-    public void destroyDialog() {
-        frame.setVisible(false);
-        frame.dispose();
-    }
+	public void destroyDialog() {
+		frame.setVisible(false);
+		frame.dispose();
+	}
 }

firestar/src/main/java/Suggs.form

@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="20" y="20" width="756" height="460"/>
+      <xy x="20" y="20" width="771" height="460"/>
     </constraints>
     <properties>
       <background color="-15128227"/>
@@ -40,7 +40,7 @@
           </component>
         </children>
       </scrollpane>
-      <grid id="eb54e" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="eb54e" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -54,7 +54,7 @@
         <children>
           <component id="adce7" class="javax.swing.JButton" binding="cancelBtn">
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <background color="-2271221"/>
@@ -67,25 +67,27 @@
           </component>
           <hspacer id="8ecbf">
             <constraints>
-              <grid row="0" column="0" row-span="2" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="3" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
           </hspacer>
           <component id="b6c2f" class="javax.swing.JCheckBox" binding="checkAdditive">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <enabled value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2"/>
               <foreground color="-1"/>
               <opaque value="false"/>
               <text value="Append to default playlist"/>
+              <toolTipText value="Check this box to add your playlist to the existing in-game one instead of overwriting it."/>
               <visible value="false"/>
             </properties>
           </component>
           <component id="a7b02" class="javax.swing.JButton" binding="saveBtn">
             <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <background color="-2271221"/>
@@ -96,6 +98,21 @@
               <text value="Save"/>
             </properties>
           </component>
+          <component id="2252b" class="javax.swing.JCheckBox" binding="checkNormalize">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <enabled value="true"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <opaque value="false"/>
+              <text value="Normalize Volumes"/>
+              <toolTipText value="Prevents sound effects from drowning out the music, but may reduce sound quality. This process is SKIPPED for ATRAC9 files since they are never transcoded!"/>
+              <visible value="true"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="cc2" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -125,7 +142,9 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <disabledTextColor color="-10124141"/>
+            </properties>
           </component>
           <component id="f7802" class="javax.swing.JLabel">
             <constraints>
@@ -143,7 +162,9 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <disabledTextColor color="-10124141"/>
+            </properties>
           </component>
           <grid id="27515" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
@@ -183,7 +204,9 @@
       <grid id="568f5" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <maximum-size width="600" height="-1"/>
+          </grid>
         </constraints>
         <properties>
           <opaque value="false"/>
@@ -287,7 +310,7 @@
           <color color="-1"/>
         </border>
         <children>
-          <grid id="6168c" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="6168c" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -309,7 +332,7 @@
               </component>
               <component id="74c7a" class="javax.swing.JLabel">
                 <constraints>
-                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <font name="Exo 2"/>
@@ -319,7 +342,7 @@
               </component>
               <component id="1fda4" class="javax.swing.JLabel" binding="dSTitle">
                 <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <font name="Exo 2" style="2"/>
@@ -329,7 +352,7 @@
               </component>
               <component id="99b42" class="javax.swing.JLabel" binding="dMTitle">
                 <constraints>
-                  <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <font name="Exo 2" style="2"/>
@@ -337,9 +360,9 @@
                   <text value="no track"/>
                 </properties>
               </component>
-			  <component id="c11e8" class="javax.swing.JLabel" binding="dSSize">
+              <component id="c11e8" class="javax.swing.JLabel" binding="dSSize">
                 <constraints>
-                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <font name="Exo 2" style="2"/>
@@ -347,9 +370,9 @@
                   <text value="no size"/>
                 </properties>
               </component>
-			  <component id="8480f" class="javax.swing.JLabel" binding="dMSize">
+              <component id="8480f" class="javax.swing.JLabel" binding="dMSize">
                 <constraints>
-                  <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="6" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <font name="Exo 2" style="2"/>
@@ -359,9 +382,35 @@
               </component>
               <vspacer id="73ce0">
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
+              <component id="6ab1b" class="javax.swing.JButton" binding="spDeleteBtn">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="1" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <background color="-2271221"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
+                  <text value="Remove"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="9d8a0" class="javax.swing.JButton" binding="mpDeleteBtn">
+                <constraints>
+                  <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="1" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <background color="-2271221"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
+                  <text value="Remove"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
             </children>
           </grid>
         </children>

firestar/src/main/java/Suggs.java

@@ -19,6 +19,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.*;
@@ -26,9 +28,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
@@ -48,348 +48,588 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 public class Suggs implements ActionListener, ListSelectionListener {
-    public JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JList dSongList;
-    private JButton moveDownBtn;
-    private JButton saveBtn;
-    private JButton cancelBtn;
-    private JTextField fTitle;
-    private JTextField fArtist;
-    private JLabel dTrackNo;
-    private JLabel dFileSize;
-    private JButton frontendDemoChooseBtn;
-    private JButton frontendMainChooseBtn;
-    private JButton deleteSongBtn;
-    private JButton addSongBtn;
-    private JButton moveUpBtn;
-    private JLabel dSTitle;
-    private JLabel dMTitle;
-    private JLabel dSSize;
-    private JLabel dMSize;
-    private JCheckBox checkAdditive;
-    private Scooter progressDialog;
-    
-    JFrame parent;
-    int curIndex = -1;
-    
-    public class AudioTrack {
-        public File path; // file name
-        public String title; // audio title
-	public String artist; // audio artist
-	public long size; // file size in bytes
-	public boolean noConvert;
-    }
-    private static List<AudioTrack> tracklist = new ArrayList<AudioTrack>();
-    private File sptrack;
-    private File mptrack;
-
-    public Suggs(JFrame parent) {
-	this.parent = parent;
-        parent.setEnabled(false);
-
-        frame.setIconImage(Main.windowIcon);
-        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
-
-        frame.setSize(700, 400);
-        frame.setMinimumSize(new Dimension(650,280));
-        frame.setTitle("Soundtrack Mod Generator");
-        frame.setResizable(true);
-        frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(parent);
-        frame.setAlwaysOnTop(true);
-
-        cancelBtn.addActionListener(this); // TODO: put warning dialog "Are you sure? All unsaved changes will be lost."
-        saveBtn.addActionListener(this);
-        addSongBtn.addActionListener(this);     // file picker
-        deleteSongBtn.addActionListener(this);  // delete from list
-        moveUpBtn.addActionListener(this);
-        moveDownBtn.addActionListener(this);
-        fTitle.addActionListener(this);         // automatically change selected item when changed &
-        fArtist.addActionListener(this);        // also update field when new item selected
-        frontendMainChooseBtn.addActionListener(this);      // file picker for singleplayer campaign grid music
-        frontendDemoChooseBtn.addActionListener(this);      // file picker for multiplayer lobby music
-        dSongList.addListSelectionListener(this);
-
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {// TODO: put warning dialog "Are you sure? All unsaved changes will be lost."
-                parent.setEnabled(true);
-                e.getWindow().dispose();
-            }
-        });
-
-        frame.setVisible(true);
-    }
-
-    private void haveSeggs() { // kill yourself
-
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-	if (actionEvent.getSource() == cancelBtn) {
-	    parent.setEnabled(true);
-            frame.dispose();
-	} else
-	if (actionEvent.getSource() == fTitle || actionEvent.getSource() == fArtist) {
-	    tracklist.get(curIndex).title = fTitle.getText();
-	    tracklist.get(curIndex).artist = fArtist.getText();
-	    InitializeSongListInGUI();
-	    dSongList.setSelectedIndex(curIndex);
-	} else
-	if (actionEvent.getSource() == addSongBtn) {addSong();} else
-	if (actionEvent.getSource() == deleteSongBtn) {remove(curIndex);} else
-	if (actionEvent.getSource() == moveUpBtn) {moveUp(curIndex);} else
-	if (actionEvent.getSource() == moveDownBtn) {moveDown(curIndex);} else
-	if (actionEvent.getSource() == frontendMainChooseBtn) {setSPMusic();} else 
-	if (actionEvent.getSource() == frontendDemoChooseBtn) {setMPMusic();} else
-	if (actionEvent.getSource() == saveBtn) {save();}
-    }
-
-    @Override
-    public void valueChanged(ListSelectionEvent listSelectionEvent) {
-	curIndex = dSongList.getSelectedIndex();
-	if (curIndex >= 0) {
-	    AudioTrack at = tracklist.get(curIndex);
-	    fTitle.setText(at.title);
-	    fArtist.setText(at.artist);
-	    dTrackNo.setText(String.format("MT_%02d", curIndex));
-	    dFileSize.setText((at.size / 1000) + "kb");
-	} else {
-	    fTitle.setText("");
-	    fArtist.setText("");
-	    dTrackNo.setText("--");
-	    dFileSize.setText("-kb");
+	public JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JList dSongList;
+	private JButton moveDownBtn;
+	private JButton saveBtn;
+	private JButton cancelBtn;
+	private JTextField fTitle;
+	private JTextField fArtist;
+	private JLabel dTrackNo;
+	private JLabel dFileSize;
+	private JButton frontendDemoChooseBtn;
+	private JButton frontendMainChooseBtn;
+	private JButton deleteSongBtn;
+	private JButton addSongBtn;
+	private JButton moveUpBtn;
+	private JLabel dSTitle;
+	private JLabel dMTitle;
+	private JLabel dSSize;
+	private JLabel dMSize;
+	private JCheckBox checkAdditive;
+	private JButton spDeleteBtn;
+	private JButton mpDeleteBtn;
+	private JCheckBox checkNormalize;
+	private Scooter progressDialog;
+	
+	JFrame parent;
+	int curIndex = -1;
+	boolean normalizeVolumes = false;
+	
+	public class AudioTrack {
+		public File path; // file name
+		public String title; // audio title
+		public String artist; // audio artist
+		public long size; // file size in bytes
+		public boolean noConvert;
 	}
-    }
-    
-    private void remove(int index) {
-        if (index >= 0) {
-            tracklist.remove(index);
-            InitializeSongListInGUI();
-        }
-    }
-    
-    private void moveUp(int index) {
-        if (index > 0) {
-            Collections.swap(tracklist, index, index - 1);
-            InitializeSongListInGUI();
-        }
-    }
+	private List<AudioTrack> tracklist = new ArrayList<AudioTrack>();
+	private File sptrack;
+	private File mptrack;
 
-    private void moveDown(int index) {
-        if (index < (tracklist.size() - 1)) {
-            Collections.swap(tracklist, index, index + 1);
-            InitializeSongListInGUI();
-        }
-    }
-    
-    private void InitializeSongListInGUI() {
-        dSongList.clearSelection();
-        dSongList.removeAll();
-        dSongList.setVisibleRowCount(tracklist.size());
-        dSongList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
-        // add text entry for each
-        int i = 0;
-        String[] contents = new String[tracklist.size()];
-        while (i < tracklist.size()) {
-            if (tracklist.get(i).title == null || tracklist.get(i).title.isEmpty())
-            {tracklist.get(i).title = tracklist.get(i).path.getName();}
-	    if (tracklist.get(i).artist == null || tracklist.get(i).artist.isEmpty())
-            {tracklist.get(i).artist = "???";}
-            contents[i] = tracklist.get(i).artist + " - " + tracklist.get(i).title;
-
-            i++;
-        }
-        dSongList.setListData(contents);
-	dSongList.setSelectedIndex(curIndex);
-    }
-    
-    private void setSPMusic() {
-	JFileChooser fileChooser = new JFileChooser();
-        fileChooser.setCurrentDirectory(new File(System.getProperty("user.home")));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("WAVE", "wav"));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("ATRAC9", "at9"));
-
-        int result = fileChooser.showOpenDialog(frame);
-	if (result == JFileChooser.APPROVE_OPTION) {
-            File selectedFile = fileChooser.getSelectedFile();
-	    sptrack = selectedFile;
-	    dSTitle.setText(selectedFile.getName());
-	    dSSize.setText((selectedFile.length() / 1000) + "kb");
-        }
-    }
-    
-    private void setMPMusic() {
-	JFileChooser fileChooser = new JFileChooser();
-        fileChooser.setCurrentDirectory(new File(System.getProperty("user.home")));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("WAVE", "wav"));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("ATRAC9", "at9"));
-
-        int result = fileChooser.showOpenDialog(frame);
-	if (result == JFileChooser.APPROVE_OPTION) {
-            File selectedFile = fileChooser.getSelectedFile();
-	    mptrack = selectedFile;
-	    dMTitle.setText(selectedFile.getName());
-	    dMSize.setText((selectedFile.length() / 1000) + "kb");
-        }
-    }
-    
-    private void addSong() {
-	JFileChooser fileChooser = new JFileChooser();
-	fileChooser.setMultiSelectionEnabled(true);
-        fileChooser.setCurrentDirectory(new File(System.getProperty("user.home")));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("WAVE", "wav"));
-        fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("ATRAC9", "at9"));
-
-        int result = fileChooser.showOpenDialog(frame);
-	if (result == JFileChooser.APPROVE_OPTION) {
-            File[] selectedFiles = fileChooser.getSelectedFiles();
-	    for (File f : selectedFiles) {
-		if (f.exists()) {
-		    System.out.println("Importing audio file \"" + f.getName() + "\"");
-		    AudioTrack track = new AudioTrack();
-		    track.path = f;
-		    String fname = f.getName();
-		    if (fname.contains(" - ")) {
-			track.title  = fname.substring(fname.indexOf(" - ")+3, fname.lastIndexOf("."));
-			track.artist  = fname.substring(0, fname.indexOf(" - "));
-		    } else track.title = fname;
-		    track.size = f.length();
-		    tracklist.add(track);
+	DocumentListener id3TagEditorHandler = new DocumentListener() {
+		@Override
+		public void insertUpdate(DocumentEvent documentEvent) {
+			updateSelectionToMatchTextFields();
 		}
-	    }
-            InitializeSongListInGUI();
-        }
-    }
-    
-    private void save() {
-	frame.setEnabled(false);
-	frame.setAlwaysOnTop(false);
-	Main.deleteDir(new File(System.getProperty("user.home") + "/.firestar/temp/")); // starts with clean temp
-	new Thread(() -> {
-	    int progressSize = tracklist.size()+(sptrack != null?1:0)+(mptrack != null?1:0)+3; // Accounting for processes
 
-	    progressDialog = new Scooter();
-	    progressDialog.showDialog("Soundtrack Mod Generator");
-	    progressDialog.setText("Generating audio files...");
-	    progressDialog.setProgressMax(progressSize);
-	    progressDialog.setProgressValue(0);
-	    
-	    new File(Main.inpath + "temp/data/audio/music").mkdirs();
-	    
-	    for (int i = 0; i < tracklist.size(); i++) {
-		AudioTrack at = tracklist.get(i);
-		String trackno = String.format("%02d", i);
-		new File(Main.inpath + "temp/data/audio/music/" + trackno).mkdirs();
-		if (at.path.getName().endsWith(".at9")) {
-		    progressDialog.setText("Copying track " + (i+1) + " out of " + tracklist.size() + "...");
-		    try {
-			// Assume whoever made the AT9s knows what they're doing
-			System.out.println("Copying track #" + (i+1) + " \"" + at.title + " - " + at.artist + "\"...");
-			Files.copy(at.path.toPath(), Paths.get(Main.inpath + "tmp/data/audio/music/" + trackno + "/music_stereo.at9"), StandardCopyOption.REPLACE_EXISTING);
-		    } catch (IOException ex) {
-			Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
-		    }
+		@Override
+		public void removeUpdate(DocumentEvent documentEvent) {
+			updateSelectionToMatchTextFields();
+		}
+
+		@Override
+		public void changedUpdate(DocumentEvent documentEvent) {
+			updateSelectionToMatchTextFields();
+		}
+	};
+
+	public Suggs(JFrame parent) {
+	this.parent = parent;
+		parent.setEnabled(false);
+
+		frame.setIconImage(Main.windowIcon);
+		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+
+		frame.setSize(700, 400);
+		frame.setMinimumSize(new Dimension(700,400));
+		frame.setTitle("Soundtrack Mod Generator");
+		frame.setResizable(true);
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(parent);
+		frame.setAlwaysOnTop(true);
+
+		cancelBtn.addActionListener(this);
+		saveBtn.addActionListener(this);
+		addSongBtn.addActionListener(this);	 // file picker
+		deleteSongBtn.addActionListener(this);  // delete from list
+		moveUpBtn.addActionListener(this);
+		moveDownBtn.addActionListener(this);
+		fTitle.addActionListener(this);		 // automatically change selected item when changed &
+		fArtist.addActionListener(this);		// also update field when new item selected
+		frontendMainChooseBtn.addActionListener(this);	  // file picker for singleplayer campaign grid music
+		frontendDemoChooseBtn.addActionListener(this);	  // file picker for multiplayer lobby music
+		spDeleteBtn.addActionListener(this);
+		mpDeleteBtn.addActionListener(this);
+		dSongList.addListSelectionListener(this);
+
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				if (!tracklist.isEmpty() || sptrack != null || mptrack != null) {
+					int result = JOptionPane.showConfirmDialog(frame, "Are you sure?\nAll unsaved changes will be lost.", "Soundtrack Mod Generator", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+					if (result == JOptionPane.NO_OPTION) {return;}
+				}
+				parent.setEnabled(true);
+				e.getWindow().dispose();
+			}
+		});
+
+		fTitle.setText("");
+		fArtist.setText("");
+		dTrackNo.setText("\u200E");
+		dFileSize.setText("\u200E");
+		fTitle.setEnabled(false);
+		fArtist.setEnabled(false);
+
+		fTitle.getDocument().addDocumentListener(id3TagEditorHandler);
+		fArtist.getDocument().addDocumentListener(id3TagEditorHandler);
+
+		frame.setVisible(true);
+	}
+
+	private void haveSeggs() { // kill yourself
+
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		if (actionEvent.getSource() == cancelBtn) {
+			if (!tracklist.isEmpty() || sptrack != null || mptrack != null) {
+				int result = JOptionPane.showConfirmDialog(frame, "Are you sure?\nAll unsaved changes will be lost.", "Soundtrack Mod Generator", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+				if (result == JOptionPane.NO_OPTION) {return;}
+			}
+			parent.setEnabled(true);
+			frame.dispose();
+		} else
+		if (actionEvent.getSource() == addSongBtn) {addSong();} else
+		if (actionEvent.getSource() == deleteSongBtn) {remove(curIndex);} else
+		if (actionEvent.getSource() == moveUpBtn) {moveUp(curIndex);} else
+		if (actionEvent.getSource() == moveDownBtn) {moveDown(curIndex);} else
+		if (actionEvent.getSource() == frontendMainChooseBtn) {setSPMusic();} else 
+		if (actionEvent.getSource() == frontendDemoChooseBtn) {setMPMusic();} else
+		if (actionEvent.getSource() == saveBtn) {
+			if (tracklist.isEmpty() && sptrack == null && mptrack == null) {
+				JOptionPane.showMessageDialog(frame, "Please add at least one song to the playlist.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			} else {
+				String deets;
+				if (tracklist.isEmpty()) {
+					deets = "no songs";
+				} else {
+					deets = tracklist.size() + " songs";
+				}
+				if (sptrack != null && mptrack == null) {
+					deets = deets + " and a custom campaign menu track";
+				} else if (mptrack != null && sptrack == null) {
+					deets = deets + " and a custom lobby menu track";
+				} else if (mptrack != null && sptrack != null) {
+					deets = deets + ", a custom campaign menu track, and a custom lobby menu track";
+				}
+				int result = JOptionPane.showConfirmDialog(frame, "Your custom playlist with " + deets + " will be generated.\nPress YES to continue, or NO to continue editing.", "Soundtrack Mod Generator", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+				if (result == JOptionPane.YES_OPTION) {
+					save();
+				}
+			}
+		} else
+		if (actionEvent.getSource() == spDeleteBtn) {
+			dSTitle.setToolTipText(null);
+			dSTitle.setText("no track");
+			dSSize.setText("no size");
+			sptrack = null;
+			spDeleteBtn.setVisible(false);
+		} else
+		if (actionEvent.getSource() == mpDeleteBtn) {
+			dMTitle.setToolTipText(null);
+			dMTitle.setText("no track");
+			dMSize.setText("no size");
+			mptrack = null;
+			mpDeleteBtn.setVisible(false);
+		}
+	}
+
+	@Override
+	public void valueChanged(ListSelectionEvent listSelectionEvent) {
+		fTitle.getDocument().removeDocumentListener(id3TagEditorHandler);
+		fArtist.getDocument().removeDocumentListener(id3TagEditorHandler);
+		curIndex = dSongList.getSelectedIndex();
+		if (curIndex >= 0) {
+			fTitle.setEnabled(true);
+			fArtist.setEnabled(true);
+			AudioTrack at = tracklist.get(curIndex);
+			fTitle.setText(at.title);
+			fArtist.setText(at.artist);
+			dTrackNo.setText(String.format("MT_%02d", curIndex+1));
+			dFileSize.setText(at.size + " B");
+			if (at.size > 1023) {
+				dFileSize.setText((at.size / 1024) + " KB");
+			}
+			if (at.size > 1048575) {
+				dFileSize.setText((at.size / 1048576) + " MB");
+			}
+			fTitle.getDocument().addDocumentListener(id3TagEditorHandler);
+			fArtist.getDocument().addDocumentListener(id3TagEditorHandler);
 		} else {
-		    progressDialog.setText("Encoding track " + (i+1) + " out of " + tracklist.size() + "...");
-		    try {
-			System.out.println("Encoding track #" + (i+1) + " \"" + at.title + " - " + at.artist + "\"...");
-			Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", at.path.getPath(), "data/audio/music/" + trackno + "/music_stereo.at9"}, Main.inpath + "temp/");
-			p.waitFor();
-		    } catch (IOException | InterruptedException ex) {
-			Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
-		    }
+			fTitle.setEnabled(false);
+			fArtist.setEnabled(false);
+			fTitle.setText("");
+			fArtist.setText("");
+			dTrackNo.setText("\u200E");
+			dFileSize.setText("\u200E");
+			fTitle.getDocument().addDocumentListener(id3TagEditorHandler);
+			fArtist.getDocument().addDocumentListener(id3TagEditorHandler);
 		}
-		progressDialog.setProgressValue(i+1);
-	    }
-	    if (sptrack != null) {
-		progressDialog.setText("Encoding singleplayer frontend track...");
-		if (sptrack.exists()) {
-		    try {
-			System.out.println("Encoding singleplayer frontend track...");
-			new File(Main.inpath + "temp/data/audio/music/FEMusic").mkdirs();
-			Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", sptrack.getPath(), "data/audio/music/FEMusic/frontend_stereo.at9"}, System.getProperty("user.home") + "/.firestar/temp/");
-			p.waitFor();
-		    } catch (IOException | InterruptedException ex) {
-			Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
-		    }
-		}
-		progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
-	    }
-	    if (mptrack != null) {
-		progressDialog.setText("Encoding multiplayer frontend track...");
-		try {
-		    assert(mptrack.exists());
-		    System.out.println("Encoding multiplayer frontend track...");
-		    new File(Main.inpath + "temp/data/audio/music/FEDemoMusic").mkdirs();
-		    Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", mptrack.getPath(), "data/audio/music/FEDemoMusic/frontend_stereo.at9"}, System.getProperty("user.home") + "/.firestar/temp/");
-		    p.waitFor();
-		} catch (IOException | InterruptedException ex) {
-		    Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
-		}
-		progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
-	    }
-	    System.out.println("Finished encoding.");
-	    
-	    progressDialog.setText("Generating Music Definitions...");
-	    try {
-		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+	}
 
-		Document defDoc = docBuilder.newDocument();
-		Element docScreen = defDoc.createElement("Screen");
-		docScreen.setAttribute("name", "Top");
-		for (int i = 0; i < tracklist.size(); i++) { // TODO: support for additive
-		    AudioTrack at = tracklist.get(i);
-		    String trackno = String.format("%02d", i);
-		    
-		    Element trackElem = defDoc.createElement("PI_Music");
-		    trackElem.setAttribute("name", trackno);
-		    
-		    Element pathElem = defDoc.createElement("Values");
-		    pathElem.setAttribute("location", "data\\audio\\music\\"+trackno);
-		    trackElem.appendChild(pathElem);
-		    
-		    Element artistElem = defDoc.createElement("Entry");
-		    artistElem.setAttribute("Artist", at.artist);
-		    trackElem.appendChild(artistElem);
-		    
-		    Element titleElem = defDoc.createElement("Entry");
-		    titleElem.setAttribute("Label", at.title);
-		    trackElem.appendChild(titleElem);
-		    
-		    docScreen.appendChild(trackElem);
-		    System.out.println("Adding \"" + trackno + ". " + at.artist + " - " + at.title + "\" to Definition.xml");
+	private void updateSelectionToMatchTextFields() {
+		tracklist.get(curIndex).title = fTitle.getText();
+		tracklist.get(curIndex).artist = fArtist.getText();
+		InitializeSongListInGUI();
+		dSongList.setSelectedIndex(curIndex);
+	}
+	
+	private void remove(int index) {
+		if (index >= 0) {
+			tracklist.remove(index);
+			InitializeSongListInGUI();
 		}
-		defDoc.appendChild(docScreen);
-		
-		new File(Main.inpath + "temp/data/plugins/music/").mkdirs();
-		FileOutputStream output = new FileOutputStream(Main.inpath + "temp/data/plugins/music/Definition.xml");
-		TransformerFactory transformerFactory = TransformerFactory.newInstance();
-		Transformer transformer = transformerFactory.newTransformer();
-		DOMSource source = new DOMSource(defDoc);
-		StreamResult result = new StreamResult(output);
-		
-		transformer.transform(source, result);
-	    } catch (IOException | ParserConfigurationException | TransformerException ex) {
-		Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
-	    }
-	    progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
-	    
-	    progressDialog.setText("Localizing...");
-	    System.out.println("Creating localization edits for music tracks...");
-	    // TODO: Actually do what the above print-out says
-	    progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
-	    
-	    progressDialog.destroyDialog();
-	    frame.dispose();
-	    new Clifford().Action(frame, new File(Main.inpath + "temp/"));
-	    parent.setEnabled(true);
-	}).start();
-    }
+	}
+	
+	private void moveUp(int index) {
+		if (index > 0) {
+			Collections.swap(tracklist, index, index - 1);
+			curIndex--;
+			InitializeSongListInGUI();
+		}
+	}
+
+	private void moveDown(int index) {
+		if (index < (tracklist.size() - 1)) {
+			Collections.swap(tracklist, index, index + 1);
+			curIndex++;
+			InitializeSongListInGUI();
+		}
+	}
+	
+	private void InitializeSongListInGUI() {
+		dSongList.removeListSelectionListener(this); // prevent weird bullshit
+		dSongList.clearSelection();
+		dSongList.removeAll();
+		dSongList.setVisibleRowCount(tracklist.size());
+		dSongList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+		// add text entry for each
+		int i = 0;
+		String[] contents = new String[tracklist.size()];
+		while (i < tracklist.size()) {
+			String dTitleInList;	// avoid editing the actual list
+			String dArtistInList;	// otherwise we cause weird JTextField behavior
+			if (tracklist.get(i).title == null || tracklist.get(i).title.isEmpty())
+				dTitleInList = tracklist.get(i).path.getName();
+			else 
+				dTitleInList = tracklist.get(i).title;
+			if (tracklist.get(i).artist == null || tracklist.get(i).artist.isEmpty()) 
+				dArtistInList = "Unknown Artist";
+			else 
+				dArtistInList = tracklist.get(i).artist;
+			contents[i] = dArtistInList + " - " + dTitleInList;
+
+			i++;
+		}
+		dSongList.setListData(contents);
+		dSongList.setSelectedIndex(curIndex);
+		dSongList.addListSelectionListener(this);
+	}
+
+	private JFileChooser commonSoundFilePicker(boolean multiselect) {
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setMultiSelectionEnabled(multiselect);
+		fileChooser.setCurrentDirectory(new File(System.getProperty("user.home")));
+		fileChooser.setFileFilter(new FileNameExtensionFilter("All Compatible Files", "mp3", "ogg", "oga", "opus", "m4a", "3gp", "wav", "wave", "aif", "aiff", "aifc", "flac", "at3", "at9"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("MPEG Audio Layer 3", "mp3"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Ogg Audio", "ogg", "oga", "opus"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("AAC or MPEG-4 Audio", "m4a", "3gp"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("IBM/Microsoft WAVE", "wav", "wave"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Apple AIFF", "aif", "aiff", "aifc"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Free Lossless Audio Codec", "flac"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Sony ATRAC3", "at3"));
+		fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Sony ATRAC9", "at9"));
+		return fileChooser;
+	}
+	
+	private void setSPMusic() {
+		JFileChooser fileChooser = commonSoundFilePicker(false);
+		int result = fileChooser.showOpenDialog(frame);
+		if (result == JFileChooser.APPROVE_OPTION) {
+			File selectedFile = fileChooser.getSelectedFile();
+			sptrack = selectedFile;
+			dSTitle.setText(selectedFile.getName().substring(0, Math.min(selectedFile.getName().length(), 20)));
+			if (selectedFile.getName().length() > 20) {dSTitle.setToolTipText(selectedFile.getName());}
+			dSSize.setText(selectedFile.length() + " B");
+			if (selectedFile.length() > 1023) {
+				dSSize.setText((selectedFile.length() / 1024) + " KB");
+			}
+			if (selectedFile.length() > 1048575) {
+				dSSize.setText((selectedFile.length() / 1048576) + " MB");
+			}
+			spDeleteBtn.setVisible(true);
+		}
+	}
+	
+	private void setMPMusic() {
+		JFileChooser fileChooser = commonSoundFilePicker(false);
+		int result = fileChooser.showOpenDialog(frame);
+		if (result == JFileChooser.APPROVE_OPTION) {
+			File selectedFile = fileChooser.getSelectedFile();
+			mptrack = selectedFile;
+			dMTitle.setText(selectedFile.getName().substring(0, Math.min(selectedFile.getName().length(), 20)));
+			if (selectedFile.getName().length() > 20) {dMTitle.setToolTipText(selectedFile.getName());}
+			dMSize.setText(selectedFile.length() + " B");
+			if (selectedFile.length() > 1023) {
+				dMSize.setText((selectedFile.length() / 1024) + " KB");
+			}
+			if (selectedFile.length() > 1048575) {
+				dMSize.setText((selectedFile.length() / 1048576) + " MB");
+			}
+			mpDeleteBtn.setVisible(true);
+		}
+	}
+	
+	private void addSong() {
+		JFileChooser fileChooser = commonSoundFilePicker(true);
+
+		int result = fileChooser.showOpenDialog(frame);
+		if (result == JFileChooser.APPROVE_OPTION) {
+			File[] selectedFiles = fileChooser.getSelectedFiles();
+			for (File f : selectedFiles) {
+				if (f.exists()) {
+					System.out.println("Importing audio file \"" + f.getName() + "\"");
+					AudioTrack track = new AudioTrack();
+					track.path = f;
+					String fname = f.getName();
+					if (fname.contains(" - ")) {
+					track.title  = fname.substring(fname.indexOf(" - ")+3, fname.lastIndexOf("."));
+					track.artist  = fname.substring(0, fname.indexOf(" - "));
+					} else track.title = fname;
+					track.size = f.length();
+					tracklist.add(track);
+				}
+			}
+			InitializeSongListInGUI();
+		}
+	}
+	
+	private void save() {
+		frame.setEnabled(false);
+		frame.setAlwaysOnTop(false);
+		normalizeVolumes = checkNormalize.isSelected();
+		Main.deleteDir(new File(System.getProperty("user.home") + "/.firestar/temp/")); // starts with clean temp
+		new Thread(() -> {
+			int progressSize = tracklist.size()+(sptrack != null?1:0)+(mptrack != null?1:0)+1; // Accounting for processes
+
+			progressDialog = new Scooter();
+			progressDialog.showDialog("Soundtrack Mod Generator");
+			progressDialog.setText("Generating audio files...");
+			progressDialog.setProgressMax(progressSize);
+			progressDialog.setProgressValue(0);
+			progressDialog.progressBar.setStringPainted(false);
+
+			try {
+			new File(Main.inpath + "temp/data/audio/music").mkdirs();
+			FileOutputStream fos = new FileOutputStream(new File(Main.inpath + "temp/fscript"));
+			PrintStream ps = new PrintStream(fos);
+			ps.println("fscript 1");
+			ps.println("# AUTOGENERATED BY FIRESTAR");
+			for (int i = 0; i < tracklist.size(); i++) {
+				AudioTrack at = tracklist.get(i);
+				String trackno = String.format("%02d", i+1);
+				String oTitle;
+				if (at.title == null) {oTitle = "";} else {oTitle = at.title;}
+				String oArtist;
+				if (at.artist == null) {oArtist = "";} else {oArtist = at.artist;}
+				new File(Main.inpath + "temp/data/audio/music/" + trackno).mkdirs();
+				if (at.path.getName().endsWith(".at9")) {
+				progressDialog.setText("Copying track " + (i+1) + " out of " + tracklist.size() + "...");
+				try {
+					// Assume whoever made the AT9s knows what they're doing
+					System.out.println("Copying track #" + (i+1) + " \"" + at.artist + " - " + at.title + "\"...");
+					Files.copy(at.path.toPath(), Paths.get(Main.inpath + "temp/data/audio/music/" + trackno + "/music_stereo.at9"), StandardCopyOption.REPLACE_EXISTING);
+				} catch (IOException ex) {
+					Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+				}
+				} else {
+				progressDialog.setText("Encoding track " + (i+1) + " out of " + tracklist.size() + "...");
+				try {
+					System.out.println("Encoding track #" + (i+1) + " \"" + oArtist + " - " + oTitle + "\"...");
+					if (normalizeVolumes) { // normalize tracks
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", at.path.getPath(), "-filter", "loudnorm=linear=true:i=-5.0:lra=7.0:tp=0.0", /*  force sample rate to prevent Random Stupid Bullshit™  */"-ar", "44100", "ffmpeg/" + at.path.getName() + "_normalized.wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						at.path = new File(Main.inpath + "temp/ffmpeg/" + at.path.getName() + "_normalized.wav");
+					} else { // convert to WAV first if it's not readable by at9tool yet
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", at.path.getPath(), "-ar", "44100", "ffmpeg/" + at.path.getName() + ".wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						at.path = new File(Main.inpath + "temp/ffmpeg/" + at.path.getName() + ".wav");
+					}
+					Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", at.path.getPath(), "data/audio/music/" + trackno + "/music_stereo.at9"}, Main.inpath + "temp/");
+					final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+					ioThread.start();
+					p.waitFor();
+					Main.deleteDir(new File(Main.inpath + "temp/ffmpeg/"));
+				} catch (IOException | InterruptedException ex) {
+					Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+				}
+				}
+				String ocmd = "modify";
+				if (i >= 12) ocmd = "create";
+				String oArtistLine;
+				if (!oArtist.isEmpty()) {
+					oArtistLine = oArtist.replace("\"", "\\\"")+"\\n";
+				} else {
+					oArtistLine = "";
+				}
+				int i2 = 0;
+				while (i2 < 15 /*17 languages*/) {
+					String language = "INTERNAL_ERROR";
+					switch (i2) {
+						case 0 -> language = "american";
+						case 1 -> language = "danish";
+						case 2 -> language = "dutch";
+						case 3 -> language = "english";
+						case 4 -> language = "finnish";
+						case 5 -> language = "french";
+						case 6 -> language = "german";
+						case 7 -> language = "italian";
+						case 8 -> language = "japanese";
+						case 9 -> language = "norwegian";
+						case 10 -> language = "polish";
+						case 11 -> language = "portuguese";
+						case 12 -> language = "russian";
+						case 13 -> language = "spanish";
+						case 14 -> language = "swedish";
+						default -> {
+							int result = JOptionPane.showConfirmDialog(frame, "Firestar encountered an internal error.\nString 'language' exported to FSCRIPT was blank.", "Fatal Error", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+							if (result == JOptionPane.OK_OPTION) {System.exit(1);} //user safety
+						}
+					}
+				//case 9: language = "korean"; break;
+				//case 16: language = "traditionalchinese"; break;
+					ps.println("file \"data/plugins/languages/"+language+"/entries.xml\" xml "+ocmd+" StringTable.entry#MT_"+trackno+" set attribute \"string\" \""+oArtistLine+oTitle.replace("\"", "\\\"")+"\"");
+					i2++;
+				}
+				ps.println("file \"data/audio/music/"+trackno+"/music_stereo.fft\" delete");
+				progressDialog.setProgressValue(i+1);
+			}
+			for (int s = tracklist.size(); s < 12; s++) {
+				ps.println("file \"data/audio/music/"+String.format("%02d", s+1)+"/music_stereo.fft\" delete");
+			}
+			if (sptrack != null) {
+				progressDialog.setText("Encoding singleplayer frontend track...");
+				if (sptrack.exists()) {
+				try {
+					System.out.println("Encoding singleplayer frontend track...");
+					if (normalizeVolumes) { // normalize tracks
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", sptrack.getPath(), "-filter", "loudnorm=linear=true:i=-10.0:lra=12.0:tp=-2.0", /*  force sample rate to prevent Random Stupid Bullshit™  */"-ar", "44100", "ffmpeg/" + sptrack.getName() + "_normalized.wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						sptrack = new File(Main.inpath + "temp/ffmpeg/" + sptrack.getName() + "_normalized.wav");
+					} else { // convert to WAV first if it's not readable by at9tool yet
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", sptrack.getPath(), "-ar", "44100", "ffmpeg/" + sptrack.getName() + ".wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						sptrack = new File(Main.inpath + "temp/ffmpeg/" + sptrack.getName() + ".wav");
+					}
+					new File(Main.inpath + "temp/data/audio/music/FEMusic").mkdirs();
+					Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", sptrack.getPath(), "data/audio/music/FEMusic/frontend_stereo.at9"}, System.getProperty("user.home") + "/.firestar/temp/");
+					final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+					ioThread.start();
+					p.waitFor();
+					Main.deleteDir(new File(Main.inpath + "temp/ffmpeg/"));
+				} catch (IOException | InterruptedException ex) {
+					Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+				}
+				}
+				ps.println("file \"data/audio/music/FEMusic/frontend_stereo.fft\" delete");
+				progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
+			}
+			if (mptrack != null) {
+				progressDialog.setText("Encoding multiplayer frontend track...");
+				try {
+				assert(mptrack.exists());
+				System.out.println("Encoding multiplayer frontend track...");
+					if (normalizeVolumes) { // normalize tracks
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", mptrack.getPath(), "-filter", "loudnorm=linear=true:i=-10.0:lra=12.0:tp=-2.0", /*  force sample rate to prevent Random Stupid Bullshit™  */"-ar", "44100", "ffmpeg/" + mptrack.getName() + "_normalized.wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						mptrack = new File(Main.inpath + "temp/ffmpeg/" + mptrack.getName() + "_normalized.wav");
+					} else { // convert to WAV first if it's not readable by at9tool yet
+						new File(Main.inpath + "temp/ffmpeg/").mkdirs();
+						Process p = Main.exec(new String[]{Main.inpath + "ffmpeg.exe", "-y", "-i", mptrack.getPath(), "-ar", "44100", "ffmpeg/" + mptrack.getName() + ".wav"}, Main.inpath + "temp/");
+						final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+						ioThread.start();
+						p.waitFor();
+						mptrack = new File(Main.inpath + "temp/ffmpeg/" + mptrack.getName() + ".wav");
+					}
+				new File(Main.inpath + "temp/data/audio/music/FEDemoMusic").mkdirs();
+				Process p = Main.exec(new String[]{Main.inpath + "at9tool.exe", "-e", "-br", "144", mptrack.getPath(), "data/audio/music/FEDemoMusic/frontend_stereo.at9"}, System.getProperty("user.home") + "/.firestar/temp/");
+				final Thread ioThread = new Thread() {@Override public void run() {Main.printProcessLogToStdOut(p);}};
+				ioThread.start();
+				p.waitFor();
+					Main.deleteDir(new File(Main.inpath + "temp/ffmpeg/"));
+				} catch (IOException | InterruptedException ex) {
+				Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+				}
+				ps.println("file \"data/audio/music/FEDemoMusic/frontend_stereo.fft\" delete");
+				progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
+			}
+			System.out.println("Finished encoding.");
+
+			progressDialog.setText("Generating Music Definitions...");
+			try {
+				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+				DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+
+				Document defDoc = docBuilder.newDocument();
+				Element docScreen = defDoc.createElement("Screen");
+				docScreen.setAttribute("name", "Top");
+				for (int i = 0; i < tracklist.size(); i++) { // TODO: support for additive
+				AudioTrack at = tracklist.get(i);
+				String trackno = String.format("%02d", i+1);
+
+				Element trackElem = defDoc.createElement("PI_Music");
+				trackElem.setAttribute("name", trackno);
+
+				Element pathElem = defDoc.createElement("Values");
+				pathElem.setAttribute("location", "data\\audio\\music\\"+trackno);
+				trackElem.appendChild(pathElem);
+
+				Element artistElem = defDoc.createElement("Entry");
+				artistElem.setAttribute("Artist", at.artist);
+				trackElem.appendChild(artistElem);
+
+				Element titleElem = defDoc.createElement("Entry");
+				titleElem.setAttribute("Label", at.title);
+				trackElem.appendChild(titleElem);
+
+				docScreen.appendChild(trackElem);
+				System.out.println("Adding \"" + trackno + ". " + at.artist + " - " + at.title + "\" to Definition.xml");
+				}
+				defDoc.appendChild(docScreen);
+
+				new File(Main.inpath + "temp/data/plugins/music/").mkdirs();
+				FileOutputStream output = new FileOutputStream(Main.inpath + "temp/data/plugins/music/Definition.xml");
+				TransformerFactory transformerFactory = TransformerFactory.newInstance();
+				Transformer transformer = transformerFactory.newTransformer();
+				DOMSource source = new DOMSource(defDoc);
+				StreamResult result = new StreamResult(output);
+
+				transformer.transform(source, result);
+			} catch (IOException | ParserConfigurationException | TransformerException ex) {
+				Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+			}
+			progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
+
+			progressDialog.setText("Finalizing script...");
+			System.out.println("Finalizing Fscript...");
+			ps.println("# END FIRESTAR AUTOGENERATION");
+			ps.close();
+			fos.close();
+			} catch (IOException ex) {
+			Logger.getLogger(Suggs.class.getName()).log(Level.SEVERE, null, ex);
+			}
+
+			progressDialog.setProgressValue(progressDialog.getProgressValue()+1);
+
+			progressDialog.destroyDialog();
+			frame.dispose();
+			Clifford saveDialog = new Clifford();
+			saveDialog.isSoundtrack = true;
+			saveDialog.Action(frame, new File(Main.inpath + "temp/"));
+			parent.setEnabled(true);
+		}).start();
+	}
 }

firestar/src/main/java/Waldorf.form

@@ -90,7 +90,9 @@
       <grid id="b015e" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <maximum-size width="500" height="-1"/>
+          </grid>
         </constraints>
         <properties>
           <opaque value="false"/>
@@ -99,7 +101,7 @@
         <children>
           <component id="18770" class="javax.swing.JLabel" binding="fOutpath">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <font name="Exo 2"/>
@@ -109,7 +111,7 @@
           </component>
           <component id="fa1ee" class="javax.swing.JButton" binding="fOutpathChangebtn">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <background color="-2271221"/>

firestar/src/main/java/Waldorf.java

@@ -16,153 +16,151 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 
 import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
 
 public class Waldorf implements ActionListener {
-    private JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JButton okbtn;
-    private JButton cancelbtn;
-    private JLabel fOutpath;
-    private JButton resetbtn;
-    private JButton bOpenFolder;
-    private JButton dwnSDKbtn;
-    private JButton dwnARCbtn;
-    private JButton fOutpathChangebtn;
-    private JCheckBox checkUpdatesToggle;
-    private JButton bDelArcs;
+	private JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JButton okbtn;
+	private JButton cancelbtn;
+	private JLabel fOutpath;
+	private JButton resetbtn;
+	private JButton bOpenFolder;
+	private JButton dwnSDKbtn;
+	private JButton dwnARCbtn;
+	private JButton fOutpathChangebtn;
+	private JCheckBox checkUpdatesToggle;
+	private JButton bDelArcs;
 
-    MissPiggy invoker;
-    private String tOutPath = Main.outpath;
+	MissPiggy invoker;
+	private String tOutPath = Main.outpath;
 
-    public void Action(MissPiggy inv) {
-        invoker = inv;
+	public void Action(MissPiggy inv) {
+		invoker = inv;
 
-        frame.add(frameContainer);
-        try {
-            BufferedImage windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-        frame.setSize(600, 300); // 1280 800
-        frame.setMinimumSize(new Dimension(200,100));
-        frame.setTitle("Options");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(inv.frame);
-        frame.setAlwaysOnTop(true);
+		frame.add(frameContainer);
+		frame.setIconImage(Main.windowIcon);
+		frame.setSize(600, 300); // 1280 800
+		frame.setMinimumSize(new Dimension(200,100));
+		frame.setTitle("Options");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(inv.frame);
+		frame.setAlwaysOnTop(true);
 
-        cancelbtn.addActionListener(this);
-        okbtn.addActionListener(this);
-        resetbtn.addActionListener(this);
-        bOpenFolder.addActionListener(this);
-        bDelArcs.addActionListener(this);
-        dwnARCbtn.addActionListener(this);
-        dwnSDKbtn.addActionListener(this);
-        fOutpathChangebtn.addActionListener(this);
+		cancelbtn.addActionListener(this);
+		okbtn.addActionListener(this);
+		resetbtn.addActionListener(this);
+		bOpenFolder.addActionListener(this);
+		bDelArcs.addActionListener(this);
+		dwnARCbtn.addActionListener(this);
+		dwnSDKbtn.addActionListener(this);
+		fOutpathChangebtn.addActionListener(this);
 
-        fOutpath.setText(Main.outpath);
-        checkUpdatesToggle.setSelected(Main.checkUpdates);
+		updateDOutpath(Main.outpath);
+		checkUpdatesToggle.setSelected(Main.checkUpdates);
 
-        frame.setVisible(true);
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                invoker.frame.setEnabled(true);
-                e.getWindow().dispose();
-            }
-        });
-    }
+		frame.setVisible(true);
+		frame.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e)
+			{
+				invoker.frame.setEnabled(true);
+				e.getWindow().dispose();
+			}
+		});
+	}
 
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == cancelbtn) {
-            invoker.frame.setEnabled(true);
-            frame.dispose();
-        } else
-        if (actionEvent.getSource() == okbtn) {
-            Main.outpath = tOutPath;
-            Main.checkUpdates = checkUpdatesToggle.isSelected();
-            Main.writeConf();
-            Main.loadConf();
+	private void updateDOutpath(String path) {
+		String s = path;
+		if (s.startsWith(System.getProperty("user.home"))) {s = "~" + s.substring(System.getProperty("user.home").length());}
+		if (s.length() > 50) {s = s.substring(0, Math.min(path.length(), 46)) + "...";fOutpath.setToolTipText(path);} else {fOutpath.setToolTipText(null);}
+		fOutpath.setText(s);
+	}
 
-            invoker.frame.setEnabled(true);
-            frame.dispose();
-        } else
-        if (actionEvent.getSource() == resetbtn) {
-            int result = JOptionPane.showConfirmDialog(frame,"Are you sure you want to redo the initial setup?", "Restore Default Settings", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-            if (result == JOptionPane.YES_OPTION) {
-                System.out.println("Restoring default settings");
-                new File(System.getProperty("user.home") + "/.firestar/firestar.conf").delete();
-                System.out.println("Deleting existing PSARCs");
-                new File(Main.inpath + "data.psarc").delete();
-                new File(Main.inpath + "data1.psarc").delete();
-                new File(Main.inpath + "data2.psarc").delete();
-                new File(Main.inpath + "dlc1.psarc").delete();
-                new File(Main.inpath + "dlc2.psarc").delete();
-                int result2 = JOptionPane.showConfirmDialog(frame,"Firestar will now close.", "Restore Default Settings", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE);
-                if (result2 == JOptionPane.OK_OPTION) {
-                    System.exit(0);
-                }
-            }
-        } else
-        if (actionEvent.getSource() == bOpenFolder) {
-            try {
-                Desktop.getDesktop().open(new File(Main.inpath));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        } else
-        if (actionEvent.getSource() == bDelArcs) {
-            int result = JOptionPane.showConfirmDialog(frame, "All existing PSARC dumps will be deleted.\nDo you want to continue?", "Delete PSARCs", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-            if (result == JOptionPane.NO_OPTION) {return;}
-            System.out.println("User requested arc wipe, deleting existing PSARCs");
-            new File(Main.inpath + "data.psarc").delete();
-            new File(Main.inpath + "data1.psarc").delete();
-            new File(Main.inpath + "data2.psarc").delete();
-            new File(Main.inpath + "dlc1.psarc").delete();
-            new File(Main.inpath + "dlc2.psarc").delete();
-            JOptionPane.showMessageDialog(frame, "PSARC files purged.", "Delete PSARCs", JOptionPane.INFORMATION_MESSAGE);
-        } else
-        if (actionEvent.getSource() == dwnARCbtn) {
-            new Bert(invoker.frame);
-            frame.dispose();
-        } else
-        if (actionEvent.getSource() == dwnSDKbtn) {
-            Thread downloaderPopupThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    Main.downloadDependenciesBeforeSetVisible(invoker.frame);
-                    invoker.frame.setEnabled(true);
-                }
-            });
-            downloaderPopupThread.start();
-            frame.dispose();
-        } else
-            if (actionEvent.getSource() == fOutpathChangebtn) {
-                JFileChooser fileChooser = new JFileChooser();
-                fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-                int result = fileChooser.showOpenDialog(frame);
-                if (result == JFileChooser.APPROVE_OPTION) {
-                    if (fileChooser.getSelectedFile().isDirectory()) {
-                        tOutPath = fileChooser.getSelectedFile().getAbsolutePath();
-                        fOutpath.setText(tOutPath);
-                    }
-                }
-            }
-    }
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		if (actionEvent.getSource() == cancelbtn) {
+			invoker.frame.setEnabled(true);
+			frame.dispose();
+		} else
+		if (actionEvent.getSource() == okbtn) {
+			Main.outpath = tOutPath;
+			Main.checkUpdates = checkUpdatesToggle.isSelected();
+			Main.writeConf();
+			Main.loadConf();
+
+			invoker.frame.setEnabled(true);
+			frame.dispose();
+		} else
+		if (actionEvent.getSource() == resetbtn) {
+			int result = JOptionPane.showConfirmDialog(frame,"Are you sure you want to redo the initial setup?", "Restore Default Settings", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+			if (result == JOptionPane.YES_OPTION) {
+				System.out.println("Restoring default settings");
+				new File(System.getProperty("user.home") + "/.firestar/firestar.conf").delete();
+				int result2 = JOptionPane.showConfirmDialog(frame,"Firestar will now close.", "Restore Default Settings", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE);
+				if (result2 == JOptionPane.OK_OPTION) {
+					System.exit(0);
+				}
+			}
+		} else
+		if (actionEvent.getSource() == bOpenFolder) {
+			try {
+				Desktop.getDesktop().open(new File(Main.inpath));
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		} else
+		if (actionEvent.getSource() == bDelArcs) {
+			int result = JOptionPane.showConfirmDialog(frame, "All existing PSARC dumps will be deleted.\nDo you want to continue?", "Delete PSARCs", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+			if (result == JOptionPane.NO_OPTION) {return;}
+			System.out.println("User requested arc wipe, deleting existing PSARCs");
+			new File(Main.inpath + "data.psarc").delete();
+			new File(Main.inpath + "data1.psarc").delete();
+			new File(Main.inpath + "data2.psarc").delete();
+			new File(Main.inpath + "dlc1.psarc").delete();
+			new File(Main.inpath + "dlc2.psarc").delete();
+			JOptionPane.showMessageDialog(frame, "PSARC files purged.", "Delete PSARCs", JOptionPane.INFORMATION_MESSAGE);
+		} else
+		if (actionEvent.getSource() == dwnARCbtn) {
+			if (!new File(Main.inpath + "pkg2zip.exe").exists() || !new File(Main.inpath + "psvpfsparser.exe").exists()) {
+				JOptionPane.showMessageDialog(frame, "Your decryption tools are missing.\nPlease select \"Get Dependencies\" in the Options menu.", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			new Bert(invoker.frame);
+			frame.dispose();
+		} else
+		if (actionEvent.getSource() == dwnSDKbtn) {
+			Thread downloaderPopupThread = new Thread(new Runnable() {
+				@Override
+				public void run() {
+					Main.downloadDependenciesBeforeSetVisible(invoker.frame);
+					invoker.frame.setEnabled(true);
+				}
+			});
+			downloaderPopupThread.start();
+			frame.dispose();
+		} else
+			if (actionEvent.getSource() == fOutpathChangebtn) {
+				JFileChooser fileChooser = new JFileChooser();
+				fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+				int result = fileChooser.showOpenDialog(frame);
+				if (result == JFileChooser.APPROVE_OPTION) {
+					if (fileChooser.getSelectedFile().isDirectory()) {
+						tOutPath = fileChooser.getSelectedFile().getAbsolutePath()+"/";
+						updateDOutpath(tOutPath);
+					}
+				}
+			}
+	}
 }

firestar/src/main/java/WilkinsCoffee.java

@@ -24,7 +24,6 @@ import javax.swing.text.html.HTMLDocument;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -32,182 +31,176 @@ import java.nio.file.Files;
 import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
 
 public class WilkinsCoffee implements ActionListener {
-    BufferedImage windowIcon;
-    Image logo;
-    public Pages page;
-    public JFrame frame = new JFrame();
-    private JPanel frameContainer;
-    private JLabel picLabel;
-    private JEditorPane instructions;
-    private JButton contBtn;
-    private JPanel inputContainer;
-    private JButton PSARC_downBtn;
-    private JButton PSARC_impBtn;
-    private JPanel inputContainer2;
-    private JButton EXPORT_openFolderBtn;
-    private JLabel pathDisplay;
-    private JPanel checklistContainer;
-    private JLabel checklistFury;
-    private JLabel checklistHD;
-    private JLabel checklistPatch2;
-    private JLabel checklistPatch1;
-    private JLabel checklistBase;
+	Image logo;
+	public Pages page;
+	public JFrame frame = new JFrame();
+	private JPanel frameContainer;
+	private JLabel picLabel;
+	private JEditorPane instructions;
+	private JButton contBtn;
+	private JPanel inputContainer;
+	private JButton PSARC_downBtn;
+	private JButton PSARC_impBtn;
+	private JPanel inputContainer2;
+	private JButton EXPORT_openFolderBtn;
+	private JLabel pathDisplay;
+	private JPanel checklistContainer;
+	private JLabel checklistFury;
+	private JLabel checklistHD;
+	private JLabel checklistPatch2;
+	private JLabel checklistPatch1;
+	private JLabel checklistBase;
 
-    public enum Pages {
-        INTRO(0),
-        PSARC(1),
-        EXPORT_LOCATION(2),
-        DONE(3);
+	public enum Pages {
+		INTRO(0),
+		PSARC(1),
+		EXPORT_LOCATION(2),
+		DONE(3);
 
-        public final int value;
+		public final int value;
 
-        private Pages(int i) {
-            this.value = i;
-        }
-    }
+		private Pages(int i) {
+			this.value = i;
+		}
+	}
 
-    private String outPathTemp = System.getProperty("user.home") + "/Documents";
-    private boolean sdkInstalled = false;
+	private String outPathTemp = System.getProperty("user.home") + "/Documents/";
+	private boolean sdkInstalled = false;
 
-    public void setup() {
-        page = Pages.INTRO;
-        inputContainer.setVisible(false);
-        checklistContainer.setVisible(false);
-        inputContainer2.setVisible(false);
+	public void setup() {
+		page = Pages.INTRO;
+		inputContainer.setVisible(false);
+		checklistContainer.setVisible(false);
+		inputContainer2.setVisible(false);
 
-        // check if this is windows or not
-        if(System.getProperty("os.name").contains("Windows")) {Main.windows = true;System.out.println("Assuming we should NOT use WINE based on known system variables.");}
-        else {Main.windows = false;System.out.println("Assuming we should use WINE based on known system variables.");}
+		// check if this is windows or not
+		if(System.getProperty("os.name").contains("Windows")) {Main.windows = true;System.out.println("Assuming we should NOT use WINE based on known system variables.");}
+		else {Main.windows = false;System.out.println("Assuming we should use WINE based on known system variables.");}
 
-        // reformat path slightly for windows
-        if (Main.windows) {outPathTemp.replace("/", "\\");}
+		// reformat path slightly for windows
+		if (Main.windows) {outPathTemp.replace("/", "\\");}
 
-        try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
-            frame.setIconImage(windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
-        try {
-            logo = ImageIO.read(Main.class.getResourceAsStream("/programIcon.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
-            picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
-        } catch (IOException e) {
-            System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
-            picLabel.setText("");
-        }
+		frame.setIconImage(Main.windowIcon);
+		try {
+			logo = ImageIO.read(Main.class.getResourceAsStream("/programIcon.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
+			picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
+		} catch (IOException e) {
+			System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
+			picLabel.setText("");
+		}
 
-        String bodyRule = "html, body {margin:0px;} p#first-p {margin-top:-13px;} p {margin-left:-20px;}";
-        ((HTMLDocument)instructions.getDocument()).getStyleSheet().addRule(bodyRule);
-        instructions.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE); // makes text smaller than joe biden's windmill if font set manually. wtf??
-        contBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
-        PSARC_downBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
-        PSARC_impBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
-        EXPORT_openFolderBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
+		String bodyRule = "html, body {margin:0px;} p#first-p {margin-top:-13px;} p {margin-left:-20px;}";
+		((HTMLDocument)instructions.getDocument()).getStyleSheet().addRule(bodyRule);
+		instructions.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE); // makes text smaller than joe biden's windmill if font set manually. wtf??
+		contBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
+		PSARC_downBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
+		PSARC_impBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
+		EXPORT_openFolderBtn.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
 
-        frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
+		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
 
-        contBtn.addActionListener(this);
-        PSARC_downBtn.addActionListener(this);
-        PSARC_impBtn.addActionListener(this);
-        EXPORT_openFolderBtn.addActionListener(this);
+		contBtn.addActionListener(this);
+		PSARC_downBtn.addActionListener(this);
+		PSARC_impBtn.addActionListener(this);
+		EXPORT_openFolderBtn.addActionListener(this);
 
-        frame.setSize(400, 400);
-        frame.setTitle("Firestar Setup");
-        frame.setResizable(false);
-        frame.setDefaultCloseOperation(EXIT_ON_CLOSE);
-        frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
-    }
+		frame.setSize(400, 400);
+		frame.setTitle("Firestar Setup");
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(EXIT_ON_CLOSE);
+		frame.setLayout(new GridLayout());
+		frame.setLocationRelativeTo(null);
+		frame.setVisible(true);
+	}
 
-    @Override
-    public void actionPerformed(ActionEvent actionEvent) {
-        WilkinsCoffee threadParent = this;
-        if (actionEvent.getSource() == PSARC_downBtn) {
-            Thread waiterThread = new Thread(new Runnable() {@Override
-            public void run() {
-                if (new Bert(frame).reportWhenDownloaded(threadParent)) {
-                    contBtn.setEnabled(true);
-                    contBtn.setBackground(new Color(221, 88, 11)); //orange
+	@Override
+	public void actionPerformed(ActionEvent actionEvent) {
+		WilkinsCoffee threadParent = this;
+		if (actionEvent.getSource() == PSARC_downBtn) {
+			Thread waiterThread = new Thread(new Runnable() {@Override
+			public void run() {
+				if (new Bert(frame).reportWhenDownloaded(threadParent)) {
+					contBtn.setEnabled(true);
+					contBtn.setBackground(new Color(221, 88, 11)); //orange
 
-                    refreshChecklist();
-                }
-            }});
-        waiterThread.start();
-        } else
-        if (actionEvent.getSource() == PSARC_impBtn) {
-            JFileChooser fileChooser = new JFileChooser();
-            fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            FileFilter fileChooserFilter = new FileNameExtensionFilter("Sony Playstation Archive File", "psarc");
-            fileChooser.setFileFilter(fileChooserFilter);
-            int result = fileChooser.showOpenDialog(frame);
-            if (result == JFileChooser.APPROVE_OPTION) {
-                try {
-                    Files.copy(fileChooser.getSelectedFile().toPath(), new File(Main.inpath + fileChooser.getSelectedFile().getName()).toPath());
-                    refreshChecklist();
-                    contBtn.setEnabled(true);
-                    contBtn.setBackground(new Color(221, 88, 11)); //orange
-                } catch (IOException e) {
-                    System.out.println(e.getMessage());
-                    JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-                }
-            }
-        } else
-        if (actionEvent.getSource() == EXPORT_openFolderBtn) {
-            JFileChooser fileChooser = new JFileChooser();
-            fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-            int result = fileChooser.showOpenDialog(frame);
-            if (result == JFileChooser.APPROVE_OPTION) {
-                if (fileChooser.getSelectedFile().isDirectory()) {
-                    outPathTemp = fileChooser.getSelectedFile().getAbsolutePath();
-                    pathDisplay.setText("Export path: " + outPathTemp);
-                }
-            }
-        } else
-        if (actionEvent.getSource() == contBtn) {
-            switch (page) {
-                case INTRO:
-                    if (!new File(Main.inpath + "psp2psarc.exe").exists()) { // we may have been here before // nag
-                        frame.setEnabled(false);
-                        int result = JOptionPane.showConfirmDialog(frame, "Firestar needs to download additional software to function. Setup is automatic and will only take a few minutes.\nIf you select NO, you will have to download additional dependencies later on.\n\nContinue?", "Firestar Setup", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-                        if (result == JOptionPane.YES_OPTION) {
-                            sdkInstalled = true;
-                            Thread downloaderPopupThread = new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Main.downloadDependenciesBeforeSetVisible(frame);
-                                    frame.setEnabled(true);
-                                }
-                            });
-                            downloaderPopupThread.start();
-                        } else {
-                            frame.setEnabled(true);
-                        }
-                    } else {
-                        sdkInstalled = true;
-                    }
+					refreshChecklist();
+				}
+			}});
+		waiterThread.start();
+		} else
+		if (actionEvent.getSource() == PSARC_impBtn) {
+			JFileChooser fileChooser = new JFileChooser();
+			fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+			FileFilter fileChooserFilter = new FileNameExtensionFilter("Sony Playstation Archive File", "psarc");
+			fileChooser.setFileFilter(fileChooserFilter);
+			int result = fileChooser.showOpenDialog(frame);
+			if (result == JFileChooser.APPROVE_OPTION) {
+				try {
+					Files.copy(fileChooser.getSelectedFile().toPath(), new File(Main.inpath + fileChooser.getSelectedFile().getName()).toPath());
+					refreshChecklist();
+					contBtn.setEnabled(true);
+					contBtn.setBackground(new Color(221, 88, 11)); //orange
+				} catch (IOException e) {
+					System.out.println(e.getMessage());
+					JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+				}
+			}
+		} else
+		if (actionEvent.getSource() == EXPORT_openFolderBtn) {
+			JFileChooser fileChooser = new JFileChooser();
+			fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+			int result = fileChooser.showOpenDialog(frame);
+			if (result == JFileChooser.APPROVE_OPTION) {
+				if (fileChooser.getSelectedFile().isDirectory()) {
+					outPathTemp = fileChooser.getSelectedFile().getAbsolutePath()+"/";
+					pathDisplay.setText("Export path: " + outPathTemp);
+				}
+			}
+		} else
+		if (actionEvent.getSource() == contBtn) {
+			switch (page) {
+				case INTRO:
+					if (!new File(Main.inpath + "psp2psarc.exe").exists()) { // we may have been here before // nag
+						frame.setEnabled(false);
+						int result = JOptionPane.showConfirmDialog(frame, "Firestar needs to download additional software to function. Setup is automatic and will only take a few minutes.\nIf you select NO, you will have to download additional dependencies later on.\n\nContinue?", "Firestar Setup", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+						if (result == JOptionPane.YES_OPTION) {
+							sdkInstalled = true;
+							Thread downloaderPopupThread = new Thread(new Runnable() {
+								@Override
+								public void run() {
+									Main.downloadDependenciesBeforeSetVisible(frame);
+									frame.setEnabled(true);
+								}
+							});
+							downloaderPopupThread.start();
+						} else {
+							frame.setEnabled(true);
+						}
+					} else {
+						sdkInstalled = true;
+					}
 
-                    page = Pages.PSARC;
-                    try {
-                        logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconPSARC.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
-                        picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
-                    } catch (IOException e) {
-                        System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
-                        picLabel.setText("");
-                    }
+					page = Pages.PSARC;
+					try {
+						logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconPSARC.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
+						picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
+					} catch (IOException e) {
+						System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
+						picLabel.setText("");
+					}
 
-                    contBtn.setEnabled(false);
-                    contBtn.setBackground(new Color(102, 74, 58)); //brown
-                    refreshChecklist();
-                    inputContainer.setVisible(true);
-                    checklistContainer.setVisible(true);
-                    if (!sdkInstalled) {
-                        PSARC_downBtn.setEnabled(false);
-                        PSARC_downBtn.setBackground(new Color(102, 74, 58)); //brown
-                    }
+					contBtn.setEnabled(false);
+					contBtn.setBackground(new Color(102, 74, 58)); //brown
+					refreshChecklist();
+					inputContainer.setVisible(true);
+					checklistContainer.setVisible(true);
+					if (!sdkInstalled) {
+						PSARC_downBtn.setEnabled(false);
+						PSARC_downBtn.setBackground(new Color(102, 74, 58)); //brown
+					}
 
-                    instructions.setText("<html>\n" +
-                            "  <head>\n" +
+					instructions.setText("<html>\n" +
+							"  <head>\n" +
                             "    \n" +
                             "  </head>\n" +
                             "  <body>\n" +
@@ -220,24 +213,24 @@ public class WilkinsCoffee implements ActionListener {
                             "  </body>\n" +
                             "</html>\n");
 
-                    break;
-                case PSARC:
-                    page = Pages.EXPORT_LOCATION;
-                    try {
-                        logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconEXPORT.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
-                        picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
-                    } catch (IOException e) {
-                        System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
-                        picLabel.setText("");
-                    }
-                    contBtn.setEnabled(true);
-                    contBtn.setBackground(new Color(221, 88, 11)); //orange
-                    inputContainer.setVisible(false);
-                    checklistContainer.setVisible(false);
-                    inputContainer2.setVisible(true);
+					break;
+				case PSARC:
+					page = Pages.EXPORT_LOCATION;
+					try {
+						logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconEXPORT.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
+						picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
+					} catch (IOException e) {
+						System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
+						picLabel.setText("");
+					}
+					contBtn.setEnabled(true);
+					contBtn.setBackground(new Color(221, 88, 11)); //orange
+					inputContainer.setVisible(false);
+					checklistContainer.setVisible(false);
+					inputContainer2.setVisible(true);
 
-                    instructions.setText("<html>\n" +
-                            "  <head>\n" +
+					instructions.setText("<html>\n" +
+							"  <head>\n" +
                             "    \n" +
                             "  </head>\n" +
                             "  <body>\n" +
@@ -250,25 +243,25 @@ public class WilkinsCoffee implements ActionListener {
                             "  </body>\n" +
                             "</html>\n");
 
-                    pathDisplay.setText("Export path: " + outPathTemp);
+					pathDisplay.setText("Export path: " + outPathTemp);
 
-                    break;
-                case EXPORT_LOCATION:
-                    page = Pages.DONE;
-                    try {
-                        logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconDONE.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
-                        picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
-                    } catch (IOException e) {
-                        System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
-                        picLabel.setText("");
-                    }
-                    inputContainer2.setVisible(false);
-                    Main.outpath = outPathTemp + "/";
-                    Main.repatch = true;
-                    Main.writeConf();
+					break;
+				case EXPORT_LOCATION:
+					page = Pages.DONE;
+					try {
+						logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconDONE.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
+						picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
+					} catch (IOException e) {
+						System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
+						picLabel.setText("");
+					}
+					inputContainer2.setVisible(false);
+					Main.outpath = outPathTemp;
+					Main.repatch = true;
+					Main.writeConf();
 
-                    instructions.setText("<html>\n" +
-                            "  <head>\n" +
+					instructions.setText("<html>\n" +
+							"  <head>\n" +
                             "    \n" +
                             "  </head>\n" +
                             "  <body>\n" +
@@ -278,48 +271,48 @@ public class WilkinsCoffee implements ActionListener {
                             "  </body>\n" +
                             "</html>\n");
 
-                    break;
-                case DONE:
-                    frame.dispose();
-                    new MissPiggy().Action();
-                    break;
-                default:
-                    throw new UnsupportedOperationException("ERROR: Setup page-flip event listener didn't drink any Wilkins Coffee. Get a programmer!");
-            }
-        }
-    }
+					break;
+				case DONE:
+					frame.dispose();
+					new MissPiggy().Action();
+					break;
+				default:
+					throw new UnsupportedOperationException("ERROR: Setup page-flip event listener didn't drink any Wilkins Coffee. Get a programmer!");
+			}
+		}
+	}
 
-    private void refreshChecklist() {
-        ImageIcon positive = new ImageIcon(Main.class.getResource("/lightPositive.png"));
-        ImageIcon negative = new ImageIcon(Main.class.getResource("/lightNegative.png"));
+	private void refreshChecklist() {
+		ImageIcon positive = new ImageIcon(Main.class.getResource("/lightPositive.png"));
+		ImageIcon negative = new ImageIcon(Main.class.getResource("/lightNegative.png"));
 
-        // enabling the continue button here leaves the previous one redundant,
-        // but it's needed to ensure we don't force a redownload if the setup is interrupted
+		// enabling the continue button here leaves the previous one redundant,
+		// but it's needed to ensure we don't force a redownload if the setup is interrupted
 
-        if(new File(Main.inpath + "data.psarc").exists()) {
-            checklistBase.setIcon(positive);
-            contBtn.setEnabled(true);
-            contBtn.setBackground(new Color(221, 88, 11)); //orange
-        } else {checklistBase.setIcon(negative);}
-        if(new File(Main.inpath + "data1.psarc").exists()) {
-            checklistPatch1.setIcon(positive);
-            contBtn.setEnabled(true);
-            contBtn.setBackground(new Color(221, 88, 11)); //orange
-        } else {checklistPatch1.setIcon(negative);}
-        if(new File(Main.inpath + "data2.psarc").exists()) {
-            checklistPatch2.setIcon(positive);
-            contBtn.setEnabled(true);
-            contBtn.setBackground(new Color(221, 88, 11)); //orange
-        } else {checklistPatch2.setIcon(negative);}
-        if(new File(Main.inpath + "dlc1.psarc").exists()) {
-            checklistHD.setIcon(positive);
-            contBtn.setEnabled(true);
-            contBtn.setBackground(new Color(221, 88, 11)); //orange
-        } else {checklistHD.setIcon(negative);}
-        if(new File(Main.inpath + "dlc2.psarc").exists()) {
-            checklistFury.setIcon(positive);
-            contBtn.setEnabled(true);
-            contBtn.setBackground(new Color(221, 88, 11)); //orange
-        } else {checklistFury.setIcon(negative);}
-    }
+		if(new File(Main.inpath + "data.psarc").exists()) {
+			checklistBase.setIcon(positive);
+			contBtn.setEnabled(true);
+			contBtn.setBackground(new Color(221, 88, 11)); //orange
+		} else {checklistBase.setIcon(negative);}
+		if(new File(Main.inpath + "data1.psarc").exists()) {
+			checklistPatch1.setIcon(positive);
+			contBtn.setEnabled(true);
+			contBtn.setBackground(new Color(221, 88, 11)); //orange
+		} else {checklistPatch1.setIcon(negative);}
+		if(new File(Main.inpath + "data2.psarc").exists()) {
+			checklistPatch2.setIcon(positive);
+			contBtn.setEnabled(true);
+			contBtn.setBackground(new Color(221, 88, 11)); //orange
+		} else {checklistPatch2.setIcon(negative);}
+		if(new File(Main.inpath + "dlc1.psarc").exists()) {
+			checklistHD.setIcon(positive);
+			contBtn.setEnabled(true);
+			contBtn.setBackground(new Color(221, 88, 11)); //orange
+		} else {checklistHD.setIcon(negative);}
+		if(new File(Main.inpath + "dlc2.psarc").exists()) {
+			checklistFury.setIcon(positive);
+			contBtn.setEnabled(true);
+			contBtn.setBackground(new Color(221, 88, 11)); //orange
+		} else {checklistFury.setIcon(negative);}
+	}
 }

gradle.properties

@@ -1 +1 @@
-netbeans.hint.jdkPlatform=JDK_22__System_
+netbeans.hint.jdkPlatform=JDK_17__System_