rename packages

HMCL/build.gradle

@@ -26,7 +26,7 @@ if (!hasProperty('mainClass')) {
     ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main'
 }
 
-def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".8" : "."+System.getenv("BUILD_NUMBER")
+def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".9" : "."+System.getenv("BUILD_NUMBER")
 
 String mavenGroupId = 'HMCL'
 String mavenVersion = '2.3.5' + buildnumber

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java

@@ -26,16 +26,16 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import javax.swing.SwingUtilities;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.views.LogWindow;
+import org.jackhuang.hellominecraft.util.ui.LogWindow;
-import org.jackhuang.hellominecraft.launcher.utils.MinecraftCrashAdvicer;
+import org.jackhuang.hellominecraft.launcher.util.MinecraftCrashAdvicer;
-import org.jackhuang.hellominecraft.utils.DoubleOutputStream;
+import org.jackhuang.hellominecraft.util.DoubleOutputStream;
-import org.jackhuang.hellominecraft.utils.LauncherPrintStream;
+import org.jackhuang.hellominecraft.util.LauncherPrintStream;
-import org.jackhuang.hellominecraft.utils.MathUtils;
+import org.jackhuang.hellominecraft.util.MathUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.Utils;
+import org.jackhuang.hellominecraft.util.Utils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java

@@ -32,21 +32,21 @@ import javax.net.ssl.X509TrustManager;
 import javax.swing.ImageIcon;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
 import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
-import org.jackhuang.hellominecraft.launcher.utils.CrashReporter;
+import org.jackhuang.hellominecraft.launcher.util.CrashReporter;
-import org.jackhuang.hellominecraft.utils.logging.Configuration;
+import org.jackhuang.hellominecraft.util.logging.Configuration;
-import org.jackhuang.hellominecraft.utils.logging.appender.ConsoleAppender;
+import org.jackhuang.hellominecraft.util.logging.appender.ConsoleAppender;
-import org.jackhuang.hellominecraft.utils.logging.layout.DefaultLayout;
+import org.jackhuang.hellominecraft.util.logging.layout.DefaultLayout;
-import org.jackhuang.hellominecraft.utils.views.LogWindow;
+import org.jackhuang.hellominecraft.util.ui.LogWindow;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.upgrade.IUpgrader;
+import org.jackhuang.hellominecraft.launcher.util.upgrade.IUpgrader;
-import org.jackhuang.hellominecraft.launcher.views.MainFrame;
+import org.jackhuang.hellominecraft.launcher.ui.MainFrame;
 import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel;
-import org.jackhuang.hellominecraft.utils.MathUtils;
+import org.jackhuang.hellominecraft.util.MathUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.VersionNumber;
+import org.jackhuang.hellominecraft.util.VersionNumber;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java

@@ -17,12 +17,14 @@
  */
 package org.jackhuang.hellominecraft.launcher.api;
 
+import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.setting.Profile;
 import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
+import org.jackhuang.hellominecraft.util.func.Consumer;
 
 /**
  *
@@ -59,5 +61,5 @@ public interface IPlugin {
      */
     void onProcessingLoginResult(UserProfileProvider result) throws AuthenticationException;
 
-    void onInitializingProfile(Profile p);
+    void onProcessingLaunchOptions(LaunchOptions p) throws GameException;
 }

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java

