Update README.md

.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/inspectionProfiles/Project_Default.xml

@@ -1,8 +1,16 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ClassInitializerMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommentedOutCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="FieldMayBeFinal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalPrivateMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalStaticMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyResultOfObjectAllocationIgnored" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="StringOperationCanBeSimplified" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreStringConstructor" value="true" />
     </inspection_tool>
+    <inspection_tool class="ThrowablePrintStackTrace" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </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

@@ -8,9 +8,6 @@
       <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
       </item>
-      <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.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
         <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
       </item>
@@ -32,17 +29,20 @@
           <property name="text" value="CheckBox" />
         </initial-values>
       </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+      <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="0" hsize-policy="0" anchor="8" fill="0" />
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-        <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.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.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,18 +1,20 @@
 ![](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)
 
+![](https://files.worlio.com/users/bonkmaykr/http/git/embed/ScreenShot.'Main'.0x8000024.20250820.135157.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.
+- **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
@@ -22,6 +24,34 @@ If you aren't sure which file to get:
 - **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.
+
 # 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.
@@ -51,13 +81,15 @@ Firestar itself can run natively on the system, but it needs WINE in order to ha
 Firestar is built on top of the following additional software:
 - *[WINE](https://www.winehq.org/), for running the below applications across platforms.
 - *[ffmpeg](https://ffmpeg.org/), for audio conversion in the OST generator
+- †[org.json](https://github.com/stleary/JSON-java), Java library for handling JSON data.
+- †[zip4j](https://github.com/srikanth-lingala/zip4j), A Java library for ZIP files
 - [pkg2zip](https://github.com/mmozeiko/pkg2zip) & [psvpfsparser](https://github.com/motoharu-gosuto/psvpfstools), for (legal) asset decryption from Playstation Network.
-- [FART](https://fart-it.sourceforge.net/), for find-and-replace patches. Yes, seriously, that's what it's called.
 - [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.
 
 *_WINE, ffmpeg, and the Java Runtime are pulled as package dependencies on Linux systems._  
+†_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.
 
@@ -70,6 +102,3 @@ Cross-platform support with no hassle, a built-in UI framework, and I don't need
 
 ## 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.
-
-## Fast Mode vs. Compatibility Mode
-"Fast Mode" was a legacy option that was scrapped before it could be developed. It skipped the creation of a PSARC file and simply dumped the final game assets to their destination folder. This works great for emulators, and doesn't require proprietary stolen SDKs from SCE. However the filesystem on the Playstation Vita really hated this method and would glitch out when this was done, causing textures to be corrupted once placed on the memory card. The WipEout engine has no fault tolerance for malformed or missing assets, so it just crashes instantly when it encounters one. This is where Compatibility mode comes from, which is the default setting for 2048.

firestar/build.gradle

@@ -17,6 +17,9 @@ configurations {
 dependencies {
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.11.5'
     implementation group: 'org.json', name: 'json', version: '20240303'
+    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'
@@ -34,6 +37,7 @@ jar {
 			'Main-Class': 'Main'
 		)
 	}
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 	from {
 		configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
 	}

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

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Bert">
   <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="10" left="25" bottom="0" right="25"/>
+    <margin top="10" left="25" bottom="10" right="25"/>
     <constraints>
       <xy x="20" y="20" width="1156" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <grid id="59440" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -13,7 +17,11 @@
         <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/>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+        </properties>
         <border type="none"/>
         <children>
           <grid id="1a1a9" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -21,7 +29,11 @@
             <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/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
               <component id="783ac" class="javax.swing.JLabel">
@@ -29,7 +41,9 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Select your game version below."/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
+                  <text value="Select the required asset packs below."/>
                 </properties>
               </component>
               <component id="e27cc" class="javax.swing.JLabel">
@@ -37,7 +51,9 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="This will determine what file your mods are deployed to."/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
+                  <text value="This will depend on what version of the game you have and what DLC you own."/>
                 </properties>
               </component>
               <component id="319fa" class="javax.swing.JLabel">
@@ -45,7 +61,9 @@
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value=" If you add/remove DLC in the future, you will need to change this setting again."/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
+                  <text value="Downloading a game update will automatically download its previous versions."/>
                 </properties>
               </component>
             </children>
@@ -55,7 +73,11 @@
             <constraints>
               <grid row="2" 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/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
               <component id="a94bd" class="javax.swing.JButton" binding="cancelbtn">
@@ -63,6 +85,11 @@
                   <grid row="0" column="0" 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"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Cancel"/>
                 </properties>
               </component>
@@ -71,57 +98,248 @@
                   <grid row="0" 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"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Download"/>
                 </properties>
               </component>
             </children>
           </grid>
-          <grid id="c82fd" 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"/>
             </constraints>
-            <properties/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
-              <component id="11210" class="javax.swing.JRadioButton" binding="baseRad">
+              <component id="f3723" class="javax.swing.JCheckBox" binding="hdCheck">
                 <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"/>
+                  <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"/>
-                  <text value="Base game only, no updates"/>
+                  <opaque value="false"/>
-                </properties>
+                  <text value="HD Add-On Pack"/>
-              </component>
-              <component id="94d8" class="javax.swing.JRadioButton" binding="hdRad">
-                <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"/>
-                </constraints>
-                <properties>
-                  <horizontalTextPosition value="10"/>
-                  <text value="HD DLC, without Fury"/>
-                </properties>
-              </component>
-              <component id="69445" class="javax.swing.JRadioButton" binding="patchRad">
-                <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>
-                  <text value="Base game only, 1.04"/>
-                </properties>
-              </component>
-              <component id="35def" class="javax.swing.JRadioButton" binding="furyRad">
-                <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"/>
-                </constraints>
-                <properties>
-                  <horizontalAlignment value="10"/>
-                  <horizontalTextPosition value="11"/>
-                  <selected value="true"/>
-                  <text value="HD Fury DLC"/>
                   <verticalTextPosition value="0"/>
                 </properties>
               </component>
+              <component id="5ed0c" class="javax.swing.JCheckBox" binding="furyCheck">
+                <constraints>
+                  <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"/>
+                  <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,26 +16,33 @@
  *     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 JRadioButton baseRad;
+	private JRadioButton baseCheck;
-    private JRadioButton patchRad;
+	private JRadioButton patchCheck1;
-    private JRadioButton hdRad;
+	private JRadioButton patchCheck2;
-    private JRadioButton furyRad;
+	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;
@@ -53,23 +60,22 @@ public class Bert implements ActionListener {
 		frame.setResizable(false);
 		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 		frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
+		frame.setLocationRelativeTo(parent);
 		frame.setAlwaysOnTop(true);
 
-        radios.add(baseRad);
+		radios.add(baseCheck);
-        radios.add(patchRad);
+		radios.add(patchCheck1);
-        radios.add(hdRad);
+		radios.add(patchCheck2);
-        radios.add(furyRad);
 
 		cancelbtn.addActionListener(this);
 		downloadbtn.addActionListener(this);
+		baseCheck.addActionListener(this);
+		patchCheck1.addActionListener(this);
+		patchCheck2.addActionListener(this);
 
-        try {
+		refreshChecklist();
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
+
-            frame.setIconImage(windowIcon);
+		frame.setIconImage(Main.windowIcon);
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
-        }
 
 		frame.setVisible(true);
 		frame.addWindowListener(new WindowAdapter() {
@@ -86,6 +92,9 @@ public class Bert implements ActionListener {
 			invoker.setEnabled(true);
 			frame.dispose();
 		}
+
+		if (new File(Main.inpath + "data2.psarc").exists())
+			skipBaseCheck.setEnabled(true);
 	}
 
 	public boolean reportWhenDownloaded(WilkinsCoffee setup) {
@@ -99,42 +108,81 @@ public class Bert implements ActionListener {
 
 	@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) {
-            int result = JOptionPane.showConfirmDialog(frame, "All existing PSARC dumps will be deleted and replaced by the new ones.\nThis download could take several minutes. Do you want to continue?", "Download Game Assets", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+			ArrayList<Main.ArcTarget> arcs = new ArrayList<Main.ArcTarget>();
-            if (result == JOptionPane.NO_OPTION) {return;}
+			ArrayList<Main.ArcKey> keys = new ArrayList<Main.ArcKey>();
-            System.out.println("User requested download of assets. 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();
 
-            Main.ArcTarget type;
+			// Always download predecessors to ensure no missing files
-            Main.ArcKey key;
+			// Probably not necessary since I will be adding selective extraction to Gonzo,
-            if (baseRad.isSelected()) {
+			// and throw errors when a lower PSARC doesn't exist, but there's no real reason not to.
-                type = Main.ArcTarget.BASE;
+			//
-                key = Main.ArcKey.BASE;
+			// Of course, to avoid additional download times, we should probably
-                System.out.println("Begin download of data (Game version 1.0)");
+			// avoid adding to the download list if a file already exists, unless explicitly
-            } else
+			// selected (the exact radio button). The user can redownload one at a time
-            if (patchRad.isSelected()) {
+			// but Firestar will not overwrite existing PSARCs otherwise.
-                type = Main.ArcTarget.LATEST;
+			if (baseCheck.isSelected()) { // I have the base game
-                key = Main.ArcKey.LATEST;
+				if (!skipBaseCheck.isSelected() || !new File(Main.inpath + "data.psarc").exists()) {
-                System.out.println("Begin download of data2 (Game version 1.04)");
+					arcs.add(Main.ArcTarget.BASE);
-            } else
+					keys.add(Main.ArcKey.BASE);
-            if (hdRad.isSelected()) {
+					System.out.println("Queued download of data (Game version 1.0)");
-                type = Main.ArcTarget.ADDON_HD;
+				}
-                key = Main.ArcKey.ADDON_HD;
+			}
-                System.out.println("Begin download of dlc1 (HD DLC)");
+			if (patchCheck1.isSelected()) { // I updated it once after it came out and then didn't turn my vita on for thousands of years
-            } else
+				if (!new File(Main.inpath + "data.psarc").exists()) {
-            if (furyRad.isSelected()) {
+					arcs.add(Main.ArcTarget.BASE);
-                type = Main.ArcTarget.ADDON_HD_FURY;
+					keys.add(Main.ArcKey.BASE);
-                key = Main.ArcKey.ADDON_HD_FURY;
+					System.out.println("Queued download of data (Game version 1.0)");
-                System.out.println("Begin download of dlc2 (Fury DLC)");
+				}
-            } else {
+				if (!skipBaseCheck.isSelected() || !new File(Main.inpath + "data1.psarc").exists()) {
-                return; // fire hydrant
+					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)");
+				}
+			}
+
+			// 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;
 			}
 
 			frame.dispose();
@@ -143,8 +191,41 @@ public class Bert implements ActionListener {
 			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;
+						}
+
 						// download file
-                    boolean downloader = new Fozzie().DownloadFile(type.toString(), Main.inpath, "asset.pkg");
+						Fozzie downloaderHandler = new Fozzie();
+						boolean downloader = downloaderHandler.DownloadFile(type.toString(), Main.inpath, "asset.pkg", arcname);
+
 						if (!downloader) {
 							// cleanup
 							new File(Main.inpath + "asset.pkg").delete();
@@ -158,13 +239,11 @@ public class Bert implements ActionListener {
 						}
 
 						// dump contents
-                    System.out.println("Extracting asset.pkg");
+						System.out.println("Extracting " + arcname);
 						Fozzie popup = new Fozzie();
-                    popup.displayTextOnly("Extracting PKG...", "Extracting");
+						popup.displayTextOnly("Extracting " + arcname + "...", "Extracting");
-                    Process p;
 						try {
-                        if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine pkg2zip.exe -x asset.pkg " + key.toString()});}
+							Process p = Main.exec(new String[]{Main.inpath + "pkg2zip.exe", "-x", "asset.pkg", key.toString()}, Main.inpath);
-                        else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "pkg2zip.exe", "-x", "asset.pkg", key.toString()}, null, new File(Main.inpath));} //inpath cannot change here
 							InputStream debugin = new BufferedInputStream(p.getInputStream());
 							OutputStream debugout = new BufferedOutputStream(System.out);
 							int c;
@@ -192,6 +271,9 @@ public class Bert implements ActionListener {
 						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";
@@ -218,8 +300,7 @@ public class Bert implements ActionListener {
 						popup.setText("<html>Decrypting protected PFS:<br/>" + extracted + "</html>", "Decrypting");
 
 						try {
-                        if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + Main.inpath + ";wine psvpfsparser.exe -i " + extracted + " -o ./temp/ -z " + key.toString() + " -f cma.henkaku.xyz"});}
+							Process p = Main.exec(new String[]{Main.inpath + "psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, Main.inpath);
-                        else {p = Runtime.getRuntime().exec(new String[]{Main.inpath + "psvpfsparser.exe", "-i", extracted, "-o", "./temp/", "-z", key.toString(), "-f", "cma.henkaku.xyz"}, null, new File(Main.inpath));}
 							InputStream debugin = new BufferedInputStream(p.getInputStream());
 							OutputStream debugout = new BufferedOutputStream(System.out);
 							int c;
@@ -255,6 +336,7 @@ public class Bert implements ActionListener {
 						Main.deleteDir(new File(Main.inpath + "temp/"));
 
 						popup.destroyDialog();
+					}
 
 					// restore controls
 					JOptionPane.showMessageDialog(frame, "Assets downloaded successfully.", "Download Complete", JOptionPane.INFORMATION_MESSAGE);
@@ -268,4 +350,20 @@ public class Bert implements ActionListener {
 			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.form

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Clifford">
   <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="0" left="0" bottom="0" right="0"/>
+    <margin top="10" left="25" bottom="10" right="25"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <component id="3294c" class="javax.swing.JLabel">
@@ -13,6 +17,8 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Name"/>
         </properties>
       </component>
@@ -21,6 +27,8 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Author"/>
         </properties>
       </component>
@@ -45,6 +53,8 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Version"/>
         </properties>
       </component>
@@ -61,6 +71,11 @@
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Save"/>
         </properties>
       </component>
@@ -69,6 +84,11 @@
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Cancel"/>
         </properties>
       </component>
@@ -76,7 +96,11 @@
         <constraints>
           <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+        </properties>
         <border type="none"/>
         <children>
           <component id="4c6b" class="javax.swing.JTextPane" binding="fDescription">
@@ -90,6 +114,8 @@
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Description"/>
         </properties>
       </component>

firestar/src/main/java/Clifford.java

@@ -20,18 +20,15 @@ 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;
 
@@ -45,33 +42,54 @@ public class Clifford implements ActionListener {
 	private JButton savebtn;
 	private JButton cancelbtn;
 
-    MissPiggy invoker;
+	JFrame invoker;
+	MissPiggy invokerPig;
+	boolean isPig = false;
 	Main.Mod mod;
 	int index;
 	File directory;
+	boolean isSoundtrack = false;
 
 	boolean creating;
 
-    public void Action(MissPiggy inv, int modindex) { // Editor
+	public void Action(MissPiggy inv, int modindex) {
+		invokerPig = inv;
+		invoker = invokerPig.frame;
+		mod = Main.Mods.get(modindex);
+		index = modindex;
+		creating = false;
+
+		isPig = true;
+
+		Action(invoker, modindex);
+	}
+
+	public void Action(MissPiggy inv, File dir) {
+		invokerPig = inv;
+		invoker = invokerPig.frame;
+		directory = dir;
+		creating = true;
+
+		isPig = true;
+
+		Action(invoker, dir);
+	}
+
+	public void Action(JFrame inv, int modindex) { // Editor
 		invoker = inv;
 		mod = Main.Mods.get(modindex);
 		index = modindex;
 		creating = false;
 
 		frame.add(frameContainer);
-        try {
+		frame.setIconImage(Main.windowIcon);
-            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(null);
+		frame.setLocationRelativeTo(inv);
 		frame.setAlwaysOnTop(true);
 
 		fName.setText(mod.friendlyName);
@@ -87,13 +105,13 @@ public class Clifford implements ActionListener {
 			@Override
 			public void windowClosing(WindowEvent e)
 			{
-                invoker.frame.setEnabled(true);
+				invoker.setEnabled(true);
 				e.getWindow().dispose();
 			}
 		});
 	}
 
-    public void Action(MissPiggy inv, File dir) { // Generator
+	public void Action(JFrame inv, File dir) { // Generator
 		invoker = inv;
 		directory = dir;
 		creating = true;
@@ -116,7 +134,8 @@ public class Clifford implements ActionListener {
 			@Override
 			public void windowClosing(WindowEvent e)
 			{
-                invoker.frame.setEnabled(true);
+				Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+				invoker.setEnabled(true);
 				e.getWindow().dispose();
 			}
 		});
@@ -125,7 +144,8 @@ public class Clifford implements ActionListener {
 	@Override
 	public void actionPerformed(ActionEvent actionEvent) {
 		if (actionEvent.getSource() == cancelbtn) {
-            invoker.frame.setEnabled(true);
+			Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+			invoker.setEnabled(true);
 			frame.dispose();
 		} else if (actionEvent.getSource() == savebtn && !creating) {
 			try {
@@ -143,12 +163,15 @@ public class Clifford implements ActionListener {
 				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);
+			if (!mod.requires.isEmpty()) container.put("requires", mod.requires);
+			if (!mod.extracts.isEmpty()) container.put("extracts", mod.extracts);
 
 			try {
 				new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + mod.path.trim()).setComment(container.toString());
@@ -158,8 +181,8 @@ public class Clifford implements ActionListener {
 			}
 
 			Main.Mods.set(index, mod);
-            invoker.frame.setEnabled(true);
+			invoker.setEnabled(true);
-            invoker.InitializeModListInGUI();
+			if (isPig) {invokerPig.InitializeModListInGUI();}
 			frame.dispose();
 		} else if (actionEvent.getSource() == savebtn && creating) {
 			if (fName.getText().isEmpty()) {
@@ -176,7 +199,10 @@ public class Clifford implements ActionListener {
 			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());
+				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()) {
@@ -185,13 +211,47 @@ public class Clifford implements ActionListener {
 					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;
+					}
+
+					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());
-                    container.put("loaderversion", 0); // TODO for later versions: Change depending on features inside of mod folder
+					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());
@@ -203,7 +263,8 @@ public class Clifford implements ActionListener {
 					return;
 				}
 				JOptionPane.showMessageDialog(frame, "Mod file created", "Success", JOptionPane.INFORMATION_MESSAGE);
-                invoker.frame.setEnabled(true);
+				Main.deleteDir(new File(Main.inpath + "temp/")); // soundtrack gen
+				invoker.setEnabled(true);
 				frame.dispose();
 			}
 		}

firestar/src/main/java/Ernie.java

@@ -19,7 +19,8 @@
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,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;
@@ -43,7 +43,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class Ernie implements ActionListener, Runnable {
+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";
@@ -59,23 +59,22 @@ public class Ernie implements ActionListener, Runnable {
 	private JButton surebtn;
 	
 	public boolean backgroundDone = false;
-    private BufferedImage windowIcon;
 
-    public void run() {
+	private JFrame parent;
-        try {
+
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
+	public Ernie(JFrame parent, boolean isManual) {
-            frame.setIconImage(windowIcon);
+		this.parent = parent;
-        } catch (IOException e) {
+		frame.setIconImage(Main.windowIcon);
-            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");
-        }
-	byte[] urlraw = new Ernie().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)) {
+				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);
@@ -87,13 +86,24 @@ public class Ernie implements ActionListener, Runnable {
 					frame.setTitle("An update is available!");
 					frame.setSize(450, 400);
 					frame.setResizable(false);
-		    frame.setLocationRelativeTo(null);
+					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."); }
+				} else {
-	    } catch (IOException ex) {
+					System.out.println("Updater: No updates.");
-		Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
+					if (isManual) {JOptionPane.showMessageDialog(frame, "There are no updates at this time.", "Check for Updates", JOptionPane.INFORMATION_MESSAGE);}
-	    } catch (JSONException ex) {
+				}
+			} catch (IOException | JSONException ex) {
 				Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
 			}
 		}
@@ -101,12 +111,16 @@ public class Ernie implements ActionListener, Runnable {
 	
 	@Override
 	public void actionPerformed(ActionEvent actionEvent) {
-        if (actionEvent.getSource() == notnowbtn) {frame.dispose();} else
+		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);

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.form

@@ -5,7 +5,11 @@
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <component id="4913b" class="javax.swing.JProgressBar" binding="progressBar">
@@ -16,6 +20,9 @@
           </grid>
         </constraints>
         <properties>
+          <background color="-1"/>
+          <borderPainted value="false"/>
+          <foreground color="-2271221"/>
           <indeterminate value="false"/>
           <stringPainted value="true"/>
           <value value="0"/>
@@ -26,6 +33,9 @@
           <grid row="0" column="0" row-span="1" col-span="1" 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"/>
           <text value="Downloading file..."/>
         </properties>
       </component>

firestar/src/main/java/Fozzie.java

@@ -16,20 +16,14 @@
  *     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;
 
 public class Fozzie {
-    BufferedImage windowIcon;
 	private JFrame frame = new JFrame();
 	public JProgressBar progressBar;
 	private JPanel frameContainer;
@@ -42,6 +36,10 @@ public class Fozzie {
 	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, String dname) {
 		frame.add(frameContainer);
 		frame.setSize(300, 100);
 		frame.setTitle("Download in Progress");
@@ -50,15 +48,10 @@ public class Fozzie {
 		frame.setLayout(new GridLayout());
 		frame.setLocationRelativeTo(null);
 		frame.setAlwaysOnTop(true);
-        try {
+		frame.setIconImage(Main.windowIcon);
-            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);
 
-        label.setText("Downloading \"" + oname + "\"");
+		label.setText("Downloading " + dname);
 
 		try {
 			URL fileURL = new URL(url);
@@ -105,12 +98,7 @@ public class Fozzie {
 		frame.setLayout(new GridLayout());
 		frame.setLocationRelativeTo(null);
 		frame.setAlwaysOnTop(true);
-        try {
+		frame.setIconImage(Main.windowIcon);
-            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);
 
 		label.setText(text);

firestar/src/main/java/Gonzo.form

@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Gonzo">
   <grid id="27dc6" binding="frameContainer" 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"/>
+    <margin top="3" left="3" bottom="3" right="3"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <scrollpane id="6830c" binding="scrollPane">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
-        <border type="line" title="Please wait a few minutes. Progress is shown above." title-justification="2" title-position="5"/>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+        </properties>
+        <border type="line" title="Please wait a few minutes. Progress is shown above." title-justification="2" title-position="5">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
           <component id="491c1" class="javax.swing.JTextArea" binding="consoleDisplay">
             <constraints/>
             <properties>
+              <background color="-2271221"/>
+              <font name="Luxi Mono"/>
+              <foreground color="-1"/>
               <text value=""/>
             </properties>
           </component>

firestar/src/main/java/Gonzo.java

@@ -17,22 +17,18 @@
  */
 
 import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.util.FileUtils;
 
-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.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -49,28 +45,40 @@ public class Gonzo {
 	private MissPiggy invoker;
 	public String oArcTarget = "dlc2.psarc"; // which psarc to rebuild the assets in
 
+	// 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.)
+
 	public void DeployMods(MissPiggy inv) {
 		invoker = inv;
 		System.out.println("\n\nStarting mod deployment\n\n");
 
 		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
 
-        try {
+		frame.setIconImage(Main.windowIcon);
-            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(null);
+		frame.setLocationRelativeTo(inv.frame);
 		frame.setAlwaysOnTop(true);
 		frame.setVisible(true);
 
+		DefaultCaret caret = (DefaultCaret) consoleDisplay.getCaret();
+		caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
+
 		File psarcHandle = new File(Main.inpath + "data.psarc");
 		data0 = psarcHandle.isFile();
 		psarcHandle = new File(Main.inpath + "data1.psarc");
@@ -98,26 +106,47 @@ public class Gonzo {
 	}
 
 	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>();
-        if (data0) {dumpThese.add("data.psarc");oArcTarget = "data.psarc";}
+		for (Main.Mod m : modsFlipped) {
-        if (data1) {dumpThese.add("data1.psarc");oArcTarget = "data1.psarc";}
+			if (m.enabled) {
-        if (data2) {dumpThese.add("data2.psarc");oArcTarget = "data2.psarc";}
+				System.out.println(m.friendlyName + " : " + m.requires.toString() + " : " + m.extracts.toString());
-        if (dlc1) {dumpThese.add("dlc1.psarc");oArcTarget = "dlc1.psarc";}
+				for (String r : m.requires) if (!dumpThese.contains(r)) dumpThese.add(r);
-        if (dlc2) {dumpThese.add("dlc2.psarc");oArcTarget = "dlc2.psarc";}
+			}
+		}
+		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 = Runtime.getRuntime().exec(new String[]{"bash","-c","aplay /home/bonkyboo/kittens_loop.wav"}); // DEBUG
 				Process p;
-                if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + System.getProperty("user.home") + "/.firestar/temp/" + ";wine ../psp2psarc.exe extract -y ../" + s});}
+				if (s.equals(oArcTarget)) p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../"+s}, System.getProperty("user.home") + "/.firestar/temp/");
-                else {p = Runtime.getRuntime().exec(new String[]{new String(System.getProperty("user.home") + "\\.firestar\\psp2psarc.exe"), "extract", "-y", "..\\" + s}, null, new File(new String(System.getProperty("user.home") + "/.firestar/temp/").replace("/", "\\")));}
+				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() {
@@ -151,16 +180,50 @@ public class Gonzo {
 
 		// 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) {
+		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();
+					}
+			
 					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
@@ -185,14 +248,15 @@ public class Gonzo {
 							}
 						}
 
-                        // cleanup so we don't run it again for the next mod unless needed
+						// cleanup so we don't run it again for the next mod
-                        // 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());
+					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;
@@ -200,6 +264,18 @@ public class Gonzo {
 			}
 		}
 	
+		// 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>();
@@ -238,9 +314,7 @@ public class Gonzo {
 		try {
 			System.out.println("Firestar is compiling the final build");
 			consoleDisplay.append("Firestar is compiling the final build" + "\n");
-            Process p;
+			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/");
-            if (!Main.windows) {p = Runtime.getRuntime().exec(new String[]{"bash","-c","cd " + System.getProperty("user.home") + "/.firestar/temp" + ";wine ../psp2psarc.exe create --skip-missing-files -j12 -a -i -y --input-file=list.txt -o " + oArcTarget});}
-            else {p = Runtime.getRuntime().exec(new String[]{new String(System.getProperty("user.home") + "\\.firestar\\psp2psarc.exe"), "create", "--skip-missing-files", "-j12", "-a", "-i", "-y", "--input-file=list.txt", "-o" + oArcTarget}, null, new File(new String(System.getProperty("user.home") + "/.firestar/temp/").replace("/", "\\")));}
 			final Thread ioThread = new Thread() {
 				@Override
 				public void run() {
@@ -289,7 +363,9 @@ public class Gonzo {
 		}
 		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());
@@ -302,10 +378,7 @@ public class Gonzo {
 			//ignore
 		}
 
-        TitledBorder titledBorder = BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.BLACK), "DONE! Close this pop-up to continue.");
+		((TitledBorder)scrollPane.getBorder()).setTitle("DONE! Close this pop-up to continue.");
-        titledBorder.setTitlePosition(TitledBorder.BOTTOM);
-        titledBorder.setTitleJustification(TitledBorder.CENTER);
-        scrollPane.setBorder(titledBorder);
 		scrollPane.repaint();
 
 		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
@@ -325,17 +398,15 @@ public class Gonzo {
 			@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)
+	private static void listAllFiles(Path currentPath, List<String> allFiles) throws IOException {
-            throws IOException
+		try (DirectoryStream<Path> stream = Files.newDirectoryStream(currentPath)) {
-    {
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(currentPath))
-        {
 			for (Path entry : stream) {
 				if (Files.isDirectory(entry)) {
 					listAllFiles(entry, allFiles);

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,41 +18,52 @@
 
 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 String vstr = "Release 1.3.1";
 	public static final String vcode = "Tetsuo";
-    public static final String vtag = "tetsuo-1.3"; // set to dekka-1.1 for testing
+	public static final String vtag = "tetsuo-1.3.1"; // set to dekka-1.1 for testing
 	public static final int vint = 1;
 
+	// Jenkins Build Information
+	public static boolean isNightly = false;
+	public static final String vtagPrevious = "tetsuo-1.3.1";
+	public static String dateOfCompile = null;
+
 	// User Settings
-    // TODO: replace with user preference when config i/o is done
-    // also please double check that outpath is actually valid
 	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;
+	public static boolean checkUpdates = true;
 	//public static String psarc; //sdk location
 
 	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");
 
 		private final String value;
-        ArcTarget(final String value) {this.value = value;};
+		ArcTarget(final String value) {this.value = value;}
 
 		@Override
 		public String toString() {
@@ -60,14 +71,15 @@ public class Main {
 		}
 	}
 
-    public enum ArcKey { // install target for 2048, type used by downloader
+	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;};
+		ArcKey(final String value) {this.value = value;}
 
 		@Override
 		public String toString() {
@@ -78,7 +90,6 @@ public class Main {
 	public class Mod {
 		public String path; // file name
 		public int version = 1;
-        //public int gameversion; //TODO detect a game version and compatibility? // no
 		public int priority = 0; //unused
 		public String friendlyName;
 		public String description = "";
@@ -86,6 +97,8 @@ public class Main {
 		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
@@ -93,13 +106,28 @@ public class Main {
 
 	// 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;
+			}
+		}
 
-    public static void main(String[] args) {
 		// license string
-        System.out.printf("FIRESTAR MOD MANAGER for WipEout 2048\nversion " + vstr + " (codename " + vcode + ") major " + vint + "\n" +
+		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) 2024  bonkmaykr\n\nThis program is free software: you can redistribute it and/or modify\n" +
+				"\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" +
@@ -112,7 +140,9 @@ public class Main {
 				"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
+		// display splash screen
+		new Beaker();
+
 		// load global assets
 		try {
 			fExo2 = Font.createFont(Font.TRUETYPE_FONT, Main.class.getResourceAsStream("/exo2.ttf"));
@@ -121,6 +151,13 @@ public class Main {
 			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()) {
@@ -207,10 +244,25 @@ public class Main {
 		Main.writeConf();
 	}
 
-    public static boolean downloadDependencies () { // todo: CHECKSUM!!!! THESE ARE EXECUTABLES!!!!!!!!!!! DON'T ALLOW MALWARE!!!!
+	public static boolean downloadDependencies () {
-        boolean downloader = new Fozzie().DownloadFile("https://bonkmaykr.worlio.com/http/firestar/firesdk.zip", System.getProperty("user.home") + "/.firestar/", "firesdk.zip");
+		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/");
@@ -221,10 +273,33 @@ public class Main {
 		}
 		sdk.getFile().delete(); // cleanup
 
+		JOptionPane.showMessageDialog(null, "All remote dependencies satisfied.", "Download Completed", JOptionPane.INFORMATION_MESSAGE);
 		return true;
 	}
 	
-    public static boolean callDownloaderStatically (String url, String folder, String name) {
+	public static Process exec(String[] cmd, String cwd) throws IOException {
-        return new Fozzie().DownloadFile(url, folder, name);
+		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;
+		}
 	}
 }

firestar/src/main/java/MasterWindowLayout.form

@@ -6,8 +6,8 @@
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties>
-      <background color="-1"/>
+      <background color="-15128227"/>
-      <foreground color="-592129"/>
+      <foreground color="-15128227"/>
     </properties>
     <border type="none"/>
     <children>
@@ -21,41 +21,63 @@
           </grid>
         </constraints>
         <properties>
-          <background color="-526337"/>
+          <background color="-15128227"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
         </properties>
-        <border type="line" title="Description"/>
+        <border type="line" title="Description">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
-          <component id="a9cee" class="javax.swing.JTextPane" binding="descriptionField">
+          <scrollpane id="6e7e5" binding="descriptionScroller">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                <preferred-size width="150" height="50"/>
-              </grid>
             </constraints>
             <properties>
+              <autoscrolls value="false"/>
+              <foreground color="-1"/>
+              <opaque value="false"/>
+            </properties>
+            <border type="empty"/>
+            <children>
+              <component id="d55bf" class="javax.swing.JTextPane" binding="descriptionField">
+                <constraints/>
+                <properties>
+                  <background color="-15128227"/>
                   <editable value="false"/>
                   <focusable value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Select a mod from the list on the right to view more details, or to make changes to your installation."/>
                 </properties>
               </component>
             </children>
+          </scrollpane>
+        </children>
       </grid>
       <scrollpane id="ecc63" binding="modListScrollContainer">
         <constraints>
           <grid row="0" column="1" row-span="2" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <background color="-526337"/>
+          <background color="-15128227"/>
-          <foreground color="-526337"/>
+          <foreground color="-1"/>
         </properties>
         <border type="line" title="Mods List" title-justification="1" title-position="2">
-          <font/>
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
         </border>
         <children>
           <component id="d80ff" class="javax.swing.JList" binding="modList">
             <constraints/>
             <properties>
-              <foreground color="-16777216"/>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+              <opaque value="true"/>
+              <selectionBackground color="-2271221"/>
+              <selectionForeground color="-1"/>
               <valueIsAdjusting value="false"/>
             </properties>
             <clientProperties>
@@ -74,10 +96,14 @@
           </grid>
         </constraints>
         <properties>
-          <background color="-526337"/>
+          <background color="-15128227"/>
-          <foreground color="-657921"/>
+          <foreground color="-1"/>
         </properties>
-        <border type="line" title="Actions"/>
+        <border type="line" title="Actions">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
           <component id="3cd60" class="javax.swing.JButton" binding="toggleButton" default-binding="true">
             <constraints>
@@ -87,10 +113,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Toggle"/>
             </properties>
           </component>
@@ -102,10 +129,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Move Up"/>
             </properties>
           </component>
@@ -119,10 +147,11 @@
             </constraints>
             <properties>
               <alignmentX value="0.0"/>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Delete"/>
             </properties>
           </component>
@@ -135,10 +164,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Move Down"/>
             </properties>
           </component>
@@ -149,10 +179,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Options"/>
             </properties>
           </component>
@@ -163,10 +194,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-526337"/>
+              <foreground color="-1"/>
               <text value="Import"/>
             </properties>
           </component>
@@ -178,10 +210,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Deploy"/>
             </properties>
           </component>

firestar/src/main/java/MissPiggy.java

@@ -16,39 +16,33 @@
  *     along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.text.DefaultCaret;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.math.RoundingMode;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.*;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
+import java.util.Map;
-import java.util.Random;
+
-import java.util.regex.Pattern;
 import net.lingala.zip4j.*;
-import net.lingala.zip4j.exception.ZipException;
 import org.json.JSONException;
 import org.json.JSONObject;
-import static java.nio.file.StandardCopyOption.*;
 
 import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
 
 public class MissPiggy implements ActionListener {
-    BufferedImage windowIcon;
 	JFrame frame = new JFrame();
 	JPanel frameContainer;
 	JPanel actionsContainer;
@@ -71,6 +65,7 @@ public class MissPiggy implements ActionListener {
 	private JButton importButton;
 	private JButton deployButton;
 	private JTextPane descriptionField;
+	private JScrollPane descriptionScroller;
 
 	//private int selectedItem;
 
@@ -152,12 +147,7 @@ public class MissPiggy implements ActionListener {
 		descriptionField.getDocument().putProperty("filterNewlines", Boolean.FALSE);
 
 		// display window
-        try {
+		frame.setIconImage(Main.windowIcon);
-            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.");
-        }
 
 		menuBar.setBackground(new Color(25, 41, 93));
 		fileMenu.setForeground(new Color(255, 255, 255));
@@ -175,6 +165,8 @@ public class MissPiggy implements ActionListener {
 		importButton.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
 		deployButton.setFont(Main.fExo2.deriveFont(Font.BOLD).deriveFont(12f));
 
+		((DefaultCaret)descriptionField.getCaret()).setUpdatePolicy(DefaultCaret.NEVER_UPDATE); // prevent automatically scrolling to the bottom when mod details exceed window size
+
 		frame.setSize(800, 600); // 1280 800
 		frame.setMinimumSize(new Dimension(640,480));
 		frame.setTitle("Firestar Mod Manager");
@@ -183,7 +175,7 @@ public class MissPiggy implements ActionListener {
 		frame.setLayout(new GridLayout());
 		frame.setLocationRelativeTo(null);
 	
-	if (Main.checkUpdates) { StartErnie(); }
+		if (Main.checkUpdates) { StartErnie(false); }
 
 		frame.setVisible(true);
 	}
@@ -193,7 +185,6 @@ public class MissPiggy implements ActionListener {
 		Main.Mods.clear();
 
 		// get current list of mods from file
-        // todo: rewrite when modpacks/playlists are added
 		try {
 			priorityList = new String(Files.readAllBytes(Paths.get(System.getProperty("user.home") + "/.firestar/mods/index")));
 		} catch (IOException e) {
@@ -211,8 +202,9 @@ public class MissPiggy implements ActionListener {
 
 		// initialize data structures from each list entry
 		String[] pListArray = priorityList.split("\n");
-        Arrays.sort(pListArray);
+		Arrays.sort(pListArray, new NaturalOrderComparator<>(false));
 		System.out.println("Initializing modList from file with length of " + pListArray.length + " units"); //debug
+
 		for (String s : pListArray) {
 			/*
 			Do nothing if the index number is not valid.
@@ -221,7 +213,6 @@ public class MissPiggy implements ActionListener {
 
 			06/29/24 - also skip files that were manually removed but remain in the list
 			*/
-
 			File mod = new File(System.getProperty("user.home") + "/.firestar/mods/" + s.substring(s.indexOf("=") + 1).trim());
 
 			if (s.split("=")[0].matches("[0-9]+=*") &&
@@ -242,6 +233,16 @@ public class MissPiggy implements ActionListener {
 					if (metadata.has("loaderversion")) {m.loaderversion = Integer.parseInt(metadata.get("loaderversion").toString());}
 					if (metadata.has("game")) {m.game = metadata.get("game").toString();}
 
+					if (m.loaderversion >= 1) {
+						// Firestar 1.3 features
+						if (metadata.has("requires"))
+							for (Object i : (ArrayList<Object>)((Map<String, Object>)metadata.toMap()).get("requires"))
+								m.requires.add(i.toString());
+						if (metadata.has("extracts"))
+							for (Object i : (ArrayList<Object>)((Map<String, Object>)metadata.toMap()).get("extracts"))
+								m.extracts.add(i.toString());
+					}
+
 					//send to list
 					Main.Mods.add(m);
 				} catch (Exception e) {
@@ -296,13 +297,14 @@ public class MissPiggy implements ActionListener {
 		System.out.println("Initializing modList to GUI with length of " + Main.Mods.size() + " units"); //debug
 		while (i < Main.Mods.size()) {
 			if (Main.Mods.get(i).friendlyName == null || Main.Mods.get(i).friendlyName.isEmpty())
-            {Main.Mods.get(i).friendlyName = Main.Mods.get(i).path;}
+				Main.Mods.get(i).friendlyName = Main.Mods.get(i).path;
 			if (Main.Mods.get(i).enabled) {contents[i] = Main.Mods.get(i).friendlyName;}
 			else {contents[i] = Main.Mods.get(i).friendlyName + " (Disabled)";}
 
 			//debug
 			String authorDisplay;
-            if (Main.Mods.get(i).author == null || Main.Mods.get(i).author.isEmpty()) {authorDisplay = "Anonymous";} else {authorDisplay = "\"" + Main.Mods.get(i).author + "\"";}
+			if (Main.Mods.get(i).author == null || Main.Mods.get(i).author.isEmpty()) {authorDisplay = "Anonymous";}
+			else {authorDisplay = "\"" + Main.Mods.get(i).author + "\"";}
 			System.out.println("Added " + Main.Mods.get(i).friendlyName + " by " + authorDisplay);
 
 			i++;
@@ -311,9 +313,13 @@ public class MissPiggy implements ActionListener {
 		createSelectionEventListener();
 	}
 	
-    private void StartErnie() {
+	private void StartErnie(boolean isManual) {
-	Ernie e = new Ernie();
+		new Thread(new Runnable() {
-	new Thread(e).start();
+			@Override
+			public void run() {
+				new Ernie(frame, isManual); // changed away from runnable in order to pass params to constructor -bonk
+			}
+		}).start();
 	}
 
 	private ListSelectionListener whenItemSelected() {
@@ -339,7 +345,11 @@ public class MissPiggy implements ActionListener {
 
 		if (actionEvent.getSource() == toolsMenu.getItem(0)) {metaEditorGUI(modList.getSelectedIndex());} else
 		if (actionEvent.getSource() == toolsMenu.getItem(1)) {generatorGUI();} else
-        if (actionEvent.getSource() == toolsMenu.getItem(2)) {throwUnimplemented();} else
+		if (actionEvent.getSource() == toolsMenu.getItem(2)) {
+			if (!new File(Main.inpath + "at9tool.exe").exists() || !new File(Main.inpath + "ffmpeg.exe").exists())
+			JOptionPane.showMessageDialog(frame, "Your AT9 encoders are missing.\nPlease select \"Get Dependencies\" in the Options menu.", "Error", JOptionPane.ERROR_MESSAGE);
+			else new Suggs(frame);
+		} else
 
 		if (actionEvent.getSource() == helpMenu.getItem(0)) {
 			try {
@@ -365,8 +375,8 @@ public class MissPiggy implements ActionListener {
 				JOptionPane.showMessageDialog(frame, e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
 			}
 		} else
-        if (actionEvent.getSource() == helpMenu.getItem(5)) {StartErnie();} else
+		if (actionEvent.getSource() == helpMenu.getItem(5)) {StartErnie(true);} else
-        if (actionEvent.getSource() == helpMenu.getItem(6)) {new Rowlf();}
+		if (actionEvent.getSource() == helpMenu.getItem(6)) {new Rowlf(frame);}
 	}
 
 	// Will likely split the below functions into separate classes to work with intellij GUI designer.
@@ -378,7 +388,7 @@ public class MissPiggy implements ActionListener {
 		}
 
 		if (i > 0) {
-            int result = JOptionPane.showConfirmDialog(frame, "A new PSARC will be generated. This can take several minutes.\nDuring this time, your computer may be very busy or slow.\n\nAre you sure you want to continue?", "Deploy Mods", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+			int result = JOptionPane.showConfirmDialog(frame, "A new PSARC will be generated. This can take several minutes.\nDuring this time, your computer may be very busy or slow.\n\nIt will be placed in: " + Main.outpath + "\n\nAre you sure you want to continue?", "Deploy Mods", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
 			if (result == JOptionPane.YES_OPTION) {
 				// prevent interruptions
 				frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
@@ -467,7 +477,6 @@ public class MissPiggy implements ActionListener {
 	}
 
 	public void removeAllGUI() {
-        // todo warning dialog that nukes list when Yes is clicked
 		int result = JOptionPane.showConfirmDialog(frame, "Do you really want to delete all mods?", "Remove All", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 
 		if (result == JOptionPane.YES_OPTION) {
@@ -523,20 +532,20 @@ public class MissPiggy implements ActionListener {
 	}
 
 	private void moveUp(int index) {
-        if (index > 0) {
+		if (index > 0) { // not negative
 			Collections.swap(Main.Mods, index, index - 1);
 			System.out.println("Items moved, redeploying list");
-            InitializeModListInGUI();
+			regenerateModIndex(true);
-            regenerateModIndex(false);
+			modList.setSelectedIndex(index - 1);
 		}
 	}
 
 	private void moveDown(int index) {
-        if (index < (Main.Mods.size() - 1)) {
+		if (index < (Main.Mods.size() - 1)) { // not last in list
 			Collections.swap(Main.Mods, index, index + 1);
 			System.out.println("Items moved, redeploying list");
-            InitializeModListInGUI();
+			regenerateModIndex(true);
-            regenerateModIndex(false);
+			modList.setSelectedIndex(index + 1);
 		}
 	}
 
@@ -544,6 +553,7 @@ public class MissPiggy implements ActionListener {
 		if (index >= 0) {
 			Main.Mods.get(index).enabled = !Main.Mods.get(index).enabled;
 			regenerateModBlacklist(true);
+			modList.setSelectedIndex(index);
 		} else {
 			JOptionPane.showMessageDialog(frame, "Please select a mod to toggle first.", "Error", JOptionPane.ERROR_MESSAGE);
 		}
@@ -601,7 +611,6 @@ public class MissPiggy implements ActionListener {
 					int result = JOptionPane.showConfirmDialog(frame, "Firestar encountered an internal error.\n" + ex.getMessage(), "Fatal Error", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
 					if (result == JOptionPane.OK_OPTION) {System.exit(1);} //user safety
 				}
-
 			}
 		});
 	}

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.form

@@ -8,7 +8,7 @@
     <properties>
       <background color="-15128227"/>
       <font name="Exo 2"/>
-      <foreground color="-526337"/>
+      <foreground color="-1"/>
     </properties>
     <border type="none"/>
     <children>
@@ -20,7 +20,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Aww fiddlesticks, what now?"/>
         </properties>
       </component>
@@ -32,11 +32,11 @@
           </grid>
         </constraints>
         <properties>
-          <background color="-16777216"/>
+          <background color="-2271221"/>
           <editable value="false"/>
           <focusable value="false"/>
-          <font name="Fusion" size="10"/>
+          <font name="Exo 2"/>
-          <foreground color="-5180417"/>
+          <foreground color="-1"/>
           <horizontalAlignment value="0"/>
           <text value="Do you think we should appeal to the alien authorities?"/>
         </properties>
@@ -50,7 +50,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Version Unknown"/>
         </properties>
       </component>
@@ -63,7 +63,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Platform Unknown"/>
         </properties>
       </component>

firestar/src/main/java/Rowlf.java

@@ -19,14 +19,11 @@
 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;
@@ -35,19 +32,14 @@ public class Rowlf {
 	private JLabel versionLabel;
 	private JLabel environmentLabel;
 
-    public Rowlf() {
+	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 {
+		frame.setIconImage(Main.windowIcon);
-            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.add(picLabel);
 		frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
@@ -55,18 +47,19 @@ public class Rowlf {
 
 		informationText.getDocument().putProperty("filterNewlines", Boolean.FALSE);
 		informationText.setHorizontalAlignment(JTextField.CENTER);
-        informationText.setText("Created by bonkmaykr, a.k.a. \"Downforce Agent\"\n" +
+		informationText.setText("Created by bonkmaykr & Wirlaburla\n" +
 				"\n" +
 				"Special thanks to:\n" +
-                "ThatOneBonk, for Thallium and for modding help\n" +
+				"ThatOneBonk, ChaCheeChoo, and the AGRF community\n" +
-                "Wirlaburla, for web hosting and code assistance\n" +
+				"Psygnosis / Studio Liverpool, SCE Europe\n" +
-                "Psygnosis, for making our favorite game ever\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 + ")");
+		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
@@ -76,7 +69,7 @@ public class Rowlf {
 		frame.setAlwaysOnTop(true);
 		frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		frame.setLayout(new GridLayout());
-        frame.setLocationRelativeTo(null);
+		frame.setLocationRelativeTo(parent);
 		frame.setVisible(true);
 	}
 }

firestar/src/main/java/Scooter.form

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Scooter">
+  <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="500" height="400"/>
+    </constraints>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
+    <border type="none"/>
+    <children>
+      <component id="4913b" class="javax.swing.JProgressBar" binding="progressBar">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="50" height="-1"/>
+            <maximum-size width="200" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <background color="-1"/>
+          <borderPainted value="false"/>
+          <foreground color="-2271221"/>
+          <indeterminate value="false"/>
+          <stringPainted value="false"/>
+          <value value="0"/>
+        </properties>
+      </component>
+      <component id="46ede" class="javax.swing.JLabel" binding="label">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" 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"/>
+          <text value=""/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

firestar/src/main/java/Scooter.java

@@ -0,0 +1,76 @@
+/*
+ *     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 java.awt.*;
+
+public class Scooter {
+	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);
+	
+		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();
+	}
+
+	public void setText(String text) {
+		label.setText(text);
+	}
+
+	public void destroyDialog() {
+		frame.setVisible(false);
+		frame.dispose();
+	}
+}

firestar/src/main/java/Suggs.form

@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Suggs">
+  <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="771" height="460"/>
+    </constraints>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
+    <border type="none"/>
+    <children>
+      <scrollpane id="bd8d3">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+          <opaque value="false"/>
+        </properties>
+        <border type="line" title="Song List">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
+        <children>
+          <component id="1b9e1" class="javax.swing.JList" binding="dSongList">
+            <constraints/>
+            <properties>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+              <opaque value="true"/>
+              <selectionBackground color="-2271221"/>
+              <selectionForeground color="-1"/>
+            </properties>
+          </component>
+        </children>
+      </scrollpane>
+      <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"/>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+          <opaque value="false"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <component id="adce7" class="javax.swing.JButton" binding="cancelBtn">
+            <constraints>
+              <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"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Cancel"/>
+            </properties>
+          </component>
+          <hspacer id="8ecbf">
+            <constraints>
+              <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="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="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"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <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">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="3" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <component id="aa38f" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+              <text value="Title"/>
+            </properties>
+          </component>
+          <component id="9667" class="javax.swing.JTextField" binding="fTitle">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <disabledTextColor color="-10124141"/>
+            </properties>
+          </component>
+          <component id="f7802" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+              <text value="Artist"/>
+            </properties>
+          </component>
+          <component id="7fc56" class="javax.swing.JTextField" binding="fArtist">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <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"/>
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <component id="fbefd" class="javax.swing.JLabel" binding="dTrackNo">
+                <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>
+                  <background color="-15128227"/>
+                  <foreground color="-1"/>
+                  <text value="track # here (in MT_xx format)"/>
+                </properties>
+              </component>
+              <component id="a659e" class="javax.swing.JLabel" binding="dFileSize">
+                <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>
+                  <background color="-15128227"/>
+                  <foreground color="-1"/>
+                  <text value="file size here"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <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">
+            <maximum-size width="600" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <opaque value="false"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <component id="cc5fd" class="javax.swing.JButton" binding="frontendDemoChooseBtn">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Select Multiplayer Menu Track"/>
+            </properties>
+          </component>
+          <component id="fb30a" class="javax.swing.JButton" binding="frontendMainChooseBtn">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Select Singleplayer Menu Track"/>
+            </properties>
+          </component>
+          <component id="e9b40" class="javax.swing.JButton" binding="deleteSongBtn">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Delete Song"/>
+            </properties>
+          </component>
+          <component id="f5254" class="javax.swing.JButton" binding="moveDownBtn">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Move Down"/>
+            </properties>
+          </component>
+          <component id="6b3fa" class="javax.swing.JButton" binding="addSongBtn">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Add Song"/>
+            </properties>
+          </component>
+          <component id="38ad" class="javax.swing.JButton" binding="moveUpBtn">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Move Up"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="2d649" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="2" left="2" bottom="2" right="2"/>
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="-1" height="100"/>
+            <maximum-size width="-1" height="300"/>
+          </grid>
+        </constraints>
+        <properties>
+          <opaque value="false"/>
+        </properties>
+        <border type="line" title="Info">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
+        <children>
+          <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"/>
+            </constraints>
+            <properties>
+              <opaque value="false"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <component id="43fad" class="javax.swing.JLabel">
+                <constraints>
+                  <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>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
+                  <text value="Menu:"/>
+                </properties>
+              </component>
+              <component id="74c7a" class="javax.swing.JLabel">
+                <constraints>
+                  <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"/>
+                  <foreground color="-1"/>
+                  <text value="Lobby:"/>
+                </properties>
+              </component>
+              <component id="1fda4" class="javax.swing.JLabel" binding="dSTitle">
+                <constraints>
+                  <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"/>
+                  <foreground color="-1"/>
+                  <text value="no track"/>
+                </properties>
+              </component>
+              <component id="99b42" class="javax.swing.JLabel" binding="dMTitle">
+                <constraints>
+                  <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"/>
+                  <foreground color="-1"/>
+                  <text value="no track"/>
+                </properties>
+              </component>
+              <component id="c11e8" class="javax.swing.JLabel" binding="dSSize">
+                <constraints>
+                  <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"/>
+                  <foreground color="-1"/>
+                  <text value="no size"/>
+                </properties>
+              </component>
+              <component id="8480f" class="javax.swing.JLabel" binding="dMSize">
+                <constraints>
+                  <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"/>
+                  <foreground color="-1"/>
+                  <text value="no size"/>
+                </properties>
+              </component>
+              <vspacer id="73ce0">
+                <constraints>
+                  <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>
+      </grid>
+    </children>
+  </grid>
+</form>

firestar/src/main/java/Suggs.java

@@ -0,0 +1,635 @@
+/*
+ *     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 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.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.filechooser.FileNameExtensionFilter;
+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;
+
+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 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 List<AudioTrack> tracklist = new ArrayList<AudioTrack>();
+	private File sptrack;
+	private File mptrack;
+
+	DocumentListener id3TagEditorHandler = new DocumentListener() {
+		@Override
+		public void insertUpdate(DocumentEvent documentEvent) {
+			updateSelectionToMatchTextFields();
+		}
+
+		@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 {
+			fTitle.setEnabled(false);
+			fArtist.setEnabled(false);
+			fTitle.setText("");
+			fArtist.setText("");
+			dTrackNo.setText("\u200E");
+			dFileSize.setText("\u200E");
+			fTitle.getDocument().addDocumentListener(id3TagEditorHandler);
+			fArtist.getDocument().addDocumentListener(id3TagEditorHandler);
+		}
+	}
+
+	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();
+		}
+	}
+	
+	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

@@ -1,110 +1,252 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Waldorf">
-  <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="25" bottom="10" right="25"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties>
+      <background color="-15128227"/>
+      <foreground color="-1"/>
       <maximumSize width="50" height="100"/>
       <minimumSize width="50" height="100"/>
       <preferredSize width="50" height="100"/>
     </properties>
     <border type="none"/>
     <children>
-      <component id="3d88f" class="javax.swing.JButton" binding="okbtn">
-        <constraints>
-          <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Save"/>
-        </properties>
-      </component>
-      <component id="86775" class="javax.swing.JTextField" binding="fOutpath">
-        <constraints>
-          <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="150" height="-1"/>
-          </grid>
-        </constraints>
-        <properties/>
-      </component>
       <component id="db731" class="javax.swing.JLabel">
         <constraints>
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Mod Export Path"/>
         </properties>
       </component>
-      <component id="50d13" class="javax.swing.JButton" binding="cancelbtn">
-        <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Cancel"/>
-        </properties>
-      </component>
-      <component id="252b3" class="javax.swing.JButton" binding="resetbtn">
-        <constraints>
-          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Restore Defaults"/>
-        </properties>
-      </component>
       <component id="e2cd7" class="javax.swing.JLabel">
         <constraints>
           <grid row="1" column="0" row-span="3" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value=".firestar Folder"/>
         </properties>
       </component>
-      <component id="c68f2" class="javax.swing.JButton" binding="bOpenFolder">
-        <constraints>
-          <grid row="1" column="1" row-span="3" col-span="2" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <label value="Browse"/>
-          <text value="Browse"/>
-        </properties>
-      </component>
       <component id="63b35" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Downloads"/>
         </properties>
       </component>
       <grid id="1206c" 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"/>
+        <margin top="3" left="5" bottom="3" right="5"/>
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
-        <border type="none">
+          <background color="-15128227"/>
-          <color color="-16777216"/>
+          <foreground color="-1"/>
+        </properties>
+        <border type="line">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
         </border>
         <children>
           <component id="92a60" class="javax.swing.JButton" binding="dwnSDKbtn">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
               <text value="Get Dependencies"/>
             </properties>
           </component>
           <component id="87ead" class="javax.swing.JButton" binding="dwnARCbtn">
             <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"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
               <text value="Auto-Download PSARCs"/>
             </properties>
           </component>
         </children>
       </grid>
+      <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">
+            <maximum-size width="500" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <opaque value="false"/>
+        </properties>
+        <border type="none"/>
+        <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="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Deploys Go Here"/>
+            </properties>
+          </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="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Change"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <component id="73ca5" class="javax.swing.JCheckBox" binding="checkUpdatesToggle">
+        <constraints>
+          <grid row="5" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+          <label value="Automatically check for updates on startup"/>
+          <opaque value="false"/>
+          <rolloverEnabled value="false"/>
+          <text value="Automatically check for updates on startup"/>
+        </properties>
+      </component>
+      <grid id="6078c" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="3" left="5" bottom="3" right="5"/>
+        <constraints>
+          <grid row="1" column="1" row-span="3" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+          <opaque value="false"/>
+        </properties>
+        <border type="line">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
+        <children>
+          <component id="8fec2" class="javax.swing.JButton" binding="bOpenFolder">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <label value="Browse"/>
+              <text value="Browse"/>
+            </properties>
+          </component>
+          <component id="b08c4" class="javax.swing.JButton" binding="bDelArcs">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <label value="Delete PSARCs"/>
+              <text value="Delete PSARCs"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="d0121" layout-manager="GridLayoutManager" row-count="1" 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="6" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <opaque value="false"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <component id="50d13" class="javax.swing.JButton" binding="cancelbtn">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="100" height="-1"/>
+                <preferred-size width="200" height="-1"/>
+                <maximum-size width="200" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Cancel"/>
+            </properties>
+          </component>
+          <component id="252b3" class="javax.swing.JButton" binding="resetbtn">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="100" height="-1"/>
+                <preferred-size width="200" height="-1"/>
+                <maximum-size width="200" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Restore Defaults"/>
+            </properties>
+          </component>
+          <component id="3d88f" class="javax.swing.JButton" binding="okbtn">
+            <constraints>
+              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="100" height="-1"/>
+                <preferred-size width="200" height="-1"/>
+                <maximum-size width="200" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <text value="Save"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
     </children>
   </grid>
 </form>

firestar/src/main/java/Waldorf.java

@@ -16,14 +16,12 @@
  *     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;
 
@@ -34,41 +32,43 @@ public class Waldorf implements ActionListener {
 	private JPanel frameContainer;
 	private JButton okbtn;
 	private JButton cancelbtn;
-    private JTextField fOutpath;
+	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;
 
 	public void Action(MissPiggy inv) {
 		invoker = inv;
 
 		frame.add(frameContainer);
-        try {
+		frame.setIconImage(Main.windowIcon);
-            BufferedImage windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
+		frame.setSize(600, 300); // 1280 800
-            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, 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.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);
 
-        fOutpath.setText(Main.outpath);
+		updateDOutpath(Main.outpath);
+		checkUpdatesToggle.setSelected(Main.checkUpdates);
 
 		frame.setVisible(true);
 		frame.addWindowListener(new WindowAdapter() {
@@ -81,6 +81,13 @@ public class Waldorf implements ActionListener {
 		});
 	}
 
+	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);
+	}
+
 	@Override
 	public void actionPerformed(ActionEvent actionEvent) {
 		if (actionEvent.getSource() == cancelbtn) {
@@ -88,7 +95,8 @@ public class Waldorf implements ActionListener {
 			frame.dispose();
 		} else
 		if (actionEvent.getSource() == okbtn) {
-            Main.outpath = fOutpath.getText();
+			Main.outpath = tOutPath;
+			Main.checkUpdates = checkUpdatesToggle.isSelected();
 			Main.writeConf();
 			Main.loadConf();
 
@@ -100,12 +108,6 @@ public class Waldorf implements ActionListener {
 			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);
@@ -119,7 +121,22 @@ public class Waldorf implements ActionListener {
 				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
@@ -133,6 +150,17 @@ public class Waldorf implements ActionListener {
 			});
 			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.form

@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="WilkinsCoffee">
-  <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <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="416" height="455"/>
+      <xy x="20" y="20" width="416" height="479"/>
     </constraints>
     <properties>
       <background color="-15128227"/>
+      <foreground color="-1"/>
     </properties>
     <border type="none"/>
     <children>
       <component id="a7e40" class="javax.swing.JLabel" binding="picLabel">
         <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">
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="1" anchor="1" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="76" height="76"/>
-            <maximum-size width="76" height="76"/>
+            <maximum-size width="96" height="96"/>
           </grid>
         </constraints>
         <properties>
+          <foreground color="-1"/>
           <text value="Image"/>
         </properties>
       </component>
       <component id="29913" class="javax.swing.JEditorPane" binding="instructions">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="1" use-parent-layout="false">
+          <grid row="0" column="1" row-span="2" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="1" use-parent-layout="false">
             <preferred-size width="150" height="50"/>
           </grid>
         </constraints>
@@ -36,27 +38,27 @@
           <focusCycleRoot value="false"/>
           <focusable value="false"/>
           <font name="Exo 2" size="14"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <margin top="0" left="5" bottom="0" right="0"/>
           <text value="&lt;html&gt;&#10;  &lt;head&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p id=&quot;first-p&quot;&gt;&#10;      Welcome to the Firestar Setup.&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      Please read the manual before continuing, and make sure your Vita is &#10;      configured correctly first. You will need enso custom firmware and &#10;      Repatch Reloaded for Firestar to work.&lt;br&gt;&lt;br&gt;Emulator players can skip &#10;      these preparations.&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      Press &amp;quot;Continue&amp;quot; when you are ready.&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;&#10;&lt;/html&gt;&#10;"/>
         </properties>
       </component>
       <component id="c3ec3" class="javax.swing.JButton" binding="contBtn">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <background color="-2271221"/>
           <borderPainted value="false"/>
           <focusPainted value="false"/>
-          <foreground color="-526337"/>
+          <foreground color="-1"/>
           <text value="Continue"/>
         </properties>
       </component>
       <grid id="ee2dd" binding="inputContainer" 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="3" right="0"/>
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <background color="-15128227"/>
@@ -64,36 +66,36 @@
         </properties>
         <border type="none"/>
         <children>
-          <component id="1c41b" class="javax.swing.JButton" binding="PSARC_downBtn">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <background color="-2271221"/>
-              <borderPainted value="false"/>
-              <focusPainted value="false"/>
-              <foreground color="-592129"/>
-              <text value="Auto-Download"/>
-            </properties>
-          </component>
           <component id="30c84" class="javax.swing.JButton" binding="PSARC_impBtn">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" 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"/>
               <borderPainted value="false"/>
               <focusPainted value="false"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Import My Own"/>
             </properties>
           </component>
+          <component id="1c41b" class="javax.swing.JButton" binding="PSARC_downBtn">
+            <constraints>
+              <grid row="0" column="0" 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"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <foreground color="-1"/>
+              <text value="Auto-Download"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="8468" binding="inputContainer2" 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="3" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <background color="-15128227"/>
@@ -108,7 +110,7 @@
               <background color="-2271221"/>
               <borderPainted value="false"/>
               <focusPainted value="false"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Select Folder"/>
             </properties>
           </component>
@@ -118,12 +120,87 @@
             </constraints>
             <properties>
               <font name="Exo 2" size="12"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Your Documents folder is selected by default."/>
             </properties>
           </component>
         </children>
       </grid>
+      <grid id="71c64" binding="checklistContainer" layout-manager="GridLayoutManager" row-count="5" 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="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+          <opaque value="false"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <component id="eae72" class="javax.swing.JLabel" binding="checklistFury">
+            <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"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <icon value="lightNegative.png"/>
+              <text value="Fury DLC"/>
+            </properties>
+          </component>
+          <component id="ae838" class="javax.swing.JLabel" binding="checklistHD">
+            <constraints>
+              <grid row="3" 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="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <icon value="lightNegative.png"/>
+              <text value="HD DLC"/>
+            </properties>
+          </component>
+          <component id="35a85" class="javax.swing.JLabel" binding="checklistPatch2">
+            <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"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <icon value="lightNegative.png"/>
+              <text value="Patch 2"/>
+            </properties>
+          </component>
+          <component id="4ca0c" class="javax.swing.JLabel" binding="checklistPatch1">
+            <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"/>
+            </constraints>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <icon value="lightNegative.png"/>
+              <text value="Patch 1"/>
+            </properties>
+          </component>
+          <component id="94f98" class="javax.swing.JLabel" binding="checklistBase">
+            <constraints>
+              <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="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+              <icon value="lightNegative.png"/>
+              <text value="Base"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
     </children>
   </grid>
 </form>

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,7 +31,6 @@ 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();
@@ -46,6 +44,12 @@ public class WilkinsCoffee implements ActionListener {
 	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),
@@ -60,12 +64,13 @@ public class WilkinsCoffee implements ActionListener {
 		}
 	}
 
-    private String outPathTemp = System.getProperty("user.home") + "/Documents";
+	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);
 
 		// check if this is windows or not
@@ -75,14 +80,9 @@ public class WilkinsCoffee implements ActionListener {
 		// reformat path slightly for windows
 		if (Main.windows) {outPathTemp.replace("/", "\\");}
 
+		frame.setIconImage(Main.windowIcon);
 		try {
-            windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
+			logo = ImageIO.read(Main.class.getResourceAsStream("/programIcon.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
-            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(76, 76, 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.");
@@ -122,6 +122,8 @@ public class WilkinsCoffee implements ActionListener {
 				if (new Bert(frame).reportWhenDownloaded(threadParent)) {
 					contBtn.setEnabled(true);
 					contBtn.setBackground(new Color(221, 88, 11)); //orange
+
+					refreshChecklist();
 				}
 			}});
 		waiterThread.start();
@@ -135,6 +137,7 @@ public class WilkinsCoffee implements ActionListener {
 			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) {
@@ -149,7 +152,7 @@ public class WilkinsCoffee implements ActionListener {
 			int result = fileChooser.showOpenDialog(frame);
 			if (result == JFileChooser.APPROVE_OPTION) {
 				if (fileChooser.getSelectedFile().isDirectory()) {
-                    outPathTemp = fileChooser.getSelectedFile().getAbsolutePath();
+					outPathTemp = fileChooser.getSelectedFile().getAbsolutePath()+"/";
 					pathDisplay.setText("Export path: " + outPathTemp);
 				}
 			}
@@ -157,18 +160,16 @@ public class WilkinsCoffee implements ActionListener {
 		if (actionEvent.getSource() == contBtn) {
 			switch (page) {
 				case INTRO:
-                    page = Pages.PSARC;
-
 					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);
-                                    sdkInstalled = true;
 								}
 							});
 							downloaderPopupThread.start();
@@ -179,9 +180,20 @@ public class WilkinsCoffee implements ActionListener {
 						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("");
+					}
+
 					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
@@ -204,9 +216,17 @@ public class WilkinsCoffee implements ActionListener {
 					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" +
@@ -228,8 +248,15 @@ public class WilkinsCoffee implements ActionListener {
 					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.outpath = outPathTemp;
 					Main.repatch = true;
 					Main.writeConf();
 
@@ -254,4 +281,38 @@ public class WilkinsCoffee implements ActionListener {
 			}
 		}
 	}
+
+	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
+
+		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_

installer/win32/installer_win32.iss

@@ -1,9 +1,9 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Firestar Mod Manager"
+#define MyAppName "Firestar"
-#define MyAppVersion "1.2"
+#define MyAppVersion "1.3.1"
-#define MyAppPublisher "bonkmaykr"
+#define MyAppPublisher "Canithesis Interactive"
 #define MyAppURL "https://screwgravity.net/firestar/"
 #define MyAppExeName "firestar.jar"
 #define MyAppAssocName "Firestar Mod Package"
@@ -30,7 +30,7 @@ LicenseFile=Z:\home\bonkyboo\repos\firestar\LICENSE
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir=Z:\home\bonkyboo\repos\firestar\out\inno
 OutputBaseFilename=firestar
-SetupIconFile=Z:\home\bonkyboo\repos\firestar\titleIcon.ico
+SetupIconFile=Z:\home\bonkyboo\repos\firestar\programIcon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -43,8 +43,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "Z:\home\bonkyboo\repos\firestar\out\artifacts\firestar_jar\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Z:\home\bonkyboo\repos\firestar\titleIcon.ico"; DestDir: "{app}"; Flags: ignoreversion
+Source: "Z:\home\bonkyboo\repos\firestar\programIcon.ico"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Z:\home\bonkyboo\repos\firestar\resources\*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]
@@ -55,6 +54,6 @@ Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; Value
 Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: ""
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\titleIcon.ico";
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\programIcon.ico";
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\titleIcon.ico"; Tasks: desktopicon
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\programIcon.ico"; Tasks: desktopicon