From 899c8258132c9c6af09c12759fc43dfc5bf43db0 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Mon, 30 Jan 2017 16:20:41 +0800 Subject: [PATCH] Change default language from zh_CN to en_US --- .../launcher/api/PluginManager.java | 2 +- .../hellominecraft/launcher/core/MCUtils.java | 4 +- .../core/asset/AssetsMojangLoader.java | 10 +- .../launcher/core/asset/IAssetsHandler.java | 12 +- .../core/asset/MinecraftAssetService.java | 14 +- .../core/auth/yggdrasil/PropertyMap.java | 2 +- .../yggdrasil/YggdrasilAuthentication.java | 38 +- .../launcher/core/download/DownloadType.java | 2 +- .../download/MinecraftDownloadService.java | 10 +- .../download/MinecraftRemoteVersions.java | 2 +- .../core/install/InstallerVersionList.java | 2 +- .../install/MinecraftInstallerService.java | 8 +- .../core/install/forge/ForgeInstaller.java | 8 +- .../forge/MinecraftForgeVersionList.java | 6 +- .../liteloader/LiteLoaderInstaller.java | 10 +- .../liteloader/LiteLoaderVersionList.java | 6 +- .../install/optifine/OptiFineInstaller.java | 10 +- .../bmcl/OptiFineBMCLVersionList.java | 6 +- .../vanilla/OptiFineDownloadFormatter.java | 6 +- .../optifine/vanilla/OptiFineVersionList.java | 6 +- .../core/launch/AbstractMinecraftLoader.java | 8 +- .../core/launch/DefaultGameLauncher.java | 8 +- .../launcher/core/launch/GameLauncher.java | 12 +- .../launcher/core/launch/LaunchOptions.java | 2 +- .../core/launch/LibraryDownloadTask.java | 2 +- .../launcher/core/launch/MinecraftLoader.java | 6 +- .../core/mod/MinecraftModService.java | 4 +- .../launcher/core/mod/ModInfo.java | 4 +- .../launcher/core/mod/ModpackManager.java | 16 +- .../core/service/IMinecraftAssetService.java | 2 +- .../service/IMinecraftDownloadService.java | 2 +- .../service/IMinecraftInstallerService.java | 2 +- .../core/version/LibraryDownloadInfo.java | 2 +- .../core/version/MinecraftLibrary.java | 4 +- .../core/version/MinecraftVersionManager.java | 8 +- .../launcher/core/version/OSRestriction.java | 2 +- .../hellominecraft/launcher/Main.java | 10 +- .../launcher/setting/Config.java | 4 +- .../launcher/setting/Profile.java | 4 +- .../launcher/setting/Settings.java | 4 +- .../launcher/setting/VersionSetting.java | 8 +- .../launcher/ui/GameDownloadPanel.java | 2 +- .../launcher/ui/GameSettingsPanel.java | 10 +- .../launcher/ui/InstallerPanel.java | 6 +- .../launcher/ui/LauncherSettingsPanel.java | 4 +- .../launcher/ui/LaunchingUIDaemon.java | 8 +- .../hellominecraft/launcher/ui/MainFrame.java | 8 +- .../launcher/ui/MainPagePanel.form | 498 +++++++++--------- .../launcher/ui/MainPagePanel.java | 29 +- .../launcher/ui/RepaintPage.java | 1 + .../ui/modpack/ModpackDescriptionPanel.java | 2 +- .../ui/modpack/ModpackFileSelectionPanel.java | 2 +- .../launcher/ui/modpack/ModpackWizard.java | 8 +- .../launcher/util/CrashReporter.java | 6 +- .../launcher/util/FileNameFilter.java | 2 +- .../launcher/util/HMCLGameLauncher.java | 2 +- .../launcher/util/HMCLMinecraftService.java | 6 +- .../launcher/util/MinecraftCrashAdvicer.java | 2 +- .../util/upgrade/AppDataUpgrader.java | 14 +- .../util/upgrade/NewFileUpgrader.java | 10 +- .../HelloMinecraftLookAndFeel.java | 4 +- .../jackhuang/hellominecraft/svrmgr/Main.java | 2 +- .../install/bukkit/BukkitFormatThread.java | 2 +- .../install/cauldron/ForgeFormatThread.java | 2 +- .../install/cauldron/ForgeInstaller.java | 10 +- .../svrmgr/plugin/PluginManager.java | 2 +- .../svrmgr/server/BackupManager.java | 8 +- .../hellominecraft/svrmgr/server/Server.java | 4 +- .../svrmgr/server/ServerChecker.java | 2 +- .../server/schedule/AutoExecuteSchedule.java | 2 +- .../svrmgr/setting/PlayerList.java | 4 +- .../svrmgr/setting/ServerProperties.java | 6 +- .../svrmgr/setting/SettingsManager.java | 4 +- .../hellominecraft/svrmgr/ui/MainWindow.java | 14 +- .../svrmgr/ui/PluginInfoDialog.java | 4 +- .../hellominecraft/svrmgr/util/IPGet.java | 4 +- .../hellominecraft/svrmgr/util/ModType.java | 2 +- .../svrmgr/util/MonitorServiceImpl.java | 4 +- .../svrmgr/util/MonitorThread.java | 2 +- .../hellominecraft/svrmgr/util/Utilities.java | 2 +- .../svrmgr/util/WaitForThread.java | 2 +- .../util/MinecraftVersionRequest.java | 4 +- .../hellominecraft/util/UpdateChecker.java | 3 +- .../hellominecraft/util/VersionNumber.java | 2 +- .../hellominecraft/util/code/Charsets.java | 2 +- .../util/lang/Localization.java | 9 +- .../{logging => log}/AppenderControl.java | 4 +- .../util/{logging => log}/Configuration.java | 8 +- .../util/{logging => log}/HMCLog.java | 4 +- .../util/{logging => log}/Level.java | 2 +- .../util/{logging => log}/LogEvent.java | 4 +- .../{logging => log}/LoggingException.java | 2 +- .../appender/AbstractAppender.java | 4 +- .../appender/ConsoleAppender.java | 4 +- .../{logging => log}/appender/IAppender.java | 6 +- .../appender/OutputStreamAppender.java | 8 +- .../layout/AbstractStringLayout.java | 4 +- .../layout/DefaultLayout.java | 4 +- .../util/{logging => log}/layout/ILayout.java | 4 +- .../logger/AbstractLogger.java | 12 +- .../util/{logging => log}/logger/ILogger.java | 6 +- .../util/{logging => log}/logger/Logger.java | 16 +- .../message/AbstractMessageFactory.java | 2 +- .../{logging => log}/message/IMessage.java | 2 +- .../message/IMessageFactory.java | 2 +- .../message/ObjectMessage.java | 2 +- .../message/ParameterizedMessage.java | 2 +- .../message/ParameterizedMessageFactory.java | 2 +- .../message/SimpleMessage.java | 2 +- .../message/StringFormattedMessage.java | 2 +- .../download => net}/FileDownloadTask.java | 14 +- .../{tasks/download => net}/HTTPGetTask.java | 9 +- .../util/{ => net}/NetUtils.java | 6 +- .../util/{ui => net}/WebFrame.java | 6 +- .../util/{ui => net}/WebPage.java | 5 +- .../{system => sys}/CompressingUtils.java | 2 +- .../util/{system => sys}/FileUtils.java | 4 +- .../util/{system => sys}/IOUtils.java | 4 +- .../util/{system => sys}/Java.java | 4 +- .../util/{system => sys}/JavaProcess.java | 2 +- .../{system => sys}/JavaProcessMonitor.java | 6 +- .../util/{system => sys}/JdkVersion.java | 4 +- .../util/{system => sys}/OS.java | 4 +- .../util/{system => sys}/Platform.java | 2 +- .../util/{system => sys}/ProcessManager.java | 2 +- .../util/{system => sys}/ProcessThread.java | 4 +- .../util/{system => sys}/ZipEngine.java | 2 +- .../util/{tasks => task}/DeleteFileTask.java | 2 +- .../{tasks => task}/DoingDoneListener.java | 2 +- .../util/{tasks => task}/DoubleTask.java | 2 +- .../{tasks => task}/NoShownTaskException.java | 2 +- .../util/{tasks => task}/ParallelTask.java | 2 +- .../ProgressProviderListener.java | 2 +- .../util/{tasks => task}/Task.java | 2 +- .../util/{tasks => task}/TaskInfo.java | 2 +- .../util/{tasks => task}/TaskList.java | 4 +- .../util/{tasks => task}/TaskRunnable.java | 2 +- .../util/{tasks => task}/TaskWindow.form | 0 .../util/{tasks => task}/TaskWindow.java | 4 +- .../{tasks => task}/comm/PreviousResult.java | 2 +- .../comm/PreviousResultRegistrar.java | 4 +- .../hellominecraft/util/ui/GaussionPanel.java | 5 +- .../hellominecraft/util}/ui/IRepaint.java | 2 +- .../hellominecraft/util/ui/LogWindow.java | 4 +- .../util/ui/LogWindowOutputStream.java | 2 +- .../util}/ui/MyRepaintManager.java | 2 +- .../hellominecraft/util/ui/SwingUtils.java | 4 +- .../hellominecraft/util}/ui/WideComboBox.java | 2 +- .../ui/wizard/api/displayer/NavProgress.java | 2 +- .../api/displayer/WizardDisplayerImpl.java | 2 +- .../wizard/modules/InstructionsPanelImpl.java | 2 +- .../util/ui/wizard/spi/SimpleWizardInfo.java | 2 +- .../lang/{I18N.lang => I18N_zh_CN.lang} | 0 ...{I18N.properties => I18N_zh_CN.properties} | 0 .../hellominecraft/lang/I18N_zh_TW.lang | 4 +- .../hellominecraft/lang/I18N_zh_TW.properties | 4 +- 156 files changed, 648 insertions(+), 613 deletions(-) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/AppenderControl.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/Configuration.java (81%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/HMCLog.java (91%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/Level.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/LogEvent.java (88%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/LoggingException.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/appender/AbstractAppender.java (92%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/appender/ConsoleAppender.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/appender/IAppender.java (84%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/appender/OutputStreamAppender.java (89%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/layout/AbstractStringLayout.java (89%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/layout/DefaultLayout.java (91%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/layout/ILayout.java (89%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/logger/AbstractLogger.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/logger/ILogger.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/logger/Logger.java (90%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/AbstractMessageFactory.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/IMessage.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/IMessageFactory.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/ObjectMessage.java (97%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/ParameterizedMessage.java (99%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/ParameterizedMessageFactory.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/SimpleMessage.java (97%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{logging => log}/message/StringFormattedMessage.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks/download => net}/FileDownloadTask.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks/download => net}/HTTPGetTask.java (92%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{ => net}/NetUtils.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{ui => net}/WebFrame.java (88%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{ui => net}/WebPage.java (91%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/CompressingUtils.java (99%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/FileUtils.java (99%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/IOUtils.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/Java.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/JavaProcess.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/JavaProcessMonitor.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/JdkVersion.java (97%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/OS.java (97%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/Platform.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/ProcessManager.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/ProcessThread.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{system => sys}/ZipEngine.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/DeleteFileTask.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/DoingDoneListener.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/DoubleTask.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/NoShownTaskException.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/ParallelTask.java (96%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/ProgressProviderListener.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/Task.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/TaskInfo.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/TaskList.java (98%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/TaskRunnable.java (95%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/TaskWindow.form (100%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/TaskWindow.java (99%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/comm/PreviousResult.java (94%) rename HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/{tasks => task}/comm/PreviousResultRegistrar.java (90%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GaussionPage.java => HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java (96%) rename {HMCL/src/main/java/org/jackhuang/hellominecraft/launcher => HMCUtils/src/main/java/org/jackhuang/hellominecraft/util}/ui/IRepaint.java (96%) rename {HMCL/src/main/java/org/jackhuang/hellominecraft/launcher => HMCUtils/src/main/java/org/jackhuang/hellominecraft/util}/ui/MyRepaintManager.java (97%) rename {HMCL/src/main/java/org/jackhuang/hellominecraft/launcher => HMCUtils/src/main/java/org/jackhuang/hellominecraft/util}/ui/WideComboBox.java (96%) rename HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/{I18N.lang => I18N_zh_CN.lang} (100%) rename HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/{I18N.properties => I18N_zh_CN.properties} (100%) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java index 63d3bb7d4..bb33d229e 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.api; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java index 9c692f68b..b7d940c3d 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java @@ -19,8 +19,8 @@ package org.jackhuang.hellominecraft.launcher.core; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java index 284511aff..0a10fe205 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java @@ -25,16 +25,16 @@ import java.util.HashSet; import java.util.Map; import java.util.Objects; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.util.VersionNumber; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.task.TaskInfo; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java index ef3d3f327..e35bd0fe1 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java @@ -24,16 +24,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.jackhuang.hellominecraft.util.code.DigestUtils; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.task.TaskInfo; /** * Assets diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java index 4452668be..89a751fcb 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java @@ -31,13 +31,13 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.AssetIndexDownloadInfo; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.task.TaskInfo; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java index 166fe2cad..b687d5820 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; public class PropertyMap extends HashMap { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java index 081009032..17f11de54 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.net.NetUtils; import org.jackhuang.hellominecraft.util.StrUtils; public class YggdrasilAuthentication { @@ -188,24 +188,30 @@ public class YggdrasilAuthentication { public void loadFromStorage(Map credentials) { logOut(); - setUserName((String) credentials.get(STORAGE_KEY_USER_NAME)); + try { + setUserName((String) credentials.get(STORAGE_KEY_USER_NAME)); - if (credentials.containsKey(STORAGE_KEY_USER_ID)) - userid = (String) credentials.get(STORAGE_KEY_USER_ID); - else - userid = username; + if (credentials.containsKey(STORAGE_KEY_USER_ID)) + userid = (String) credentials.get(STORAGE_KEY_USER_ID); + else + userid = username; - if (credentials.containsKey(STORAGE_KEY_USER_PROPERTIES)) - userProperties.fromList((List>) credentials.get(STORAGE_KEY_USER_PROPERTIES)); + if (credentials.containsKey(STORAGE_KEY_USER_PROPERTIES)) + userProperties.fromList((List>) credentials.get(STORAGE_KEY_USER_PROPERTIES)); - if ((credentials.containsKey(STORAGE_KEY_PROFILE_NAME)) && (credentials.containsKey(STORAGE_KEY_PROFILE_ID))) { - GameProfile profile = new GameProfile(UUIDTypeAdapter.fromString((String) credentials.get(STORAGE_KEY_PROFILE_ID)), (String) credentials.get(STORAGE_KEY_PROFILE_NAME)); - if (credentials.containsKey(STORAGE_KEY_PROFILE_PROPERTIES)) - profile.properties.fromList((List>) credentials.get(STORAGE_KEY_PROFILE_PROPERTIES)); - selectedProfile = profile; + if ((credentials.containsKey(STORAGE_KEY_PROFILE_NAME)) && (credentials.containsKey(STORAGE_KEY_PROFILE_ID))) { + GameProfile profile = new GameProfile(UUIDTypeAdapter.fromString((String) credentials.get(STORAGE_KEY_PROFILE_ID)), (String) credentials.get(STORAGE_KEY_PROFILE_NAME)); + if (credentials.containsKey(STORAGE_KEY_PROFILE_PROPERTIES)) + profile.properties.fromList((List>) credentials.get(STORAGE_KEY_PROFILE_PROPERTIES)); + selectedProfile = profile; + } + + this.accessToken = (String) credentials.get(STORAGE_KEY_ACCESS_TOKEN); + } catch(Exception e) { + HMCLog.err("Failed to load yggdrasil authenticator settings, maybe its format is malformed.", e); + + logOut(); } - - this.accessToken = (String) credentials.get(STORAGE_KEY_ACCESS_TOKEN); } public Map saveForStorage() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java index 61c1e3fb2..d5841de85 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.core.download; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.task.TaskWindow; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java index aa3f09fa6..8507570f2 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java @@ -26,17 +26,17 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.GameDownloadInfo; import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskInfo; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java index 2264c9c5f..7b408a01f 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.launcher.core.download; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.net.NetUtils; import org.jackhuang.hellominecraft.util.AbstractSwingWorker; /** diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java index c683028b1..8aebc7d56 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java index e6ab59ab8..7287ed1b3 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java @@ -26,10 +26,10 @@ import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderI import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderInstallerVersion; import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineInstaller; import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineDownloadFormatter; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.tasks.DeleteFileTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.task.DeleteFileTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java index e6b7ab404..7b9b6b316 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java @@ -24,13 +24,13 @@ import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java index 12379dee0..17d44e4e7 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java @@ -28,9 +28,9 @@ import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; -import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hellominecraft.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java index 2597f6e67..b4e954345 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java @@ -21,12 +21,12 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java index c3b8cf918..6040dde55 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java @@ -28,9 +28,9 @@ import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; -import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hellominecraft.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java index 636edab41..499f15446 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java @@ -23,13 +23,13 @@ import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java index 1f2166ee3..c87c64f40 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java @@ -31,9 +31,9 @@ import org.jackhuang.hellominecraft.util.ArrayUtils; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; -import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hellominecraft.util.net.HTTPGetTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java index 8673f2637..418a3b522 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java @@ -20,9 +20,9 @@ package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; +import org.jackhuang.hellominecraft.util.net.NetUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java index 81fbd7079..6154c7634 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java @@ -35,9 +35,9 @@ import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersi import org.jackhuang.hellominecraft.util.ArrayUtils; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskInfo; -import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskInfo; +import org.jackhuang.hellominecraft.util.net.HTTPGetTask; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java index 996b2950e..740c80773 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java @@ -22,12 +22,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.JdkVersion; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.JdkVersion; import org.jackhuang.hellominecraft.util.MathUtils; import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.util.system.OS; -import org.jackhuang.hellominecraft.util.system.Platform; +import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hellominecraft.util.sys.Platform; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java index e453982a3..562bdba57 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java @@ -20,14 +20,14 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.IOException; import java.util.HashSet; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.tasks.ParallelTask; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.system.CompressingUtils; +import org.jackhuang.hellominecraft.util.task.ParallelTask; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.sys.CompressingUtils; import org.jackhuang.hellominecraft.util.MessageBox; public class DefaultGameLauncher extends GameLauncher { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java index c827f0641..7929359a2 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java @@ -37,12 +37,12 @@ import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.system.JavaProcess; -import org.jackhuang.hellominecraft.util.system.OS; -import org.jackhuang.hellominecraft.util.system.ProcessManager; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.sys.JavaProcess; +import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hellominecraft.util.sys.ProcessManager; public class GameLauncher { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java index e57ae697c..b70874516 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.File; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.system.JdkVersion; +import org.jackhuang.hellominecraft.util.sys.JdkVersion; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java index 6c82eef8e..9d497eb3d 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.launch; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java index 70c00ed91..268e5984d 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.sys.OS; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java index 16cdf6605..231096434 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java index 20e6628b6..a5a1bfb32 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java index 69f178418..fe629aece 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java @@ -34,21 +34,21 @@ import java.util.zip.ZipFile; import javax.swing.JFrame; import javax.swing.JOptionPane; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.util.func.BiFunction; import org.jackhuang.hellominecraft.util.func.CallbackIO; -import org.jackhuang.hellominecraft.util.system.CompressingUtils; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.ZipEngine; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.ui.WebPage; +import org.jackhuang.hellominecraft.util.sys.CompressingUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.ZipEngine; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.net.WebPage; import org.jackhuang.hellominecraft.util.MinecraftVersionRequest; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.tasks.NoShownTaskException; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.task.NoShownTaskException; /** * A mod pack(*.zip) includes these things: diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java index 567bab0a3..1801e1bcf 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java @@ -21,7 +21,7 @@ import java.io.File; import java.io.IOException; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.version.AssetIndexDownloadInfo; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java index 87d65406f..1ef511137 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java @@ -22,7 +22,7 @@ import java.util.List; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java index 133ac59e2..87cef4ec0 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.service; import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java index f2cb07a3e..9a5ac015b 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.launcher.core.version; import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index d4ba265e9..b041570ca 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -21,8 +21,8 @@ import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import org.jackhuang.hellominecraft.util.system.OS; -import org.jackhuang.hellominecraft.util.system.Platform; +import org.jackhuang.hellominecraft.util.sys.OS; +import org.jackhuang.hellominecraft.util.sys.Platform; import org.jackhuang.hellominecraft.util.StrUtils; /** diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java index 88a758ea0..8304bd975 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java @@ -25,14 +25,14 @@ import java.util.Collection; import java.util.Map; import java.util.TreeMap; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.func.Consumer; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java index 2e276adcf..d881ce07b 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.version; import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.OS; /** * 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 688849897..6af914721 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -36,18 +36,18 @@ import javax.swing.ImageIcon; import javax.swing.RepaintManager; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; import org.jackhuang.hellominecraft.launcher.util.CrashReporter; -import org.jackhuang.hellominecraft.util.logging.Configuration; -import org.jackhuang.hellominecraft.util.logging.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.util.logging.layout.DefaultLayout; +import org.jackhuang.hellominecraft.util.log.Configuration; +import org.jackhuang.hellominecraft.util.log.appender.ConsoleAppender; +import org.jackhuang.hellominecraft.util.log.layout.DefaultLayout; import org.jackhuang.hellominecraft.util.ui.LogWindow; import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.util.upgrade.IUpgrader; import org.jackhuang.hellominecraft.launcher.ui.MainFrame; -import org.jackhuang.hellominecraft.launcher.ui.MyRepaintManager; +import org.jackhuang.hellominecraft.util.ui.MyRepaintManager; import org.jackhuang.hellominecraft.launcher.util.DefaultPlugin; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; import org.jackhuang.hellominecraft.util.MathUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java index 13ba76e8b..d15b1615e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java @@ -28,8 +28,8 @@ import java.util.UUID; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.lookandfeel.Theme; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.system.JdkVersion; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.JdkVersion; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java index 344a01a8b..b00532e52 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java @@ -24,10 +24,10 @@ import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java index a73e77fc4..c1d7ca9ba 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java @@ -23,13 +23,13 @@ import java.io.IOException; import java.util.Collection; import java.util.Map; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.util.CollectionUtils; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.UpdateChecker; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java index fa266d775..9ba27169e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java @@ -27,10 +27,10 @@ import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.Java; -import org.jackhuang.hellominecraft.util.system.JdkVersion; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.Java; +import org.jackhuang.hellominecraft.util.sys.JdkVersion; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java index e88f5efcb..892b22162 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java @@ -23,7 +23,7 @@ import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.task.TaskWindow; import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java index 51d43a2d8..18a111697 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java @@ -43,7 +43,7 @@ import javax.swing.event.TableModelEvent; import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.util.LauncherVisibility; import org.jackhuang.hellominecraft.launcher.setting.Profile; import org.jackhuang.hellominecraft.launcher.setting.Settings; @@ -57,13 +57,13 @@ import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.AbstractSwingWorker; import org.jackhuang.hellominecraft.util.MinecraftVersionRequest; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.OS; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.util.ui.SwingUtils; -import org.jackhuang.hellominecraft.util.system.Java; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.sys.Java; +import org.jackhuang.hellominecraft.util.task.TaskWindow; import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; import org.jackhuang.hellominecraft.util.ui.LogWindow; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java index 81a852ca2..4f6901cdb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java @@ -24,11 +24,11 @@ import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.core.install.InstallerType; import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList; -import org.jackhuang.hellominecraft.util.tasks.TaskRunnable; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.task.TaskRunnable; +import org.jackhuang.hellominecraft.util.task.TaskWindow; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java index 042231e5e..860ac0c84 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java @@ -21,10 +21,10 @@ import java.io.IOException; import javax.swing.DefaultComboBoxModel; import javax.swing.filechooser.FileNameExtensionFilter; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.lang.SupportedLocales; import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java index 3d98dd771..e88a07ce8 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LaunchingUIDaemon.java @@ -31,11 +31,11 @@ import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.JavaProcessMonitor; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.JavaProcessMonitor; import org.jackhuang.hellominecraft.util.ui.LogWindow; -import org.jackhuang.hellominecraft.util.ui.WebFrame; +import org.jackhuang.hellominecraft.util.net.WebFrame; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java index f07fd221c..caed3133e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainFrame.java @@ -17,6 +17,8 @@ */ package org.jackhuang.hellominecraft.launcher.ui; +import org.jackhuang.hellominecraft.util.ui.GaussionPanel; +import org.jackhuang.hellominecraft.util.ui.IRepaint; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; @@ -55,7 +57,7 @@ import org.jackhuang.hellominecraft.lookandfeel.Theme; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.ui.BasicColors; import org.jackhuang.hellominecraft.util.ui.DropShadowBorder; import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; @@ -75,7 +77,7 @@ public final class MainFrame extends DraggableFrame implements IRepaint { JPanel header, infoSwap, realPanel; CardLayout infoLayout; JLabel windowTitle; - GaussionPage backgroundLabel; + GaussionPanel backgroundLabel; DropShadowBorder border; boolean enableShadow; String defaultTitle; @@ -327,7 +329,7 @@ public final class MainFrame extends DraggableFrame implements IRepaint { background = SwingUtils.searchBackgroundImage(Main.getIcon(Settings.getInstance().getTheme().settings.get("Customized.MainFrame.background_image")), Settings.getInstance().getBgpath(), 800, 480); if (background != null) { if (backgroundLabel == null) { - backgroundLabel = new GaussionPage(); + backgroundLabel = new GaussionPanel(); backgroundLabel.addAeroObject(backgroundLabel); backgroundLabel.setBounds(0, 0, 800, 480); centralPanel.add(backgroundLabel, -1); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form index 3dbd3d0f8..8b2c13b60 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form @@ -18,271 +18,287 @@ - - - - - - - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java index ebb09115b..374d3c668 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java @@ -17,6 +17,8 @@ */ package org.jackhuang.hellominecraft.launcher.ui; +import org.jackhuang.hellominecraft.util.ui.WideComboBox; +import org.jackhuang.hellominecraft.util.ui.GaussionPanel; import java.awt.CardLayout; import java.awt.Dimension; import java.awt.Font; @@ -40,8 +42,8 @@ import org.jackhuang.hellominecraft.launcher.util.HMCLMinecraftService; import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.lookandfeel.ConstomButton; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.task.TaskWindow; import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; import org.jackhuang.hellominecraft.util.ui.JSystemFileChooser; import org.jackhuang.hellominecraft.util.ui.SwingUtils; @@ -51,7 +53,7 @@ import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; * * @author huangyuhui */ -public class MainPagePanel extends GaussionPage { +public class MainPagePanel extends Page { public MainPagePanel() { } @@ -73,7 +75,7 @@ public class MainPagePanel extends GaussionPage { btnRun.setFont(newFont); btnRun.addActionListener(e -> MainFrame.INSTANCE.daemon.runGame(Settings.getLastProfile())); - add(pnlButtons); + pnlRoot.add(pnlButtons); pnlButtons.setBounds(0, 0, w, h); this.setSize(new Dimension(DEFAULT_WIDTH, DEFAULT_HEIGHT)); @@ -91,10 +93,10 @@ public class MainPagePanel extends GaussionPage { prepareAuths(); if (Settings.getInstance().isEnableBlur()) - addAeroObject(pnlMore); - setBackgroundImage(MainFrame.INSTANCE.background.getImage()); + ((GaussionPanel) pnlRoot).addAeroObject(pnlMore); + ((GaussionPanel) pnlRoot).setBackgroundImage(MainFrame.INSTANCE.background.getImage()); - ((RepaintPage) pnlMore).setRepainter(this); + ((RepaintPage) pnlMore).setRepainter(pnlRoot); } /** @@ -106,7 +108,8 @@ public class MainPagePanel extends GaussionPage { // //GEN-BEGIN:initComponents private void initComponents() { - pnlMore = new RepaintPage(); + pnlRoot = new GaussionPanel(); + pnlMore = new org.jackhuang.hellominecraft.launcher.ui.RepaintPage(); txtPlayerName = new javax.swing.JTextField(); lblLogin = new javax.swing.JLabel(); cboLoginMode = new javax.swing.JComboBox(); @@ -126,6 +129,8 @@ public class MainPagePanel extends GaussionPage { setLayout(null); + pnlRoot.setLayout(null); + pnlMore.setBackground(new java.awt.Color(204, 204, 204)); pnlMore.setOpaque(false); @@ -298,15 +303,18 @@ public class MainPagePanel extends GaussionPage { .addComponent(txtPlayerName, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(pnlPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 248, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 254, Short.MAX_VALUE) .addComponent(btnImportModpack) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnExportModpack) .addContainerGap()) ); - add(pnlMore); + pnlRoot.add(pnlMore); pnlMore.setBounds(0, 0, 190, 480); + + add(pnlRoot); + pnlRoot.setBounds(0, 0, 800, 480); }// //GEN-END:initComponents private void txtPlayerNameFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_txtPlayerNameFocusGained @@ -445,6 +453,7 @@ public class MainPagePanel extends GaussionPage { private javax.swing.JPanel pnlLogOut; private javax.swing.JPanel pnlMore; private javax.swing.JPanel pnlPassword; + private javax.swing.JPanel pnlRoot; private javax.swing.JPasswordField txtPassword; private javax.swing.JTextField txtPlayerName; // End of variables declaration//GEN-END:variables diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java index b8c8bd0be..c376e526f 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/RepaintPage.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.ui; +import org.jackhuang.hellominecraft.util.ui.IRepaint; import java.awt.Rectangle; import java.awt.Window; import java.util.Arrays; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java index c914e9c07..eab84035c 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackDescriptionPanel.java @@ -25,7 +25,7 @@ import javax.swing.JOptionPane; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.ui.WebPage; +import org.jackhuang.hellominecraft.util.net.WebPage; import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardController; import org.markdown4j.Markdown4jProcessor; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java index ff003c8cb..1332fcf41 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackFileSelectionPanel.java @@ -26,7 +26,7 @@ import javax.swing.tree.DefaultTreeModel; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.Pair; import org.jackhuang.hellominecraft.util.func.BiFunction; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeCellRenderer; import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode; import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNodeSelectionListener; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java index dae15d2bf..c26ef3163 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackWizard.java @@ -39,10 +39,10 @@ import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.Pair; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.Utils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.system.ZipEngine; -import org.jackhuang.hellominecraft.util.ui.WebPage; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.sys.ZipEngine; +import org.jackhuang.hellominecraft.util.net.WebPage; import org.jackhuang.hellominecraft.util.ui.checktree.CheckBoxTreeNode; import org.jackhuang.hellominecraft.util.ui.wizard.spi.DeferredWizardResult; import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java index 5de58ced4..54c6cf464 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java @@ -26,13 +26,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.SwingUtilities; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import static org.jackhuang.hellominecraft.launcher.Main.LAUNCHER_VERSION; import org.jackhuang.hellominecraft.launcher.setting.Settings; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.net.NetUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.OS; import org.jackhuang.hellominecraft.util.ui.LogWindow; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java index 8799bf6f5..74778cf6f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/FileNameFilter.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.launcher.util; import java.io.File; import javax.swing.filechooser.FileFilter; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java index adb69233f..71588aa10 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameLauncher.java @@ -31,7 +31,7 @@ import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java index 756f8d380..ce8831bd2 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java @@ -36,9 +36,9 @@ import org.jackhuang.hellominecraft.launcher.setting.Profile; import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; import org.jackhuang.hellominecraft.launcher.ui.MainFrame; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.task.TaskWindow; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java index 39d4c907c..a5bb7bc01 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/MinecraftCrashAdvicer.java @@ -43,7 +43,7 @@ public final class MinecraftCrashAdvicer { return C.i18n("crash.advice.ConcurrentModificationException"); else if (trace.contains("securityexception")) return C.i18n("crash.advice.SecurityException"); - else if (trace.contains("nosuchfieldexception") || trace.contains("nosuchfielderror")) + else if (trace.contains("nosuchfieldexception") || trace.contains("nosuchmethodexception") || trace.contains("nosuchfielderror") || trace.contains("nosuchmethoderror")) return C.i18n("crash.advice.NoSuchFieldError"); else if (trace.contains("outofmemory") || trace.contains("out of memory")) return C.i18n("crash.advice.OutOfMemoryError"); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java index b5df83372..67132f855 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/AppDataUpgrader.java @@ -35,19 +35,19 @@ import java.util.jar.JarOutputStream; import java.util.jar.Pack200; import java.util.zip.GZIPInputStream; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.launcher.core.MCUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.jackhuang.hellominecraft.util.ArrayUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.UpdateChecker; import org.jackhuang.hellominecraft.util.Utils; import org.jackhuang.hellominecraft.util.VersionNumber; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java index daa18e093..ee3c7e091 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/upgrade/NewFileUpgrader.java @@ -19,13 +19,13 @@ package org.jackhuang.hellominecraft.launcher.util.upgrade; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.jackhuang.hellominecraft.util.ArrayUtils; import org.jackhuang.hellominecraft.util.VersionNumber; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java index 9938b79ab..24cfd7210 100755 --- a/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java +++ b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java @@ -23,8 +23,8 @@ import java.text.ParseException; import java.util.Map; import javax.swing.UIDefaults; import javax.swing.plaf.synth.SynthLookAndFeel; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * 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 f7aea9bb1..6cdee6718 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java @@ -21,7 +21,7 @@ import java.awt.Font; import java.text.ParseException; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.ui.LogWindow; import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; import org.jackhuang.hellominecraft.util.UpdateChecker; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java index 07b861b06..27d9c2dd8 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.svrmgr.install.bukkit; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.func.Consumer; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java index 5fd74f295..0c4f62a8c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java index cccb71912..d0e4dd576 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java @@ -36,14 +36,14 @@ import java.util.jar.Pack200; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import javax.swing.JOptionPane; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.code.DigestUtils; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.tukaani.xz.XZInputStream; /** diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java index 036496039..a6915f8a1 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.ho.yaml.Yaml; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.net.NetUtils; import org.jackhuang.hellominecraft.util.StrUtils; /** diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java index 6e00831fd..ba84fe512 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java @@ -21,13 +21,13 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.CompressingUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.CompressingUtils; import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; import org.jackhuang.hellominecraft.svrmgr.util.Utilities; import org.jackhuang.hellominecraft.util.func.Consumer; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * 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 1e2682a8a..8183bb3b4 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java @@ -34,8 +34,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.Pair; import org.jackhuang.hellominecraft.util.StrUtils; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java index 9a890008a..9f2ae707c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java @@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.svrmgr.server; import java.io.File; import java.io.IOException; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java index 9284e8602..4b445d4c6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.io.IOException; import java.util.TimerTask; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.svrmgr.server.Server; import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java index 0f69d94a7..39df966a6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java @@ -22,8 +22,8 @@ import java.io.File; import java.io.IOException; import java.util.HashSet; import java.util.UUID; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.svrmgr.setting.PlayerList.BasePlayer; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java index 8bb6c5c19..a1cd4561b 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java @@ -25,9 +25,9 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java index d4ab35eb6..7bc37a98f 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java @@ -24,8 +24,8 @@ package org.jackhuang.hellominecraft.svrmgr.setting; import com.google.gson.Gson; import java.io.File; import java.io.IOException; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java index 2c8d18e25..e4553ace2 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java @@ -46,14 +46,14 @@ import javax.swing.JPopupMenu; import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; -import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask; -import org.jackhuang.hellominecraft.util.system.FileUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; +import org.jackhuang.hellominecraft.util.net.HTTPGetTask; +import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.svrmgr.util.IMonitorService; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.svrmgr.util.ModType; import org.jackhuang.hellominecraft.svrmgr.util.MonitorInfoBean; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java index 3ec5868a5..cf0044e5e 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java @@ -19,8 +19,8 @@ package org.jackhuang.hellominecraft.svrmgr.ui; import java.io.File; import javax.swing.table.DefaultTableModel; -import org.jackhuang.hellominecraft.util.tasks.TaskWindow; -import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; +import org.jackhuang.hellominecraft.util.task.TaskWindow; +import org.jackhuang.hellominecraft.util.net.FileDownloadTask; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo; import org.jackhuang.hellominecraft.svrmgr.plugin.PluginVersion; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java index 96f0aecb8..fef2a758b 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java @@ -19,8 +19,8 @@ package org.jackhuang.hellominecraft.svrmgr.util; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.NetUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.net.NetUtils; import org.jackhuang.hellominecraft.util.func.Consumer; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java index 96565493f..31f0632ef 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * 判断mod类型 diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java index 1ef00cb32..8b4d18bcc 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java @@ -26,8 +26,8 @@ import java.lang.management.ManagementFactory; import java.util.StringTokenizer; import com.sun.management.OperatingSystemMXBean; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java index 02d055160..9c7b9a904 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java index 8e7181244..5644b9024 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.util; import java.io.File; import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java index 430692a02..ab3b211d6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.svrmgr.util; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java index e904964de..a00b13a91 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.io.Serializable; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java index b39a772be..d4b84d92b 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java @@ -17,9 +17,10 @@ */ package org.jackhuang.hellominecraft.util; +import org.jackhuang.hellominecraft.util.net.NetUtils; import com.google.gson.JsonSyntaxException; import java.io.IOException; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import java.util.Map; /** diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java index f0acebc06..9b85d6168 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hellominecraft.util; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java index a4fc9d024..a73a2e28d 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java @@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.util.code; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; public final class Charsets { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java index 169ede6f7..7ace45029 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java @@ -22,8 +22,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * @@ -46,9 +45,9 @@ public final class Localization { if (is == null) is = getStream("_" + locale.getLanguage()); if (is == null) - is = getStream(""); + is = getStream("_en"); if (is == null) - throw new IllegalStateException("Language file missing"); + throw new InternalError("Language file missing"); try { for (String s : IOUtils.readLines(is, IOUtils.DEFAULT_CHARSET)) @@ -59,7 +58,7 @@ public final class Localization { lang.put(s.substring(0, i), s.substring(i + 1)); } } catch (IOException ex) { - HMCLog.err("LANG FILE MISSING", ex); + throw new InternalError("Language file missing", ex); } } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java index a530db27c..8531bcb05 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/AppenderControl.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; -import org.jackhuang.hellominecraft.util.logging.appender.IAppender; +import org.jackhuang.hellominecraft.util.log.appender.IAppender; public class AppenderControl { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java similarity index 81% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java index 711e68f9d..b6ed6579e 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Configuration.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; import java.util.ArrayList; -import org.jackhuang.hellominecraft.util.logging.appender.ConsoleAppender; -import org.jackhuang.hellominecraft.util.logging.appender.IAppender; -import org.jackhuang.hellominecraft.util.logging.layout.DefaultLayout; +import org.jackhuang.hellominecraft.util.log.appender.ConsoleAppender; +import org.jackhuang.hellominecraft.util.log.appender.IAppender; +import org.jackhuang.hellominecraft.util.log.layout.DefaultLayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java index 270d2668f..0888a38d8 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/HMCLog.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; -import org.jackhuang.hellominecraft.util.logging.logger.Logger; +import org.jackhuang.hellominecraft.util.log.logger.Logger; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java index f09182646..e29b13705 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/Level.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; import java.awt.Color; import java.util.regex.Matcher; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java similarity index 88% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java index e182bb707..045af68e5 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LogEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; -import org.jackhuang.hellominecraft.util.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.log.message.IMessage; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java index f97e273e2..9eef0235a 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/LoggingException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging; +package org.jackhuang.hellominecraft.util.log; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java similarity index 92% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java index 856ff9624..cfe28fe26 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/AbstractAppender.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.appender; +package org.jackhuang.hellominecraft.util.log.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java index eb3582235..f868f5274 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/ConsoleAppender.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.appender; +package org.jackhuang.hellominecraft.util.log.appender; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java similarity index 84% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java index d48b7bd1d..1c08c07d5 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/IAppender.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.appender; +package org.jackhuang.hellominecraft.util.log.appender; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.logging.LogEvent; -import org.jackhuang.hellominecraft.util.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hellominecraft.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java index 9d0a7c8a5..23c9f4615 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/appender/OutputStreamAppender.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.appender; +package org.jackhuang.hellominecraft.util.log.appender; import java.io.IOException; import java.io.OutputStream; @@ -23,9 +23,9 @@ import java.io.PrintStream; import java.io.Serializable; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.jackhuang.hellominecraft.util.logging.LogEvent; -import org.jackhuang.hellominecraft.util.logging.LoggingException; -import org.jackhuang.hellominecraft.util.logging.layout.ILayout; +import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hellominecraft.util.log.LoggingException; +import org.jackhuang.hellominecraft.util.log.layout.ILayout; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java index c67b9e580..2554a25a5 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/AbstractStringLayout.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.layout; +package org.jackhuang.hellominecraft.util.log.layout; -import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java index ed6deb46d..1eb845185 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/DefaultLayout.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.layout; +package org.jackhuang.hellominecraft.util.log.layout; import java.text.SimpleDateFormat; import java.util.Date; -import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java similarity index 89% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java index 0e2da34b3..742702b17 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/layout/ILayout.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.layout; +package org.jackhuang.hellominecraft.util.log.layout; import java.io.Serializable; -import org.jackhuang.hellominecraft.util.logging.LogEvent; +import org.jackhuang.hellominecraft.util.log.LogEvent; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java index f44a98233..5044d2e16 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/AbstractLogger.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.logger; +package org.jackhuang.hellominecraft.util.log.logger; -import org.jackhuang.hellominecraft.util.logging.Level; -import org.jackhuang.hellominecraft.util.logging.message.IMessage; -import org.jackhuang.hellominecraft.util.logging.message.IMessageFactory; -import org.jackhuang.hellominecraft.util.logging.message.ParameterizedMessageFactory; -import org.jackhuang.hellominecraft.util.logging.message.StringFormattedMessage; +import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hellominecraft.util.log.message.IMessage; +import org.jackhuang.hellominecraft.util.log.message.IMessageFactory; +import org.jackhuang.hellominecraft.util.log.message.ParameterizedMessageFactory; +import org.jackhuang.hellominecraft.util.log.message.StringFormattedMessage; public abstract class AbstractLogger implements ILogger { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java index 2e89ce88d..65958c7ab 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/ILogger.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.logger; +package org.jackhuang.hellominecraft.util.log.logger; -import org.jackhuang.hellominecraft.util.logging.Level; -import org.jackhuang.hellominecraft.util.logging.message.IMessage; +import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hellominecraft.util.log.message.IMessage; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java similarity index 90% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java index 83068bb6f..8d3c2b05b 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/logger/Logger.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.logger; +package org.jackhuang.hellominecraft.util.log.logger; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.jackhuang.hellominecraft.util.logging.AppenderControl; -import org.jackhuang.hellominecraft.util.logging.Configuration; -import org.jackhuang.hellominecraft.util.logging.Level; -import org.jackhuang.hellominecraft.util.logging.LogEvent; -import org.jackhuang.hellominecraft.util.logging.appender.IAppender; -import org.jackhuang.hellominecraft.util.logging.message.IMessage; -import org.jackhuang.hellominecraft.util.logging.message.IMessageFactory; +import org.jackhuang.hellominecraft.util.log.AppenderControl; +import org.jackhuang.hellominecraft.util.log.Configuration; +import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hellominecraft.util.log.LogEvent; +import org.jackhuang.hellominecraft.util.log.appender.IAppender; +import org.jackhuang.hellominecraft.util.log.message.IMessage; +import org.jackhuang.hellominecraft.util.log.message.IMessageFactory; public class Logger extends AbstractLogger { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java index 6c4e0785b..7b70d79da 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/AbstractMessageFactory.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java index bd3143acd..22c11cc02 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; import java.io.Serializable; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java index cdf628d18..8cacfa720 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/IMessageFactory.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java index 5c7fdb966..ab046b6eb 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ObjectMessage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; public class ObjectMessage implements IMessage { diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java index 95de0aed0..17be6b993 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java index e2a9059f9..c78385350 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/ParameterizedMessageFactory.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java index d1998bd21..1590a73e9 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/SimpleMessage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java index 75dc60f1e..9af3fd098 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/log/message/StringFormattedMessage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.logging.message; +package org.jackhuang.hellominecraft.util.log.message; import java.util.Arrays; import java.util.IllegalFormatException; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java index 227acd351..1366f5971 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/FileDownloadTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks.download; +package org.jackhuang.hellominecraft.util.net; import java.io.File; import java.io.IOException; @@ -29,12 +29,12 @@ import java.util.ArrayList; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.code.DigestUtils; import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.system.FileUtils; -import org.jackhuang.hellominecraft.util.tasks.Task; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResult; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResultRegistrar; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.sys.FileUtils; +import org.jackhuang.hellominecraft.util.task.Task; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResultRegistrar; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java similarity index 92% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java index fe572a8a9..343282aad 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/HTTPGetTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks.download; +package org.jackhuang.hellominecraft.util.net; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,12 +25,11 @@ import java.net.Proxy; import java.net.URL; import java.nio.charset.Charset; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.tasks.comm.PreviousResult; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.task.comm.PreviousResult; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.NetUtils; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java index 135a9b7c7..e146721ea 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/NetUtils.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util; +package org.jackhuang.hellominecraft.util.net; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -27,7 +27,7 @@ import java.net.Proxy; import java.net.URL; import java.util.Map; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java similarity index 88% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java index 4ce0e0bfa..402bfba0b 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebFrame.java @@ -15,13 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.ui; +package org.jackhuang.hellominecraft.util.net; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JDialog; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.log.Level; +import org.jackhuang.hellominecraft.util.ui.GraphicsUtils; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java similarity index 91% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java index cdaa71347..5c8db5a97 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/net/WebPage.java @@ -15,11 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.ui; +package org.jackhuang.hellominecraft.util.net; import javax.swing.JScrollPane; import javax.swing.event.HyperlinkEvent; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.ui.SwingUtils; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/CompressingUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/CompressingUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java index 4d3653c12..77e84c312 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/CompressingUtils.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/CompressingUtils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.File; import java.io.FileOutputStream; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java index 32caf44d1..2bedc68f7 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/FileUtils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.File; import java.io.FileFilter; @@ -29,7 +29,7 @@ import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java index 8dc318e26..5b09c2879 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/IOUtils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import org.jackhuang.hellominecraft.util.func.Consumer; import org.jackhuang.hellominecraft.util.func.Function; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java index 040d298b0..8a850803a 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Java.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java index 477c5f2b3..5f44eeda4 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcess.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.util.ArrayList; import java.util.Arrays; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java index 757e6af83..a5c40eb76 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JavaProcessMonitor.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.util.Arrays; import java.util.HashSet; import org.jackhuang.hellominecraft.util.CollectionUtils; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.log.Level; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java index d58ee22ed..fe8a7f0f0 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/JdkVersion.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.File; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.StrUtils; /** diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java similarity index 97% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java index 12e3c73f0..319b43ebf 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/OS.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import com.sun.management.OperatingSystemMXBean; import java.io.BufferedReader; @@ -26,7 +26,7 @@ import java.lang.management.ManagementFactory; import java.util.Locale; import java.util.StringTokenizer; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * @author huangyuhui diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java index c7aabc5bb..7584050fe 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/Platform.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java index 2742bc7d2..70dbb8cf4 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.util.HashSet; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java index d145dd057..7e531710e 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ProcessThread.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.code.Charsets; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java index 4375f1b49..35b30c3a6 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/sys/ZipEngine.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.system; +package org.jackhuang.hellominecraft.util.sys; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java index 6317d71b4..8a30bde59 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DeleteFileTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.io.File; import java.io.IOException; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java index 213855d0d..a2fd4adf8 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoingDoneListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java index d88b06824..a6ebc5c95 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/DoubleTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.Arrays; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java index 4e7cd962a..fe3f620a7 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/NoShownTaskException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java similarity index 96% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java index fce15c20e..be9bd8a22 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ParallelTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.Collection; import java.util.HashSet; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java index 97a4969b1..af024d88a 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/ProgressProviderListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java index 24d9349f8..5836a515e 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/Task.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.Collection; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java index b2ab31c9f..b01a04e25 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java similarity index 98% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java index 2df8dc0c9..f6a64a74c 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.ArrayList; import java.util.Collection; @@ -30,7 +30,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import org.jackhuang.hellominecraft.util.EventHandler; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java similarity index 95% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java index 28f42de50..b708f7944 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskRunnable.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.form similarity index 100% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.form diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java similarity index 99% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java index 1ac7c1dc5..1b3a553f4 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/TaskWindow.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks; +package org.jackhuang.hellominecraft.util.task; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +23,7 @@ import java.util.LinkedList; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.ui.SwingUtils; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResult.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java similarity index 94% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResult.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java index a73a592d9..9fa6734b4 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResult.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResult.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks.comm; +package org.jackhuang.hellominecraft.util.task.comm; /** * diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResultRegistrar.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java similarity index 90% rename from HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResultRegistrar.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java index a637e76b8..1849491f2 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/comm/PreviousResultRegistrar.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/task/comm/PreviousResultRegistrar.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.util.tasks.comm; +package org.jackhuang.hellominecraft.util.task.comm; -import org.jackhuang.hellominecraft.util.tasks.Task; +import org.jackhuang.hellominecraft.util.task.Task; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GaussionPage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GaussionPage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java index 0619e4dd7..563c4905a 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GaussionPage.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GaussionPanel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.ui; +package org.jackhuang.hellominecraft.util.ui; import java.awt.AlphaComposite; import java.awt.Graphics; @@ -26,13 +26,12 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; import javax.swing.JPanel; -import org.jackhuang.hellominecraft.util.ui.StackBlurFilter; /** * This component will allow some area blured to provide better UI. * @author huangyuhui */ -public class GaussionPage extends Page { +public class GaussionPanel extends JPanel { private transient BufferedImage aeroBuffer; private transient Image backgroundImage; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/IRepaint.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/IRepaint.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java index fa07e3817..cb8952729 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/IRepaint.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/IRepaint.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.ui; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Rectangle; import java.awt.Window; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java index 89e32d87c..dece70821 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java @@ -23,8 +23,8 @@ import javax.swing.text.Document; import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.log.HMCLog; +import org.jackhuang.hellominecraft.util.log.Level; import org.jackhuang.hellominecraft.util.func.NonFunction; import org.jackhuang.hellominecraft.util.DoubleOutputStream; import org.jackhuang.hellominecraft.util.Utils; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java index 76cc2bff9..387fc1d76 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java @@ -21,7 +21,7 @@ import java.io.OutputStream; import java.util.Objects; import javax.swing.SwingUtilities; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.logging.Level; +import org.jackhuang.hellominecraft.util.log.Level; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MyRepaintManager.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MyRepaintManager.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java index 5f4466508..7a871ec9a 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MyRepaintManager.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/MyRepaintManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.ui; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Container; import java.awt.Rectangle; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java index a6b7eef1d..c79196291 100755 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java @@ -43,12 +43,12 @@ import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.Utils; import org.jackhuang.hellominecraft.util.func.NonFunction; -import org.jackhuang.hellominecraft.util.system.OS; +import org.jackhuang.hellominecraft.util.sys.OS; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/WideComboBox.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/WideComboBox.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java index 5000fb690..5204aa0ec 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/WideComboBox.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WideComboBox.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.ui; +package org.jackhuang.hellominecraft.util.ui; import java.awt.Dimension; import javax.swing.JComboBox; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java index 7f543b47a..f19defe4d 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java @@ -8,7 +8,7 @@ import javax.swing.JLabel; import javax.swing.JProgressBar; import javax.swing.border.EmptyBorder; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.ui.wizard.spi.ResultProgressHandle; import org.jackhuang.hellominecraft.util.ui.wizard.spi.Summary; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java index 74cbd24c6..4e908c3eb 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java @@ -50,7 +50,7 @@ import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardDisplayer; import org.jackhuang.hellominecraft.util.ui.wizard.api.WizardResultReceiver; import org.jackhuang.hellominecraft.util.ui.wizard.modules.InstructionsPanelImpl; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java index 19d1c0fab..cad6733f5 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java @@ -44,7 +44,7 @@ import javax.swing.JComponent; import javax.swing.JEditorPane; import javax.swing.UIManager; import org.jackhuang.hellominecraft.util.C; -import org.jackhuang.hellominecraft.util.logging.HMCLog; +import org.jackhuang.hellominecraft.util.log.HMCLog; import org.jackhuang.hellominecraft.util.ui.wizard.api.displayer.InstructionsPanel; import org.jackhuang.hellominecraft.util.ui.wizard.spi.Wizard; import org.jackhuang.hellominecraft.util.ui.wizard.spi.WizardObserver; diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java index 8b4dcb883..5ed354cf1 100644 --- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java @@ -31,7 +31,7 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import org.jackhuang.hellominecraft.util.ArrayUtils; import org.jackhuang.hellominecraft.util.code.Charsets; -import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * Provides information about a simple wizard. Wraps a diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties similarity index 100% rename from HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang index 4b799e08b..811170b33 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang @@ -233,7 +233,7 @@ modpack.enter_name=給遊戲起個你喜歡的名字 modpack.task.save=導出懶人包 modpack.task.install=導入懶人包 modpack.task.install.error=安裝失敗，可能是懶人包格式不正確或操作資料失敗 -modpack.task.install.will_install=將會安裝懶人包： +modpack.task.install.will=將會安裝懶人包： modpack.wizard=導出懶人包嚮導 modpack.wizard.step.1=基本設定 @@ -417,4 +417,4 @@ wizard.failed=失败 wizard.steps=步驟 lang=正體中文 -lang.default=跟隨系統語言 \ No newline at end of file +lang.default=跟隨系統語言 diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties index 38de9c441..3430e3e8b 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties @@ -233,7 +233,7 @@ modpack.enter_name=\u7d66\u904a\u6232\u8d77\u500b\u4f60\u559c\u6b61\u7684\u540d\ modpack.task.save=\u5c0e\u51fa\u61f6\u4eba\u5305 modpack.task.install=\u5c0e\u5165\u61f6\u4eba\u5305 modpack.task.install.error=\u5b89\u88dd\u5931\u6557\uff0c\u53ef\u80fd\u662f\u61f6\u4eba\u5305\u683c\u5f0f\u4e0d\u6b63\u78ba\u6216\u64cd\u4f5c\u8cc7\u6599\u5931\u6557 -modpack.task.install.will_install=\u5c07\u6703\u5b89\u88dd\u61f6\u4eba\u5305\uff1a +modpack.task.install.will=\u5c07\u6703\u5b89\u88dd\u61f6\u4eba\u5305\uff1a modpack.wizard=\u5c0e\u51fa\u61f6\u4eba\u5305\u56ae\u5c0e modpack.wizard.step.1=\u57fa\u672c\u8a2d\u5b9a @@ -417,4 +417,4 @@ wizard.failed=\u5931\u8d25 wizard.steps=\u6b65\u9a5f lang=\u6b63\u9ad4\u4e2d\u6587 -lang.default=\u8ddf\u96a8\u7cfb\u7d71\u8a9e\u8a00 \ No newline at end of file +lang.default=\u8ddf\u96a8\u7cfb\u7d71\u8a9e\u8a00