@@ -17,8 +17,8 @@
  */
 package org.jackhuang.hellominecraft.launcher.api;
 
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.launcher.settings.DefaultPlugin;
+import org.jackhuang.hellominecraft.launcher.setting.DefaultPlugin;
 
 /**
  *
@@ -31,7 +31,7 @@ public class PluginManager {
     public static void getServerPlugin() {
         try {
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            Class c = cl.loadClass("org.jackhuang.hellominecraft.launcher.servers.ServerPlugin");
+            Class c = cl.loadClass("org.jackhuang.hellominecraft.launcher.server.ServerPlugin");
             IPlugin p = (IPlugin) c.newInstance();
             NOW_PLUGIN = p;
         } catch (ClassNotFoundException ignore) {

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java

@@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core;
 
 import java.io.File;
 import java.io.IOException;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java

@@ -25,10 +25,10 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java

@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.OverridableSwingWorker;
+import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
-import org.jackhuang.hellominecraft.utils.VersionNumber;
+import org.jackhuang.hellominecraft.util.VersionNumber;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,17 +23,17 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
 import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.code.DigestUtils;
+import org.jackhuang.hellominecraft.util.code.DigestUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.OverridableSwingWorker;
+import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
 
 /**
  * Assets

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java

@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.assets;
+package org.jackhuang.hellominecraft.launcher.core.asset;
 
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.io.IOException;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java

@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-import org.jackhuang.hellominecraft.utils.code.DigestUtils;
+import org.jackhuang.hellominecraft.util.code.DigestUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java

@@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.code.DigestUtils;
+import org.jackhuang.hellominecraft.util.code.DigestUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java

@@ -17,10 +17,10 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.auth;
 
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.code.DigestUtils;
+import org.jackhuang.hellominecraft.util.code.DigestUtils;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.views.Selector;
+import org.jackhuang.hellominecraft.util.ui.Selector;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java

@@ -17,8 +17,6 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.auth;
 
-import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo;
-
 /**
  *
  * @author huangyuhui
@@ -108,13 +106,4 @@ public final class UserProfileProvider {
     private String otherInfo = "";
     private String clientIdentifier = "";
     private String userType = "Offline";
-    private ServerInfo server = null;
-
-    public ServerInfo getServer() {
-        return server;
-    }
-
-    public void setServer(ServerInfo server) {
-        this.server = server;
-    }
 }

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java

@@ -21,9 +21,9 @@ import com.google.gson.GsonBuilder;
 import java.net.Proxy;
 import java.util.Map;
 import javax.swing.JOptionPane;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.ArrayUtils;
+import org.jackhuang.hellominecraft.util.ArrayUtils;
-import org.jackhuang.hellominecraft.utils.views.Selector;
+import org.jackhuang.hellominecraft.util.ui.Selector;
 import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.GameProfile;
 import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.PropertyMap;
 import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.YggdrasilAuthentication;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java

@@ -26,7 +26,7 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.UUID;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 public class GameProfile {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java

@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 
 public class PropertyMap extends HashMap<String, Property> {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java

@@ -28,10 +28,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 public class YggdrasilAuthentication {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 
 /**
  *
@@ -27,17 +27,17 @@ public class BMCLAPIDownloadProvider extends IDownloadProvider {
 
     @Override
     public InstallerVersionList getForgeInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getLiteLoaderInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getOptiFineInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl.OptiFineBMCLVersionList.getInstance();
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java

@@ -18,7 +18,7 @@
 package org.jackhuang.hellominecraft.launcher.core.download;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java

@@ -17,8 +17,8 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerType;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java

@@ -22,21 +22,21 @@ import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.OverridableSwingWorker;
+import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersion;
+import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion;
-import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersions;
+import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersions;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 
 /**
  *
@@ -27,17 +27,17 @@ public class MojangDownloadProvider extends IDownloadProvider {
 
     @Override
     public InstallerVersionList getForgeInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.forge.MinecraftForgeVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getLiteLoaderInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getOptiFineInstaller() {
-        return org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineVersionList.getInstance();
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.launcher.core.installers.forge.Install;
+import org.jackhuang.hellominecraft.launcher.core.install.forge.Install;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.util.func.Consumer;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 import java.util.Comparator;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java

@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService;
 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion;
-import org.jackhuang.hellominecraft.launcher.core.installers.forge.ForgeInstaller;
+import org.jackhuang.hellominecraft.launcher.core.install.forge.ForgeInstaller;
-import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderInstaller;
+import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderInstaller;
-import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderVersionList;
-import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineInstaller;
+import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineInstaller;
-import org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineDownloadFormatter;
+import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineDownloadFormatter;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.TaskInfo;
+import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers;
+package org.jackhuang.hellominecraft.launcher.core.install;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import org.jackhuang.hellominecraft.utils.system.Compressor;
+import org.jackhuang.hellominecraft.util.system.Compressor;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java

@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallProfile;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallProfile;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import org.jackhuang.hellominecraft.launcher.core.installers.PackMinecraftInstaller;
+import org.jackhuang.hellominecraft.launcher.core.install.PackMinecraftInstaller;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java

@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java

@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult;
+import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult;
-import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar;
+import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,13 +23,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java

@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.optifine;
+package org.jackhuang.hellominecraft.launcher.core.install.optifine;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.zip.ZipFile;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult;
+import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult;
-import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResultRegistrar;
+import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResultRegistrar;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.optifine;
+package org.jackhuang.hellominecraft.launcher.core.install.optifine;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl;
+package org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl;
 
 import com.google.gson.reflect.TypeToken;
 import java.util.ArrayList;
@@ -25,12 +25,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.ArrayUtils;
+import org.jackhuang.hellominecraft.util.ArrayUtils;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla;
+package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.tasks.communication.PreviousResult;
+import org.jackhuang.hellominecraft.util.tasks.communication.PreviousResult;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla;
+package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -29,11 +29,11 @@ import java.util.regex.Pattern;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion;
+import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion;
-import org.jackhuang.hellominecraft.utils.ArrayUtils;
+import org.jackhuang.hellominecraft.util.ArrayUtils;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java

@@ -23,19 +23,19 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Launcher;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.system.JdkVersion;
+import org.jackhuang.hellominecraft.util.system.JdkVersion;
-import org.jackhuang.hellominecraft.utils.MathUtils;
+import org.jackhuang.hellominecraft.util.MathUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
-import org.jackhuang.hellominecraft.utils.system.Platform;
+import org.jackhuang.hellominecraft.util.system.Platform;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.Utils;
+import org.jackhuang.hellominecraft.util.Utils;
 
 /**
  *
@@ -150,8 +150,6 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader {
         }
 
         String serverIp = options.getServerIp();
-        if (lr.getServer() != null)
-            serverIp = lr.getServer().addr;
         if (StrUtils.isNotBlank(serverIp)) {
             String[] args = serverIp.split(":");
             res.add("--server");

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java

@@ -18,17 +18,17 @@
 package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.IOException;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.utils.tasks.ParallelTask;
+import org.jackhuang.hellominecraft.util.tasks.ParallelTask;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.system.Compressor;
+import org.jackhuang.hellominecraft.util.system.Compressor;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 public class DefaultGameLauncher extends GameLauncher {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java

@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
@@ -36,14 +36,14 @@ import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob;
 import org.jackhuang.hellominecraft.launcher.core.version.DecompressLibraryJob;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.system.JavaProcess;
+import org.jackhuang.hellominecraft.util.system.JavaProcess;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.EventHandler;
+import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.utils.system.ProcessManager;
+import org.jackhuang.hellominecraft.util.system.ProcessManager;
 
 public class GameLauncher {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java

@@ -18,10 +18,9 @@
 package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.system.JdkVersion;
+import org.jackhuang.hellominecraft.util.system.JdkVersion;
 
 /**
  *
@@ -36,8 +35,6 @@ public class LaunchOptions {
     private File gameDir;
     private GameDirType gameDirType;
 
-    protected transient IMinecraftService service;
-
     public String getVersionName() {
         return versionName;
     }

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java

@@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.File;
 import java.net.URL;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java

@@ -23,22 +23,22 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
+import org.jackhuang.hellominecraft.launcher.core.asset.AssetsIndex;
-import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject;
+import org.jackhuang.hellominecraft.launcher.core.asset.AssetsObject;
-import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler;
+import org.jackhuang.hellominecraft.launcher.core.asset.IAssetsHandler;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java

@@ -25,12 +25,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.ModInfo;
-import org.jackhuang.hellominecraft.utils.code.DigestUtils;
+import org.jackhuang.hellominecraft.util.code.DigestUtils;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java

@@ -26,19 +26,19 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.functions.BiFunction;
+import org.jackhuang.hellominecraft.util.func.BiFunction;
-import org.jackhuang.hellominecraft.utils.functions.Predicate;
+import org.jackhuang.hellominecraft.util.func.Predicate;
-import org.jackhuang.hellominecraft.utils.system.Compressor;
+import org.jackhuang.hellominecraft.util.system.Compressor;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.ZipEngine;
+import org.jackhuang.hellominecraft.util.system.ZipEngine;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.version.MinecraftVersionRequest;
+import org.jackhuang.hellominecraft.util.version.MinecraftVersionRequest;
 
 /**
  * A mod pack(*.zip) includes these things:

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java

@@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.io.File;
 import java.io.IOException;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java

@@ -22,9 +22,9 @@ import java.util.List;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.OverridableSwingWorker;
+import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.utils.version.MinecraftRemoteVersion;
+import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java

@@ -17,9 +17,9 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.service;
 
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerType;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.utils.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.Task;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java

@@ -22,8 +22,8 @@ import java.util.Collection;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.version.DecompressLibraryJob;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.EventHandler;
+import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.util.func.Consumer;
 
 /**
  * Provide everything of the Minecraft of a Profile.

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java

@@ -21,9 +21,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
-import org.jackhuang.hellominecraft.utils.system.Platform;
+import org.jackhuang.hellominecraft.util.system.Platform;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java

@@ -22,11 +22,11 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
-import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
+import org.jackhuang.hellominecraft.launcher.core.asset.AssetsIndex;
-import org.jackhuang.hellominecraft.utils.ArrayUtils;
+import org.jackhuang.hellominecraft.util.ArrayUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java

@@ -24,21 +24,21 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.TreeMap;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.launcher.core.MCUtils;
-import org.jackhuang.hellominecraft.utils.tasks.DecompressTask;
+import org.jackhuang.hellominecraft.util.tasks.DecompressTask;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.util.func.Consumer;
-import org.jackhuang.hellominecraft.utils.views.SwingUtils;
+import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java

@@ -1,54 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2013  huangyuhui <huanghongxun2008@126.com>
- *
- * 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 {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hellominecraft.launcher.core.version;
-
-import java.io.File;
-import java.util.HashMap;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import org.jackhuang.hellominecraft.utils.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.Utils;
-
-/**
- *
- * @author huangyuhui
- */
-public class ServerInfo {
-
-    public String name, addr, picurl, type, info, wfjc, tsjs, version, url, depend;
-    public String[] md5;
-    public int port;
-
-    public Icon icon;
-
-    public static final HashMap<String, Icon> CACHE = new HashMap<>();
-
-    public void downloadIcon() {
-        if (icon == null && Utils.isURL(picurl))
-            if (CACHE.containsKey(picurl))
-                icon = CACHE.get(picurl);
-            else
-                try {
-                    File tmp = File.createTempFile("HMCLSERVER", ".png");
-                    FileDownloadTask.download(picurl, tmp, null);
-                    CACHE.put(picurl, icon = new ImageIcon(tmp.getAbsolutePath()));
-                } catch (Throwable e) {
-                    throw new RuntimeException("Failed to download icon", e);
-                }
-    }
-}

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import com.google.gson.annotations.SerializedName;
@@ -27,9 +27,9 @@ import java.util.TreeMap;
 import java.util.UUID;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.lookandfeel.Theme;
