bonkmaykr/firestar
3
1
Fork 0
Code Issues 6 Pull Requests Releases 8 Wiki Activity

FINALLY - implement PSARC partial extraction (in the shittiest way, but it's all we can do right now) - 1.3 is about ready

Browse Source
This commit is contained in:
Downforce Agent
2025-02-20 10:26:26 -06:00
parent f07a75276c
commit b8dbfc9095
1 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
firestar/src/main/java/Gonzo.java
View File

@@ -25,10 +25,7 @@ import java.awt.*;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.*; 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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -114,22 +111,42 @@ public class Gonzo {
// create temporary working area for asset dump // create temporary working area for asset dump
new File(System.getProperty("user.home") + "/.firestar/temp/").mkdirs(); 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 // decide which files to dump
List<String> dumpThese = new ArrayList<String>(); 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 // dump all assets to working area
for (String s : dumpThese) { for (String s : dumpThese) {
try { 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); System.out.println("Firestar is extracting " + s);
consoleDisplay.append("Firestar is extracting " + s + "\n"); 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;
Process p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../"+s}, System.getProperty("user.home") + "/.firestar/temp/"); if (s.equals(oArcTarget)) p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../"+s}, System.getProperty("user.home") + "/.firestar/temp/");
else {
new File(System.getProperty("user.home") + "/.firestar/temparcs/" + s + "/").mkdirs();
p = Main.exec(new String[]{Main.inpath + "psp2psarc.exe", "extract", "-y", "../../"+s}, System.getProperty("user.home") + "/.firestar/temparcs/" + s + "/");
}
final Thread ioThread = new Thread() { final Thread ioThread = new Thread() {
@Override @Override
public void run() { public void run() {
@@ -163,8 +180,6 @@ public class Gonzo {
// overwrite assets with custom ones from each mod and/or perform operations as specified in mod's delete list // 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 // todo: implement RegEx functions after delete.txt
List<Main.Mod> modsFlipped = new ArrayList<>(Main.Mods);
Collections.reverse(modsFlipped);
for (Main.Mod m : modsFlipped) { for (Main.Mod m : modsFlipped) {
if (m.enabled) { if (m.enabled) {
try { try {
@@ -172,6 +187,30 @@ public class Gonzo {
consoleDisplay.append("Firestar is extracting " + m.friendlyName + " by " + m.author + "\n"); 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/"); 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"); File fscript = new File(Main.inpath + "temp/fscript");
if (fscript.exists()) { if (fscript.exists()) {
System.out.println("Firestar is applying patches from " + m.friendlyName + " by " + m.author); System.out.println("Firestar is applying patches from " + m.friendlyName + " by " + m.author);
@@ -324,7 +363,9 @@ public class Gonzo {
} }
try { try {
File tmp = new File(System.getProperty("user.home") + "/.firestar/temp/"); 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(tmp);
Main.deleteDir(tmp2);
} catch (Exception e) { } catch (Exception e) {
System.out.println("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage()); 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()); consoleDisplay.append("WARNING: Temporary files may not have been properly cleared.\n" + e.getMessage());