diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 1159a493b..d98830a22 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ HMCL/build/ HMCLServer/ HMCSM/build/ MetroLookAndFeel/build/ +/HMCUtils/build/ +/HMCLaF/build/ \ No newline at end of file diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 407d50f75..220770fec 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -55,6 +55,35 @@ task generateSources(type: Copy) { compileJava.setSource "$buildDir/generated-src" compileJava.dependsOn generateSources +sourceSets { + main { + java { + srcDirs = [ + 'src/core/java/', + 'src/main/java/' + ] + } + resources { + srcDirs = ['src/main/resources/'] + } + } + core { + java { + compileClasspath += main.compileClasspath + runtimeClasspath += main.runtimeClasspath + srcDirs 'src/core/java/' + } + resources { + srcDirs 'src/main/resources/' + } + } +} + +configurations { + coreCompile.extendsFrom compile + coreRuntime.extendsFrom runtime +} + buildscript { repositories { mavenCentral(); @@ -80,8 +109,8 @@ configure(install.repositories.mavenInstaller) { } dependencies { - compile project(":MetroLookAndFeel") - compile project(":HMCLAPI") + compile project(":HMCLaF") + compile project(":HMCUtils") compile group: "org.commonjava.googlecode.markdown4j", name: "markdown4j", version: "2.2-cj-1.0" } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java similarity index 92% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java index 9b004edf7..c14d18661 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java @@ -19,7 +19,6 @@ package org.jackhuang.hellominecraft.launcher.api; import org.jackhuang.hellominecraft.launcher.core.GameException; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; -import org.jackhuang.hellominecraft.launcher.setting.Profile; import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator; import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider; @@ -35,12 +34,12 @@ public interface IPlugin { /** * You can modify the application actions by this method. * - * @param profile info to the Minecraft Loader + * @param obj minecraft service wanted * * @return For example, you can implement IMinecraftProvider to support * MultiMC */ - IMinecraftService provideMinecraftService(Profile profile); + IMinecraftService provideMinecraftService(Object obj); /** * Register authenticators by calling IAuthenticator.LOGINS.add. diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java similarity index 74% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java index 164ad6d95..3468dbb22 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java @@ -18,7 +18,6 @@ package org.jackhuang.hellominecraft.launcher.api; import org.jackhuang.hellominecraft.util.logging.HMCLog; -import org.jackhuang.hellominecraft.launcher.util.DefaultPlugin; /** * @@ -26,17 +25,21 @@ import org.jackhuang.hellominecraft.launcher.util.DefaultPlugin; */ public class PluginManager { - private static IPlugin NOW_PLUGIN = new DefaultPlugin(); + private static IPlugin NOW_PLUGIN; public static void getServerPlugin() { try { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Class c = cl.loadClass("org.jackhuang.hellominecraft.launcher.server.ServerPlugin"); - IPlugin p = (IPlugin) c.newInstance(); - NOW_PLUGIN = p; + getPlugin(Thread.currentThread().getContextClassLoader().loadClass("org.jackhuang.hellominecraft.launcher.server.ServerPlugin")); } catch (ClassNotFoundException ignore) { + } + } + + public static void getPlugin(Class cls) { + try { + IPlugin p = (IPlugin) cls.newInstance(); + NOW_PLUGIN = p; } catch (Exception e) { - HMCLog.err("Failed to new instance"); + HMCLog.err("Failed to new instance"); } } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/GameException.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/GameException.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadLibraryJob.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteLatestVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallProfile.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerType.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionNewerComparator.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeOldInstaller.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderInstaller.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/bmcl/OptiFineBMCLVersionList.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineDownloadFormatter.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/vanilla/OptiFineVersionList.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchingState.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchingState.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchingState.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchingState.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/MinecraftModService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/DecompressLibraryJob.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/DecompressLibraryJob.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/DecompressLibraryJob.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/DecompressLibraryJob.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java similarity index 100% rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java rename to HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java 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 a07f2ae63..a4e8d2689 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -46,6 +46,7 @@ import org.jackhuang.hellominecraft.util.ui.LogWindow; import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.util.upgrade.IUpgrader; import org.jackhuang.hellominecraft.launcher.ui.MainFrame; +import org.jackhuang.hellominecraft.launcher.util.DefaultPlugin; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; import org.jackhuang.hellominecraft.util.MathUtils; import org.jackhuang.hellominecraft.util.StrUtils; @@ -118,7 +119,7 @@ public final class Main implements Runnable { @SuppressWarnings({ "CallToPrintStackTrace", "UseSpecificCatch" }) public static void main(String[] args) throws IOException { { - //PluginManager.getServerPlugin(); + PluginManager.getPlugin(DefaultPlugin.class); if (IUpgrader.NOW_UPGRADER.parseArguments(getVersionNumber(), args)) return; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java index 3bf161a13..f744d9490 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultPlugin.java @@ -42,8 +42,8 @@ public class DefaultPlugin implements IPlugin { SkinmeAuthenticator SKINME_LOGIN = null; @Override - public IMinecraftService provideMinecraftService(Profile profile) { - return new HMCLMinecraftService(profile); + public IMinecraftService provideMinecraftService(Object profile) { + return new HMCLMinecraftService((Profile) profile); } @Override diff --git a/MetroLookAndFeel/build.gradle b/HMCLaF/build.gradle similarity index 97% rename from MetroLookAndFeel/build.gradle rename to HMCLaF/build.gradle index b91cd205a..71c0ce12e 100755 --- a/MetroLookAndFeel/build.gradle +++ b/HMCLaF/build.gradle @@ -35,7 +35,7 @@ buildscript { } dependencies { - compile project(":HMCLAPI") + compile project(":HMCUtils") } retrolambda { diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/Theme.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ComboBoxUI.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ListCellRender.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollBarUI.java diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java b/HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java similarity index 100% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java rename to HMCLaF/src/main/java/org/jackhuang/hellominecraft/lookandfeel/ui/ScrollButton.java diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_disabled.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_off_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_disabled.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/checkbox_on_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_disabled.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_normal.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/combo_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_error.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_info.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_question.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/option_pane_warning.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_normal.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_disabled_selected.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/radio_btn_selected_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_normal.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_dec_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_disabled.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_enabled.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_normal.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_inc_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_normal.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_over.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/scroll_thumb_pressed.png diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_closed.gif diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_collapsed.gif diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_expanded.gif diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_leaf.gif diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/images/tree_open.gif diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth.xml diff --git a/MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth_backup.xml b/HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth_backup.xml similarity index 100% rename from MetroLookAndFeel/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth_backup.xml rename to HMCLaF/src/main/resources/org/jackhuang/hellominecraft/lookandfeel/synth_backup.xml diff --git a/HMCSM/build.gradle b/HMCSM/build.gradle index 770faebe8..d8e6ec12d 100755 --- a/HMCSM/build.gradle +++ b/HMCSM/build.gradle @@ -64,18 +64,18 @@ retrolambda { } dependencies { - compile project(":HMCLAPI") - compile project(":MetroLookAndFeel") - compile ('org.jyaml:jyaml:1.3') + compile project(":HMCLaF") + compile project(":HMCUtils") + compile ("org.jyaml:jyaml:1.3") compile ("org.tukaani:xz:1.5") - compile ('org.jsoup:jsoup:1.7.2') + compile ("org.jsoup:jsoup:1.7.2") } jar { from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } manifest { - attributes 'Created-By' : 'Copyright(c) 2014 huangyuhui.', + attributes 'Created-By' : "Copyright(c) 2014 huangyuhui.", 'Main-Class' : mainClass } } diff --git a/HMCLAPI/build.gradle b/HMCUtils/build.gradle similarity index 100% rename from HMCLAPI/build.gradle rename to HMCUtils/build.gradle diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ArrayUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/C.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/C.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/C.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/C.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/CollectionUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Event.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Event.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Event.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Event.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/EventHandler.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/IUpdateChecker.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/LauncherPrintStream.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MathUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MessageBox.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/MinecraftVersionRequest.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Pair.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Pair.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Pair.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Pair.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/UpdateChecker.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Utils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Utils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/Utils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Utils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/VersionNumber.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Base64.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Charsets.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/DigestUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/code/Hex.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiConsumer.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/BiFunction.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/CallbackIO.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Consumer.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Function.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/NonFunction.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/Predicate.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/func/TriConsumer.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/Localization.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/lang/SupportedLocales.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/AppenderControl.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Configuration.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/HMCLog.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/Level.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LogEvent.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/LoggingException.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/AbstractAppender.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/ConsoleAppender.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/IAppender.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/appender/OutputStreamAppender.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/AbstractStringLayout.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/DefaultLayout.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/layout/ILayout.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/AbstractLogger.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/ILogger.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/Logger.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/logger/SimpleLogger.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/AbstractMessageFactory.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/IMessageFactory.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ObjectMessage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/ParameterizedMessageFactory.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/SimpleMessage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/logging/message/StringFormattedMessage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/FileUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Java.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcess.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JavaProcessMonitor.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/JdkVersion.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/OS.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Platform.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessManager.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ProcessThread.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ThreadExecutor.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DecompressTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoingDoneListener.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/DoubleTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/NoShownTaskException.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ParallelTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/ProgressProviderListener.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/Task.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskInfo.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskRunnable.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.form diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/DefaultPreviousResult.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResult.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/communication/PreviousResultRegistrar.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/ContentGetAndShowTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/DownloadListener.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/NetException.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/AbstractFilter.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/BasicColors.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/DropShadowBorder.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/FastBlurFilter.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/GraphicsUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.form diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindow.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/SwingUtils.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/TintablePanel.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebFrame.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/WebPage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeCellRenderer.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeLabel.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNode.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/checktree/CheckBoxTreeNodeSelectionListener.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardDisplayer.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/WizardResultReceiver.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/InstructionsPanel.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavButtonManager.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/NavProgress.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/api/displayer/WizardDisplayerImpl.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/InstructionsPanelImpl.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/modules/MergeMap.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/BranchingWizard.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/DeferredWizardResult.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/GenericListener.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/ResultProgressHandle.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizard.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/SimpleWizardInfo.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Summary.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Util.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/Wizard.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardBranchController.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardController.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardControllerImplementation.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardException.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardImplementation.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardObserver.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPage.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanel.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelNavResult.java diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java similarity index 100% rename from HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java rename to HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/wizard/spi/WizardPanelProvider.java diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg similarity index 100% rename from HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg rename to HMCUtils/src/main/resources/org/jackhuang/hellominecraft/wizard.jpg diff --git a/settings.gradle b/settings.gradle index 3cd87598c..ba5f82c9c 100755 --- a/settings.gradle +++ b/settings.gradle @@ -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/}. */ -rootProject.name = 'HMCL' +rootProject.name = 'Hello Minecraft!' // Find the directories containing a "build.gradle" file in the root directory // of the project. That is, every directory containing a "build.gradle" will