getting core

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java

@@ -30,7 +30,7 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.views.LogWindow;
-import org.jackhuang.hellominecraft.launcher.launch.MinecraftCrashAdvicer;
+import org.jackhuang.hellominecraft.launcher.core.MinecraftCrashAdvicer;
 import org.jackhuang.hellominecraft.utils.DoubleOutputStream;
 import org.jackhuang.hellominecraft.utils.LauncherPrintStream;
 import org.jackhuang.hellominecraft.utils.MathUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java

@@ -34,7 +34,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
-import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.utils.CrashReporter;
 import org.jackhuang.hellominecraft.logging.Configuration;
 import org.jackhuang.hellominecraft.logging.appender.ConsoleAppender;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/IPlugin.java

@@ -17,11 +17,11 @@
  */
 package org.jackhuang.hellominecraft.launcher.api;
 
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
+import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.utils.functions.Consumer;
 
 /**

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java

@@ -18,7 +18,7 @@
 package org.jackhuang.hellominecraft.launcher.api;
 
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.DefaultPlugin;
+import org.jackhuang.hellominecraft.launcher.core.DefaultPlugin;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java

@@ -15,14 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core;
 
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.installers.MinecraftInstallerService;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftAssetService;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftDownloadService;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftModService;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService;
+import org.jackhuang.hellominecraft.launcher.core.installers.MinecraftInstallerService;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftDownloadService;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftModService;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java

@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core;
 
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.api.IPlugin;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.OfflineAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.SkinmeAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.utils.auth.YggdrasilAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.SkinmeAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.auth.YggdrasilAuthenticator;
 import org.jackhuang.hellominecraft.launcher.views.MainFrame;
 import org.jackhuang.hellominecraft.utils.functions.Consumer;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/GameException.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MCUtils.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.core;
 
 import java.io.File;
 import java.io.IOException;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core;
 
 import org.jackhuang.hellominecraft.C;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/ModInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils;
+package org.jackhuang.hellominecraft.launcher.core;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/Profile.java

@@ -15,14 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.settings;
+package org.jackhuang.hellominecraft.launcher.core;
 
 import java.io.File;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
-import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
-import org.jackhuang.hellominecraft.launcher.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.core.MCUtils;
+import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility;
+import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.utils.Utils;
 import org.jackhuang.hellominecraft.utils.EventHandler;
@@ -53,6 +55,7 @@ public final class Profile {
     private int gameDirType;
 
     protected transient IMinecraftService service;
+    public transient final EventHandler<String> propertyChanged = new EventHandler<>(this);
 
     public Profile() {
         this("Default");
@@ -134,7 +137,7 @@ public final class Profile {
     public Profile setGameDir(String gameDir) {
         this.gameDir = gameDir;
         service().version().refreshVersions();
-        Settings.save();
+        propertyChanged.execute("gameDir");
         return this;
     }
 
@@ -156,7 +159,7 @@ public final class Profile {
 
     public void setJavaDir(String javaDir) {
         this.javaDir = javaDir;
-        Settings.save();
+        propertyChanged.execute("javaDir");
     }
 
     public Java getJava() {
@@ -183,7 +186,7 @@ public final class Profile {
                 return;
             this.java = java.getName();
         }
-        Settings.save();
+        propertyChanged.execute("java");
     }
 
     public File getFolder(String folder) {
@@ -198,6 +201,7 @@ public final class Profile {
 
     public void setName(String name) {
         this.name = name;
+        propertyChanged.execute("name");
     }
 
     public String getJavaArgs() {
@@ -208,7 +212,7 @@ public final class Profile {
 
     public void setJavaArgs(String javaArgs) {
         this.javaArgs = javaArgs;
-        Settings.save();
+        propertyChanged.execute("javaArgs");
     }
 
     public boolean hasJavaArgs() {
@@ -223,7 +227,7 @@ public final class Profile {
 
     public void setMaxMemory(String maxMemory) {
         this.maxMemory = maxMemory;
-        Settings.save();
+        propertyChanged.execute("maxMemory");
     }
 
     public String getWidth() {
@@ -234,6 +238,7 @@ public final class Profile {
 
     public void setWidth(String width) {
         this.width = width;
+        propertyChanged.execute("width");
     }
 
     public String getHeight() {
@@ -244,7 +249,7 @@ public final class Profile {
 
     public void setHeight(String height) {
         this.height = height;
-        Settings.save();
+        propertyChanged.execute("height");
     }
 
     public String getUserProperties() {
@@ -255,6 +260,7 @@ public final class Profile {
 
     public void setUserProperties(String userProperties) {
         this.userProperties = userProperties;
+        propertyChanged.execute("userProperties");
     }
 
     public boolean isFullscreen() {
@@ -263,7 +269,7 @@ public final class Profile {
 
     public void setFullscreen(boolean fullscreen) {
         this.fullscreen = fullscreen;
-        Settings.save();
+        propertyChanged.execute("fullscreen");
     }
 
     public boolean isDebug() {
@@ -272,7 +278,7 @@ public final class Profile {
 
     public void setDebug(boolean debug) {
         this.debug = debug;
-        Settings.save();
+        propertyChanged.execute("debug");
     }
 
     public LauncherVisibility getLauncherVisibility() {
@@ -281,7 +287,7 @@ public final class Profile {
 
     public void setLauncherVisibility(LauncherVisibility launcherVisibility) {
         this.launcherVisibility = launcherVisibility.ordinal();
-        Settings.save();
+        propertyChanged.execute("launcherVisibility");
     }
 
     public GameDirType getGameDirType() {
@@ -293,7 +299,7 @@ public final class Profile {
     public void setGameDirType(GameDirType gameDirType) {
         this.gameDirType = gameDirType.ordinal();
         service().version().setGameDirType(getGameDirType());
-        Settings.save();
+        propertyChanged.execute("gameDirType");
     }
 
     public String getPermSize() {
@@ -302,7 +308,7 @@ public final class Profile {
 
     public void setPermSize(String permSize) {
         this.permSize = permSize;
-        Settings.save();
+        propertyChanged.execute("permSize");
     }
 
     public boolean isNoJVMArgs() {
@@ -311,6 +317,7 @@ public final class Profile {
 
     public void setNoJVMArgs(boolean noJVMArgs) {
         this.noJVMArgs = noJVMArgs;
+        propertyChanged.execute("noJVMArgs");
     }
 
     public String getMinecraftArgs() {
@@ -319,7 +326,7 @@ public final class Profile {
 
     public void setMinecraftArgs(String minecraftArgs) {
         this.minecraftArgs = minecraftArgs;
-        Settings.save();
+        propertyChanged.execute("minecraftArgs");
     }
 
     public boolean isCanceledWrapper() {
@@ -328,7 +335,7 @@ public final class Profile {
 
     public void setCanceledWrapper(boolean canceledWrapper) {
         this.canceledWrapper = canceledWrapper;
-        Settings.save();
+        propertyChanged.execute("canceledWrapper");
     }
 
     public String getPrecalledCommand() {
@@ -337,7 +344,7 @@ public final class Profile {
 
     public void setPrecalledCommand(String precalledCommand) {
         this.precalledCommand = precalledCommand;
-        Settings.save();
+        propertyChanged.execute("precalledCommand");
     }
 
     public String getServerIp() {
@@ -346,7 +353,7 @@ public final class Profile {
 
     public void setServerIp(String serverIp) {
         this.serverIp = serverIp;
-        Settings.save();
+        propertyChanged.execute("serverIp");
     }
 
     public void checkFormat() {

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsIndex.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.assets;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsMojangLoader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.assets;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,14 +23,14 @@ import java.util.ArrayList;
 import java.util.Map;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
 import org.jackhuang.hellominecraft.utils.StrUtils;
-import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.utils.VersionNumber;
 import rx.Observable;
 import rx.Observer;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/AssetsObject.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.assets;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/Contents.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.assets;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/IAssetsHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.assets;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,9 +25,9 @@ import java.util.Collection;
 import java.util.List;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService;
-import org.jackhuang.hellominecraft.launcher.utils.download.IDownloadProvider;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.download.IDownloadProvider;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.utils.code.DigestUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/AuthenticationException.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 public class AuthenticationException extends Exception {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/BestLogin.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import java.io.IOException;
 import java.io.InputStream;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/IAuthenticator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,7 +50,7 @@ public abstract class IAuthenticator {
      * @return login result
      *
      * @throws
-     * org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException
+     * org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException
      */
     public abstract UserProfileProvider login(LoginInfo info) throws AuthenticationException;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/LoginInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/OfflineAuthenticator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import java.util.HashMap;
 import java.util.Map;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/SkinmeAuthenticator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.utils.code.DigestUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/UserProfileProvider.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
