Cleanup some registry logic

AlexProgrammerDE · Feb 24, 2024 · d9eefad · d9eefad
1 parent 8f27552
commit d9eefad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/net/pistonmaster/soulfire/client/settings/AccountRegistry.java b/src/main/java/net/pistonmaster/soulfire/client/settings/AccountRegistry.java
@@ -17,7 +17,6 @@
  */
 package net.pistonmaster.soulfire.client.settings;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,7 +60,7 @@ private MinecraftAccount fromStringSingle(String data, AuthType authType) {
 
     try {
       return authType.authService().createDataAndLogin(data, null);
-    } catch (IOException e) {
+    } catch (Exception e) {
       log.error("Failed to load account from string", e);
       throw new RuntimeException(e);
     }

diff --git a/src/main/java/net/pistonmaster/soulfire/client/settings/ProxyRegistry.java b/src/main/java/net/pistonmaster/soulfire/client/settings/ProxyRegistry.java
@@ -64,12 +64,21 @@ private SFProxy fromStringSingle(String data, ProxyType proxyType) {
 
     var split = data.split(":");
 
-    var host = split[0];
-    var port = Integer.parseInt(split[1]);
-    var username = getIndexOrNull(split, 2);
-    var password = getIndexOrNull(split, 3);
+    if (split.length < 2) {
+      throw new IllegalArgumentException("Proxy must have at least a host and a port!");
+    }
+
+    try {
+      var host = split[0];
+      var port = Integer.parseInt(split[1]);
+      var username = getIndexOrNull(split, 2);
+      var password = getIndexOrNull(split, 3);
 
-    return new SFProxy(proxyType, host, port, username, password, true);
+      return new SFProxy(proxyType, host, port, username, password, true);
+    } catch (Exception e) {
+      log.error("Failed to load proxy from string.", e);
+      throw new RuntimeException(e);
+    }
   }
 
   public List<SFProxy> getProxies() {