firestar/src/main/java/Bert.java

@@ -16,16 +16,19 @@
  *     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;
@@ -57,7 +60,12 @@ public class Bert implements ActionListener {
         cancelbtn.addActionListener(this);
         downloadbtn.addActionListener(this);
 
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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);
         frame.addWindowListener(new WindowAdapter() {

firestar/src/main/java/Clifford.java

@@ -20,14 +20,18 @@ 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 static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
 
@@ -80,7 +84,12 @@ public class Clifford implements ActionListener {
         creating = false;
 
         frame.add(frameContainer);
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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");

firestar/src/main/java/Ernie.java

@@ -21,6 +21,7 @@ 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.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,6 +33,7 @@ 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;
@@ -59,12 +61,18 @@ public class Ernie implements ActionListener {
     private JButton surebtn;
     
     public boolean backgroundDone = false;
+    private BufferedImage windowIcon;
 
     private JFrame parent;
 
     public Ernie(JFrame parent) {
         this.parent = parent;
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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.");
+        }
 	byte[] urlraw = 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);

firestar/src/main/java/Fozzie.java

@@ -19,12 +19,18 @@
 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;
+import java.util.Optional;
 
 public class Fozzie {
+    BufferedImage windowIcon;
     private JFrame frame = new JFrame();
     public JProgressBar progressBar;
     private JPanel frameContainer;
@@ -49,7 +55,12 @@ public class Fozzie {
         frame.setLayout(new GridLayout());
         frame.setLocationRelativeTo(null);
         frame.setAlwaysOnTop(true);
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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 \"" + dname + "\"");
@@ -99,7 +110,12 @@ public class Fozzie {
         frame.setLayout(new GridLayout());
         frame.setLocationRelativeTo(null);
         frame.setAlwaysOnTop(true);
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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.java

@@ -21,11 +21,13 @@ import com.github.difflib.UnifiedDiffUtils;
 import com.github.difflib.patch.Patch;
 import net.lingala.zip4j.ZipFile;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
 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.Files;
@@ -58,7 +60,12 @@ public class Gonzo {
 
         frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA
 
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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");

firestar/src/main/java/MissPiggy.java

@@ -16,6 +16,7 @@
  *     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;
@@ -23,23 +24,32 @@ 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.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;
@@ -144,7 +154,12 @@ public class MissPiggy implements ActionListener {
         descriptionField.getDocument().putProperty("filterNewlines", Boolean.FALSE);
 
         // display window
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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));

firestar/src/main/java/Rizzo.java

@@ -1,87 +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 java.io.File;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-public class Rizzo {
-    
-    public void Rizzo(File infile) {
-	
-    }
-    
-    public static String[] translateCommandline(String toProcess) {
-	if (toProcess == null || toProcess.length() == 0) {
-	    return new String[0];
-	}
-
-	final int normal = 0;
-	final int inQuote = 1;
-	final int inDoubleQuote = 2;
-	int state = normal;
-	final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
-	final ArrayList<String> result = new ArrayList<String>();
-	final StringBuilder current = new StringBuilder();
-	boolean lastTokenHasBeenQuoted = false;
-
-	while (tok.hasMoreTokens()) {
-	    String nextTok = tok.nextToken();
-	    switch (state) {
-		case inQuote:
-		    if ("\'".equals(nextTok)) {
-			lastTokenHasBeenQuoted = true;
-			state = normal;
-		    } else {
-			current.append(nextTok);
-		    }
-		    break;
-		case inDoubleQuote:
-		    if ("\"".equals(nextTok)) {
-			lastTokenHasBeenQuoted = true;
-			state = normal;
-		    } else {
-			current.append(nextTok);
-		    }
-		    break;
-		default:
-		    if ("\'".equals(nextTok)) {
-			state = inQuote;
-		    } else if ("\"".equals(nextTok)) {
-			state = inDoubleQuote;
-		    } else if (" ".equals(nextTok)) {
-			if (lastTokenHasBeenQuoted || current.length() != 0) {
-			    result.add(current.toString());
-			    current.setLength(0);
-			}
-		    } else {
-			current.append(nextTok);
-		    }
-		    lastTokenHasBeenQuoted = false;
-		    break;
-	    }
-	}
-	if (lastTokenHasBeenQuoted || current.length() != 0) {
-	    result.add(current.toString());
-	}
-	if (state == inQuote || state == inDoubleQuote) {
-	    throw new RuntimeException("unbalanced quotes in " + toProcess);
-	}
-	return result.toArray(new String[result.size()]);
-    }
-}

firestar/src/main/java/Rowlf.java

@@ -19,11 +19,14 @@
 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;
@@ -39,7 +42,12 @@ public class Rowlf {
             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);
         }
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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

firestar/src/main/java/Scooter.java

@@ -16,8 +16,11 @@
  *     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.*;
 
 public class Scooter {
     private JFrame frame = new JFrame();

firestar/src/main/java/Waldorf.java

@@ -16,12 +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.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;
 
@@ -48,7 +50,12 @@ public class Waldorf implements ActionListener {
         invoker = inv;
 
         frame.add(frameContainer);
-        frame.setIconImage(Main.windowIcon);
+        try {
+            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(600, 300); // 1280 800
         frame.setMinimumSize(new Dimension(200,100));
         frame.setTitle("Options");

firestar/src/main/java/WilkinsCoffee.java

@@ -24,6 +24,7 @@ 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;
@@ -31,6 +32,7 @@ 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();
@@ -80,7 +82,12 @@ 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"));
+            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(96, 96, Image.SCALE_SMOOTH);
             picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");