Cutting v1.3.3 - Fix startup crash for Windows usernames like u@domain

Author: apocalyptech

src/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenBLCMM Changelog
 ===================
 
+**v1.3.3** May 26, 2023
+ - Fixed a startup crash issue for Windows users whose system username has a
+   @domain suffix which isn't present in their homedir.
+
 **v1.3.2** May 24, 2023
  - Fixed TPS Game Detection on Windows
  - Importing mods via drag-and-drop will correctly update OpenBLCMM's "last

src/blcmm/Meta.java

@@ -44,7 +44,7 @@ public class Meta {
     /**
      * App version.  Should follow https://semver.org/ conventions.
      */
-    public static final String VERSION = "1.3.2";
+    public static final String VERSION = "1.3.3";
 
     /**
      * User data directory for storing prefs, extracted data, etc.  If NAME

src/blcmm/utilities/Utilities.java

@@ -184,8 +184,26 @@ public static String hideUserName(String text) {
                 return text.replace(userHome, "~");
             } else {
                 String userName = System.getProperty("user.name");
-                String replaced = userHome.substring(0, userHome.length() - userName.length()) + "[user]";
-                return text.replace(userHome, replaced);
+                //GlobalLogger.log("user.home: '" + userHome + "'");
+                //GlobalLogger.log("user.name: '" + userName + "'");
+                if (!userHome.endsWith(userName) && userName.contains("@")) {
+                    // Sometimes a user might have "@outlook" as part of their username
+                    // which isn't included in the homedir.  There's probably a better
+                    // way to be checking for this.
+                    String[] parts = userName.split("@", 2);
+                    userName = parts[0];
+                }
+                // This is sort of a double check of the same values in most cases,
+                // but whatever.
+                if (userHome.endsWith(userName)) {
+                    String replaced = userHome.substring(0, userHome.length() - userName.length()) + "[user]";
+                    return text.replace(userHome, replaced);
+                } else {
+                    // Username wasn't found in the homedir, so just give up
+                    // (this logging would be a bit noisy; not bothering with it)
+                    //GlobalLogger.log("Could not figure out how to hide username in homedir!");
+                    return text;
+                }
             }
         }
         return text;

windows-processing/openblcmm.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "OpenBLCMM"
-#define MyAppVersion "1.3.2"
+#define MyAppVersion "1.3.3"
 #define MyAppPublisher "BLCM"
 #define MyAppURL "https://github.com/BLCM/OpenBLCMM/"
 #define MyAppExeName "OpenBLCMM.exe"