Compare commits

..

No commits in common. "859ac41fdeeaba8d96c28fbfa98e6478b37c7da4" and "1abe9519c8f2fe30589d8bee9aa56fc81fa39f6f" have entirely different histories.

3 changed files with 2 additions and 30 deletions

View File

@ -170,7 +170,7 @@ public class Gonzo {
File fscript = new File(Main.inpath + "temp/fscript"); File fscript = new File(Main.inpath + "temp/fscript");
if (fscript.exists()) { if (fscript.exists()) {
new Rizzo(new FileInputStream(fscript), Main.inpath + "temp/"); // Lets rizz this mod up new Rizzo(fscript, Main.inpath + "temp/"); // Lets rizz this mod up
} }
if (new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").isFile()) { if (new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").isFile()) {
@ -214,13 +214,6 @@ public class Gonzo {
} }
} }
} }
// Post fscript changes
try (InputStream is = Main.class.getResourceAsStream("/post.fscript")) {
new Rizzo(is, Main.inpath + "temp/");
} catch (IOException ex) {
Logger.getLogger(Gonzo.class.getName()).log(Level.SEVERE, null, ex);
}
// create a list of the contents of data/ for psp2psarc.exe to read from // create a list of the contents of data/ for psp2psarc.exe to read from
List<String> oFilesList = new ArrayList<String>(); List<String> oFilesList = new ArrayList<String>();

View File

@ -28,7 +28,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.file.Files; import java.nio.file.Files;
@ -60,7 +59,7 @@ public class Rizzo {
private int ver = 1; private int ver = 1;
private String workingDir; private String workingDir;
public Rizzo(InputStream infile, String workingDir) throws FileNotFoundException, FirescriptFormatException { public Rizzo(File infile, String workingDir) throws FileNotFoundException, FirescriptFormatException {
if (!workingDir.endsWith("/")) this.workingDir = workingDir + "/"; if (!workingDir.endsWith("/")) this.workingDir = workingDir + "/";
else this.workingDir = workingDir; else this.workingDir = workingDir;
scanner = new Scanner(infile); scanner = new Scanner(infile);
@ -289,11 +288,6 @@ public class Rizzo {
id = tag.substring(tag.indexOf("#")+1); id = tag.substring(tag.indexOf("#")+1);
tag = tag.substring(0, tag.indexOf("#")); 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) { if (id.length() > 0) {
NodeList ns; NodeList ns;
if (parent instanceof Document document) if (parent instanceof Document document)
@ -307,19 +301,6 @@ public class Rizzo {
break; 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 (((Element)n).getAttribute("name").equals(name)) {
newParent = (Element)n;
break;
}
}
} else { } else {
if (parent instanceof Document document) if (parent instanceof Document document)
newParent = document.getElementsByTagName(tag).item(index); newParent = document.getElementsByTagName(tag).item(index);

View File

@ -1,2 +0,0 @@
# POST INSTALL FSCRIPT
fscript 1