Update README.md

Windows 启动脚本中允许跨分区 cd

.gitignore

@@ -25,3 +25,5 @@ HMCL/build/
 HMCLServer/
 HMCSM/build/
 MetroLookAndFeel/build/
+/HMCUtils/build/
+/HMCLaF/build/

.nb-gradle-properties

@@ -14,6 +14,15 @@
       <task-args/>
       <task-jvm-args/>
     </task>
+    <task>
+      <display-name>createApp</display-name>
+      <non-blocking>no</non-blocking>
+      <task-names>
+        <name must-exist="yes">createApp</name>
+      </task-names>
+      <task-args/>
+      <task-jvm-args/>
+    </task>
   </common-tasks>
   <script-platform>
     <spec-name>j2se</spec-name>

.travis.yml

@@ -16,8 +16,10 @@ deploy:
   file:
   - HMCL/build/libs/HMCL-${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.jar
   - HMCL/build/libs/HMCL-${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.exe
+  - HMCL/build/libs/HMCL-${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}-MacOSApp.zip
   - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.jar
   - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.exe
+  - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}-MacOSApp.zip
   on:
     repo: huanghongxun/HMCL
     tags: false

HMCL/build.gradle

@@ -15,6 +15,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
+buildscript {
+    repositories {
+        mavenCentral();
+        
+        maven {
+            url "https://libraries.minecraft.net"
+        }
+        
+        dependencies {
+            classpath 'net.sf.proguard:proguard-gradle:4.10'
+            classpath 'edu.sc.seis.gradle:launch4j:1.0.6'
+            classpath 'me.tatarka:gradle-retrolambda:3.1.0'
+        }
+    }
+}
+
+plugins {
+    id "edu.sc.seis.macAppBundle" version "2.1.6"
+}
+
 import java.util.jar.JarOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
@@ -47,6 +67,7 @@ String mavenArtifactId = name
 
 task generateSources(type: Copy) {
     from 'src/main/java'
+    from 'src/core/java'
     into "$buildDir/generated-src"
     filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [
             'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
@@ -55,20 +76,46 @@ task generateSources(type: Copy) {
 compileJava.setSource "$buildDir/generated-src"
 compileJava.dependsOn generateSources
 
-buildscript {
-    repositories {
-        mavenCentral();
-        
-        maven {
-            url "https://libraries.minecraft.net"
+task macAppCompressed(type: Zip, dependsOn: createApp) {
+    archiveName "HMCL-$mavenVersion-MacOSApp.zip"
+    include '**'
+    destinationDir file("$buildDir/libs/")
+    from "$buildDir/macApp"
+}
+
+macAppBundle {
+    mainClassName = mainClass
+    icon = "src/main/icon.icns"
+    javaProperties.put("apple.laf.useScreenMenuBar", "true")
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = [
+                'src/core/java/',
+                'src/main/java/'
+            ]
         }
-        
-        dependencies {
-            classpath 'net.sf.proguard:proguard-gradle:4.10'
-            classpath 'edu.sc.seis.gradle:launch4j:1.0.6'
-            classpath 'me.tatarka:gradle-retrolambda:3.1.0'
+        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
 }
 
 configure(install.repositories.mavenInstaller) {
@@ -80,8 +127,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"
 }
 
@@ -123,3 +170,4 @@ processResources {
 
 build.dependsOn makeExecutable
 build.dependsOn makePackGZ
+build.dependsOn macAppCompressed

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.

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");
         }
     }
 

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

@@ -20,7 +20,6 @@ package org.jackhuang.hellominecraft.launcher.core;
 import java.io.File;
 import java.io.IOException;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
 import org.jackhuang.hellominecraft.util.system.OS;
 
 /**
@@ -63,14 +62,11 @@ public final class MCUtils {
     }
 
     public static File getInitGameDir() {
-        File gameDir = IOUtils.currentDir();
-        if (gameDir.exists()) {
-            gameDir = new File(gameDir, MCUtils.minecraft());
-            if (!gameDir.exists()) {
-                File newFile = MCUtils.getLocation();
-                if (newFile.exists())
-                    gameDir = newFile;
-            }
+        File gameDir = new File(MCUtils.minecraft());
+        if (!gameDir.exists()) {
+            File newFile = MCUtils.getLocation();
+            if (newFile.exists())
+                gameDir = newFile;
         }
         return gameDir;
     }
@@ -80,6 +76,6 @@ public final class MCUtils {
     public static void tryWriteProfile(File gameDir) throws IOException {
         File file = new File(gameDir, "launcher_profiles.json");
         if (!file.exists())
-            FileUtils.writeStringToFile(file, PROFILE);
+            FileUtils.write(file, PROFILE);
     }
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.asset;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -29,7 +30,11 @@ import java.util.Set;
 public class AssetsIndex {
 
     public static final String DEFAULT_ASSET_NAME = "legacy";
+
+    @SerializedName("objects")
     public Map<String, AssetsObject> objects;
+
+    @SerializedName("virtual")
     public boolean virtual;
 
     public AssetsIndex() {

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java

@@ -66,7 +66,7 @@ public class AssetsMojangLoader extends IAssetsHandler {
             public void executeTask() throws Throwable {
                 if (!areDependTasksSucceeded)
                     throw new IllegalStateException("Failed to get asset index");
-                String result = FileUtils.readFileToString(f);
+                String result = FileUtils.read(f);
                 if (StrUtils.isBlank(result))
                     throw new IllegalStateException("Index json is empty, please redownload it!");
                 AssetsIndex o = C.GSON.fromJson(result, AssetsIndex.class);

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java

@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Map;
 import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
@@ -30,8 +29,7 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.version.AssetIndexDownloadInfo;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.util.Utils;
-import org.jackhuang.hellominecraft.util.func.Function;
+import org.jackhuang.hellominecraft.util.func.BiFunction;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.tasks.Task;
 import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
@@ -58,23 +56,7 @@ public class MinecraftAssetService extends IMinecraftAssetService {
     public Task downloadAssets(final MinecraftVersion mv) {
         if (mv == null)
             return null;
-        return new TaskInfo("Download Assets") {
-            Collection<Task> afters = new HashSet<>();
-
-            @Override
-            public Collection<Task> getDependTasks() {
-                return Arrays.asList(IAssetsHandler.ASSETS_HANDLER.getList(mv, service.asset()));
-            }
-
-            @Override
-            public void executeTask() {
-            }
-
-            @Override
-            public Collection<Task> getAfterTasks() {
-                return Arrays.asList(IAssetsHandler.ASSETS_HANDLER.getDownloadTask(service.getDownloadType().getProvider()));
-            }
-        };
+        return IAssetsHandler.ASSETS_HANDLER.getList(mv, service.asset()).after(IAssetsHandler.ASSETS_HANDLER.getDownloadTask(service.getDownloadType().getProvider()));
     }
 
     @Override
@@ -151,7 +133,7 @@ public class MinecraftAssetService extends IMinecraftAssetService {
         File objectsDir = new File(assetsDir, "objects");
         File indexFile = new File(indexDir, assetVersion + ".json");
         try {
-            AssetsIndex index = (AssetsIndex) C.GSON.fromJson(FileUtils.readFileToString(indexFile, "UTF-8"), AssetsIndex.class);
+            AssetsIndex index = (AssetsIndex) C.GSON.fromJson(FileUtils.read(indexFile, "UTF-8"), AssetsIndex.class);
 
             String hash = ((AssetsObject) index.getFileMap().get(name)).getHash();
             return new File(objectsDir, hash.substring(0, 2) + "/" + hash);
@@ -170,7 +152,7 @@ public class MinecraftAssetService extends IMinecraftAssetService {
             return false;
 
         try {
-            String assetIndexContent = FileUtils.readFileToString(indexFile, "UTF-8");
+            String assetIndexContent = FileUtils.read(indexFile, "UTF-8");
             AssetsIndex index = (AssetsIndex) C.GSON.fromJson(assetIndexContent, AssetsIndex.class);
 
             if (index == null)
@@ -198,7 +180,7 @@ public class MinecraftAssetService extends IMinecraftAssetService {
         }
 
         try {
-            String assetIndexContent = FileUtils.readFileToString(indexFile, "UTF-8");
+            String assetIndexContent = FileUtils.read(indexFile, "UTF-8");
             AssetsIndex index = (AssetsIndex) C.GSON.fromJson(assetIndexContent, AssetsIndex.class);
 
             if (index == null)
@@ -213,7 +195,7 @@ public class MinecraftAssetService extends IMinecraftAssetService {
                     if (original.exists()) {
                         cnt++;
                         if (!target.isFile())
-                            FileUtils.copyFile(original, target, false);
+                            FileUtils.copyFile(original, target);
                     }
                 }
                 // If the scale new format existent file is lower then 0.1, use the old format.
@@ -227,8 +209,8 @@ public class MinecraftAssetService extends IMinecraftAssetService {
         return virtualRoot;
     }
 
-    public final Function<MinecraftVersion, String> ASSET_PROVIDER_IMPL = t -> {
-        if (!checkAssetsExistance(t.getAssetsIndex()))
+    public final BiFunction<MinecraftVersion, Boolean, String> ASSET_PROVIDER_IMPL = (t, allow) -> {
+        if (allow && !checkAssetsExistance(t.getAssetsIndex()))
             if (MessageBox.Show(C.i18n("assets.no_assets"), MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION)
                 TaskWindow.execute(downloadAssets(t));
         return reconstructAssets(t.getAssetsIndex()).getAbsolutePath();

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

@@ -96,7 +96,8 @@ public abstract class IAuthenticator {
     public void onLoadSettings(Map m) {
         if (m == null)
             return;
-        username = (String) m.get("IAuthenticator_UserName");
+        Object o = m.get("IAuthenticator_UserName");
+        username = o instanceof String ? (String) o : "";
     }
 
     public String getUserName() {

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

@@ -17,14 +17,24 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil;
 
+import com.google.gson.annotations.SerializedName;
+
 public class Response {
 
-    public String accessToken, clientToken;
+    @SerializedName("accessToken")
+    public String accessToken;
+    @SerializedName("clientToken")
+    public String clientToken;
+    @SerializedName("selectedProfile")
     public GameProfile selectedProfile;
+    @SerializedName("availableProfiles")
     public GameProfile[] availableProfiles;
+    @SerializedName("user")
     public User user;
-
+    @SerializedName("error")
     public String error;
+    @SerializedName("errorMessage")
     public String errorMessage;
+    @SerializedName("cause")
     public String cause;
 }

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

@@ -148,7 +148,7 @@ public class YggdrasilAuthentication {
 
             if (StrUtils.isNotBlank(response.error)) {
                 HMCLog.err("Failed to log in, the auth server returned an error: " + response.error + ", message: " + response.errorMessage + ", cause: " + response.cause);
-                if (response.errorMessage.contains("Invalid token"))
+                if (response.errorMessage != null && response.errorMessage.contains("Invalid token"))
                     response.errorMessage = C.i18n("login.invalid_token");
                 throw new AuthenticationException("Request error: " + response.errorMessage);
             }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java

@@ -25,7 +25,7 @@ public class CurseDownloadProvider extends MojangDownloadProvider {
 
     @Override
     public String getParsedDownloadURL(String str) {
-        return str == null ? null : str.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven/");
+        return str == null ? null : str.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven");
     }
 
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java

@@ -85,7 +85,7 @@ public class MinecraftDownloadService extends IMinecraftDownloadService {
                 if (mvj.exists() && !mvj.delete())
                     HMCLog.warn("Failed to delete " + mvj);
                 try {
-                    MinecraftVersion mv = C.GSON.fromJson(FileUtils.readFileToStringQuietly(new File(vpath, id + ".json")), MinecraftVersion.class);
+                    MinecraftVersion mv = C.GSON.fromJson(FileUtils.readQuietly(new File(vpath, id + ".json")), MinecraftVersion.class);
                     if (mv == null)
                         throw new JsonSyntaxException("incorrect version");
 

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersion.java

@@ -29,6 +29,6 @@ public class MinecraftRemoteVersion {
     public String getUrl(DownloadType type) {
         if (url == null)
             return type.getProvider().getVersionsDownloadURL() + id + "/" + id + ".json";
-        return url;
+        return type.getProvider().getParsedDownloadURL(url);
     }
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.download;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.util.NetUtils;
@@ -28,7 +29,9 @@ import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
  */
 public class MinecraftRemoteVersions {
 
+    @SerializedName("versions")
     public ArrayList<MinecraftRemoteVersion> versions;
+    @SerializedName("latest")
     public MinecraftRemoteLatestVersion latest;
 
     private static volatile MinecraftRemoteVersions INSTANCE = null;

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

@@ -64,7 +64,7 @@ public class MojangDownloadProvider extends IDownloadProvider {
 
     @Override
     public String getAssetsDownloadURL() {
-        return "http://resources.download.minecraft.net/";
+        return "https://resources.download.minecraft.net/";
     }
 
     @Override

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/InstallerVersionList.java

@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
-import org.jackhuang.hellominecraft.util.func.Consumer;
+import org.jackhuang.hellominecraft.util.tasks.Task;
 
 /**
  *
  * @author huangyuhui
  */
-public abstract class InstallerVersionList implements Consumer<String[]> {
+public abstract class InstallerVersionList {
 
     /**
      * Refresh installer versions list from the downloaded content.
@@ -37,7 +37,7 @@ public abstract class InstallerVersionList implements Consumer<String[]> {
      *
      * @throws java.lang.Exception including network exceptions, IO exceptions.
      */
-    public abstract void refreshList(String[] versions) throws Exception;
+    public abstract Task refresh(String[] versions);
 
     /**
      * Installer name.
@@ -117,13 +117,4 @@ public abstract class InstallerVersionList implements Consumer<String[]> {
             return o2.compareTo(o1);
         }
     }
-
-    @Override
-    public void accept(String[] v) {
-        try {
-            refreshList(v);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java

@@ -27,10 +27,9 @@ import org.jackhuang.hellominecraft.launcher.core.install.liteloader.LiteLoaderV
 import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineInstaller;
 import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiFineDownloadFormatter;
 import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
-import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.tasks.DeleteFileTask;
 
 /**
  *
@@ -58,47 +57,31 @@ public final class MinecraftInstallerService extends IMinecraftInstallerService
 
     @Override
     public Task downloadForge(String installId, InstallerVersion v) {
-        return new TaskInfo("Forge Downloader") {
-            @Override
-            public void executeTask() {
-                File filepath = IOUtils.tryGetCanonicalFile(IOUtils.currentDirWithSeparator() + "forge-installer.jar");
-                if (v.installer != null)
-                    TaskWindow.factory()
-                        .append(new FileDownloadTask(service.getDownloadType().getProvider().getParsedDownloadURL(v.installer), filepath).setTag("forge"))
-                        .append(new ForgeInstaller(service, filepath))
-                        .create();
-            }
-        };
+        File filepath = IOUtils.tryGetCanonicalFile("forge-installer.jar");
+        if (v.installer == null)
+            return null;
+        else
+            return new FileDownloadTask(service.getDownloadType().getProvider().getParsedDownloadURL(v.installer), filepath).setTag("forge")
+                .after(new ForgeInstaller(service, filepath))
+                .after(new DeleteFileTask(filepath));
     }
 
     @Override
     public Task downloadOptiFine(String installId, InstallerVersion v) {
-        return new TaskInfo("OptiFine Downloader") {
-            @Override
-            public void executeTask() {
-                File filepath = IOUtils.tryGetCanonicalFile(IOUtils.currentDirWithSeparator() + "optifine-installer.jar");
-                if (v.installer != null) {
-                    OptiFineDownloadFormatter task = new OptiFineDownloadFormatter(v.installer);
-                    TaskWindow.factory().append(task)
-                        .append(new FileDownloadTask(filepath).registerPreviousResult(task).setTag("optifine"))
-                        .append(new OptiFineInstaller(service, installId, v, filepath))
-                        .create();
-                }
-            }
-        };
+        File filepath = IOUtils.tryGetCanonicalFile("optifine-installer.jar");
+        if (v.installer == null)
+            return null;
+        OptiFineDownloadFormatter task = new OptiFineDownloadFormatter(v.installer);
+        return task.after(new FileDownloadTask(filepath).registerPreviousResult(task).setTag("optifine"))
+            .after(new OptiFineInstaller(service, installId, v, filepath))
+            .after(new DeleteFileTask(filepath));
     }
 
     @Override
     public Task downloadLiteLoader(String installId, InstallerVersion v) {
-        return new TaskInfo("LiteLoader Downloader") {
-            @Override
-            public void executeTask() {
-                File filepath = IOUtils.tryGetCanonicalFile(IOUtils.currentDirWithSeparator() + "liteloader-universal.jar");
-                FileDownloadTask task = (FileDownloadTask) new FileDownloadTask(v.universal, filepath).setTag("LiteLoader");
-                TaskWindow.factory()
-                    .append(task).append(new LiteLoaderInstaller(service, installId, (LiteLoaderVersionList.LiteLoaderInstallerVersion) v).registerPreviousResult(task))
-                    .create();
-            }
-        };
+        File filepath = IOUtils.tryGetCanonicalFile("liteloader-universal.jar");
+        FileDownloadTask task = (FileDownloadTask) new FileDownloadTask(v.universal, filepath).setTag("LiteLoader");
+        return task.after(new LiteLoaderInstaller(service, installId, (LiteLoaderVersionList.LiteLoaderInstallerVersion) v).registerPreviousResult(task))
+            .after(new DeleteFileTask(filepath));
     }
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/PackMinecraftInstaller.java

@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.system.Compressor;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *
@@ -40,7 +39,7 @@ public class PackMinecraftInstaller {
     }
 
     public void install() throws IOException {
-        File file = new File(IOUtils.currentDir(), "HMCL-MERGE-TEMP");
+        File file = new File("HMCL-MERGE-TEMP");
         if (!file.exists() && !file.mkdirs())
             HMCLog.warn("Failed to make directories: " + file);
         for (String src1 : src)

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
 import org.jackhuang.hellominecraft.launcher.core.install.InstallProfile;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -32,6 +31,7 @@ import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.util.NetUtils;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.util.MessageBox;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *
@@ -79,10 +79,8 @@ public class ForgeInstaller extends Task {
             File file = new File(gameDir, "libraries/" + forge.getDownloadInfo().path);
             if (file.getParentFile().mkdirs())
                 HMCLog.warn("Failed to make library directory " + file.getParent());
-            try (FileOutputStream fos = new FileOutputStream(file); BufferedOutputStream bos = new BufferedOutputStream(fos)) {
-                int c;
-                while ((c = is.read()) != -1)
-                    bos.write((byte) c);
+            try (FileOutputStream fos = new FileOutputStream(file)) {
+                IOUtils.copyStream(is, fos);
             }
             mp.version().refreshVersions();
         }

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

@@ -17,20 +17,31 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  *
  * @author huangyuhui
  */
 public class Install {
 
+    @SerializedName("profileName")
     private String profileName;
+    @SerializedName("target")
     private String target;
+    @SerializedName("path")
     private String path;
+    @SerializedName("version")
     private String version;
+    @SerializedName("filePath")
     private String filePath;
+    @SerializedName("welcome")
     private String welcome;
+    @SerializedName("minecraft")
     private String minecraft;
+    @SerializedName("mirrorList")
     private String mirrorList;
+    @SerializedName("logo")
     private String logo;
 
     public Install() {

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

@@ -0,0 +1,136 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2013  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hellominecraft.launcher.core.install.forge;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.jackhuang.hellominecraft.util.C;
+import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
+import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator;
+import org.jackhuang.hellominecraft.util.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
+import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
+
+/**
+ *
+ * @author huangyuhui
+ */
+public class MinecraftForgeVersionList extends InstallerVersionList {
+
+    private static volatile MinecraftForgeVersionList instance;
+
+    public static MinecraftForgeVersionList getInstance() {
+        if (instance == null)
+            instance = new MinecraftForgeVersionList();
+        return instance;
+    }
+
+    public MinecraftForgeVersionRoot root;
+    public Map<String, List<InstallerVersion>> versionMap;
+    public List<InstallerVersion> versions;
+
+    @Override
+    public Task refresh(String[] needed) {
+        if (root != null)
+            return null;
+        return new TaskInfo(C.i18n("install.forge.get_list")) {
+            HTTPGetTask task = new HTTPGetTask(DownloadType.getSuggestedDownloadType().getProvider().getParsedDownloadURL(C.URL_FORGE_LIST));
+
+            @Override
+            public Collection<Task> getDependTasks() {
+                return Arrays.asList(task);
+            }
+
+            @Override
+            public void executeTask() throws Throwable {
+                if (!areDependTasksSucceeded)
+                    return;
+                String s = task.getResult();
+
+                root = C.GSON.fromJson(s, MinecraftForgeVersionRoot.class);
+
+                versionMap = new HashMap<>();
+                versions = new ArrayList<>();
+
+                for (Map.Entry<String, int[]> arr : root.mcversion.entrySet()) {
+                    String mcver = StrUtils.formatVersion(arr.getKey());
+                    ArrayList<InstallerVersion> al = new ArrayList<>();
+                    for (int num : arr.getValue()) {
+                        MinecraftForgeVersion v = root.number.get(num);
+                        InstallerVersion iv = new InstallerVersion(v.version, StrUtils.formatVersion(v.mcversion));
+                        for (String[] f : v.files) {
+
+                            String ver = v.mcversion + "-" + v.version;
+                            if (!StrUtils.isBlank(v.branch))
+                                ver = ver + "-" + v.branch;
+                            String filename = root.artifact + "-" + ver + "-" + f[1] + "." + f[0];
+                            String url = DownloadType.getSuggestedDownloadType().getProvider().getParsedDownloadURL(root.webpath + ver + "/" + filename);
+                            switch (f[1]) {
+                            case "installer":
+                                iv.installer = url;
+                                break;
+                            case "universal":
+                                iv.universal = url;
+                                break;
+                            case "changelog":
+                                iv.changelog = url;
+                                break;
+                            default:
+                                break;
+                            }
+                        }
+                        if (StrUtils.isBlank(iv.installer) || StrUtils.isBlank(iv.universal))
+                            continue;
+                        Collections.sort(al, new InstallerVersionNewerComparator());
+                        al.add(iv);
+                        versions.add(iv);
+                    }
+
+                    versionMap.put(StrUtils.formatVersion(mcver), al);
+                }
+
+                Collections.sort(versions, new InstallerVersionComparator());
+            }
+        };
+    }
+
+    @Override
+    public List<InstallerVersion> getVersionsImpl(String mcVersion) {
+        if (versions == null || versionMap == null)
+            return null;
+        if (StrUtils.isBlank(mcVersion))
+            return versions;
+        List c = versionMap.get(mcVersion);
+        if (c == null)
+            return versions;
+        Collections.sort(c, InstallerVersionComparator.INSTANCE);
+        return c;
+    }
+
+    @Override
+    public String getName() {
+        return "Forge - MinecraftForge Offical Site";
+    }
+}

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.forge;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.Map;
 
 /**
@@ -25,8 +26,22 @@ import java.util.Map;
  */
 public class MinecraftForgeVersionRoot {
 
-    public String artifact, webpath, adfly, homepage, name;
-    public Map<String, int[]> branches, mcversion;
+    @SerializedName("artifact")
+    public String artifact;
+    @SerializedName("webpath")
+    public String webpath;
+    @SerializedName("adfly")
+    public String adfly;
+    @SerializedName("homepage")
+    public String homepage;
+    @SerializedName("name")
+    public String name;
+    @SerializedName("branches")
+    public Map<String, int[]> branches;
+    @SerializedName("mcversion")
+    public Map<String, int[]> mcversion;
+    @SerializedName("promos")
     public Map<String, Integer> promos;
+    @SerializedName("number")
     public Map<Integer, MinecraftForgeVersion> number;
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.Map;
 
 /**
@@ -25,5 +26,6 @@ import java.util.Map;
  */
 public class LiteLoaderMCVersions {
 
+    @SerializedName("artefacts")
     public Map<String, Map<String, LiteLoaderVersion>> artefacts;
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
+import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 
 /**
@@ -25,6 +26,16 @@ import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
  */
 public class LiteLoaderVersion {
 
-    public String tweakClass, file, version, md5, timestamp;
+    @SerializedName("tweakClass")
+    public String tweakClass;
+    @SerializedName("file")
+    public String file;
+    @SerializedName("version")
+    public String version;
+    @SerializedName("md5")
+    public String md5;
+    @SerializedName("timestamp")
+    public String timestamp;
+    @SerializedName("libraries")
     public MinecraftLibrary[] libraries;
 }

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

@@ -19,6 +19,7 @@ package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -28,8 +29,10 @@ import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList.InstallerVersion;
 import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionNewerComparator;
-import org.jackhuang.hellominecraft.util.NetUtils;
 import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.util.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
+import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
 
 /**
  *
@@ -50,38 +53,52 @@ public class LiteLoaderVersionList extends InstallerVersionList {
     public List<InstallerVersion> versions;
 
     @Override
-    public void refreshList(String[] needed) throws Exception {
-        String s = NetUtils.get(C.URL_LITELOADER_LIST);
+    public Task refresh(String[] needed) {
         if (root != null)
-            return;
+            return null;
+        return new TaskInfo(C.i18n("install.liteloader.get_list")) {
+            HTTPGetTask task = new HTTPGetTask(C.URL_LITELOADER_LIST);
 
-        root = C.GSON.fromJson(s, LiteLoaderVersionsRoot.class);
-
-        versionMap = new HashMap<>();
-        versions = new ArrayList<>();
-
-        for (Map.Entry<String, LiteLoaderMCVersions> arr : root.versions.entrySet()) {
-            ArrayList<InstallerVersion> al = new ArrayList<>();
-            LiteLoaderMCVersions mcv = arr.getValue();
-            if (mcv == null || mcv.artefacts == null || mcv.artefacts.get("com.mumfrey:liteloader") == null)
-                continue;
-            for (Map.Entry<String, LiteLoaderVersion> entry : mcv.artefacts.get("com.mumfrey:liteloader").entrySet()) {
-                if ("latest".equals(entry.getKey()))
-                    continue;
-                LiteLoaderVersion v = entry.getValue();
-                LiteLoaderInstallerVersion iv = new LiteLoaderInstallerVersion(v.version, StrUtils.formatVersion(arr.getKey()));
-                iv.universal = "http://dl.liteloader.com/versions/com/mumfrey/liteloader/" + arr.getKey() + "/" + v.file;
-                iv.tweakClass = v.tweakClass;
-                iv.libraries = Arrays.copyOf(v.libraries, v.libraries.length);
-                iv.installer = "http://dl.liteloader.com/redist/" + iv.mcVersion + "/liteloader-installer-" + iv.selfVersion.replace("_", "-") + ".jar";
-                al.add(iv);
-                versions.add(iv);
+            @Override
+            public Collection<Task> getDependTasks() {
+                return Arrays.asList(task);
             }
-            Collections.sort(al, new InstallerVersionNewerComparator());
-            versionMap.put(StrUtils.formatVersion(arr.getKey()), al);
-        }
 
-        Collections.sort(versions, InstallerVersionComparator.INSTANCE);
+            @Override
+            public void executeTask() throws Throwable {
+                if (!areDependTasksSucceeded)
+                    return;
+                String s = task.getResult();
+
+                root = C.GSON.fromJson(s, LiteLoaderVersionsRoot.class);
+
+                versionMap = new HashMap<>();
+                versions = new ArrayList<>();
+
+                for (Map.Entry<String, LiteLoaderMCVersions> arr : root.versions.entrySet()) {
+                    ArrayList<InstallerVersion> al = new ArrayList<>();
+                    LiteLoaderMCVersions mcv = arr.getValue();
+                    if (mcv == null || mcv.artefacts == null || mcv.artefacts.get("com.mumfrey:liteloader") == null)
+                        continue;
+                    for (Map.Entry<String, LiteLoaderVersion> entry : mcv.artefacts.get("com.mumfrey:liteloader").entrySet()) {
+                        if ("latest".equals(entry.getKey()))
+                            continue;
+                        LiteLoaderVersion v = entry.getValue();
+                        LiteLoaderInstallerVersion iv = new LiteLoaderInstallerVersion(v.version, StrUtils.formatVersion(arr.getKey()));
+                        iv.universal = "http://dl.liteloader.com/versions/com/mumfrey/liteloader/" + arr.getKey() + "/" + v.file;
+                        iv.tweakClass = v.tweakClass;
+                        iv.libraries = Arrays.copyOf(v.libraries, v.libraries.length);
+                        iv.installer = "http://dl.liteloader.com/redist/" + iv.mcVersion + "/liteloader-installer-" + iv.selfVersion.replace("_", "-") + ".jar";
+                        al.add(iv);
+                        versions.add(iv);
+                    }
+                    Collections.sort(al, new InstallerVersionNewerComparator());
+                    versionMap.put(StrUtils.formatVersion(arr.getKey()), al);
+                }
+
+                Collections.sort(versions, InstallerVersionComparator.INSTANCE);
+            }
+        };
     }
 
     @Override

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

@@ -17,13 +17,20 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  *
  * @author huangyuhui
  */
 public class LiteLoaderVersionsMeta {
 
-    private String description, authors, url;
+    @SerializedName("versions")
+    private String description;
+    @SerializedName("authors")
+    private String authors;
+    @SerializedName("url")
+    private String url;
 
     public LiteLoaderVersionsMeta() {
     }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.install.liteloader;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.Map;
 
 /**
@@ -25,6 +26,8 @@ import java.util.Map;
  */
 public class LiteLoaderVersionsRoot {
 
+    @SerializedName("versions")
     public Map<String, LiteLoaderMCVersions> versions;
+    @SerializedName("meta")
     public LiteLoaderVersionsMeta meta;
 }

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

@@ -72,14 +72,15 @@ public class OptiFineInstaller extends Task implements PreviousResultRegistrar<F
                     mv.mainClass = "net.minecraft.launchwrapper.Launch";
                     mv.libraries.add(1, new MinecraftLibrary("net.minecraft:launchwrapper:1.7"));
                 }
-                mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";
+                if (!mv.minecraftArguments.contains("FMLTweaker"))
+                    mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";
             }
         }
         File loc = new File(service.baseDirectory(), "versions/" + mv.id);
         if (!loc.exists() && loc.mkdirs())
             HMCLog.warn("Failed to make directories: " + loc);
         File json = new File(loc, mv.id + ".json");
-        FileUtils.writeStringToFile(json, C.GSON.toJson(mv, MinecraftVersion.class));
+        FileUtils.write(json, C.GSON.toJson(mv, MinecraftVersion.class));
 
         service.version().refreshVersions();
     }

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

@@ -20,6 +20,8 @@ package org.jackhuang.hellominecraft.launcher.core.install.optifine.bmcl;
 import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +32,10 @@ import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.util.ArrayUtils;
 import org.jackhuang.hellominecraft.launcher.core.install.InstallerVersionList;
 import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion;
-import org.jackhuang.hellominecraft.util.NetUtils;
 import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.util.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
+import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
 
 /**
  *
@@ -55,34 +59,46 @@ public class OptiFineBMCLVersionList extends InstallerVersionList {
     }.getType();
 
     @Override
-    public void refreshList(String[] needed) throws Exception {
-        String s = NetUtils.get("http://bmclapi.bangbang93.com/optifine/versionlist");
+    public Task refresh(String[] needed) {
+        return new TaskInfo(C.i18n("install.optifine.get_list")) {
+            HTTPGetTask task = new HTTPGetTask("http://bmclapi.bangbang93.com/optifine/versionlist");
 
-        versionMap = new HashMap<>();
-        versions = new ArrayList<>();
-
-        if (s == null)
-            return;
-        root = C.GSON.fromJson(s, TYPE);
-        for (OptiFineVersion v : root) {
-            v.setMirror(v.getMirror().replace("http://optifine.net/http://optifine.net/", "http://optifine.net/"));
-
-            if (StrUtils.isBlank(v.getMCVersion())) {
-                Pattern p = Pattern.compile("OptiFine (.*) HD");
-                Matcher m = p.matcher(v.getVersion());
-                while (m.find())
-                    v.setMCVersion(m.group(1));
+            @Override
+            public Collection<Task> getDependTasks() {
+                return Arrays.asList(task);
             }
-            InstallerVersion iv = new InstallerVersion(v.getVersion(), StrUtils.formatVersion(v.getMCVersion()));
 
-            List<InstallerVersion> al = ArrayUtils.tryGetMapWithList(versionMap, StrUtils.formatVersion(v.getMCVersion()));
-            //String url = "http://bmclapi.bangbang93.com/optifine/" + iv.selfVersion.replace(" ", "%20");
-            iv.installer = iv.universal = v.getMirror();
-            al.add(iv);
-            versions.add(iv);
-        }
+            @Override
+            public void executeTask() throws Throwable {
+                String s = task.getResult();
 
-        Collections.sort(versions, InstallerVersionComparator.INSTANCE);
+                versionMap = new HashMap<>();
+                versions = new ArrayList<>();
+
+                if (s == null)
+                    return;
+                root = C.GSON.fromJson(s, TYPE);
+                for (OptiFineVersion v : root) {
+                    v.setMirror(v.getMirror().replace("http://optifine.net/http://optifine.net/", "http://optifine.net/"));
+
+                    if (StrUtils.isBlank(v.getMCVersion())) {
+                        Pattern p = Pattern.compile("OptiFine (.*) HD");
+                        Matcher m = p.matcher(v.getVersion());
+                        while (m.find())
+                            v.setMCVersion(m.group(1));
+                    }
+                    InstallerVersion iv = new InstallerVersion(v.getVersion(), StrUtils.formatVersion(v.getMCVersion()));
+
+                    List<InstallerVersion> al = ArrayUtils.tryGetMapWithList(versionMap, StrUtils.formatVersion(v.getMCVersion()));
+                    //String url = "http://bmclapi.bangbang93.com/optifine/" + iv.selfVersion.replace(" ", "%20");
+                    iv.installer = iv.universal = v.getMirror();
+                    al.add(iv);
+                    versions.add(iv);
+                }
+
+                Collections.sort(versions, InstallerVersionComparator.INSTANCE);
+            }
+        };
     }
 
     @Override

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

@@ -0,0 +1,155 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2013  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+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.core.install.InstallerVersionList;
+import org.jackhuang.hellominecraft.launcher.core.install.optifine.OptiFineVersion;
+import org.jackhuang.hellominecraft.util.ArrayUtils;
+import org.jackhuang.hellominecraft.util.C;
+import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.util.tasks.Task;
+import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
+import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author huangyuhui
+ */
+public class OptiFineVersionList extends InstallerVersionList {
+
+    private static OptiFineVersionList instance;
+
+    public static OptiFineVersionList getInstance() {
+        if (null == instance)
+            instance = new OptiFineVersionList();
+        return instance;
+    }
+
+    public ArrayList<OptiFineVersion> root = new ArrayList();
+    public Map<String, List<InstallerVersion>> versionMap;
+    public List<InstallerVersion> versions;
+
+    @Override
+    public Task refresh(String[] sss) {
+        if (versions != null)
+            return null;
+        return new TaskInfo(C.i18n("install.optifine.get_list")) {
+            HTTPGetTask task = new HTTPGetTask("http://optifine.net/downloads");
+
+            @Override
+            public Collection<Task> getDependTasks() {
+                return Arrays.asList(task);
+            }
+
+            @Override
+            public void executeTask() throws Throwable {
+                if (!areDependTasksSucceeded)
+                    return;
+                String content = task.getResult();
+                versionMap = new HashMap<>();
+                versions = new ArrayList<>();
+
+                content = content.replace("&nbsp;", " ").replace("&gt;", ">").replace("&lt;", "<").replace("<br>", "<br />");
+
+                try {
+                    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                    DocumentBuilder db = factory.newDocumentBuilder();
+                    Document doc = db.parse(new ByteArrayInputStream(content.getBytes("UTF-8")));
+                    Element r = doc.getDocumentElement();
+                    NodeList tables = r.getElementsByTagName("table");
+                    for (int i = 0; i < tables.getLength(); i++) {
+                        Element e = (Element) tables.item(i);
+                        if ("downloadTable".equals(e.getAttribute("class"))) {
+                            NodeList tr = e.getElementsByTagName("tr");
+                            for (int k = 0; k < tr.getLength(); k++) {
+                                NodeList downloadLine = ((Element) tr.item(k)).getElementsByTagName("td");
+                                OptiFineVersion v = new OptiFineVersion();
+                                for (int j = 0; j < downloadLine.getLength(); j++) {
+                                    Element td = (Element) downloadLine.item(j);
+                                    if (StrUtils.startsWith(td.getAttribute("class"), "downloadLineMirror"))
+                                        v.setMirror(((Element) td.getElementsByTagName("a").item(0)).getAttribute("href"));
+                                    if (StrUtils.startsWith(td.getAttribute("class"), "downloadLineDownload"))
+                                        v.setDownloadLink(((Element) td.getElementsByTagName("a").item(0)).getAttribute("href"));
+                                    if (StrUtils.startsWith(td.getAttribute("class"), "downloadLineDate"))
+                                        v.setDate(td.getTextContent());
+                                    if (StrUtils.startsWith(td.getAttribute("class"), "downloadLineFile"))
+                                        v.setVersion(td.getTextContent());
+                                }
+                                if (StrUtils.isBlank(v.getMCVersion())) {
+                                    Pattern p = Pattern.compile("OptiFine (.*?) ");
+                                    Matcher m = p.matcher(v.getVersion());
+                                    while (m.find())
+                                        v.setMCVersion(StrUtils.formatVersion(m.group(1)));
+                                }
+                                InstallerVersion iv = new InstallerVersion(v.getVersion(), StrUtils.formatVersion(v.getMCVersion()));
+                                iv.installer = iv.universal = v.getMirror();
+                                root.add(v);
+                                versions.add(iv);
+
+                                List<InstallerVersion> ivl = ArrayUtils.tryGetMapWithList(versionMap, StrUtils.formatVersion(v.getMCVersion()));
+                                ivl.add(iv);
+                            }
+                        }
+                    }
+                } catch (ParserConfigurationException | SAXException | IOException | DOMException ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                Collections.sort(versions, InstallerVersionComparator.INSTANCE);
+            }
+        };
+    }
+
+    @Override
+    public String getName() {
+        return "OptiFine - OptiFine Official Site";
+    }
+
+    @Override
+    public List<InstallerVersion> getVersionsImpl(String mcVersion) {
+        if (versions == null || versionMap == null)
+            return null;
+        if (StrUtils.isBlank(mcVersion))
+            return versions;
+        List c = versionMap.get(mcVersion);
+        if (c == null)
+            return versions;
+        Collections.sort(c, InstallerVersionComparator.INSTANCE);
+        return c;
+    }
+
+}

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

@@ -29,7 +29,6 @@ import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.util.system.OS;
 import org.jackhuang.hellominecraft.util.system.Platform;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.util.Utils;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;

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

@@ -96,10 +96,12 @@ public class GameLauncher {
         if (file != null)
             FileUtils.cleanDirectoryQuietly(file);
 
-        HMCLog.log("Detecting libraries...");
-        launchingStateChangedEvent.execute(LaunchingState.DownloadingLibraries);
-        if (!downloadLibrariesEvent.execute(service.download().getDownloadLibraries(loader.getMinecraftVersion())))
-            throw new GameException("Failed to download libraries");
+        if (!options.isNotCheckGame()) {
+            HMCLog.log("Detecting libraries...");
+            launchingStateChangedEvent.execute(LaunchingState.DownloadingLibraries);
+            if (!downloadLibrariesEvent.execute(service.download().getDownloadLibraries(loader.getMinecraftVersion())))
+                throw new GameException("Failed to download libraries");
+        }
 
         HMCLog.log("Unpacking natives...");
         launchingStateChangedEvent.execute(LaunchingState.DecompressingNatives);
@@ -118,8 +120,8 @@ public class GameLauncher {
      *
      * @throws IOException failed creating process
      */
-    public void launch(List str) throws IOException {
-        if (!service.version().onLaunch())
+    public void launch(List<String> str) throws IOException {
+        if (!service.version().onLaunch(options.getLaunchVersion()))
             return;
         if (StrUtils.isNotBlank(options.getPrecalledCommand())) {
             Process p = Runtime.getRuntime().exec(options.getPrecalledCommand());
@@ -131,6 +133,7 @@ public class GameLauncher {
             }
         }
         HMCLog.log("Starting process");
+        HMCLog.log(str.toString());
         ProcessBuilder builder = new ProcessBuilder(str);
         if (options.getLaunchVersion() == null || service.baseDirectory() == null)
             throw new Error("Fucking bug!");
@@ -153,7 +156,7 @@ public class GameLauncher {
      */
     public File makeLauncher(String launcherName, List str) throws IOException {
         HMCLog.log("Making shell launcher...");
-        service.version().onLaunch();
+        service.version().onLaunch(options.getLaunchVersion());
         boolean isWin = OS.os() == OS.WINDOWS;
         File f = new File(launcherName + (isWin ? ".bat" : ".sh"));
         if (!f.exists() && !f.createNewFile())
@@ -172,6 +175,8 @@ public class GameLauncher {
             if (appdata != null) {
                 writer.write("set appdata=" + appdata);
                 writer.newLine();
+                writer.write("cd /D %appdata%");
+                writer.newLine();
             }
         }
         if (StrUtils.isNotBlank(options.getPrecalledCommand())) {

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/LaunchOptions.java

@@ -30,7 +30,7 @@ public class LaunchOptions {
 
     private String name, versionName, javaArgs, minecraftArgs, maxMemory, permSize, width, height, serverIp, wrapper;
     private String proxyHost, proxyPort, proxyUser, proxyPass, javaDir, launchVersion, type, precalledCommand;
-    private boolean fullscreen, noJVMArgs;
+    private boolean fullscreen, noJVMArgs, notCheckGame;
     private JdkVersion java;
     private File gameDir;
     private GameDirType gameDirType;
@@ -222,4 +222,12 @@ public class LaunchOptions {
     public void setType(String type) {
         this.type = type;
     }
+
+    public boolean isNotCheckGame() {
+        return notCheckGame;
+    }
+
+    public void setNotCheckGame(boolean notCheckGame) {
+        this.notCheckGame = notCheckGame;
+    }
 }

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

@@ -19,9 +19,9 @@ package org.jackhuang.hellominecraft.launcher.core.launch;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.util.func.Function;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
 import org.jackhuang.hellominecraft.util.system.OS;
@@ -30,6 +30,7 @@ import org.jackhuang.hellominecraft.launcher.core.auth.UserProfileProvider;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.util.func.BiFunction;
 
 /**
  *
@@ -44,9 +45,24 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
     @Override
     protected void makeSelf(List<String> res) throws GameException {
         StringBuilder library = new StringBuilder("");
+        ArrayList<MinecraftLibrary> opt = new ArrayList<>();
         for (MinecraftLibrary l : version.libraries)
-            if (l.allow() && !l.isRequiredToUnzip())
-                library.append(l.getFilePath(gameDir).getAbsolutePath()).append(File.pathSeparator);
+            if (l.allow() && !l.isRequiredToUnzip()) {
+                if (l.name.toLowerCase().contains("optifine")) {
+                    opt.add(l);
+                    continue;
+                }
+                File f = l.getFilePath(gameDir);
+                if (f == null)
+                    continue;
+                library.append(f.getAbsolutePath()).append(File.pathSeparator);
+            }
+        for (MinecraftLibrary l : opt) {
+            File f = l.getFilePath(gameDir);
+            if (f == null)
+                continue;
+            library.append(f.getAbsolutePath()).append(File.pathSeparator);
+        }
         File f = version.getJar(service.baseDirectory());
         if (!f.exists())
             throw new GameException("Minecraft jar does not exists");
@@ -55,9 +71,11 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
         res.add(library.toString().substring(0, library.length() - File.pathSeparator.length()));
         res.add(version.mainClass);
 
+        if (version.minecraftArguments == null)
+            throw new GameException(new NullPointerException("Minecraft Arguments can not be null."));
         String[] splitted = StrUtils.tokenize(version.minecraftArguments);
 
-        String game_assets = assetProvider.apply(version);
+        String game_assets = assetProvider.apply(version, !options.isNotCheckGame());
 
         for (String t : splitted) {
             t = t.replace("${auth_player_name}", lr.getUserName());
@@ -96,13 +114,13 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
         }
     }
 
-    private final Function<MinecraftVersion, String> DEFAULT_ASSET_PROVIDER = t -> {
+    private final BiFunction<MinecraftVersion, Boolean, String> DEFAULT_ASSET_PROVIDER = (t, allow) -> {
         return new File(service.baseDirectory(), "assets").getAbsolutePath();
     };
 
-    private Function<MinecraftVersion, String> assetProvider = DEFAULT_ASSET_PROVIDER;
+    private BiFunction<MinecraftVersion, Boolean, String> assetProvider = DEFAULT_ASSET_PROVIDER;
 
-    public void setAssetProvider(Function<MinecraftVersion, String> assetProvider) {
+    public void setAssetProvider(BiFunction<MinecraftVersion, Boolean, String> assetProvider) {
         if (assetProvider == null)
             this.assetProvider = DEFAULT_ASSET_PROVIDER;
         else

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hellominecraft.launcher.core.mod;
 
 import com.google.gson.JsonSyntaxException;
+import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import java.io.File;
 import java.io.IOException;
@@ -37,8 +38,27 @@ import org.jackhuang.hellominecraft.util.system.FileUtils;
  */
 public class ModInfo implements Comparable<ModInfo> {
 
+    @SerializedName("location")
     public File location;
-    public String modid, name, description, author, version, mcversion, url, updateUrl, credits;
+    @SerializedName("modid")
+    public String modid;
+    @SerializedName("name")
+    public String name;
+    @SerializedName("description")
+    public String description;
+    @SerializedName("author")
+    public String author;
+    @SerializedName("version")
+    public String version;
+    @SerializedName("mcversion")
+    public String mcversion;
+    @SerializedName("url")
+    public String url;
+    @SerializedName("updateUrl")
+    public String updateUrl;
+    @SerializedName("credits")
+    public String credits;
+    @SerializedName("authorList")
     public String[] authorList;
 
     public boolean isActive() {

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java

@@ -164,13 +164,13 @@ public final class ModpackManager {
                         HMCLog.warn("Failed to rename incorrect json " + oldFile + " to " + nowFile);
 
                     File json = new File(nowFile, "pack.json");
-                    MinecraftVersion mv = C.GSON.fromJson(FileUtils.readFileToString(json), MinecraftVersion.class);
+                    MinecraftVersion mv = C.GSON.fromJson(FileUtils.read(json), MinecraftVersion.class);
                     if (mv.jar == null)
                         throw new FileNotFoundException(C.i18n("modpack.incorrect_format.no_jar"));
 
                     c.add(service.download().downloadMinecraftJar(mv, new File(nowFile, id + ".jar")));
                     mv.jar = null;
-                    FileUtils.writeStringToFile(json, C.GSON.toJson(mv));
+                    FileUtils.write(json, C.GSON.toJson(mv));
                     if (!json.renameTo(new File(nowFile, id + ".json")))
                         HMCLog.warn("Failed to rename pack.json to new id");
 

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

@@ -72,13 +72,6 @@ public abstract class IMinecraftProvider {
      */
     public abstract boolean install(String version, Consumer<MinecraftVersion> callback);
 
-    /**
-     * Returns the thing like ".minecraft/resourcepacks".
-     *
-     * @return the thing
-     */
-    public abstract File getResourcePacks();
-
     /**
      *
      * @param v should be resolved
@@ -164,7 +157,7 @@ public abstract class IMinecraftProvider {
      *
      * @return if false, will break the launch process.
      */
-    public abstract boolean onLaunch();
+    public abstract boolean onLaunch(String id);
 
     public File baseDirectory() {
         return service.baseDirectory();

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.List;
 import org.jackhuang.hellominecraft.util.StrUtils;
@@ -27,6 +28,7 @@ import org.jackhuang.hellominecraft.util.StrUtils;
  */
 public class Extract implements Cloneable {
 
+    @SerializedName("exclude")
     public List<String> exclude = new ArrayList<>();
 
     public boolean allow(String path) {

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 
 /**
@@ -25,8 +26,11 @@ import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
  */
 public class GameDownloadInfo implements Cloneable {
 
+    @SerializedName("sha1")
     public String sha1;
+    @SerializedName("size")
     public int size;
+    @SerializedName("url")
     protected String url;
 
     /**

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import java.util.Map;
 
 /**
@@ -25,6 +26,8 @@ import java.util.Map;
  */
 public class LibrariesDownloadInfo {
 
+    @SerializedName("classifiers")
     Map<String, LibraryDownloadInfo> classifiers;
+    @SerializedName("artifact")
     LibraryDownloadInfo artifact;
 }

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java

@@ -17,8 +17,10 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**
  *
@@ -26,19 +28,21 @@ import org.jackhuang.hellominecraft.util.StrUtils;
  */
 public class LibraryDownloadInfo extends GameDownloadInfo {
 
+    @SerializedName("path")
     public String path;
+    @SerializedName("forgeURL")
     public String forgeURL;
 
     @Override
     public String getUrl(DownloadType dt, boolean allowSelf) {
-        String myURL = (forgeURL == null ? dt.getProvider().getLibraryDownloadURL() : forgeURL) + "/";
+        String myURL = (forgeURL == null ? dt.getProvider().getLibraryDownloadURL() : forgeURL);
         if (StrUtils.isNotBlank(url) && allowSelf)
             myURL = url;
         if (!myURL.endsWith(".jar"))
             if (path == null)
                 return null;
             else
-                myURL += path.replace('\\', '/');
+                myURL = IOUtils.addURLSeparator(myURL) + path.replace('\\', '/');
         return myURL;
     }
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,10 +31,15 @@ import org.jackhuang.hellominecraft.util.StrUtils;
  */
 public class MinecraftLibrary extends IMinecraftLibrary {
 
+    @SerializedName("rules")
     public ArrayList<Rules> rules;
+    @SerializedName("url")
     public String url;
+    @SerializedName("natives")
     public Natives natives;
+    @SerializedName("extract")
     public Extract extract;
+    @SerializedName("downloads")
     public LibrariesDownloadInfo downloads;
 
     public MinecraftLibrary(String name) {
@@ -99,7 +105,10 @@ public class MinecraftLibrary extends IMinecraftLibrary {
 
     @Override
     public File getFilePath(File gameDir) {
-        return new File(gameDir, "libraries/" + getDownloadInfo().path);
+        LibraryDownloadInfo info = getDownloadInfo();
+        if (info == null)
+            return null;
+        return new File(gameDir, "libraries/" + info.path);
     }
 
     @Override

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,14 +38,37 @@ import org.jackhuang.hellominecraft.util.Utils;
  */
 public class MinecraftVersion implements Cloneable, Comparable<MinecraftVersion> {
 
-    public String minecraftArguments, mainClass, time, id, type, processArguments,
-        releaseTime, jar, inheritsFrom, runDir;
+    @SerializedName("minecraftArguments")
+    public String minecraftArguments;
+    @SerializedName("mainClass")
+    public String mainClass;
+    @SerializedName("time")
+    public String time;
+    @SerializedName("id")
+    public String id;
+    @SerializedName("type")
+    public String type;
+    @SerializedName("processArguments")
+    public String processArguments;
+    @SerializedName("releaseTime")
+    public String releaseTime;
+    @SerializedName("jar")
+    public String jar;
+    @SerializedName("inheritsFrom")
+    public String inheritsFrom;
+    @SerializedName("runDir")
+    public String runDir;
+    @SerializedName("assets")
     protected String assets;
+    @SerializedName("minimumLauncherVersion")
     public int minimumLauncherVersion;
+    @SerializedName("hidden")
     public boolean hidden;
+    @SerializedName("assetIndex")
     public AssetIndexDownloadInfo assetIndex;
+    @SerializedName("downloads")
     private Map<String, GameDownloadInfo> downloads;
-
+    @SerializedName("libraries")
     public ArrayList<MinecraftLibrary> libraries;
 
     public MinecraftVersion() {

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

@@ -111,7 +111,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
                 }
                 MinecraftVersion mcVersion;
                 try {
-                    mcVersion = C.GSON.fromJson(FileUtils.readFileToString(jsonFile), MinecraftVersion.class);
+                    mcVersion = C.GSON.fromJson(FileUtils.read(jsonFile), MinecraftVersion.class);
                     if (mcVersion == null)
                         throw new GameException("Wrong json format, got null.");
                 } catch (Exception e) {
@@ -119,7 +119,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
                     if (MessageBox.Show(C.i18n("launcher.versions_json_not_formatted", id), MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION) {
                         service.download().downloadMinecraftVersionJson(id);
                         try {
-                            mcVersion = C.GSON.fromJson(FileUtils.readFileToString(jsonFile), MinecraftVersion.class);
+                            mcVersion = C.GSON.fromJson(FileUtils.read(jsonFile), MinecraftVersion.class);
                             if (mcVersion == null)
                                 throw new GameException("Wrong json format, got null.");
                         } catch (IOException | GameException | JsonSyntaxException ex) {
@@ -164,7 +164,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
     public boolean renameVersion(String from, String to) {
         try {
             File fromJson = new File(versionRoot(from), from + ".json");
-            MinecraftVersion mcVersion = C.GSON.fromJson(FileUtils.readFileToString(fromJson), MinecraftVersion.class);
+            MinecraftVersion mcVersion = C.GSON.fromJson(FileUtils.read(fromJson), MinecraftVersion.class);
             mcVersion.id = to;
             FileUtils.writeQuietly(fromJson, C.GSON.toJson(mcVersion));
             File toDir = versionRoot(to);
@@ -198,7 +198,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
             return false;
         if (callback != null) {
             File mvt = new File(versionRoot(id), id + ".json");
-            MinecraftVersion v = C.GSON.fromJson(FileUtils.readFileToStringQuietly(mvt), MinecraftVersion.class);
+            MinecraftVersion v = C.GSON.fromJson(FileUtils.readQuietly(mvt), MinecraftVersion.class);
             if (v == null)
                 return false;
             callback.accept(v);
@@ -254,13 +254,8 @@ public class MinecraftVersionManager extends IMinecraftProvider {
     }
 
     @Override
-    public File getResourcePacks() {
-        return new File(service.baseDirectory(), "resourcepacks");
-    }
-
-    @Override
-    public boolean onLaunch() {
-        File resourcePacks = getResourcePacks();
+    public boolean onLaunch(String id) {
+        File resourcePacks = new File(getRunDirectory(id), "resourcepacks");
         if (!resourcePacks.exists() && !resourcePacks.mkdirs())
             HMCLog.warn("Failed to make resourcePacks: " + resourcePacks);
         return true;

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

@@ -17,13 +17,20 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  *
  * @author huangyuhui
  */
 public class Natives implements Cloneable {
 
-    public String windows, osx, linux;
+    @SerializedName("windows")
+    public String windows;
+    @SerializedName("osx")
+    public String osx;
+    @SerializedName("linux")
+    public String linux;
 
     @Override
     @SuppressWarnings("CloneDeclaresCloneNotSupported")

HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hellominecraft.launcher.core.version;
 
+import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hellominecraft.util.StrUtils;
 import org.jackhuang.hellominecraft.util.system.OS;
 
@@ -26,7 +27,10 @@ import org.jackhuang.hellominecraft.util.system.OS;
  */
 public class OSRestriction {
 
-    private String version, name;
+    @SerializedName("version")
+    private String version;
+    @SerializedName("name")
+    public String name;
 
     public String getVersion() {
         return version;