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

add forceNag for future setup screen rework

Browse Source
This commit is contained in:
Downforce Agent 2024-07-09 23:39:59 -05:00
parent 1c4f19d84b
commit bf023781d2
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firestar/src/main/java/Bert.java
View File

@ -177,7 +177,7 @@ public class Bert implements ActionListener {
} else if (type == Main.ArcTarget.ADDON_HD) { } else if (type == Main.ArcTarget.ADDON_HD) {
extracted = "addcont/PCSA00015/DLC1W2048PACKAGE"; extracted = "addcont/PCSA00015/DLC1W2048PACKAGE";
name = "dlc1.psarc"; name = "dlc1.psarc";
} else if (type == Main.ArcTarget.ADDON_HD_FURY) { } else if (type == Main.ArcTarget.ADDON_HD_FURY) { // this is not "always true" - intellij is actually very dumj
extracted = "addcont/PCSA00015/DLC2W2048PACKAGE"; extracted = "addcont/PCSA00015/DLC2W2048PACKAGE";
name = "dlc2.psarc"; name = "dlc2.psarc";
} else { } else {

6
firestar/src/main/java/Kermit.java
View File

@ -132,7 +132,11 @@ public class Kermit implements ActionListener {
changePage(Pages.DONE); changePage(Pages.DONE);
break; break;
case DONE: case DONE:
new MissPiggy().Action(); 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 page = Pages.AGREEMENT; //set it here since we're disposing of the entire thing
frame.dispose(); frame.dispose();

8
firestar/src/main/java/MissPiggy.java
View File

@ -79,8 +79,12 @@ public class MissPiggy implements ActionListener {
public boolean listenersAlreadySet = false; // was written to troubleshoot a bug but this wasn't actually the cause public boolean listenersAlreadySet = false; // was written to troubleshoot a bug but this wasn't actually the cause
public void Action() {
Action(false);
}
// Initialize the main window // Initialize the main window
public void Action(/*Main entryPoint*/) { public void Action(boolean forceNag) {
System.out.println("Main window created"); System.out.println("Main window created");
System.out.println("Loading program configuration"); System.out.println("Loading program configuration");
Main.loadConf(this); Main.loadConf(this);
@ -177,7 +181,7 @@ public class MissPiggy implements ActionListener {
frame.setLayout(new GridLayout()); frame.setLayout(new GridLayout());
frame.setLocationRelativeTo(null); frame.setLocationRelativeTo(null);
if (Main.confvint == 0){ // nag if (Main.confvint == 0 || forceNag){ // nag
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); 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) { if (result == JOptionPane.YES_OPTION) {
Thread downloaderPopupThread = new Thread(new Runnable() { Thread downloaderPopupThread = new Thread(new Runnable() {