From 67056f48497fb8d78737def0a6dabdeb014d03c1 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Wed, 1 Jul 2015 21:27:08 +0800 Subject: [PATCH] Reconstruct the codes. --- HMCL/proguard.pro | 20 +-- .../hellominecraft/launcher/Launcher.java | 10 +- .../hellominecraft/launcher/Main.java | 8 +- .../launcher/launch/DefaultGameLauncher.java | 6 +- .../launcher/launch/GameLauncher.java | 10 +- .../launcher/launch/IMinecraftLoader.java | 12 +- .../launcher/launch/IMinecraftProvider.java | 4 +- .../launcher/launch/LaunchFinisher.java | 12 +- .../launcher/launch/LaunchScriptFinisher.java | 2 +- .../launcher/launch/MinecraftLoader.java | 10 +- .../launcher/{utils => }/settings/Config.java | 6 +- .../{utils => }/settings/Profile.java | 8 +- .../{utils => }/settings/Settings.java | 6 +- .../launcher/utils/CrashReport.java | 2 +- .../launcher/utils/MCUtils.java | 6 +- .../utils/assets/AssetsMojangLoader.java | 2 +- .../launcher/utils/assets/IAssetsHandler.java | 4 +- .../launcher/utils/auth/BestLogin.java | 2 +- .../launcher/utils/auth/IAuthenticator.java | 2 +- .../utils/auth/OfflineAuthenticator.java | 2 +- .../utils/auth/SkinmeAuthenticator.java | 2 +- .../utils/installers/InstallProfile.java | 2 +- .../installers/PackMinecraftInstaller.java | 2 +- .../installers/forge/ForgeInstaller.java | 6 +- .../liteloader/LiteLoaderInstaller.java | 6 +- .../liteloader/LiteLoaderVersion.java | 2 +- .../liteloader/LiteLoaderVersionList.java | 2 +- .../optifine/OptiFineInstaller.java | 6 +- .../launcher/{utils => }/version/Extract.java | 2 +- .../{utils => }/version/GameDirType.java | 2 +- .../version/IMinecraftLibrary.java | 2 +- .../version/MinecraftClassicVersion.java | 2 +- .../{utils => }/version/MinecraftLibrary.java | 6 +- .../version/MinecraftOldLibrary.java | 2 +- .../{utils => }/version/MinecraftVersion.java | 2 +- .../version/MinecraftVersionManager.java | 8 +- .../launcher/{utils => }/version/Natives.java | 2 +- .../launcher/{utils => }/version/OS.java | 2 +- .../launcher/{utils => }/version/Rules.java | 2 +- .../launcher/views/GameSettingsPanel.java | 14 +-- .../launcher/views/LauncherSettingsPanel.java | 4 +- .../launcher/views/MainFrame.java | 2 +- .../launcher/views/MainPagePanel.java | 8 +- .../launcher/views/NewProfileWindow.java | 4 +- .../mojang/authlib/properties/Property.java | 2 +- .../hellominecraft/tasks/TaskList.java | 8 +- .../hellominecraft/tasks/TaskWindow.java | 6 +- .../jackhuang/hellominecraft/utils/Bytes.java | 33 ----- .../{tinystream => }/CollectionUtils.java | 2 +- .../hellominecraft/utils/EnumAdapter.java | 52 -------- .../hellominecraft/utils/IOUtils.java | 1 + .../hellominecraft/utils/MD5Utils.java | 53 -------- .../jackhuang/hellominecraft/utils/Pair.java | 23 +++- .../hellominecraft/utils/StrUtils.java | 9 ++ .../hellominecraft/utils/UpdateChecker.java | 7 +- .../jackhuang/hellominecraft/utils/Utils.java | 1 + .../utils/{ => code}/Base64.java | 2 +- .../utils/{ => code}/Charsets.java | 2 +- .../utils/{ => code}/DigestUtils.java | 3 +- .../hellominecraft/utils/{ => code}/Hex.java | 2 +- .../{DoneListener2.java => BiConsumer.java} | 2 +- ...seDoneListener.java => FalseFunction.java} | 2 +- .../{DoneListener0.java => NonConsumer.java} | 2 +- ...eListener0Return.java => NonFunction.java} | 2 +- .../{DoneListener3.java => TriConsumer.java} | 2 +- ...rueDoneListener.java => TrueFunction.java} | 6 +- .../utils/{ => system}/Compressor.java | 4 +- .../utils/{ => system}/JavaProcess.java | 3 +- .../utils/{ => system}/JdkVersion.java | 5 +- .../utils/{ => system}/MessageBox.java | 2 +- .../hellominecraft/utils/{ => system}/OS.java | 2 +- .../utils/{ => system}/Platform.java | 2 +- .../utils/{ => system}/ProcessManager.java | 2 +- .../utils/{ => system}/ProcessThread.java | 3 +- .../utils/tinystream/Stream.java | 116 ------------------ .../MinecraftVersionRequest.java | 2 +- .../hellominecraft/views/LogWindow.java | 12 +- .../jackhuang/hellominecraft/svrmgr/Main.java | 4 +- .../installer/cauldron/ForgeInstaller.java | 4 +- .../hellominecraft/svrmgr/server/Server.java | 2 +- .../svrmgr/server/backups/BackupManager.java | 2 +- .../svrmgr/utils/FolderOpener.java | 2 +- .../svrmgr/utils/MonitorServiceImpl.java | 29 ++--- .../svrmgr/views/MainWindow.java | 2 +- 84 files changed, 217 insertions(+), 429 deletions(-) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/settings/Config.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/settings/Profile.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/settings/Settings.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/Extract.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/GameDirType.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/IMinecraftLibrary.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/MinecraftClassicVersion.java (97%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/MinecraftLibrary.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/MinecraftOldLibrary.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/MinecraftVersion.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/MinecraftVersionManager.java (97%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/Natives.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/OS.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => }/version/Rules.java (92%) delete mode 100644 HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{tinystream => }/CollectionUtils.java (96%) delete mode 100644 HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java delete mode 100644 HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => code}/Base64.java (98%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => code}/Charsets.java (96%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => code}/DigestUtils.java (98%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => code}/Hex.java (98%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{DoneListener2.java => BiConsumer.java} (95%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{FalseDoneListener.java => FalseFunction.java} (91%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{DoneListener0.java => NonConsumer.java} (95%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{DoneListener0Return.java => NonFunction.java} (94%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{DoneListener3.java => TriConsumer.java} (94%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/{TrueDoneListener.java => TrueFunction.java} (82%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/Compressor.java (98%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/JavaProcess.java (95%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/JdkVersion.java (96%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/MessageBox.java (98%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/OS.java (97%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/Platform.java (96%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/ProcessManager.java (95%) rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/{ => system}/ProcessThread.java (97%) delete mode 100644 HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java rename HMCLAPI/src/main/java/org/jackhuang/hellominecraft/{utils => version}/MinecraftVersionRequest.java (97%) diff --git a/HMCL/proguard.pro b/HMCL/proguard.pro index 591e972cf..2d217bed6 100644 --- 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 ; public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { private ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Profile { private ; public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Config { private ; } + +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.IMinecraftLibrary { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Natives { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.OS { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Rules { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.MinecraftLibrary { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.IMinecraftLibrary { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.Natives { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.OS { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.Rules { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.version.MinecraftVersion { public ; } - -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.InstallProfile { public ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install { public ; } @@ -72,7 +72,7 @@ -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public ; } --keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { private ; } +-keepclassmembers class org.jackhuang.hellominecraft.utils.system.JdkVersion { private ; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public ; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java index e6d7e6606..e6744e119 100644 --- 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); } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java index 01dd1e7d7..0fc08c9b3 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java index 06d2df93e..7cff8bddd 100644 --- 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 { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java index 3fb8b6d36..eaea0d7ce 100644 --- 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 { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java index 3b7ff73a5..7cbcf0c03 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java index 166bd7cbc..f58e027f0 100644 --- 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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchFinisher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchFinisher.java index 7abda8366..4cc1be811 100644 --- 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> { MainFrame.instance.closeMessage(); else { if (LogWindow.instance.isVisible()) - LogWindow.instance.setExit(TrueDoneListener.instance); + LogWindow.instance.setExit(TrueFunction.instance); MainFrame.instance.dispose(); } Event event = (sender2, t) -> { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchScriptFinisher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LaunchScriptFinisher.java index a01ec9afe..d3058f8d6 100644 --- 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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java index 858876786..dc098e425 100644 --- 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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java index 690ab3b51..e96ca2c9d 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Profile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java index 06084e6fa..a53bc1885 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java index 5dc2e8748..0ea13fd28 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/CrashReport.java index 6698e44e5..28aa85443 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java index a7af67ae2..3981fcf9e 100644 --- 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; /** * diff --git 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 index 95ee65bfe..7036e82c7 100644 --- 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; diff --git 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 index fe10dc1c2..3b88468b1 100644 --- 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; diff --git 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 index 9720555c1..14527ff32 100644 --- 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; /** * diff --git 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 index ed99559a6..b138dd4d5 100644 --- 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 diff --git 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 index 5ba3078cb..5b2cc8467 100644 --- 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; /** * diff --git 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 index 6da495183..c8068afa1 100644 --- 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; diff --git 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 index f8345babe..cbc0fe3ff 100644 --- 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; /** diff --git 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 index 6bed2f8df..a3c9358d5 100644 --- 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; diff --git 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 index 504ac6b46..b196fb0b8 100644 --- 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; /** * diff --git 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 index e13e92803..05e0b021d 100644 --- 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; /** * diff --git 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 index 40692859a..1ee8d62da 100644 --- 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; /** * diff --git 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 index 57a130cb9..d56280538 100644 --- 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; diff --git 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 index ed70d0220..f151f42fa 100644 --- 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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Extract.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Extract.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Extract.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Extract.java index 3a3b79009..27ea3b305 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Extract.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/GameDirType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/GameDirType.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/GameDirType.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/GameDirType.java index 88d1b8b2c..02e61b9be 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/GameDirType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/IMinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/IMinecraftLibrary.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/IMinecraftLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/IMinecraftLibrary.java index 2669e51ce..773002e7d 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/IMinecraftLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftClassicVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftClassicVersion.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftClassicVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftClassicVersion.java index ac4d81f85..9b732c73e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftClassicVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftLibrary.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftLibrary.java index 18fca1a67..3f21dfc76 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftOldLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftOldLibrary.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftOldLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftOldLibrary.java index 08cf9345e..b112e4c41 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftOldLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersion.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersion.java index a24215da1..cff0362c1 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersionManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersionManager.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java index 5cb5984a6..a56884b4f 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/MinecraftVersionManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Natives.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Natives.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Natives.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Natives.java index 7a73bc523..ddc56a5fc 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Natives.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/OS.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/OS.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/OS.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/OS.java index 562c0c2bd..c65b1ac4f 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/OS.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Rules.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Rules.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Rules.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Rules.java index 78d669149..b84fe8705 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/version/Rules.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java index 1c929cd71..1baffbaf8 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java index 0d4989bfd..c73e87100 100644 --- 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; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java index d5ecd83f4..034d3a982 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java index 4932018b7..16249195b 100644 --- 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; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java index 42cf4b9a6..f70788199 100644 --- 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; /** diff --git a/HMCL/src/main/java/org/jackhuang/mojang/authlib/properties/Property.java b/HMCL/src/main/java/org/jackhuang/mojang/authlib/properties/Property.java index 1d5266969..4ca166068 100644 --- 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 { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskList.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskList.java index bf8ff73b5..3600c1fed 100644 --- 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 taskQueue = Collections.synchronizedList(new ArrayList()); - ArrayList allDone = new ArrayList(); + ArrayList allDone = new ArrayList(); ArrayList> 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(); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java index d154c3a93..dac28e432 100644 --- 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 { + implements ProgressProviderListener, NonConsumer, DoingDoneListener { private static final TaskWindow instance = new TaskWindow(); diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java deleted file mode 100644 index 6be41b05b..000000000 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Bytes.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2013 huangyuhui - * - * 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; - } -} \ No newline at end of file diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/CollectionUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/CollectionUtils.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/CollectionUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/CollectionUtils.java index 53f5dae69..d11d3e232 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/CollectionUtils.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java deleted file mode 100644 index 79b4c610f..000000000 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/EnumAdapter.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2013 huangyuhui - * - * 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 EnumType - */ -public class EnumAdapter implements JsonSerializer, JsonDeserializer { - 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; - } - -} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/IOUtils.java index 1971c45c5..9f1c4047c 100644 --- 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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java deleted file mode 100644 index 98a031351..000000000 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MD5Utils.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2013 huangyuhui - * - * 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 ""; - } - } -} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Pair.java index 4b68ce59c..f325e6b4b 100644 --- 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 Type + * @param V Type */ -public class Pair { +public class Pair implements Map.Entry { public K key; public V value; @@ -28,5 +32,22 @@ public class Pair { 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; + } } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/StrUtils.java index 1db577516..18ed4bb4d 100644 --- 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 cmd) { StringBuilder cmdbuf = new StringBuilder(120); for (int i = 0; i < cmd.size(); i++) { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/UpdateChecker.java index f267b9186..d5a5fb197 100644 --- 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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Utils.java index 2afeb9abd..a2e59750a 100644 --- 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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Base64.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Base64.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Base64.java index 7253124c6..a7fd9ad68 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Charsets.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Charsets.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Charsets.java index cef5c017c..d38ddf315 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/DigestUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/DigestUtils.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/DigestUtils.java index ed7dd5546..e8d3f1769 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Hex.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Hex.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/code/Hex.java index 0c71d9370..26a34f7f4 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener2.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener2.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java index c1d6e1f27..bf045caec 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener2.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/BiConsumer.java @@ -19,6 +19,6 @@ package org.jackhuang.hellominecraft.utils.functions; /** * @author hyh */ -public interface DoneListener2 { +public interface BiConsumer { void onDone(V value, V2 value2); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseDoneListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseFunction.java similarity index 91% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseDoneListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseFunction.java index 3b5c4d3ee..f82a01194 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseDoneListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/FalseFunction.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.utils.functions; * * @author hyh */ -public class FalseDoneListener implements DoneListener0Return { +public class FalseFunction implements NonFunction { @Override public Boolean onDone() { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonConsumer.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonConsumer.java index 5bea8ae86..c8022e8bc 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonConsumer.java @@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions; * * @author hyh */ -public interface DoneListener0 { +public interface NonConsumer { void onDone(); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0Return.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0Return.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java index 92f0e9c6a..f33b92747 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener0Return.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/NonFunction.java @@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions; * * @author hyh */ -public interface DoneListener0Return { +public interface NonFunction { T onDone(); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener3.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java similarity index 94% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener3.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java index fd3a35fe4..2a0800923 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/DoneListener3.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TriConsumer.java @@ -20,6 +20,6 @@ package org.jackhuang.hellominecraft.utils.functions; * * @author hyh */ -public interface DoneListener3 { +public interface TriConsumer { void onDone(V1 v1, V2 v2, V3 v3); } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueDoneListener.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueFunction.java similarity index 82% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueDoneListener.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueFunction.java index 77a8d98cc..729e31d8b 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueDoneListener.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/functions/TrueFunction.java @@ -20,11 +20,11 @@ package org.jackhuang.hellominecraft.utils.functions; * * @author hyh */ -public class TrueDoneListener implements DoneListener0Return { +public class TrueFunction implements NonFunction { - public static final TrueDoneListener instance = new TrueDoneListener(); + public static final TrueFunction instance = new TrueFunction(); - private TrueDoneListener(){} + private TrueFunction(){} @Override public Boolean onDone() { diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Compressor.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Compressor.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Compressor.java index 61ae96afe..1c8311677 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; /** * 文件压缩/解压类 diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/JavaProcess.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/JavaProcess.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JavaProcess.java index 87bc9ce2d..ca2165e58 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/JdkVersion.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/JdkVersion.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/JdkVersion.java index cc725a744..42c0bb64c 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MessageBox.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/MessageBox.java similarity index 98% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MessageBox.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/MessageBox.java index 22c35ea01..e4dc76ffd 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/OS.java index c79732b7a..f63ccfee0 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java similarity index 96% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/Platform.java index 26827c6d6..ef082e4e2 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ProcessManager.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java similarity index 95% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ProcessManager.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessManager.java index 5af0c1403..89443735c 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ProcessThread.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/ProcessThread.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/system/ProcessThread.java index e5d8f281b..775870990 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; /** * diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java deleted file mode 100644 index 44d28a626..000000000 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/tinystream/Stream.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright 2013 huangyuhui - * - * 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 { - - List internal; - - public Stream(Collection internal) { - this.internal = new ArrayList<>(internal); - } - - protected Stream() { - } - - protected static Stream noneCopyOf(List a) { - Stream b = new Stream<>(); - b.internal = a; - return b; - } - - protected static Stream of(Collection a) { - return new Stream<>(a); - } - - public Stream forEach(Consumer p) { - for (T t : internal) p.accept(t); - return this; - } - - public Stream filter(Predicate p) { - ArrayList newList = new ArrayList<>(); - forEach(a -> { - if (p.apply(a)) newList.add(a); - }); - internal = newList; - return this; - } - - public int count() { - return internal.size(); - } - - public Stream distinct() { - internal = new ArrayList<>(new HashSet<>(internal)); - return this; - } - - public Stream map(Function func) { - List newList = new ArrayList<>(internal.size()); - forEach(a -> newList.add(func.apply(a))); - return of(newList); - } - - public Stream sorted(Comparator c) { - Collections.sort(internal, c); - return this; - } - - public U reduce(U identity, BiFunction accumulator) { - for (T t : internal) identity = accumulator.apply(identity, t); - return identity; - } - - public boolean anyMatch(Predicate p) { - return map(t -> p.apply(t)).reduce(false, (a, b) -> a | b); - } - - public boolean allMatch(Predicate p) { - return map(t -> p.apply(t)).reduce(true, (a, b) -> a & b); - } - - public T findFirst() { - return internal.isEmpty() ? null : internal.get(0); - } - - public Stream skip(int c) { - internal = internal.subList(c+1, internal.size()); - return this; - } - - public Stream limit(int c) { - internal = internal.subList(0, c); - return this; - } - -} diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MinecraftVersionRequest.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/version/MinecraftVersionRequest.java similarity index 97% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/MinecraftVersionRequest.java rename to HMCLAPI/src/main/java/org/jackhuang/hellominecraft/version/MinecraftVersionRequest.java index 915a0b861..fb4b163ff 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/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; diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/views/LogWindow.java index 354b3e16b..78c735953 100644 --- 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 listener; - DoneListener0 terminateGameListener; + NonFunction 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 exit) { + public void setExit(NonFunction exit) { this.listener = exit; } - public void setTerminateGame(DoneListener0 l) { + public void setTerminateGame(NonConsumer l) { this.terminateGameListener = l; } diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java index a34a9b4e8..3501b3775 100644 --- 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() { diff --git 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 index 66215b24a..1b1f8d62a 100644 --- 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; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java index 02fe1e52b..6bad226d3 100644 --- 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; diff --git 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 index d396e6358..23d6778da 100644 --- 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; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java index e48374700..679e0924e 100644 --- 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; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java index 7003f75e1..38ba70a70 100644 --- 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 { diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java index 8128c650d..07a999e4a 100644 --- 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;