-import org.jackhuang.hellominecraft.launcher.version.ServerInfo;
+import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/YggdrasilAuthenticator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth;
+package org.jackhuang.hellominecraft.launcher.core.auth;
 
 import com.google.gson.GsonBuilder;
 import java.net.Proxy;
@@ -24,10 +24,10 @@ import javax.swing.JOptionPane;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.utils.ArrayUtils;
 import org.jackhuang.hellominecraft.views.Selector;
-import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.GameProfile;
-import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.PropertyMap;
-import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.YggdrasilAuthentication;
-import org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil.UUIDTypeAdapter;
+import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.GameProfile;
+import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.PropertyMap;
+import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.YggdrasilAuthentication;
+import org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil.UUIDTypeAdapter;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/AuthenticationRequest.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 import java.util.HashMap;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/GameProfile.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Property.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 public class Property {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/PropertyMap.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/RefreshRequest.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 public class RefreshRequest {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 public class Response {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/UUIDTypeAdapter.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/User.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
 public class User {
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/YggdrasilAuthentication.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.auth.yggdrasil;
+package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
-import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException;
+import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.download;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
 
 /**
  *
@@ -27,17 +27,17 @@ public class BMCLAPIDownloadProvider extends IDownloadProvider {
 
     @Override
     public InstallerVersionList getForgeInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.forge.MinecraftForgeVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getLiteLoaderInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getOptiFineInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl.OptiFineBMCLVersionList.getInstance();
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/DownloadType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.download;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
 import org.jackhuang.hellominecraft.C;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.download;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.download;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
 
 /**
  *
@@ -28,17 +28,17 @@ public class MojangDownloadProvider extends IDownloadProvider {
 
     @Override
     public InstallerVersionList getForgeInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.forge.MinecraftForgeVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.forge.MinecraftForgeVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getLiteLoaderInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList.getInstance();
     }
 
     @Override
     public InstallerVersionList getOptiFineInstaller() {
-        return org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla.OptiFineVersionList.getInstance();
+        return org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineVersionList.getInstance();
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.download;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallProfile.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
 import com.google.gson.annotations.SerializedName;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.forge.Install;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
 import java.util.ArrayList;
 import java.util.Comparator;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/InstallerVersionNewerComparator.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
 import java.util.Comparator;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/MinecraftInstallerService.java

@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftInstallerService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService;
 import java.io.File;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftBasicService;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion;
-import org.jackhuang.hellominecraft.launcher.utils.installers.forge.ForgeInstaller;
-import org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderInstaller;
-import org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineInstaller;
-import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla.OptiFineDownloadFormatter;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftBasicService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.forge.ForgeInstaller;
+import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderInstaller;
+import org.jackhuang.hellominecraft.launcher.core.installers.liteloader.LiteLoaderVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineInstaller;
+import org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla.OptiFineDownloadFormatter;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.TaskInfo;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/PackMinecraftInstaller.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers;
+package org.jackhuang.hellominecraft.launcher.core.installers;
 
 import java.io.File;
 import java.io.IOException;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeInstaller.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallProfile;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallProfile;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -26,12 +26,12 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
 import org.jackhuang.hellominecraft.utils.NetUtils;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.utils.MessageBox;
 
 /**

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/ForgeOldInstaller.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.PackMinecraftInstaller;
+import org.jackhuang.hellominecraft.launcher.core.installers.PackMinecraftInstaller;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/Install.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.StrUtils;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionNewerComparator;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 
 /**

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/forge/MinecraftForgeVersionRoot.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.forge;
+package org.jackhuang.hellominecraft.launcher.core.installers.forge;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderInstaller.java

@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResult;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrar;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderMCVersions.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersion.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList.InstallerVersion;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionNewerComparator;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList.InstallerVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionNewerComparator;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsMeta.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/liteloader/LiteLoaderVersionsRoot.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.liteloader;
+package org.jackhuang.hellominecraft.launcher.core.installers.liteloader;
 
 import java.util.Map;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineInstaller.java

@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.optifine;
+package org.jackhuang.hellominecraft.launcher.core.installers.optifine;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.zip.ZipFile;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResult;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResultRegistrar;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/OptiFineVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.optifine;
+package org.jackhuang.hellominecraft.launcher.core.installers.optifine;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/bmcl/OptiFineBMCLVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.bmcl;
+package org.jackhuang.hellominecraft.launcher.core.installers.optifine.bmcl;
 
 import com.google.gson.reflect.TypeToken;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.utils.ArrayUtils;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineDownloadFormatter.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla;
+package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/installers/optifine/vanilla/OptiFineVersionList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla;
+package org.jackhuang.hellominecraft.launcher.core.installers.optifine.vanilla;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@ import java.util.regex.Pattern;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
-import org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineVersion;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.optifine.OptiFineVersion;
 import org.jackhuang.hellominecraft.utils.ArrayUtils;
 import org.jackhuang.hellominecraft.utils.NetUtils;
 import org.jackhuang.hellominecraft.utils.StrUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/AbstractMinecraftLoader.java

@@ -15,8 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.launch;
 
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,10 +27,11 @@ import java.util.List;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Launcher;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.utils.system.JdkVersion;
 import org.jackhuang.hellominecraft.utils.MathUtils;
 import org.jackhuang.hellominecraft.utils.MessageBox;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/DefaultGameLauncher.java

@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.IOException;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.GameLauncher.DownloadLibraryJob;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher.DownloadLibraryJob;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.tasks.ParallelTask;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.utils.system.Compressor;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java

@@ -15,8 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.launch;
 
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,11 +29,12 @@ import java.util.List;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.api.PluginManager;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
-import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
+import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
 import org.jackhuang.hellominecraft.utils.system.JavaProcess;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/LibraryDownloadTask.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.File;
 import java.io.FileInputStream;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java

@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.launch;
 
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.io.IOException;
@@ -25,14 +26,15 @@ import java.util.Map;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
-import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex;
-import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject;
-import org.jackhuang.hellominecraft.launcher.utils.assets.IAssetsHandler;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
+import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject;
+import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import org.jackhuang.hellominecraft.utils.system.OS;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
 import org.jackhuang.hellominecraft.utils.MessageBox;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.io.File;
 import java.io.IOException;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftBasicService.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java

@@ -15,11 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.util.List;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.version.MinecraftRemoteVersion;
 import rx.Observable;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftInstallerService.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftBasicService;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftBasicService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
 import org.jackhuang.hellominecraft.tasks.Task;
 
 /**

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftLoader.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.util.List;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftModService.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.io.File;
 import java.util.List;
-import org.jackhuang.hellominecraft.launcher.utils.ModInfo;
+import org.jackhuang.hellominecraft.launcher.core.ModInfo;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftProvider.java

@@ -15,19 +15,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.io.File;
 import java.util.Collection;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
-import org.jackhuang.hellominecraft.launcher.version.GameDirType;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 
 /**
  * Provide everything of the Minecraft of a Profile.
  *
- * @see org.jackhuang.hellominecraft.launcher.version.MinecraftVersionManager
+ * @see org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager
  * @author huangyuhui
  */
 public abstract class IMinecraftProvider {
@@ -97,7 +99,7 @@ public abstract class IMinecraftProvider {
     /**
      * Provide the Minecraft Loader to generate the launching command.
      *
-     * @see org.jackhuang.hellominecraft.launcher.launch.IMinecraftLoader
+     * @see org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader
      * @param p player informations, including username & auth_token
      *
      * @return what you want

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftService.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.launch;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.util.Arrays;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDirType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/IMinecraftLibrary.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java

@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.io.IOException;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftAssetService;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex;
-import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject;
-import org.jackhuang.hellominecraft.launcher.utils.assets.IAssetsHandler;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
+import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject;
+import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftClassicVersion.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Set;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java

@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftDownloadService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService;
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.GameException;
-import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.utils.NetUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import org.jackhuang.hellominecraft.utils.system.OS;
 import org.jackhuang.hellominecraft.utils.system.Platform;
 import org.jackhuang.hellominecraft.utils.StrUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftModService.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,9 +24,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftModService;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.utils.ModInfo;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.ModInfo;
 import org.jackhuang.hellominecraft.utils.code.DigestUtils;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftOldLibrary.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -23,9 +23,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.launch.GameException;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
-import org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
+import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
 import org.jackhuang.hellominecraft.utils.ArrayUtils;
 
 /**

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersionManager.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
@@ -26,15 +26,15 @@ import java.util.Map;
 import java.util.TreeMap;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.GameException;
-import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftLoader;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftProvider;
-import org.jackhuang.hellominecraft.launcher.launch.IMinecraftService;
-import org.jackhuang.hellominecraft.launcher.launch.MinecraftLoader;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftLoader;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
+import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.launch.MinecraftLoader;
 import org.jackhuang.hellominecraft.utils.system.FileUtils;
-import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
-import org.jackhuang.hellominecraft.launcher.utils.auth.UserProfileProvider;
+import org.jackhuang.hellominecraft.launcher.core.MCUtils;
+import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.tasks.DecompressTask;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ModpackUpdater.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.util.ArrayList;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/OS.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 /**
  *

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/ServerInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.version;
+package org.jackhuang.hellominecraft.launcher.core.version;
 
 import java.io.File;
 import java.util.HashMap;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Config.java

@@ -17,7 +17,8 @@
  */
 package org.jackhuang.hellominecraft.launcher.settings;
 
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.lookandfeel.Theme;
 import org.jackhuang.hellominecraft.utils.EventHandler;
 import org.jackhuang.hellominecraft.utils.system.JdkVersion;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/Settings.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.settings;
 
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.io.IOException;
@@ -61,8 +62,13 @@ public final class Settings {
         if (!getProfiles().containsKey(DEFAULT_PROFILE))
             getProfiles().put(DEFAULT_PROFILE, new Profile());
 
-        for (Profile e : getProfiles().values())
+        for (Profile e : getProfiles().values()) {
             e.checkFormat();
+            e.propertyChanged.register((sender, t) -> {
+                save();
+                return true;
+            });
+        }
 
         List<Java> temp = new ArrayList<>();
         temp.add(new Java("Default", System.getProperty("java.home")));

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/upgrade/AppDataUpgrader.java

@@ -36,7 +36,7 @@ import java.util.jar.Pack200;
 import java.util.zip.GZIPInputStream;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.utils.MCUtils;
+import org.jackhuang.hellominecraft.launcher.core.MCUtils;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java

@@ -44,13 +44,13 @@ import javax.swing.table.DefaultTableModel;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.launcher.utils.FileNameFilter;
-import org.jackhuang.hellominecraft.launcher.utils.ModInfo;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType;
-import org.jackhuang.hellominecraft.launcher.version.GameDirType;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.ModInfo;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.version.GameDirType;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.utils.Event;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
 import org.jackhuang.hellominecraft.utils.MessageBox;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/InstallerPanel.java

@@ -22,8 +22,8 @@ import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableModel;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerType;
-import org.jackhuang.hellominecraft.launcher.utils.installers.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerType;
+import org.jackhuang.hellominecraft.launcher.core.installers.InstallerVersionList;
 import org.jackhuang.hellominecraft.tasks.TaskRunnable;
 import org.jackhuang.hellominecraft.tasks.TaskRunnableArg1;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/LauncherSettingsPanel.java

@@ -25,7 +25,7 @@ import javax.swing.filechooser.FileNameExtensionFilter;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.download.DownloadType;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import org.jackhuang.hellominecraft.utils.system.IOUtils;
 import org.jackhuang.hellominecraft.utils.MessageBox;
 import org.jackhuang.hellominecraft.views.SwingUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainFrame.java

@@ -44,7 +44,7 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 import org.jackhuang.hellominecraft.lookandfeel.Theme;
 import org.jackhuang.hellominecraft.utils.StrUtils;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/MainPagePanel.java

@@ -29,18 +29,18 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.launch.DefaultGameLauncher;
-import org.jackhuang.hellominecraft.launcher.launch.GameException;
-import org.jackhuang.hellominecraft.launcher.utils.auth.IAuthenticator;
-import org.jackhuang.hellominecraft.launcher.utils.auth.LoginInfo;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.launch.DefaultGameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.GameException;
+import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
+import org.jackhuang.hellominecraft.launcher.core.auth.LoginInfo;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.utils.MessageBox;
 import org.jackhuang.hellominecraft.utils.StrUtils;
-import org.jackhuang.hellominecraft.launcher.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.launcher.launch.GameLauncher;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
+import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.settings.LauncherVisibility;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
-import org.jackhuang.hellominecraft.launcher.utils.auth.AuthenticationException;
+import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 import org.jackhuang.hellominecraft.utils.Event;
 import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java

@@ -18,7 +18,7 @@
 package org.jackhuang.hellominecraft.launcher.views;
 
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.settings.Profile;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/ServerListCellRenderer.java

@@ -22,7 +22,7 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 import org.jackhuang.hellominecraft.C;
-import org.jackhuang.hellominecraft.launcher.version.ServerInfo;
+import org.jackhuang.hellominecraft.launcher.core.version.ServerInfo;
 
 /**
  *