Reconstruct the codes.

2025-03-31 18:10:26 +08:00 · 2015-07-01 21:27:08 +08:00 · 2015-07-01 21:27:08 +08:00 · 67056f4849
commit 67056f4849
parent dace6ab223
84 changed files with 217 additions and 429 deletions
--- a/HMCL/proguard.pro
+++ b/HMCL/proguard.pro
@ -44,19 +44,19 @@
 -keep class org.jackhuang.hellominecraft.launcher.Main { public static void main(java.lang.String[]); }
 -keep class org.jackhuang.hellominecraft.launcher.Launcher { public static void main(java.lang.String[]); }

-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Profile { private <fields>; public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { private <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Profile { private <fields>; public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Config { private <fields>; }
+
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.IMinecraftLibrary { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Natives { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.OS { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Rules { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftVersion { public <fields>; }

 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { <fields>; }

-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.IMinecraftLibrary { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.Natives { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.OS { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.Rules { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion { public <fields>; }
-
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.InstallProfile { public <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install { public <fields>; }

@ -72,7 +72,7 @@
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public <fields>; }

-keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { private <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.utils.system.JdkVersion { private <fields>; }

 -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public <fields>; }
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
@ -27,15 +27,15 @@ import java.util.ArrayList;
 import javax.swing.SwingUtilities;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.utils.functions.TrueDoneListener;
+import org.jackhuang.hellominecraft.utils.functions.TrueFunction;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.views.LogWindow;
 import org.jackhuang.hellominecraft.launcher.launch.MinecraftCrashAdvicer;
 import org.jackhuang.hellominecraft.utils.DoubleOutputStream;
-import org.jackhuang.hellominecraft.utils.JdkVersion;
+import org.jackhuang.hellominecraft.utils.system.JdkVersion;
 import org.jackhuang.hellominecraft.utils.LauncherPrintStream;
-import org.jackhuang.hellominecraft.utils.MessageBox;
-import org.jackhuang.hellominecraft.utils.Platform;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.Platform;
 import org.jackhuang.hellominecraft.utils.Utils;

 /**
@ -133,7 +133,7 @@ public final class Launcher {
            LogWindow.instance.log(C.i18n("crash.minecraft"));
            LogWindow.instance.log(advice);
            LogWindow.instance.log(trace.toString());
-            LogWindow.instance.setExit(TrueDoneListener.instance);
+            LogWindow.instance.setExit(TrueFunction.instance);
            LogWindow.instance.setVisible(true);
        }

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java
@ -31,7 +31,7 @@ import javax.swing.ImageIcon;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.utils.CrashReport;
@ -39,17 +39,17 @@ import org.jackhuang.hellominecraft.logging.Configuration;
 import org.jackhuang.hellominecraft.logging.appender.ConsoleAppender;
 import org.jackhuang.hellominecraft.logging.layout.DefaultLayout;
 import org.jackhuang.hellominecraft.views.LogWindow;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.launcher.views.MainFrame;
 import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
 *
 * @author hyh
 */
-public final class Main implements DoneListener0 {
+public final class Main implements NonConsumer {

    public static String launcherName = "Hello Minecraft! Launcher";
    public static byte firstVer = 2, secondVer = 3, thirdVer = 3;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java
@ -23,12 +23,12 @@ import org.jackhuang.hellominecraft.launcher.launch.GameLauncher.DownloadLibrary
 import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.tasks.ParallelTask;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.utils.Compressor;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.Compressor;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 public class DefaultGameLauncher extends GameLauncher {

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java
@ -29,15 +29,15 @@ import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
 import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.JavaProcess;
-import org.jackhuang.hellominecraft.utils.MessageBox;
-import org.jackhuang.hellominecraft.utils.OS;
+import org.jackhuang.hellominecraft.utils.system.JavaProcess;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.OS;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.EventHandler;
-import org.jackhuang.hellominecraft.utils.ProcessManager;
+import org.jackhuang.hellominecraft.utils.system.ProcessManager;

 public class GameLauncher {

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java
@ -25,13 +25,13 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Launcher;
 import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
-import org.jackhuang.hellominecraft.utils.JdkVersion;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.utils.system.JdkVersion;
 import org.jackhuang.hellominecraft.utils.MathUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
-import org.jackhuang.hellominecraft.utils.OS;
-import org.jackhuang.hellominecraft.utils.Platform;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.utils.system.Platform;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.Utils;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java
@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.List;
 import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchFinisher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchFinisher.java
@ -20,13 +20,13 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.utils.functions.TrueDoneListener;
+import org.jackhuang.hellominecraft.utils.functions.TrueFunction;
 import org.jackhuang.hellominecraft.launcher.views.MainFrame;
-import org.jackhuang.hellominecraft.utils.tinystream.CollectionUtils;
+import org.jackhuang.hellominecraft.utils.CollectionUtils;
 import org.jackhuang.hellominecraft.utils.Event;
-import org.jackhuang.hellominecraft.utils.JavaProcess;
-import org.jackhuang.hellominecraft.utils.MessageBox;
-import org.jackhuang.hellominecraft.utils.ProcessThread;
+import org.jackhuang.hellominecraft.utils.system.JavaProcess;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.ProcessThread;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.views.LogWindow;

@ -48,7 +48,7 @@ public class LaunchFinisher implements Event<List<String>> {
                MainFrame.instance.closeMessage();
            else {
                if (LogWindow.instance.isVisible())
-                    LogWindow.instance.setExit(TrueDoneListener.instance);
+                    LogWindow.instance.setExit(TrueFunction.instance);
                MainFrame.instance.dispose();
            }
            Event<JavaProcess> event = (sender2, t) -> {
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchScriptFinisher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchScriptFinisher.java
@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.views.MainFrame;
 import org.jackhuang.hellominecraft.utils.Event;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java
@ -23,17 +23,17 @@ import java.util.Map;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.utils.IOUtils;
 import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
 import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex;
 import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.OS;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.utils.FileUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.settings;
+package org.jackhuang.hellominecraft.launcher.settings;

 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
 import com.google.gson.annotations.SerializedName;
@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
-import org.jackhuang.hellominecraft.utils.JdkVersion;
-import org.jackhuang.hellominecraft.utils.OS;
+import org.jackhuang.hellominecraft.utils.system.JdkVersion;
+import org.jackhuang.hellominecraft.utils.system.OS;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Profile.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Profile.java
@ -14,17 +14,17 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.settings;
+package org.jackhuang.hellominecraft.launcher.settings;

 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
 import org.jackhuang.hellominecraft.utils.IOUtils;
 import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
-import org.jackhuang.hellominecraft.launcher.utils.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.version.GameDirType;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.Utils;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersionManager;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.settings;
+package org.jackhuang.hellominecraft.launcher.settings;

 import com.google.gson.JsonSyntaxException;
 import java.io.File;
@ -25,10 +25,10 @@ import java.util.Objects;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
-import org.jackhuang.hellominecraft.utils.tinystream.CollectionUtils;
+import org.jackhuang.hellominecraft.utils.CollectionUtils;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.UpdateChecker;
 import org.jackhuang.hellominecraft.utils.VersionNumber;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java
@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
 import org.jackhuang.hellominecraft.launcher.launch.MinecraftCrashAdvicer;
 import org.jackhuang.hellominecraft.utils.UpdateChecker;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.views.LogWindow;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java
@ -26,16 +26,16 @@ import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex;
 import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.version.MinecraftRemoteVersions;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.utils.ArrayUtils;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MinecraftVersionRequest;
+import org.jackhuang.hellominecraft.version.MinecraftVersionRequest;
 import org.jackhuang.hellominecraft.utils.NetUtils;
-import org.jackhuang.hellominecraft.utils.OS;
+import org.jackhuang.hellominecraft.utils.system.OS;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java
@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java
@ -26,11 +26,11 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
 import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.utils.functions.Consumer;
-import org.jackhuang.hellominecraft.utils.DigestUtils;
+import org.jackhuang.hellominecraft.utils.code.DigestUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
 import org.jackhuang.hellominecraft.utils.NetUtils;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/BestLogin.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/BestLogin.java
@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.utils.auth;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-import org.jackhuang.hellominecraft.utils.DigestUtils;
+import org.jackhuang.hellominecraft.utils.code.DigestUtils;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/IAuthenticator.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/IAuthenticator.java
@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.utils.auth;

 import java.util.ArrayList;
 import java.util.List;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;

 /**
 * Login interface
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/OfflineAuthenticator.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/OfflineAuthenticator.java
@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.utils.auth;

 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.utils.StrUtils;
-import org.jackhuang.hellominecraft.utils.DigestUtils;
+import org.jackhuang.hellominecraft.utils.code.DigestUtils;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/SkinmeAuthenticator.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/SkinmeAuthenticator.java
@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.utils.auth;

 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.utils.DigestUtils;
+import org.jackhuang.hellominecraft.utils.code.DigestUtils;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 import org.jackhuang.hellominecraft.views.Selector;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallProfile.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallProfile.java
@ -17,7 +17,7 @@
 package org.jackhuang.hellominecraft.launcher.utils.installers;

 import com.google.gson.annotations.SerializedName;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install;

 /**
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java
@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.utils.installers;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import org.jackhuang.hellominecraft.utils.Compressor;
+import org.jackhuang.hellominecraft.utils.system.Compressor;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java
@ -29,12 +29,12 @@ import java.util.zip.ZipFile;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.NetUtils;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java
@ -24,10 +24,10 @@ import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResult;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrator;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.utils.FileUtils;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersion.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersion.java
@ -16,7 +16,7 @@
 */
 package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;

-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionList.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionList.java
@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
 import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion;
 import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionNewerComparator;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java
@ -21,13 +21,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.zip.ZipFile;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResult;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrator;
 import org.jackhuang.hellominecraft.utils.FileUtils;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Extract.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Extract.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.util.Arrays;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/GameDirType.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/GameDirType.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/IMinecraftLibrary.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/IMinecraftLibrary.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftClassicVersion.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftClassicVersion.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.io.File;
 import java.util.ArrayList;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftLibrary.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftLibrary.java
@ -14,14 +14,14 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.utils.OS;
-import org.jackhuang.hellominecraft.utils.Platform;
+import org.jackhuang.hellominecraft.utils.system.OS;
+import org.jackhuang.hellominecraft.utils.system.Platform;
 import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftOldLibrary.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftOldLibrary.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersion.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersion.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import java.io.File;
 import java.util.ArrayList;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersionManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersionManager.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@ -36,10 +36,10 @@ import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
 import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.Utils;

--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Natives.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Natives.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/OS.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/OS.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Rules.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Rules.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.launcher.utils.version;
+package org.jackhuang.hellominecraft.launcher.version;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
@ -44,10 +44,10 @@ import org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoa
 import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineInstaller;
 import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla.OptiFineDownloadFormatter;
 import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.version.GameDirType;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.TaskRunnableArg1;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
@ -55,9 +55,9 @@ import org.jackhuang.hellominecraft.tasks.communication.DefaultPreviousResult;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.tasks.download.HTTPGetTask;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
-import org.jackhuang.hellominecraft.utils.MinecraftVersionRequest;
-import org.jackhuang.hellominecraft.utils.OS;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
+import org.jackhuang.hellominecraft.version.MinecraftVersionRequest;
+import org.jackhuang.hellominecraft.utils.system.OS;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.SwingUtils;
 import org.jackhuang.hellominecraft.version.MinecraftRemoteVersion;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java
@ -22,9 +22,9 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFileChooser;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 /**
 *
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java
@ -38,7 +38,7 @@ import javax.swing.JPanel;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.UpdateChecker;
 import org.jackhuang.hellominecraft.utils.Utils;
 import org.jackhuang.hellominecraft.views.DropShadowBorder;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java
@ -29,14 +29,14 @@ import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.launch.DefaultGameLauncher;
 import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
-import org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.launch.LaunchFinisher;
 import org.jackhuang.hellominecraft.launcher.launch.LaunchScriptFinisher;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 import org.jackhuang.hellominecraft.utils.Event;
 import org.jackhuang.hellominecraft.views.LogWindow;
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java
@ -16,8 +16,8 @@
 */
 package org.jackhuang.hellominecraft.launcher.views;

-import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
+import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
--- a/HMCL/src/main/java/org/jackhuang/mojang/authlib/properties/Property.java
+++ b/HMCL/src/main/java/org/jackhuang/mojang/authlib/properties/Property.java
@ -5,7 +5,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
 import java.security.Signature;
 import java.security.SignatureException;
-import org.jackhuang.hellominecraft.utils.Base64;
+import org.jackhuang.hellominecraft.utils.code.Base64;

 public class Property {

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskList.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskList.java
@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
 import org.jackhuang.hellominecraft.HMCLog;

 /**
@ -32,7 +32,7 @@ import org.jackhuang.hellominecraft.HMCLog;
 public class TaskList extends Thread {

    List<Task> taskQueue = Collections.synchronizedList(new ArrayList());
-    ArrayList<DoneListener0> allDone = new ArrayList();
+    ArrayList<NonConsumer> allDone = new ArrayList();
    ArrayList<DoingDoneListener<Task>> taskListener = new ArrayList();

    int totTask = 0;
@ -47,7 +47,7 @@ public class TaskList extends Thread {
        taskQueue.clear();
    }

-    public void addAllDoneListener(DoneListener0 l) {
+    public void addAllDoneListener(NonConsumer l) {
        allDone.add(l);
    }

@ -143,7 +143,7 @@ public class TaskList extends Thread {
        for (Task taskQueue1 : taskQueue)
            executeTask(taskQueue1);
        if (shouldContinue)
-            for (DoneListener0 d : allDone)
+            for (NonConsumer d : allDone)
                d.onDone();
    }

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java
@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.tasks;
 import java.awt.EventQueue;
 import java.util.ArrayList;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.SwingUtils;

@ -30,7 +30,7 @@ import org.jackhuang.hellominecraft.utils.SwingUtils;
 * @author hyh
 */
 public class TaskWindow extends javax.swing.JDialog
-        implements ProgressProviderListener, DoneListener0, DoingDoneListener<Task> {
+        implements ProgressProviderListener, NonConsumer, DoingDoneListener<Task> {

    private static final TaskWindow instance = new TaskWindow();

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java
@ -1,33 +0,0 @@
-/*
- * Copyright 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 2 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.
- */
-package org.jackhuang.hellominecraft.utils;
-
-/**
- *
- * @author hyh
- */
-public class Bytes {
-
-    public static String substring(String src, int start_idx, int end_idx) {
-        byte[] b = src.getBytes();
-        String tgt = "";
-        for (int i = start_idx; i <= end_idx; i++) {
-            tgt += (char) b[i];
-        }
-        return tgt;
-    }
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/CollectionUtils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/CollectionUtils.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils.tinystream;
+package org.jackhuang.hellominecraft.utils;

 import org.jackhuang.hellominecraft.utils.functions.Consumer;
 import org.jackhuang.hellominecraft.utils.functions.Predicate;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java
@ -1,52 +0,0 @@
-/*
- * Copyright 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 2 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.
- */
-package org.jackhuang.hellominecraft.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import java.lang.reflect.Type;
-
-/**
- *
- * @author huangyuhui
- * @param <T> EnumType
- */
-public class EnumAdapter<T extends Enum> implements JsonSerializer<T>, JsonDeserializer<T> {
-    T[] values;
-
-    public EnumAdapter(T[] values) {
-        this.values = values;
-    }
-
-    @Override
-    public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(src.ordinal());
-    }
-
-    @Override
-    public T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        if(json.getAsInt() < values.length)
-            return values[json.getAsInt()];
-        return null;
-    }
-    
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java
@ -16,6 +16,7 @@
 */
 package org.jackhuang.hellominecraft.utils;

+import org.jackhuang.hellominecraft.utils.system.OS;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java
@ -1,53 +0,0 @@
-/*
- * Copyright 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 2 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.
- */
-package org.jackhuang.hellominecraft.utils;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import org.jackhuang.hellominecraft.HMCLog;
-
-/**
- *
- * @author huang
- */
-public class MD5Utils {
-    
-    private static final char e[] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        'a', 'b', 'c', 'd', 'e', 'f'
-    };
-
-    public static String hash(String type, String source) {
-        try {
-            StringBuilder stringbuilder;
-            MessageDigest md = MessageDigest.getInstance(type);
-            md.update(source.getBytes());
-            byte[] bytes = md.digest();
-            int s2 = bytes.length;
-            stringbuilder = new StringBuilder(s2 << 1);
-            for (int i1 = 0; i1 < s2; i1++) {
-                stringbuilder.append(e[bytes[i1] >> 4 & 0xf]);
-                stringbuilder.append(e[bytes[i1] & 0xf]);
-            }
-
-            return stringbuilder.toString();
-        } catch (NoSuchAlgorithmException e) {
-            HMCLog.err("Failed to get md5", e);
-            return "";
-        }
-    }
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java
@ -16,11 +16,15 @@
 */
 package org.jackhuang.hellominecraft.utils;

+import java.util.Map;
+
 /**
 *
 * @author hyh
+ * @param <K> K Type
+ * @param <V> V Type
 */
-public class Pair<K, V> {
+public class Pair<K, V> implements Map.Entry<K, V> {
    public K key;
    public V value;

@ -28,5 +32,22 @@ public class Pair<K, V> {
        key = k;
        value = v;
    }
+
+    @Override
+    public K getKey() {
+        return key;
+    }
+
+    @Override
+    public V getValue() {
+        return value;
+    }
+
+    @Override
+    public V setValue(V value) {
+        V t = this.value;
+        this.value = value;
+        return t;
+    }
    
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java
@ -31,6 +31,15 @@ import java.util.StringTokenizer;
 */
 public final class StrUtils {

+    public static String substring(String src, int start_idx, int end_idx) {
+        byte[] b = src.getBytes();
+        String tgt = "";
+        for (int i = start_idx; i <= end_idx; i++) {
+            tgt += (char) b[i];
+        }
+        return tgt;
+    }
+
    public static String makeCommand(List<String> cmd) {
        StringBuilder cmdbuf = new StringBuilder(120);
        for (int i = 0; i < cmd.size(); i++) {
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java
@ -16,8 +16,9 @@
 */
 package org.jackhuang.hellominecraft.utils;

+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
 import org.jackhuang.hellominecraft.HMCLog;

 /**
@ -29,9 +30,9 @@ public final class UpdateChecker extends Thread {
    public VersionNumber base;
    public String type;
    public boolean continueUpdate;
-    public DoneListener0 dl;
+    public NonConsumer dl;

-    public UpdateChecker(VersionNumber base, String type, boolean continueUpdate, DoneListener0 dl) {
+    public UpdateChecker(VersionNumber base, String type, boolean continueUpdate, NonConsumer dl) {
 	super("UpdateChecker");
        this.base = base;
        this.type = type;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java
@ -16,6 +16,7 @@
 */
 package org.jackhuang.hellominecraft.utils;

+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import com.google.gson.GsonBuilder;
 import com.sun.management.OperatingSystemMXBean;
 import java.awt.Desktop;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.code;

 import java.io.UnsupportedEncodingException;

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.code;

 import java.nio.charset.Charset;

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java
@ -14,8 +14,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.code;

+import org.jackhuang.hellominecraft.utils.code.Hex;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.code;

 import java.nio.charset.Charset;

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener2.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener2.java
@ -19,6 +19,6 @@ package org.jackhuang.hellominecraft.utils.functions;
 /**
 * @author hyh
 */
-public interface DoneListener2<V, V2> {
+public interface BiConsumer<V, V2> {
    void onDone(V value, V2 value2);
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseDoneListener.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseDoneListener.java
@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.utils.functions;
 *
 * @author hyh
 */
-public class FalseDoneListener implements DoneListener0Return<Boolean> {
+public class FalseFunction implements NonFunction<Boolean> {

    @Override
    public Boolean onDone() {
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0.java
@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions;
 *
 * @author hyh
 */
-public interface DoneListener0 {
+public interface NonConsumer {
    void onDone();
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0Return.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0Return.java
@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions;
 *
 * @author hyh
 */
-public interface DoneListener0Return<T> {
+public interface NonFunction<T> {
    T onDone();
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener3.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener3.java
@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions;
 *
 * @author hyh
 */
-public interface DoneListener3<V1, V2, V3> {
+public interface TriConsumer<V1, V2, V3> {
    void onDone(V1 v1, V2 v2, V3 v3);
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueDoneListener.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueDoneListener.java
@ -20,11 +20,11 @@ package org.jackhuang.hellominecraft.utils.functions;
 *
 * @author hyh
 */
-public class TrueDoneListener implements DoneListener0Return<Boolean> {
+public class TrueFunction implements NonFunction<Boolean> {

-    public static final TrueDoneListener instance = new TrueDoneListener();
+    public static final TrueFunction instance = new TrueFunction();
    
-    private TrueDoneListener(){}
+    private TrueFunction(){}
    
    @Override
    public Boolean onDone() {
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@ -26,6 +26,8 @@ import java.io.InputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
+import org.jackhuang.hellominecraft.utils.IOUtils;
+import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
 * 文件压缩/解压类
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java
@ -14,8 +14,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

+import org.jackhuang.hellominecraft.utils.system.ProcessManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java
@ -14,8 +14,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

+import org.jackhuang.hellominecraft.utils.system.Platform;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@ -24,6 +25,8 @@ import java.io.InputStreamReader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jackhuang.hellominecraft.HMCLog;
+import org.jackhuang.hellominecraft.utils.FileUtils;
+import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
 *
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/MessageBox.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/MessageBox.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 import javax.swing.JOptionPane;   
 import org.jackhuang.hellominecraft.C;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 import com.sun.management.OperatingSystemMXBean;
 import java.lang.management.ManagementFactory;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 /**
 *
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 import java.util.HashSet;

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java
@ -14,13 +14,14 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.utils.system;

 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import org.jackhuang.hellominecraft.HMCLog;
+import org.jackhuang.hellominecraft.utils.EventHandler;

 /**
 *
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java
@ -1,116 +0,0 @@
-/*
- * Copyright 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 2 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.
- */
-package org.jackhuang.hellominecraft.utils.tinystream;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import org.jackhuang.hellominecraft.utils.functions.BiFunction;
-import org.jackhuang.hellominecraft.utils.functions.Consumer;
-import org.jackhuang.hellominecraft.utils.functions.Function;
-import org.jackhuang.hellominecraft.utils.functions.Predicate;
-
-/**
- *
- * @author huangyuhui
- */
-public class Stream<T> {
-
-    List<T> internal;
-
-    public Stream(Collection<T> internal) {
-        this.internal = new ArrayList<>(internal);
-    }
-
-    protected Stream() {
-    }
-
-    protected static <T> Stream<T> noneCopyOf(List<T> a) {
-        Stream<T> b = new Stream<>();
-        b.internal = a;
-        return b;
-    }
-
-    protected static <T> Stream<T> of(Collection<T> a) {
-        return new Stream<>(a);
-    }
-
-    public Stream<T> forEach(Consumer<? super T> p) {
-        for (T t : internal) p.accept(t);
-        return this;
-    }
-
-    public Stream<T> filter(Predicate<? super T> p) {
-        ArrayList<T> newList = new ArrayList<>();
-        forEach(a -> {
-            if (p.apply(a)) newList.add(a);
-        });
-        internal = newList;
-        return this;
-    }
-
-    public int count() {
-        return internal.size();
-    }
-
-    public Stream<T> distinct() {
-        internal = new ArrayList<>(new HashSet<>(internal));
-        return this;
-    }
-
-    public <R> Stream<R> map(Function<? super T, ? extends R> func) {
-        List<R> newList = new ArrayList<>(internal.size());
-        forEach(a -> newList.add(func.apply(a)));
-        return of(newList);
-    }
-
-    public Stream<T> sorted(Comparator<? super T> c) {
-        Collections.sort(internal, c);
-        return this;
-    }
-
-    public <U> U reduce(U identity, BiFunction<U, T, U> accumulator) {
-        for (T t : internal) identity = accumulator.apply(identity, t);
-        return identity;
-    }
-
-    public boolean anyMatch(Predicate<? super T> p) {
-        return map(t -> p.apply(t)).<Boolean>reduce(false, (a, b) -> a | b);
-    }
-
-    public boolean allMatch(Predicate<? super T> p) {
-        return map(t -> p.apply(t)).<Boolean>reduce(true, (a, b) -> a & b);
-    }
-
-    public T findFirst() {
-        return internal.isEmpty() ? null : internal.get(0);
-    }
-    
-    public Stream<T> skip(int c) {
-        internal = internal.subList(c+1, internal.size());
-        return this;
-    }
-    
-    public Stream<T> limit(int c) {
-        internal = internal.subList(0, c);
-        return this;
-    }
-
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/version/MinecraftVersionRequest.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/version/MinecraftVersionRequest.java
@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.
 */
-package org.jackhuang.hellominecraft.utils;
+package org.jackhuang.hellominecraft.version;

 import org.jackhuang.hellominecraft.C;

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java
@ -17,8 +17,8 @@
 package org.jackhuang.hellominecraft.views;

 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0Return;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
+import org.jackhuang.hellominecraft.utils.functions.NonFunction;
 import org.jackhuang.hellominecraft.utils.DoubleOutputStream;
 import org.jackhuang.hellominecraft.utils.LauncherPrintStream;
 import org.jackhuang.hellominecraft.utils.StrUtils;
@ -32,8 +32,8 @@ import org.jackhuang.hellominecraft.utils.Utils;
 public class LogWindow extends javax.swing.JFrame {
    
    boolean movingEnd;
-    DoneListener0Return<Boolean> listener;
-    DoneListener0 terminateGameListener;
+    NonFunction<Boolean> listener;
+    NonConsumer terminateGameListener;

    /**
     * Creates new form LogWindow
@ -250,11 +250,11 @@ public class LogWindow extends javax.swing.JFrame {
 	log(StrUtils.getStackTrace(t));
    }
    
-    public void setExit(DoneListener0Return<Boolean> exit) {
+    public void setExit(NonFunction<Boolean> exit) {
 	this.listener = exit;
    }
    
-    public void setTerminateGame(DoneListener0 l) {
+    public void setTerminateGame(NonConsumer l) {
 	this.terminateGameListener = l;
    }
    
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java
@ -10,7 +10,7 @@ import java.awt.Font;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import javax.swing.UIManager;
-import org.jackhuang.hellominecraft.utils.functions.DoneListener0;
+import org.jackhuang.hellominecraft.utils.functions.NonConsumer;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.views.LogWindow;
 import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
@ -41,7 +41,7 @@ public class Main {
 	    } catch (Throwable ex) {
 		HMCLog.warn("Failed to set look and feel", ex);
 	    }
-	    new UpdateChecker(new VersionNumber(firstVer, secondVer, thirdVer), "hmcsm", SettingsManager.settings.checkUpdate, new DoneListener0() {
+	    new UpdateChecker(new VersionNumber(firstVer, secondVer, thirdVer), "hmcsm", SettingsManager.settings.checkUpdate, new NonConsumer() {

                @Override
                public void onDone() {
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java
@ -25,10 +25,10 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import javax.swing.JOptionPane;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.utils.DigestUtils;
+import org.jackhuang.hellominecraft.utils.code.DigestUtils;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java
@ -24,7 +24,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.utils.Pair;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java
@ -10,7 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.utils.Compressor;
+import org.jackhuang.hellominecraft.utils.system.Compressor;
 import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
 import org.jackhuang.hellominecraft.svrmgr.utils.Utilities;

--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java
@ -5,7 +5,7 @@
 package org.jackhuang.hellominecraft.svrmgr.utils;

 import java.io.File;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java
@ -11,7 +11,7 @@ import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.util.StringTokenizer;
 import com.sun.management.OperatingSystemMXBean;
-import org.jackhuang.hellominecraft.utils.Bytes;
+import org.jackhuang.hellominecraft.utils.StrUtils;

 /**
 *
@ -33,6 +33,7 @@ public class MonitorServiceImpl implements IMonitorService {
     * @throws Exception
     * @author GuoHuang
     */
+    @Override
    public MonitorInfoBean getMonitorInfoBean() throws Exception {
        int kb = 1024;
        // 可使用内存
@ -78,7 +79,7 @@ public class MonitorServiceImpl implements IMonitorService {
        InputStream is = null;
        InputStreamReader isr = null;
        BufferedReader brStat = null;
-        StringTokenizer tokenStat = null;
+        StringTokenizer tokenStat;
        try {
            System.out.println("Getting usage rate of CPU , linux version: " + linuxVersion);
            Process process = Runtime.getRuntime().exec("top -b -n 1");
@ -102,9 +103,9 @@ public class MonitorServiceImpl implements IMonitorService {
                user = user.substring(0, user.indexOf("%"));
                system = system.substring(0, system.indexOf("%"));
                nice = nice.substring(0, nice.indexOf("%"));
-                float userUsage = new Float(user).floatValue();
-                float systemUsage = new Float(system).floatValue();
-                float niceUsage = new Float(nice).floatValue();
+                float userUsage = new Float(user);
+                float systemUsage = new Float(system);
+                float niceUsage = new Float(nice);
                return (userUsage + systemUsage + niceUsage) / 100;
            } else {
                brStat.readLine();
@ -120,7 +121,7 @@ public class MonitorServiceImpl implements IMonitorService {
                String cpuUsage = tokenStat.nextToken();
                System.out.println("CPU idle : " + cpuUsage);
                Float usage = new Float(cpuUsage.substring(0, cpuUsage.indexOf("%")));
-                return (1 - usage.floatValue() / 100);
+                return (1 - usage / 100);
            }
        } catch (IOException ioe) {
            System.out.println(ioe.getMessage());
@ -164,11 +165,11 @@ public class MonitorServiceImpl implements IMonitorService {
            if (c0 != null && c1 != null) {
                long idletime = c1[0] - c0[0];
                long busytime = c1[1] - c0[1];
-                return Double.valueOf(PERCENT * (busytime) / (busytime + idletime)).doubleValue();
+                return (double) PERCENT * (busytime) / (busytime + idletime);
            } else {
                return 0.0;
            }
-        } catch (Exception ex) {
+        } catch (IOException | InterruptedException ex) {
            ex.printStackTrace();
            return 0.0;
        }
@ -206,13 +207,13 @@ public class MonitorServiceImpl implements IMonitorService {
                }
                // 字段出现顺序：Caption,CommandLine,KernelModeTime,ReadOperationCount,
                // ThreadCount,UserModeTime,WriteOperation
-                String caption = Bytes.substring(line, capidx, cmdidx - 1).trim();
-                String cmd = Bytes.substring(line, cmdidx, kmtidx - 1).trim();
-                if (cmd.indexOf("wmic.exe") >= 0) {
+                String caption = StrUtils.substring(line, capidx, cmdidx - 1).trim();
+                String cmd = StrUtils.substring(line, cmdidx, kmtidx - 1).trim();
+                if (cmd.contains("wmic.exe")) {
                    continue;
                }
-                String s1 = Bytes.substring(line, kmtidx, rocidx - 1).trim();
-                String s2 = Bytes.substring(line, umtidx, wocidx - 1).trim();
+                String s1 = StrUtils.substring(line, kmtidx, rocidx - 1).trim();
+                String s2 = StrUtils.substring(line, umtidx, wocidx - 1).trim();
                if (caption.equals("System Idle Process") || caption.equals("System")) {
                    if (s1.length() > 0) {
                        idletime += Long.parseLong(s1);
@ -232,7 +233,7 @@ public class MonitorServiceImpl implements IMonitorService {
            retn[0] = idletime;
            retn[1] = kneltime + usertime;
            return retn;
-        } catch (Exception ex) {
+        } catch (IOException | NumberFormatException ex) {
            ex.printStackTrace();
        } finally {
            try {
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java
@ -42,7 +42,7 @@ import org.jackhuang.hellominecraft.tasks.download.HTTPGetTask;
 import org.jackhuang.hellominecraft.utils.FileUtils;
 import org.jackhuang.hellominecraft.svrmgr.utils.IMonitorService;
 import org.jackhuang.hellominecraft.utils.IOUtils;
-import org.jackhuang.hellominecraft.utils.MessageBox;
+import org.jackhuang.hellominecraft.utils.system.MessageBox;
 import org.jackhuang.hellominecraft.svrmgr.utils.ModType;
 import org.jackhuang.hellominecraft.svrmgr.utils.MonitorInfoBean;
 import org.jackhuang.hellominecraft.svrmgr.utils.MonitorServiceImpl;