Changed version string

.gitignore

@@ -11,7 +11,7 @@ out/
 .settings
 .springBeans
 .sts4-cache
-bin/
+/bin/
 !**/src/main/**/bin/
 !**/src/test/**/bin/
 
@@ -27,6 +27,7 @@ bin/
 
 ### Mac OS ###
 .DS_Store
+
 /firestar.zip
 /run-linux.sh
 /run-win32.bat

installer/unix/usr/bin/firestar

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/java/firestar/
+PATH="/usr/lib/jvm/java-17-openjdk/bin/:$PATH" java -jar firestar.jar "$@"

installer/win32/installer_win32.iss

@@ -43,6 +43,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "Z:\home\bonkyboo\repos\firestar\out\artifacts\firestar_jar\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "Z:\home\bonkyboo\repos\firestar\titleIcon.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Z:\home\bonkyboo\repos\firestar\resources\*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -54,6 +55,6 @@ Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; Value
 Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: ""
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\titleIcon.ico";
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\titleIcon.ico"; Tasks: desktopicon
 

src/Clifford.java

@@ -139,6 +139,10 @@ public class Clifford implements ActionListener {
             mod.description = fDescription.getText();
 
             JSONObject container = new JSONObject();
+            if (mod.friendlyName.isEmpty()) {
+                JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
             container.put("version", mod.version);
             container.put("friendlyName", mod.friendlyName);
             container.put("author", mod.author);
@@ -158,6 +162,10 @@ public class Clifford implements ActionListener {
             invoker.InitializeModListInGUI();
             frame.dispose();
         } else if (actionEvent.getSource() == savebtn && creating) {
+            if (fName.getText().isEmpty()) {
+                JOptionPane.showMessageDialog(frame, "Mod name cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
             try {
                 Integer.parseInt(fVersion.getText());
             } catch (NumberFormatException e) {

src/Gonzo.java

@@ -169,7 +169,7 @@ public class Gonzo {
                         System.out.println("The deletion queue is " + dQarray.length + " files long!"); //debug
 
                         for (String file : dQarray) {
-                            if(file.contains("..")) { //todo: find all possible hazardous paths and blacklist them with regex
+                            if(file.contains("..")) { //todo: is this safe enough?
                                 System.out.println("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!");
                                 consoleDisplay.append("WARNING: Firestar skipped a potentially dangerous delete command. Please ensure the mod you're installing is from someone you trust!\n");
                             } else {

src/Main.java

@@ -27,7 +27,7 @@ import javax.swing.JOptionPane;
 
 public class Main {
     // Build Information
-    public static final String vstr = "Release 1.1";
+    public static final String vstr = "Release 1.2";
     public static final String vcode = "Dekka";
     public static final int vint = 0;
 

src/MissPiggy.java

@@ -286,12 +286,14 @@ public class MissPiggy implements ActionListener {
         /*JLabel[]*/String[] contents = new String[Main.Mods.size()];
         System.out.println("Initializing modList to GUI with length of " + Main.Mods.size() + " units"); //debug
         while (i < Main.Mods.size()) {
+            if (Main.Mods.get(i).friendlyName == null || Main.Mods.get(i).friendlyName.isEmpty())
+            {Main.Mods.get(i).friendlyName = Main.Mods.get(i).path;}
             if (Main.Mods.get(i).enabled) {contents[i] = Main.Mods.get(i).friendlyName;}
             else {contents[i] = Main.Mods.get(i).friendlyName + " (Disabled)";}
 
             //debug
             String authorDisplay;
-            if (Main.Mods.get(i).author == null) {authorDisplay = "Anonymous";} else {authorDisplay = "\"" + Main.Mods.get(i).author + "\"";}
+            if (Main.Mods.get(i).author == null || Main.Mods.get(i).author.isEmpty()) {authorDisplay = "Anonymous";} else {authorDisplay = "\"" + Main.Mods.get(i).author + "\"";}
             System.out.println("Added " + Main.Mods.get(i).friendlyName + " by " + authorDisplay);
 
             i++;
@@ -546,7 +548,7 @@ public class MissPiggy implements ActionListener {
                 modFileSizeStr = String.valueOf(df.format(modFileSize / (1024 * 1024 * 1024)));
                 modFileSizeUnits = "Gigabytes";
             }
-            if (Main.Mods.get(modList.getSelectedIndex()).author == null) {
+            if (Main.Mods.get(modList.getSelectedIndex()).author == null || Main.Mods.get(modList.getSelectedIndex()).author.isEmpty()) {
                 authorDisplay = "an Unknown Author";
             } else {
                 authorDisplay = Main.Mods.get(modList.getSelectedIndex()).author;