added icon to all windows

Author: hyperdefined

src/main/java/lol/hyper/customlauncher/Main.java

@@ -29,8 +29,13 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Properties;
@@ -40,6 +45,7 @@ public class Main {
     public static String VERSION;
     public static Logger logger;
     public static String pathToUse;
+    public static Image icon;
 
     public static void main(String[] args) throws IOException {
         System.setProperty("log4j.configurationFile", "log4j2config.xml");
@@ -55,6 +61,11 @@ public static void main(String[] args) throws IOException {
         }
         boolean runSetup = false;
 
+        InputStream iconStream = Main.class.getResourceAsStream("/icon.png");
+        if (iconStream != null) {
+            icon = ImageIO.read(iconStream);
+        }
+
         // create the default files
         // config.json with default values
         // accounts.json with no accounts
@@ -121,7 +132,6 @@ public static void main(String[] args) throws IOException {
                 }
             }
         }
-
         JFrame mainWindow = new MainWindow("CustomLauncherRewrite", new InvasionTracker());
         mainWindow.dispose();
     }

src/main/java/lol/hyper/customlauncher/accounts/windows/AccountManagerWindow.java

@@ -17,6 +17,8 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
+
 import javax.swing.*;
 
 public class AccountManagerWindow extends JFrame {
@@ -32,6 +34,7 @@ public AccountManagerWindow(String title) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/accounts/windows/DeleteAccountWindow.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.Account;
 import lol.hyper.customlauncher.accounts.JSONManager;
 
@@ -40,6 +41,7 @@ public DeleteAccountWindow(String title) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/accounts/windows/MainWindow.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.Account;
 import lol.hyper.customlauncher.accounts.JSONManager;
 import lol.hyper.customlauncher.invasiontracker.InvasionTracker;
@@ -43,6 +44,7 @@ public MainWindow(String title, InvasionTracker invasionTracker) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/accounts/windows/NewAccountWindow.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.JSONManager;
 
 import javax.swing.*;
@@ -34,6 +35,7 @@ public NewAccountWindow(String title) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/accounts/windows/OptionsWindow.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.JSONManager;
 
 import javax.swing.*;
@@ -34,6 +35,7 @@ public OptionsWindow(String title) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/accounts/windows/SecretPrompt.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.accounts.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.Account;
 import lol.hyper.customlauncher.accounts.JSONManager;
 import lol.hyper.customlauncher.login.LoginHandler;
@@ -37,6 +38,7 @@ public SecretPrompt(String title, Account account) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/invasiontracker/InvasionTracker.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.invasiontracker;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.generic.ErrorWindow;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -66,6 +67,7 @@ public void showWindow() {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/login/windows/TwoFactorAuth.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.login.windows;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.login.LoginHandler;
 import lol.hyper.customlauncher.login.LoginRequest;
 
@@ -37,6 +38,7 @@ public TwoFactorAuth(String title, String banner, String token) {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+        frame.setIconImage(Main.icon);
 
         // GUI elements
         JPanel panel = new JPanel();

src/main/java/lol/hyper/customlauncher/ttrupdater/TTRUpdater.java

@@ -17,6 +17,7 @@
 
 package lol.hyper.customlauncher.ttrupdater;
 
+import lol.hyper.customlauncher.Main;
 import lol.hyper.customlauncher.accounts.JSONManager;
 import lol.hyper.customlauncher.generic.ErrorWindow;
 import lol.hyper.customlauncher.generic.InfoWindow;
@@ -29,6 +30,7 @@
 
 import javax.swing.*;
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
+import java.awt.*;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
@@ -60,6 +62,8 @@ public TTRUpdater(String title, Path installLocation) throws IOException {
             logger.error(e);
         }
 
+        frame.setIconImage(Main.icon);
+
         // GUI elements
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));