-import org.jackhuang.hellominecraft.utils.EventHandler;
+import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.utils.system.JdkVersion;
+import org.jackhuang.hellominecraft.util.system.JdkVersion;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultMinecraftService.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
-import org.jackhuang.hellominecraft.launcher.core.installers.MinecraftInstallerService;
+import org.jackhuang.hellominecraft.launcher.core.install.MinecraftInstallerService;
-import org.jackhuang.hellominecraft.launcher.core.assets.MinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.asset.MinecraftAssetService;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.download.MinecraftDownloadService;
 import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
@@ -35,8 +35,8 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.mod.MinecraftModService;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/DefaultPlugin.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.api.IPlugin;
@@ -24,8 +24,9 @@ import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.SkinmeAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator;
-import org.jackhuang.hellominecraft.launcher.views.MainFrame;
+import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.launcher.ui.MainFrame;
+import org.jackhuang.hellominecraft.util.func.Consumer;
 
 /**
  *
@@ -75,8 +76,7 @@ public class DefaultPlugin implements IPlugin {
     }
 
     @Override
-    public void onInitializingProfile(Profile p) {
+    public void onProcessingLaunchOptions(LaunchOptions p) {
-
     }
 
 }

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/HMCLGameProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java

@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
 import org.jackhuang.hellominecraft.launcher.core.MCUtils;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.EventHandler;
+import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
 
 /**
  *
@@ -44,7 +44,6 @@ public final class Profile {
     public Profile(String name) {
         this.name = name;
         gameDir = MCUtils.getInitGameDir().getPath();
-        PluginManager.NOW_PLUGIN.onInitializingProfile(this);
     }
 
     public Profile(Profile v) {

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java

@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.CollectionUtils;
+import org.jackhuang.hellominecraft.util.CollectionUtils;
-import org.jackhuang.hellominecraft.utils.Event;
+import org.jackhuang.hellominecraft.util.Event;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.UpdateChecker;
+import org.jackhuang.hellominecraft.util.UpdateChecker;
-import org.jackhuang.hellominecraft.utils.VersionNumber;
+import org.jackhuang.hellominecraft.util.VersionNumber;
-import org.jackhuang.hellominecraft.utils.functions.Predicate;
+import org.jackhuang.hellominecraft.util.func.Predicate;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.setting;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,13 +23,13 @@ import org.jackhuang.hellominecraft.launcher.Main;
 import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility;
 import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
 import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.EventHandler;
+import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.Utils;
+import org.jackhuang.hellominecraft.util.Utils;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.system.Java;
+import org.jackhuang.hellominecraft.util.system.Java;
-import org.jackhuang.hellominecraft.utils.system.JdkVersion;
+import org.jackhuang.hellominecraft.util.system.JdkVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/AnimatedPanel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.AlphaComposite;
 import java.awt.Graphics;
@@ -24,7 +24,7 @@ import java.awt.image.BufferedImage;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/DraggableFrame.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import javax.swing.table.DefaultTableModel;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.views.SwingUtils;
+import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.Color;
 import java.awt.datatransfer.DataFlavor;
@@ -42,32 +42,32 @@ import javax.swing.event.ChangeListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.DefaultTableModel;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.setting.Profile;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.FileNameFilter;
+import org.jackhuang.hellominecraft.launcher.util.FileNameFilter;
 import org.jackhuang.hellominecraft.launcher.core.ModInfo;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerType;
 import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager;
 import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.launcher.settings.DefaultMinecraftService;
+import org.jackhuang.hellominecraft.launcher.setting.DefaultMinecraftService;
-import org.jackhuang.hellominecraft.launcher.settings.VersionSetting;
+import org.jackhuang.hellominecraft.launcher.setting.VersionSetting;
-import org.jackhuang.hellominecraft.launcher.views.modpack.ModpackWizard;
+import org.jackhuang.hellominecraft.launcher.ui.modpack.ModpackWizard;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.Event;
+import org.jackhuang.hellominecraft.util.Event;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.OverridableSwingWorker;
+import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
-import org.jackhuang.hellominecraft.utils.version.MinecraftVersionRequest;
+import org.jackhuang.hellominecraft.util.version.MinecraftVersionRequest;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.views.SwingUtils;
+import org.jackhuang.hellominecraft.util.ui.SwingUtils;
-import org.jackhuang.hellominecraft.utils.system.Java;
+import org.jackhuang.hellominecraft.util.system.Java;
-import org.jackhuang.hellominecraft.utils.views.wizard.api.WizardDisplayer;
+import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/HeaderTab.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.EventQueue;
 import java.awt.event.ActionListener;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java

@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.util.List;
 import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableModel;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerType;
-import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
-import org.jackhuang.hellominecraft.utils.tasks.TaskRunnable;
+import org.jackhuang.hellominecraft.util.tasks.TaskRunnable;
-import org.jackhuang.hellominecraft.utils.tasks.TaskRunnableArg1;
+import org.jackhuang.hellominecraft.util.tasks.TaskRunnableArg1;
-import org.jackhuang.hellominecraft.utils.tasks.TaskWindow;
+import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.utils.tasks.communication.DefaultPreviousResult;
+import org.jackhuang.hellominecraft.util.tasks.communication.DefaultPreviousResult;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.views.SwingUtils;
+import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java

@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.Color;
 import java.io.IOException;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.system.IOUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.views.SwingUtils;
+import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -40,18 +40,18 @@ import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 import org.jackhuang.hellominecraft.lookandfeel.Theme;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.Utils;
+import org.jackhuang.hellominecraft.util.Utils;
-import org.jackhuang.hellominecraft.utils.views.DropShadowBorder;
+import org.jackhuang.hellominecraft.util.ui.DropShadowBorder;
-import org.jackhuang.hellominecraft.utils.views.TintablePanel;
+import org.jackhuang.hellominecraft.util.ui.TintablePanel;
-import org.jackhuang.hellominecraft.utils.views.BasicColors;
+import org.jackhuang.hellominecraft.util.ui.BasicColors;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import java.awt.CardLayout;
 import java.awt.Dimension;
@@ -27,26 +27,28 @@ import java.io.IOException;
 import java.util.List;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.launcher.api.PluginManager;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.C;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.launch.DefaultGameLauncher;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.setting.Profile;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.core.LauncherVisibility;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
 import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
+import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
-import org.jackhuang.hellominecraft.utils.Event;
+import org.jackhuang.hellominecraft.util.Event;
 import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
+import org.jackhuang.hellominecraft.util.func.Consumer;
-import org.jackhuang.hellominecraft.utils.system.JavaProcessMonitor;
+import org.jackhuang.hellominecraft.util.system.JavaProcessMonitor;
-import org.jackhuang.hellominecraft.utils.views.LogWindow;
+import org.jackhuang.hellominecraft.util.ui.LogWindow;
 
 /**
  *
@@ -118,7 +120,6 @@ public class MainPagePanel extends AnimatedPanel implements Event<String> {
         pnlMore.setBackground(new java.awt.Color(204, 204, 204));
         pnlMore.setOpaque(false);
 
-        txtPlayerName.setText("");
         txtPlayerName.addFocusListener(new java.awt.event.FocusAdapter() {
             public void focusGained(java.awt.event.FocusEvent evt) {
                 txtPlayerNameFocusGained(evt);
@@ -215,7 +216,7 @@ public class MainPagePanel extends AnimatedPanel implements Event<String> {
         );
         jPanel3Layout.setVerticalGroup(
             jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(btnLogout, javax.swing.GroupLayout.PREFERRED_SIZE, 26, Short.MAX_VALUE)
+            .addComponent(btnLogout, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
 
         pnlPassword.add(jPanel3, "card3");
@@ -408,19 +409,21 @@ public class MainPagePanel extends AnimatedPanel implements Event<String> {
             @Override
             public void run() {
                 Thread.currentThread().setName("Game Launcher");
-                DefaultGameLauncher gl = new DefaultGameLauncher(getProfile().getSelectedVersionSetting().createLaunchOptions(getProfile().getCanonicalGameDirFile()), getProfile().service(), li, l);
-                gl.setTag(getProfile().getSelectedVersionSetting().getLauncherVisibility());
-                gl.successEvent.register((sender, s) -> {
-                    isLaunching = false;
-                    return true;
-                });
-                listener.accept(gl);
                 try {
+                    LaunchOptions options = getProfile().getSelectedVersionSetting().createLaunchOptions(getProfile().getCanonicalGameDirFile());
+                    PluginManager.NOW_PLUGIN.onProcessingLaunchOptions(options);
+                    DefaultGameLauncher gl = new DefaultGameLauncher(options, getProfile().service(), li, l);
+                    gl.setTag(getProfile().getSelectedVersionSetting().getLauncherVisibility());
+                    gl.successEvent.register((sender, s) -> {
+                        isLaunching = false;
+                        return true;
+                    });
+                    listener.accept(gl);
                     gl.makeLaunchCommand();
                 } catch (GameException e) {
                     failed(C.i18n("launch.failed") + ", " + e.getMessage());
                 } catch (AuthenticationException e) {
-                    failed(C.i18n("login.failed") + e.getMessage());
+                    failed(C.i18n("login.failed") + ", " + e.getMessage());
                 }
             }
         }.start();

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewProfileWindow.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.setting.Profile;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/NewTabPane.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 import javax.swing.JTabbedPane;
 import javax.swing.event.ChangeEvent;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/Selectable.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views;
+package org.jackhuang.hellominecraft.launcher.ui;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java

@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views.modpack;
+package org.jackhuang.hellominecraft.launcher.ui.modpack;
 
 import java.io.File;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.swing.tree.DefaultTreeModel;
-import org.jackhuang.hellominecraft.utils.functions.BiFunction;
+import org.jackhuang.hellominecraft.util.func.BiFunction;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeCellRenderer;
+import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeCellRenderer;
-import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNode;
+import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode;
-import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNodeSelectionListener;
+import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNodeSelectionListener;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views.modpack;
+package org.jackhuang.hellominecraft.launcher.ui.modpack;
 
 import java.util.Map;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.views.modpack;
+package org.jackhuang.hellominecraft.launcher.ui.modpack;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,16 +29,16 @@ import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.mod.ModpackManager;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.utils.views.checktree.CheckBoxTreeNode;
+import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.DeferredWizardResult;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.DeferredWizardResult;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.ResultProgressHandle;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.Summary;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardBranchController;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardBranchController;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardController;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardException;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardException;
-import org.jackhuang.hellominecraft.utils.views.wizard.spi.WizardPanelProvider;
+import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardPanelProvider;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.util;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -23,15 +23,15 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import javax.swing.SwingUtilities;
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.utils.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
-import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.setting.Settings;
-import org.jackhuang.hellominecraft.utils.NetUtils;
+import org.jackhuang.hellominecraft.util.NetUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.utils.StrUtils;
+import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.util.system.OS;
-import org.jackhuang.hellominecraft.utils.views.LogWindow;
+import org.jackhuang.hellominecraft.util.ui.LogWindow;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.util;
 
 import java.io.File;
 import javax.swing.filechooser.FileFilter;
-import org.jackhuang.hellominecraft.utils.system.FileUtils;
+import org.jackhuang.hellominecraft.util.system.FileUtils;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.util;
 
-import org.jackhuang.hellominecraft.utils.C;
+import org.jackhuang.hellominecraft.util.C;
 
 /**
  * Give the advice to solve the Minecraft crashing.

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/ModpackUpdater.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.util;
 
 import java.io.File;
 import java.util.ArrayList;