From d488df81a609b2230db3b822ef574ed1a901fb91 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Tue, 19 Jan 2016 22:40:23 +0800 Subject: [PATCH] getting core --- .../hellominecraft/launcher/Launcher.java | 2 +- .../hellominecraft/launcher/Main.java | 2 +- .../hellominecraft/launcher/api/IPlugin.java | 10 ++--- .../launcher/api/PluginManager.java | 2 +- .../DefaultMinecraftService.java | 19 +++++--- .../{launch => core}/DefaultPlugin.java | 14 +++--- .../{launch => core}/GameException.java | 2 +- .../launcher/{utils => core}/MCUtils.java | 2 +- .../MinecraftCrashAdvicer.java | 2 +- .../launcher/{utils => core}/ModInfo.java | 2 +- .../launcher/{settings => core}/Profile.java | 45 +++++++++++-------- .../{utils => core}/assets/AssetsIndex.java | 2 +- .../assets/AssetsMojangLoader.java | 10 ++--- .../{utils => core}/assets/AssetsObject.java | 2 +- .../{utils => core}/assets/Contents.java | 2 +- .../assets/IAssetsHandler.java | 8 ++-- .../auth/AuthenticationException.java | 2 +- .../{utils => core}/auth/BestLogin.java | 2 +- .../{utils => core}/auth/IAuthenticator.java | 4 +- .../{utils => core}/auth/LoginInfo.java | 2 +- .../auth/OfflineAuthenticator.java | 2 +- .../auth/SkinmeAuthenticator.java | 2 +- .../auth/UserProfileProvider.java | 4 +- .../auth/YggdrasilAuthenticator.java | 10 ++--- .../auth/yggdrasil/AuthenticationRequest.java | 2 +- .../auth/yggdrasil/GameProfile.java | 2 +- .../auth/yggdrasil/Property.java | 2 +- .../auth/yggdrasil/PropertyMap.java | 2 +- .../auth/yggdrasil/RefreshRequest.java | 2 +- .../auth/yggdrasil/Response.java | 2 +- .../auth/yggdrasil/UUIDTypeAdapter.java | 2 +- .../{utils => core}/auth/yggdrasil/User.java | 2 +- .../yggdrasil/YggdrasilAuthentication.java | 4 +- .../download/BMCLAPIDownloadProvider.java | 10 ++--- .../download/DownloadType.java | 2 +- .../download/IDownloadProvider.java | 6 +-- .../download/MojangDownloadProvider.java | 12 ++--- .../download/RapidDataDownloadProvider.java | 2 +- .../installers/InstallProfile.java | 6 +-- .../installers/InstallerType.java | 2 +- .../installers/InstallerVersionList.java | 2 +- .../InstallerVersionNewerComparator.java | 4 +- .../installers/MinecraftInstallerService.java | 20 ++++----- .../installers/PackMinecraftInstaller.java | 2 +- .../installers/forge/ForgeInstaller.java | 10 ++--- .../installers/forge/ForgeOldInstaller.java | 4 +- .../installers/forge/Install.java | 2 +- .../forge/MinecraftForgeVersion.java | 2 +- .../forge/MinecraftForgeVersionList.java | 6 +-- .../forge/MinecraftForgeVersionRoot.java | 2 +- .../liteloader/LiteLoaderInstaller.java | 8 ++-- .../liteloader/LiteLoaderMCVersions.java | 2 +- .../liteloader/LiteLoaderVersion.java | 4 +- .../liteloader/LiteLoaderVersionList.java | 10 ++--- .../liteloader/LiteLoaderVersionsMeta.java | 2 +- .../liteloader/LiteLoaderVersionsRoot.java | 2 +- .../optifine/OptiFineInstaller.java | 8 ++-- .../installers/optifine/OptiFineVersion.java | 2 +- .../bmcl/OptiFineBMCLVersionList.java | 6 +-- .../vanilla/OptiFineDownloadFormatter.java | 2 +- .../optifine/vanilla/OptiFineVersionList.java | 6 +-- .../launch/AbstractMinecraftLoader.java | 11 +++-- .../launch/DefaultGameLauncher.java | 10 ++--- .../{ => core}/launch/GameLauncher.java | 15 ++++--- .../launch/LibraryDownloadTask.java | 2 +- .../{ => core}/launch/MinecraftLoader.java | 16 ++++--- .../service}/IMinecraftAssetService.java | 2 +- .../service}/IMinecraftBasicService.java | 2 +- .../service}/IMinecraftDownloadService.java | 8 ++-- .../service}/IMinecraftInstallerService.java | 10 ++--- .../service}/IMinecraftLoader.java | 4 +- .../service}/IMinecraftModService.java | 4 +- .../service}/IMinecraftProvider.java | 14 +++--- .../service}/IMinecraftService.java | 6 +-- .../launcher/{ => core}/version/Extract.java | 2 +- .../{ => core}/version/GameDirType.java | 2 +- .../{ => core}/version/IMinecraftLibrary.java | 4 +- .../version/MinecraftAssetService.java | 12 ++--- .../version/MinecraftClassicVersion.java | 4 +- .../version/MinecraftDownloadService.java | 10 ++--- .../{ => core}/version/MinecraftLibrary.java | 4 +- .../version/MinecraftModService.java | 8 ++-- .../version/MinecraftOldLibrary.java | 4 +- .../{ => core}/version/MinecraftVersion.java | 8 ++-- .../version/MinecraftVersionManager.java | 18 ++++---- .../{ => core}/version/ModpackUpdater.java | 2 +- .../launcher/{ => core}/version/Natives.java | 2 +- .../launcher/{ => core}/version/OS.java | 2 +- .../launcher/{ => core}/version/Rules.java | 2 +- .../{ => core}/version/ServerInfo.java | 2 +- .../launcher/settings/Config.java | 5 ++- .../launcher/settings/Settings.java | 8 +++- .../utils/upgrade/AppDataUpgrader.java | 2 +- .../launcher/views/GameSettingsPanel.java | 10 ++--- .../launcher/views/InstallerPanel.java | 4 +- .../launcher/views/LauncherSettingsPanel.java | 2 +- .../launcher/views/MainFrame.java | 2 +- .../launcher/views/MainPagePanel.java | 16 +++---- .../launcher/views/NewProfileWindow.java | 2 +- .../views/ServerListCellRenderer.java | 2 +- .../launcher/views/ServerListView.java | 2 +- 101 files changed, 298 insertions(+), 267 deletions(-) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core}/DefaultMinecraftService.java (66%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core}/DefaultPlugin.java (85%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core}/GameException.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/MCUtils.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core}/MinecraftCrashAdvicer.java (97%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/ModInfo.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{settings => core}/Profile.java (87%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/assets/AssetsIndex.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/assets/AssetsMojangLoader.java (91%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/assets/AssetsObject.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/assets/Contents.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/assets/IAssetsHandler.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/AuthenticationException.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/BestLogin.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/IAuthenticator.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/LoginInfo.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/OfflineAuthenticator.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/SkinmeAuthenticator.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/UserProfileProvider.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/YggdrasilAuthenticator.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/AuthenticationRequest.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/GameProfile.java (97%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/Property.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/PropertyMap.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/RefreshRequest.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/Response.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/UUIDTypeAdapter.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/User.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/auth/yggdrasil/YggdrasilAuthentication.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/download/BMCLAPIDownloadProvider.java (80%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/download/DownloadType.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/download/IDownloadProvider.java (88%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/download/MojangDownloadProvider.java (76%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/download/RapidDataDownloadProvider.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/InstallProfile.java (82%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/InstallerType.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/InstallerVersionList.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/InstallerVersionNewerComparator.java (86%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/MinecraftInstallerService.java (81%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/PackMinecraftInstaller.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/ForgeInstaller.java (91%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/ForgeOldInstaller.java (88%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/Install.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/MinecraftForgeVersion.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/MinecraftForgeVersionList.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/forge/MinecraftForgeVersionRoot.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderInstaller.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderMCVersions.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderVersion.java (85%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderVersionList.java (90%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderVersionsMeta.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/liteloader/LiteLoaderVersionsRoot.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/optifine/OptiFineInstaller.java (91%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/optifine/OptiFineVersion.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/optifine/bmcl/OptiFineBMCLVersionList.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/optifine/vanilla/OptiFineDownloadFormatter.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{utils => core}/installers/optifine/vanilla/OptiFineVersionList.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/launch/AbstractMinecraftLoader.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/launch/DefaultGameLauncher.java (87%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/launch/GameLauncher.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/launch/LibraryDownloadTask.java (98%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/launch/MinecraftLoader.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftAssetService.java (96%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftBasicService.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftDownloadService.java (82%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftInstallerService.java (78%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftLoader.java (86%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftModService.java (90%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftProvider.java (89%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{launch => core/service}/IMinecraftService.java (88%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/Extract.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/GameDirType.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/IMinecraftLibrary.java (92%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftAssetService.java (90%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftClassicVersion.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftDownloadService.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftLibrary.java (97%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftModService.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftOldLibrary.java (91%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftVersion.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/MinecraftVersionManager.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/ModpackUpdater.java (95%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/Natives.java (94%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/OS.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/Rules.java (93%) rename HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/{ => core}/version/ServerInfo.java (96%) diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java index e706e40db..9bf42bb84 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java @@ -30,7 +30,7 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.views.LogWindow; -import org.jackhuang.hellominecraft.launcher.launch.MinecraftCrashAdvicer; +import org.jackhuang.hellominecraft.launcher.core.MinecraftCrashAdvicer; import org.jackhuang.hellominecraft.utils.DoubleOutputStream; import org.jackhuang.hellominecraft.utils.LauncherPrintStream; import org.jackhuang.hellominecraft.utils.MathUtils; 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 89f2c5f2b..a82305fad 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -34,7 +34,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.api.PluginManager; -import org.jackhuang.hellominecraft.launcher.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; import org.jackhuang.hellominecraft.launcher.utils.CrashReporter; import org.jackhuang.hellominecraft.logging.Configuration; import org.jackhuang.hellominecraft.logging.appender.ConsoleAppender; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java index e6f840785..4d5d1b764 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java @@ -17,11 +17,11 @@ */ package org.jackhuang.hellominecraft.launcher.api; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.Profile; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.utils.functions.Consumer; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java index 70a33d36d..c0c5c0ef9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.api; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.DefaultPlugin; +import org.jackhuang.hellominecraft.launcher.core.DefaultPlugin; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java similarity index 66% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultMinecraftService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java index 4e1123c4a..1e522698d 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java @@ -15,14 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.utils.installers.MinecraftInstallerService; -import org.jackhuang.hellominecraft.launcher.version.MinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.version.MinecraftDownloadService; -import org.jackhuang.hellominecraft.launcher.version.MinecraftModService; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; +import org.jackhuang.hellominecraft.launcher.core.installers.MinecraftInstallerService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftDownloadService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftModService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultPlugin.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java index cc8424b3d..b0ab97227 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.launcher.api.IPlugin; -import org.jackhuang.hellominecraft.launcher.settings.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.OfflineAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.SkinmeAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.utils.auth.YggdrasilAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.SkinmeAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator; import org.jackhuang.hellominecraft.launcher.views.MainFrame; import org.jackhuang.hellominecraft.utils.functions.Consumer; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameException.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameException.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.java index 987c0e412..7da953c9e 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameException.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.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.launch; +package org.jackhuang.hellominecraft.launcher.core; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java index 797911dfc..1d25c465a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils; +package org.jackhuang.hellominecraft.launcher.core; import java.io.File; import java.io.IOException; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java index 13474e81e..63b8fb381 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.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.launch; +package org.jackhuang.hellominecraft.launcher.core; import org.jackhuang.hellominecraft.C; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModInfo.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java index 7376d6d81..fd24591f9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/ModInfo.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils; +package org.jackhuang.hellominecraft.launcher.core; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java similarity index 87% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java index 0162d8500..893c670a8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java @@ -15,14 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.settings; +package org.jackhuang.hellominecraft.launcher.core; import java.io.File; import org.jackhuang.hellominecraft.launcher.api.PluginManager; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.launcher.utils.MCUtils; -import org.jackhuang.hellominecraft.launcher.version.GameDirType; +import org.jackhuang.hellominecraft.launcher.core.MCUtils; +import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; +import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; +import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.utils.StrUtils; import org.jackhuang.hellominecraft.utils.Utils; import org.jackhuang.hellominecraft.utils.EventHandler; @@ -53,6 +55,7 @@ public final class Profile { private int gameDirType; protected transient IMinecraftService service; + public transient final EventHandler propertyChanged = new EventHandler<>(this); public Profile() { this("Default"); @@ -134,7 +137,7 @@ public final class Profile { public Profile setGameDir(String gameDir) { this.gameDir = gameDir; service().version().refreshVersions(); - Settings.save(); + propertyChanged.execute("gameDir"); return this; } @@ -156,7 +159,7 @@ public final class Profile { public void setJavaDir(String javaDir) { this.javaDir = javaDir; - Settings.save(); + propertyChanged.execute("javaDir"); } public Java getJava() { @@ -183,7 +186,7 @@ public final class Profile { return; this.java = java.getName(); } - Settings.save(); + propertyChanged.execute("java"); } public File getFolder(String folder) { @@ -198,6 +201,7 @@ public final class Profile { public void setName(String name) { this.name = name; + propertyChanged.execute("name"); } public String getJavaArgs() { @@ -208,7 +212,7 @@ public final class Profile { public void setJavaArgs(String javaArgs) { this.javaArgs = javaArgs; - Settings.save(); + propertyChanged.execute("javaArgs"); } public boolean hasJavaArgs() { @@ -223,7 +227,7 @@ public final class Profile { public void setMaxMemory(String maxMemory) { this.maxMemory = maxMemory; - Settings.save(); + propertyChanged.execute("maxMemory"); } public String getWidth() { @@ -234,6 +238,7 @@ public final class Profile { public void setWidth(String width) { this.width = width; + propertyChanged.execute("width"); } public String getHeight() { @@ -244,7 +249,7 @@ public final class Profile { public void setHeight(String height) { this.height = height; - Settings.save(); + propertyChanged.execute("height"); } public String getUserProperties() { @@ -255,6 +260,7 @@ public final class Profile { public void setUserProperties(String userProperties) { this.userProperties = userProperties; + propertyChanged.execute("userProperties"); } public boolean isFullscreen() { @@ -263,7 +269,7 @@ public final class Profile { public void setFullscreen(boolean fullscreen) { this.fullscreen = fullscreen; - Settings.save(); + propertyChanged.execute("fullscreen"); } public boolean isDebug() { @@ -272,7 +278,7 @@ public final class Profile { public void setDebug(boolean debug) { this.debug = debug; - Settings.save(); + propertyChanged.execute("debug"); } public LauncherVisibility getLauncherVisibility() { @@ -281,7 +287,7 @@ public final class Profile { public void setLauncherVisibility(LauncherVisibility launcherVisibility) { this.launcherVisibility = launcherVisibility.ordinal(); - Settings.save(); + propertyChanged.execute("launcherVisibility"); } public GameDirType getGameDirType() { @@ -293,7 +299,7 @@ public final class Profile { public void setGameDirType(GameDirType gameDirType) { this.gameDirType = gameDirType.ordinal(); service().version().setGameDirType(getGameDirType()); - Settings.save(); + propertyChanged.execute("gameDirType"); } public String getPermSize() { @@ -302,7 +308,7 @@ public final class Profile { public void setPermSize(String permSize) { this.permSize = permSize; - Settings.save(); + propertyChanged.execute("permSize"); } public boolean isNoJVMArgs() { @@ -311,6 +317,7 @@ public final class Profile { public void setNoJVMArgs(boolean noJVMArgs) { this.noJVMArgs = noJVMArgs; + propertyChanged.execute("noJVMArgs"); } public String getMinecraftArgs() { @@ -319,7 +326,7 @@ public final class Profile { public void setMinecraftArgs(String minecraftArgs) { this.minecraftArgs = minecraftArgs; - Settings.save(); + propertyChanged.execute("minecraftArgs"); } public boolean isCanceledWrapper() { @@ -328,7 +335,7 @@ public final class Profile { public void setCanceledWrapper(boolean canceledWrapper) { this.canceledWrapper = canceledWrapper; - Settings.save(); + propertyChanged.execute("canceledWrapper"); } public String getPrecalledCommand() { @@ -337,7 +344,7 @@ public final class Profile { public void setPrecalledCommand(String precalledCommand) { this.precalledCommand = precalledCommand; - Settings.save(); + propertyChanged.execute("precalledCommand"); } public String getServerIp() { @@ -346,7 +353,7 @@ public final class Profile { public void setServerIp(String serverIp) { this.serverIp = serverIp; - Settings.save(); + propertyChanged.execute("serverIp"); } public void checkFormat() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsIndex.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsIndex.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java index 3b57286c0..f8120b3ff 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsIndex.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.assets; +package org.jackhuang.hellominecraft.launcher.core.assets; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java index 2a36b441a..e5b527f5a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsMojangLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.assets; +package org.jackhuang.hellominecraft.launcher.core.assets; import java.io.File; import java.io.IOException; @@ -23,14 +23,14 @@ import java.util.ArrayList; import java.util.Map; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.utils.VersionNumber; import rx.Observable; import rx.Observer; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsObject.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsObject.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java index 4aba42df9..d86cb8c50 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/AssetsObject.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.assets; +package org.jackhuang.hellominecraft.launcher.core.assets; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/Contents.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/Contents.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java index 0af70a9f9..d405c7526 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/Contents.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.assets; +package org.jackhuang.hellominecraft.launcher.core.assets; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java index 285bee03b..68639cefb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/assets/IAssetsHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.assets; +package org.jackhuang.hellominecraft.launcher.core.assets; import java.io.File; import java.io.FileInputStream; @@ -25,9 +25,9 @@ import java.util.Collection; import java.util.List; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +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.tasks.Task; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.utils.code.DigestUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/AuthenticationException.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/AuthenticationException.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java index bfc7a5c94..a8a0cfa9d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/AuthenticationException.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; public class AuthenticationException extends Exception { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/BestLogin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/BestLogin.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java index e23501750..c93861eb7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/BestLogin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; import java.io.IOException; import java.io.InputStream; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/IAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/IAuthenticator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java index 37809270c..17a0edd69 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/IAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; import java.util.ArrayList; import java.util.HashMap; @@ -50,7 +50,7 @@ public abstract class IAuthenticator { * @return login result * * @throws - * org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException + * org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException */ public abstract UserProfileProvider login(LoginInfo info) throws AuthenticationException; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/LoginInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/LoginInfo.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java index 382fd1338..020f0d4e0 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/LoginInfo.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/OfflineAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/OfflineAuthenticator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java index c52ac96cd..fc7db9f53 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/OfflineAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; import java.util.HashMap; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/SkinmeAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/SkinmeAuthenticator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java index a5e9636fc..bf24232fb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/SkinmeAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.utils.code.DigestUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/UserProfileProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/UserProfileProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java index dacbe5ce3..c2fd831ca 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/UserProfileProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/YggdrasilAuthenticator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/YggdrasilAuthenticator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java index ab8ab0da6..aaba86ab9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/YggdrasilAuthenticator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth; +package org.jackhuang.hellominecraft.launcher.core.auth; import com.google.gson.GsonBuilder; import java.net.Proxy; @@ -24,10 +24,10 @@ import javax.swing.JOptionPane; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.utils.ArrayUtils; import org.jackhuang.hellominecraft.views.Selector; -import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.GameProfile; -import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.PropertyMap; -import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.YggdrasilAuthentication; -import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.UUIDTypeAdapter; +import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.GameProfile; +import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.PropertyMap; +import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.YggdrasilAuthentication; +import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.UUIDTypeAdapter; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/AuthenticationRequest.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/AuthenticationRequest.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java index fcb7a169e..477638ff6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/AuthenticationRequest.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; import java.util.HashMap; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/GameProfile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/GameProfile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java index b0ee6a97b..f961a4088 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/GameProfile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Property.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Property.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java index ac75f87fa..e9b014032 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Property.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; public class Property { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/PropertyMap.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/PropertyMap.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java index bf1b98d51..ff2f6512a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/PropertyMap.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/RefreshRequest.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/RefreshRequest.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java index 69cc78a63..429e18549 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/RefreshRequest.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; public class RefreshRequest { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Response.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Response.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java index b505cba28..2d4390c9f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/Response.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; public class Response { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/UUIDTypeAdapter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/UUIDTypeAdapter.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java index 269952f1c..f93d46fd3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/UUIDTypeAdapter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/User.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/User.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java index 524ae98ff..c19d222d2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/User.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; public class User { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/YggdrasilAuthentication.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/YggdrasilAuthentication.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java index ed5d5b91a..8766b65da 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/auth/yggdrasil/YggdrasilAuthentication.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil; +package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/BMCLAPIDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java similarity index 80% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/BMCLAPIDownloadProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java index 8fdaaea6c..af81402e0 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/BMCLAPIDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.download; +package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; /** * @@ -27,17 +27,17 @@ public class BMCLAPIDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/DownloadType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/DownloadType.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java index e6248e97f..e1355f7cc 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/DownloadType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.download; +package org.jackhuang.hellominecraft.launcher.core.download; import org.jackhuang.hellominecraft.C; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/IDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/IDownloadProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java index b37e83637..c9093eec5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/IDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.download; +package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java similarity index 76% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java index 929b18cb4..7df070d31 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.download; +package org.jackhuang.hellominecraft.launcher.core.download; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; /** * @@ -28,17 +28,17 @@ public class MojangDownloadProvider extends IDownloadProvider { @Override public InstallerVersionList getForgeInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.forge.MinecraftForgeVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance(); } @Override public InstallerVersionList getLiteLoaderInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance(); } @Override public InstallerVersionList getOptiFineInstaller() { - return org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla.OptiFineVersionList.getInstance(); + return org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineVersionList.getInstance(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/RapidDataDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/RapidDataDownloadProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java index 703be72ed..7b84eca2b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/RapidDataDownloadProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.download; +package org.jackhuang.hellominecraft.launcher.core.download; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallProfile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java similarity index 82% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallProfile.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java index 35442cbb6..66e16fb78 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallProfile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; import com.google.gson.annotations.SerializedName; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.forge.Install; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerType.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java index 86fee9215..4486f148d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java index dbf577749..c148dd3ad 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; import java.util.ArrayList; import java.util.Comparator; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionNewerComparator.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java similarity index 86% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionNewerComparator.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java index bff779099..cc60aae2e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/InstallerVersionNewerComparator.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; import java.util.Comparator; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/MinecraftInstallerService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java similarity index 81% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/MinecraftInstallerService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java index 3d9e7e114..e4ddf6a1b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/MinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftInstallerService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService; import java.io.File; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftBasicService; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion; -import org.jackhuang.hellominecraft.launcher.utils.installers.forge.ForgeInstaller; -import org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderInstaller; -import org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList; -import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineInstaller; -import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla.OptiFineDownloadFormatter; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftBasicService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.forge.ForgeInstaller; +import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderInstaller; +import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineInstaller; +import org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineDownloadFormatter; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.TaskInfo; import org.jackhuang.hellominecraft.tasks.TaskWindow; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java index e2225afd6..a79ba735c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/PackMinecraftInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers; +package org.jackhuang.hellominecraft.launcher.core.installers; import java.io.File; import java.io.IOException; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java index d5646337b..8e187b843 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallProfile; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallProfile; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -26,12 +26,12 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.NetUtils; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.utils.MessageBox; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeOldInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeOldInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java index a33985cbb..c817d6b89 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/ForgeOldInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import org.jackhuang.hellominecraft.launcher.utils.installers.PackMinecraftInstaller; +import org.jackhuang.hellominecraft.launcher.core.installers.PackMinecraftInstaller; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/Install.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/Install.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java index 6ee59ea46..dc4cfecbd 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/Install.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java index 4c8924256..ac65af989 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java index 954fdb95c..108eaf66a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; import java.util.ArrayList; import java.util.Collections; @@ -25,8 +25,8 @@ import java.util.Map; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionNewerComparator; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator; import org.jackhuang.hellominecraft.utils.NetUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionRoot.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionRoot.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java index 023cb9893..e77748f8e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/MinecraftForgeVersionRoot.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.forge; +package org.jackhuang.hellominecraft.launcher.core.installers.forge; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java index df7eff7d8..23a7267db 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; import java.io.File; import java.util.ArrayList; import java.util.Arrays; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.communication.PreviousResult; import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrar; import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderMCVersions.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderMCVersions.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java index c7d8a3793..2fd4e18e5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderMCVersions.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java similarity index 85% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java index b996385f5..28888010a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java index 756c6882d..b1767af50 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; import java.util.ArrayList; import java.util.Arrays; @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionNewerComparator; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsMeta.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsMeta.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java index 5b4b90b00..cb4a1ac7c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsMeta.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsRoot.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsRoot.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java index d05a89dea..4172b7fa1 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/liteloader/LiteLoaderVersionsRoot.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader; +package org.jackhuang.hellominecraft.launcher.core.installers.liteloader; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java index 9ab696f72..eb90c057c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineInstaller.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.optifine; +package org.jackhuang.hellominecraft.launcher.core.installers.optifine; import java.io.File; import java.util.ArrayList; import java.util.zip.ZipFile; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.communication.PreviousResult; import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrar; import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java index ec2fcdfe5..c342a5909 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/OptiFineVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.optifine; +package org.jackhuang.hellominecraft.launcher.core.installers.optifine; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/bmcl/OptiFineBMCLVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/bmcl/OptiFineBMCLVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java index 5c08dcd19..13267911a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/bmcl/OptiFineBMCLVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.bmcl; +package org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl; import com.google.gson.reflect.TypeToken; import java.util.ArrayList; @@ -27,8 +27,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.utils.ArrayUtils; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java index d0aafe9ad..aa106b100 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla; +package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineVersionList.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java index d3f628e76..e4c6a30d4 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineVersionList.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla; +package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -29,8 +29,8 @@ import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; -import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineVersion; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion; import org.jackhuang.hellominecraft.utils.ArrayUtils; import org.jackhuang.hellominecraft.utils.NetUtils; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java index e23ad85d5..155792a27 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/AbstractMinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java @@ -15,8 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.launch; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -25,10 +27,11 @@ import java.util.List; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.Launcher; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.utils.system.JdkVersion; import org.jackhuang.hellominecraft.utils.MathUtils; import org.jackhuang.hellominecraft.utils.MessageBox; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java similarity index 87% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java index cf0210f7f..9f82a632d 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/DefaultGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.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.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.IOException; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.GameLauncher.DownloadLibraryJob; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher.DownloadLibraryJob; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.tasks.ParallelTask; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.utils.system.Compressor; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java index 93e7daf5d..b0fcbf92b 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/GameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java @@ -15,8 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.launch; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; @@ -27,11 +29,12 @@ import java.util.List; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.api.PluginManager; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.settings.Profile; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.Profile; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.system.JavaProcess; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java index 385e42f71..2d2e053d6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.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.launch; +package org.jackhuang.hellominecraft.launcher.core.launch; import java.io.File; import java.io.FileInputStream; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java index 8af2dc2fa..9a441bca0 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java @@ -15,8 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.launch; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; @@ -25,14 +26,15 @@ import java.util.Map; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.utils.system.IOUtils; -import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex; -import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject; -import org.jackhuang.hellominecraft.launcher.utils.assets.IAssetsHandler; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex; +import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject; +import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.utils.system.OS; -import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.utils.system.FileUtils; import org.jackhuang.hellominecraft.utils.MessageBox; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftAssetService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java index 6d45a6acf..5f998788f 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftAssetService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.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.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; import java.io.IOException; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftBasicService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftBasicService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java index 602862a82..8e1cfe830 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftBasicService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.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.launch; +package org.jackhuang.hellominecraft.launcher.core.service; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftDownloadService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java similarity index 82% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftDownloadService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java index 84ba27908..0ef48c699 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftDownloadService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java @@ -15,11 +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.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.util.List; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.version.MinecraftRemoteVersion; import rx.Observable; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftInstallerService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java similarity index 78% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftInstallerService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java index 13f33c58a..1e0d8dba7 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.service; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftBasicService; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftBasicService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; import org.jackhuang.hellominecraft.tasks.Task; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java similarity index 86% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java index e48cae266..1bca890e2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftLoader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.util.List; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftModService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftModService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java index fb03d24ec..2d50c7be7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftModService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; import java.util.List; -import org.jackhuang.hellominecraft.launcher.utils.ModInfo; +import org.jackhuang.hellominecraft.launcher.core.ModInfo; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java index 7fd8a65ad..08d0d072a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java @@ -15,19 +15,21 @@ * 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.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; import java.util.Collection; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; -import org.jackhuang.hellominecraft.launcher.version.GameDirType; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.utils.StrUtils; /** * Provide everything of the Minecraft of a Profile. * - * @see org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager + * @see org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager * @author huangyuhui */ public abstract class IMinecraftProvider { @@ -97,7 +99,7 @@ public abstract class IMinecraftProvider { /** * Provide the Minecraft Loader to generate the launching command. * - * @see org.jackhuang.hellominecraft.launcher.launch.IMinecraftLoader + * @see org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader * @param p player informations, including username & auth_token * * @return what you want diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java similarity index 88% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java index 3d92c460f..032d5574f 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/IMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.launch; +package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Extract.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Extract.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java index b49c3043a..53cfbfcc5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Extract.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.util.Arrays; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/GameDirType.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/GameDirType.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java index f78a52b92..0fe97eda8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/GameDirType.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/IMinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/IMinecraftLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java index a01e2ff58..e964c9874 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/IMinecraftLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java similarity index 90% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftAssetService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java index 105c404f4..a8d5cddfe 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftAssetService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java @@ -15,17 +15,17 @@ * 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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex; -import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject; -import org.jackhuang.hellominecraft.launcher.utils.assets.IAssetsHandler; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex; +import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject; +import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftClassicVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftClassicVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java index 64512719f..d2ecd71d5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftClassicVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.util.ArrayList; import java.util.Set; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftDownloadService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftDownloadService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java index 9ae0e1e39..250e015ae 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftDownloadService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftDownloadService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService; import com.google.gson.JsonSyntaxException; import java.io.File; import java.util.ArrayList; import java.util.List; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.GameException; -import org.jackhuang.hellominecraft.launcher.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.utils.NetUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java similarity index 97% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index c1a55c498..c83c373f4 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.utils.system.OS; import org.jackhuang.hellominecraft.utils.system.Platform; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftModService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftModService.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftModService.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftModService.java index 5283f8357..d676b4b73 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftModService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftModService.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.io.FileInputStream; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftModService; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.utils.ModInfo; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.ModInfo; import org.jackhuang.hellominecraft.utils.code.DigestUtils; import org.jackhuang.hellominecraft.utils.system.FileUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftOldLibrary.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java similarity index 91% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftOldLibrary.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java index 8961691fd..84610e277 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftOldLibrary.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersion.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java index caddb3d20..1a905638e 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.util.ArrayList; @@ -23,9 +23,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.launch.GameException; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; -import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; +import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex; import org.jackhuang.hellominecraft.utils.ArrayUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java index fc8aa76d9..490579494 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/MinecraftVersionManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import com.google.gson.JsonSyntaxException; import java.io.File; @@ -26,15 +26,15 @@ import java.util.Map; import java.util.TreeMap; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.GameException; -import org.jackhuang.hellominecraft.launcher.launch.GameLauncher; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftLoader; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider; -import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.launch.MinecraftLoader; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.launch.MinecraftLoader; import org.jackhuang.hellominecraft.utils.system.FileUtils; -import org.jackhuang.hellominecraft.launcher.utils.MCUtils; -import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider; +import org.jackhuang.hellominecraft.launcher.core.MCUtils; +import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; import org.jackhuang.hellominecraft.tasks.DecompressTask; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ModpackUpdater.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java similarity index 95% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ModpackUpdater.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java index d2cf765f8..a2e4f0079 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ModpackUpdater.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.util.ArrayList; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Natives.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java similarity index 94% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Natives.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java index e9b1cc166..0d49e78fa 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Natives.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/OS.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/OS.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/OS.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/OS.java index 5c0f5ca5e..c134beb16 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/OS.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/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.launcher.version; +package org.jackhuang.hellominecraft.launcher.core.version; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Rules.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java similarity index 93% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Rules.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java index 8561d27ad..491231e88 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/Rules.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ServerInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java similarity index 96% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ServerInfo.java rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java index 0bddbd939..b7adab73a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/version/ServerInfo.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.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.version; +package org.jackhuang.hellominecraft.launcher.core.version; import java.io.File; import java.util.HashMap; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java index 0b2a61e4c..41275b0b9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java @@ -17,7 +17,8 @@ */ package org.jackhuang.hellominecraft.launcher.settings; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.Profile; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import java.util.HashMap; @@ -25,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.UUID; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.lookandfeel.Theme; import org.jackhuang.hellominecraft.utils.EventHandler; import org.jackhuang.hellominecraft.utils.system.JdkVersion; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java index 660c9b413..a16b48037 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.settings; +import org.jackhuang.hellominecraft.launcher.core.Profile; import com.google.gson.JsonSyntaxException; import java.io.File; import java.io.IOException; @@ -61,8 +62,13 @@ public final class Settings { if (!getProfiles().containsKey(DEFAULT_PROFILE)) getProfiles().put(DEFAULT_PROFILE, new Profile()); - for (Profile e : getProfiles().values()) + for (Profile e : getProfiles().values()) { e.checkFormat(); + e.propertyChanged.register((sender, t) -> { + save(); + return true; + }); + } List temp = new ArrayList<>(); temp.add(new Java("Default", System.getProperty("java.home"))); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java index c0180536e..3f4763dc2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java @@ -36,7 +36,7 @@ import java.util.jar.Pack200; import java.util.zip.GZIPInputStream; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.utils.MCUtils; +import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.tasks.Task; import org.jackhuang.hellominecraft.tasks.TaskWindow; import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java index 26fceba23..788f0f326 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java @@ -44,13 +44,13 @@ import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.launcher.utils.FileNameFilter; -import org.jackhuang.hellominecraft.launcher.utils.ModInfo; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.version.GameDirType; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.ModInfo; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.utils.Event; import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.MessageBox; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java index 9876d874c..1e4fbc3d6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java @@ -22,8 +22,8 @@ import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType; -import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType; +import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList; import org.jackhuang.hellominecraft.tasks.TaskRunnable; import org.jackhuang.hellominecraft.tasks.TaskRunnableArg1; import org.jackhuang.hellominecraft.tasks.TaskWindow; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java index 53c5f3f4e..d746e68e2 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java @@ -25,7 +25,7 @@ import javax.swing.filechooser.FileNameExtensionFilter; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType; +import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.utils.system.IOUtils; import org.jackhuang.hellominecraft.utils.MessageBox; import org.jackhuang.hellominecraft.views.SwingUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java index ec53f73cd..27ed2d51a 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java @@ -44,7 +44,7 @@ import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; import org.jackhuang.hellominecraft.launcher.Main; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; import org.jackhuang.hellominecraft.lookandfeel.Theme; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java index af37459d0..3b3af6a45 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java @@ -29,18 +29,18 @@ import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import org.jackhuang.hellominecraft.C; import org.jackhuang.hellominecraft.HMCLog; -import org.jackhuang.hellominecraft.launcher.launch.DefaultGameLauncher; -import org.jackhuang.hellominecraft.launcher.launch.GameException; -import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator; -import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.launch.DefaultGameLauncher; +import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; +import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.utils.MessageBox; import org.jackhuang.hellominecraft.utils.StrUtils; -import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion; -import org.jackhuang.hellominecraft.launcher.launch.GameLauncher; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; +import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher; import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility; import org.jackhuang.hellominecraft.launcher.settings.Settings; -import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException; +import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; import org.jackhuang.hellominecraft.utils.Event; import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java index db4406bd6..4a13d20f6 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java @@ -18,7 +18,7 @@ package org.jackhuang.hellominecraft.launcher.views; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.settings.Profile; +import org.jackhuang.hellominecraft.launcher.core.Profile; import org.jackhuang.hellominecraft.launcher.settings.Settings; import org.jackhuang.hellominecraft.utils.StrUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java index 89e751044..659ea1299 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java @@ -22,7 +22,7 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; /** * diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java index fbbf38016..d0c14ee60 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListView.java @@ -21,7 +21,7 @@ import java.awt.Color; import javax.swing.DefaultListModel; import javax.swing.JList; import org.jackhuang.hellominecraft.C; -import org.jackhuang.hellominecraft.launcher.version.ServerInfo; +import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo; /** *