move .trim() for less redundancy
This commit is contained in:
parent
d57f183785
commit
f8146fd493
|
@ -155,7 +155,7 @@ public class Gonzo {
|
||||||
try {
|
try {
|
||||||
System.out.println("Firestar is extracting " + m.friendlyName + " by " + m.author);
|
System.out.println("Firestar is extracting " + m.friendlyName + " by " + m.author);
|
||||||
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.trim()).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 (new File(System.getProperty("user.home") + "/.firestar/temp/delete.txt").isFile()) {
|
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);
|
System.out.println("Firestar is deleting files that conflict with " + m.friendlyName + " by " + m.author);
|
||||||
|
|
|
@ -198,13 +198,13 @@ public class MissPiggy implements ActionListener {
|
||||||
mod.exists()) {
|
mod.exists()) {
|
||||||
//append mod to list from substring
|
//append mod to list from substring
|
||||||
Main.Mod m = new Main().new Mod();
|
Main.Mod m = new Main().new Mod();
|
||||||
m.path = s.substring(s.indexOf("=") + 1);
|
m.path = s.substring(s.indexOf("=") + 1).trim();
|
||||||
System.out.println("found file " + m.path);
|
System.out.println("found file " + m.path);
|
||||||
|
|
||||||
//get json metadata from zip comment
|
//get json metadata from zip comment
|
||||||
JSONObject metadata;
|
JSONObject metadata;
|
||||||
try {
|
try {
|
||||||
metadata = new JSONObject(new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + m.path.trim()).getComment());
|
metadata = new JSONObject(new ZipFile(System.getProperty("user.home") + "/.firestar/mods/" + m.path).getComment());
|
||||||
if (metadata.has("friendlyName")) {m.friendlyName = metadata.get("friendlyName").toString();} else {m.friendlyName = m.path;}
|
if (metadata.has("friendlyName")) {m.friendlyName = metadata.get("friendlyName").toString();} else {m.friendlyName = m.path;}
|
||||||
if (metadata.has("description")) {m.description = metadata.get("description").toString();}
|
if (metadata.has("description")) {m.description = metadata.get("description").toString();}
|
||||||
if (metadata.has("version")) {m.version = Integer.parseInt(metadata.get("version").toString());}
|
if (metadata.has("version")) {m.version = Integer.parseInt(metadata.get("version").toString());}
|
||||||
|
@ -244,7 +244,7 @@ public class MissPiggy implements ActionListener {
|
||||||
System.out.println("Initializing blacklist from file with length of " + bListArray.length + " units"); //debug
|
System.out.println("Initializing blacklist from file with length of " + bListArray.length + " units"); //debug
|
||||||
for (String s : bListArray) {
|
for (String s : bListArray) {
|
||||||
for (Main.Mod m : Main.Mods) {
|
for (Main.Mod m : Main.Mods) {
|
||||||
if (s.trim().equals(m.path.trim())) {
|
if (s.trim().equals(m.path)) {
|
||||||
m.enabled = false;
|
m.enabled = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -474,7 +474,7 @@ public class MissPiggy implements ActionListener {
|
||||||
|
|
||||||
try { //debug
|
try { //debug
|
||||||
|
|
||||||
File pathReference = new File(System.getProperty("user.home") + "/.firestar/mods/" + Main.Mods.get(modList.getSelectedIndex()).path.trim());
|
File pathReference = new File(System.getProperty("user.home") + "/.firestar/mods/" + Main.Mods.get(modList.getSelectedIndex()).path);
|
||||||
DecimalFormat df = new DecimalFormat("##.##");
|
DecimalFormat df = new DecimalFormat("##.##");
|
||||||
df.setRoundingMode(RoundingMode.UP);
|
df.setRoundingMode(RoundingMode.UP);
|
||||||
float modFileSize = pathReference.length(); //precise units
|
float modFileSize = pathReference.length(); //precise units
|
||||||
|
|
Loading…
Reference in New Issue
Block a user