Supported new version json

2016-02-25 22:44:32 +08:00
parent 55af958792
commit fe019b8f0f
41 changed files with 441 additions and 196 deletions
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java
@@ -15,7 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see {http://www.gnu.org/licenses/}.
 */
-package org.jackhuang.hellominecraft.util.version;
+package org.jackhuang.hellominecraft.util;

 import java.io.File;
 import java.io.IOException;
@@ -142,7 +142,7 @@ public class MinecraftVersionRequest implements Serializable {
            int k = i;
            if (tmp[i + 1] >= (int) 'a' && tmp[i + 1] <= (int) 'z')
                i++;
-            while (tmp[k] >= 48 && tmp[k] <= 57 || tmp[k] == (int) '.' || tmp[k] == (int) 'w')
+            while (tmp[k] >= 48 && tmp[k] <= 57 || tmp[k] == (int) '-' || tmp[k] == (int) '.' || tmp[k] >= 97 && tmp[k] <= (int) 'z')
                k--;
            k++;
            r.version = new String(tmp, k, i - k + 1);
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/OverridableSwingWorker.java
@@ -18,6 +18,7 @@
 package org.jackhuang.hellominecraft.util;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.swing.SwingWorker;
 import org.jackhuang.hellominecraft.util.func.Consumer;
@@ -64,4 +65,16 @@ public abstract class OverridableSwingWorker<T> extends SwingWorker<Void, T> {
                c.accept(t);
    }

+    final List<T> lastChunks = new ArrayList<>();
+
+    protected void send(T... t) {
+        lastChunks.addAll(Arrays.asList(t));
+        publish(t);
+    }
+
+    public List<T> justDo() throws Exception {
+        work();
+        return lastChunks;
+    }
+
 }
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskList.java
@@ -20,12 +20,14 @@ package org.jackhuang.hellominecraft.util.tasks;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;

 /**
@@ -84,7 +86,9 @@ public class TaskList extends Thread {

    }

-    static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(64);
+    ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(64);
+    HashMap<Invoker, Future<?>> futures = new HashMap<>();
+    HashSet<Invoker> invokers = new HashSet<>();

    private void processTasks(Collection<? extends Task> c) {
        if (c == null || c.isEmpty())
@@ -95,8 +99,9 @@ public class TaskList extends Thread {
            t2.setParallelExecuting(true);
            Invoker thread = new Invoker(t2, runningThread);
            runningThread.add(thread);
+            invokers.add(thread);
            if (!EXECUTOR_SERVICE.isTerminated())
-                EXECUTOR_SERVICE.execute(thread);
+                futures.put(thread, EXECUTOR_SERVICE.submit(thread));
        }
        while (!runningThread.isEmpty())
            try {
@@ -116,10 +121,10 @@ public class TaskList extends Thread {
        if (c == null)
            c = new HashSet<>();
        HMCLog.log("Executing task: " + t.getInfo());
-        for (DoingDoneListener<Task> d : taskListener)
-            d.onDoing(t, c);
        for (DoingDoneListener<Task> d : t.getTaskListeners())
            d.onDoing(t, c);
+        for (DoingDoneListener<Task> d : taskListener)
+            d.onDoing(t, c);
        processTasks(c);

        boolean flag = true;
@@ -134,10 +139,10 @@ public class TaskList extends Thread {
            Collection<Task> at = t.getAfterTasks();
            if (at == null)
                at = new HashSet<>();
-            for (DoingDoneListener<Task> d : taskListener)
-                d.onDone(t, at);
            for (DoingDoneListener<Task> d : t.getTaskListeners())
                d.onDone(t, at);
+            for (DoingDoneListener<Task> d : taskListener)
+                d.onDone(t, at);
            processTasks(at);
        } else {
            HMCLog.err("Task failed: " + t.getInfo(), t.getFailReason());
@@ -166,7 +171,15 @@ public class TaskList extends Thread {

    public void abort() {
        shouldContinue = false;
-        EXECUTOR_SERVICE.shutdownNow();
+        final HashSet<Invoker> in = this.invokers;
+        EXECUTOR_SERVICE.shutdown();
+        while (!in.isEmpty())
+            synchronized (in) {
+                Invoker it = in.iterator().next();
+                if (!it.task.abort())
+                    futures.get(it).cancel(true);
+                in.remove(it);
+            }
        this.interrupt();
    }

--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java
@@ -34,9 +34,11 @@ import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 public class TaskWindow extends javax.swing.JDialog
    implements ProgressProviderListener, Runnable, DoingDoneListener<Task> {

-    private static final TaskWindow INSTANCE = new TaskWindow();
+    private static volatile TaskWindow INSTANCE = null;

-    private static TaskWindow instance() {
+    private static synchronized TaskWindow instance() {
+        if (INSTANCE == null)
+            INSTANCE = new TaskWindow();
        INSTANCE.clean();
        return INSTANCE;
    }
@@ -82,6 +84,8 @@ public class TaskWindow extends javax.swing.JDialog
        taskList.addAllDoneListener(this);
    }

+    public static String downloadSource = "";
+
    public boolean start() {
        if (isVisible() || taskList == null || taskList.isAlive())
            return false;
@@ -101,7 +105,7 @@ public class TaskWindow extends javax.swing.JDialog
            MessageBox.Show(C.i18n("taskwindow.no_more_instance"));
            return false;
        }
-        setTitle(C.i18n("taskwindow.title") + ": " + C.i18n("download.source"));
+        setTitle(C.i18n("taskwindow.title") + " - " + C.i18n("download.source") + ": " + downloadSource);
        this.setVisible(true);
        return this.areTasksFinished();
    }
@@ -296,6 +300,13 @@ public class TaskWindow extends javax.swing.JDialog
        });
    }

+    public static boolean execute(Task... ts) {
+        TaskWindowFactory f = factory();
+        for (Task t : ts)
+            f.append(t);
+        return f.create();
+    }
+
    public static class TaskWindowFactory {

        LinkedList<Task> ll = new LinkedList<>();
@@ -309,10 +320,10 @@ public class TaskWindow extends javax.swing.JDialog
        public boolean create() {
            String stacktrace = StrUtils.getStackTrace(new Throwable());
            return SwingUtils.invokeAndWait(() -> {
-                synchronized (INSTANCE) {
-                    if (INSTANCE.isVisible())
+                final TaskWindow tw = instance();
+                synchronized (tw) {
+                    if (tw.isVisible())
                        return false;
-                    TaskWindow tw = instance();
                    for (Task t : ll)
                        tw.addTask(t);
                    tw.lastStackTrace = tw.stackTrace;
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/FileDownloadTask.java
@@ -128,6 +128,8 @@ public class FileDownloadTask extends Task implements PreviousResult<File>, Prev
                    }
                }
            }
+            if (!shouldContinue)
+                break;
            try {

                // Open connection to URL.
@@ -195,8 +197,6 @@ public class FileDownloadTask extends Task implements PreviousResult<File>, Prev
                        lastTime = now;
                    }
                }
-                if (downloaded != contentLength)
-                    throw new IllegalStateException("Unexptected file size: " + downloaded + ", expected: " + contentLength);
                closeFiles();
                if (aborted)
                    tempFile.delete();
@@ -205,6 +205,10 @@ public class FileDownloadTask extends Task implements PreviousResult<File>, Prev
                        filePath.delete();
                    tempFile.renameTo(filePath);
                }
+                if (!shouldContinue)
+                    break;
+                if (downloaded != contentLength)
+                    throw new IllegalStateException("Unexptected file size: " + downloaded + ", expected: " + contentLength);
                String hashCode = String.format("%1$040x", new Object[] { new BigInteger(1, digest.digest()) });
                if (expectedHash != null && !expectedHash.equals(hashCode))
                    throw new IllegalStateException("Unexpected hash code: " + hashCode + ", expected: " + expectedHash);
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteLatestVersion.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteLatestVersion.java
@@ -1,28 +0,0 @@
-/*
- * Hello Minecraft!.
- * 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.util.version;
-
-/**
- *
- * @author huangyuhui
- */
-public class MinecraftRemoteLatestVersion {
-
-    public String snapshot, release;
-
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersion.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersion.java
@@ -1,27 +0,0 @@
-/*
- * Hello Minecraft!.
- * 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.util.version;
-
-/**
- *
- * @author huangyuhui
- */
-public class MinecraftRemoteVersion {
-
-    public String id, time, releaseTime, type;
-}
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersions.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftRemoteVersions.java
@@ -1,31 +0,0 @@
-/*
- * Hello Minecraft!.
- * 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.util.version;
-
-import java.util.ArrayList;
-
-/**
- *
- * @author huangyuhui
- */
-public class MinecraftRemoteVersions {
-
-    public ArrayList<MinecraftRemoteVersion> versions;
-    public MinecraftRemoteLatestVersion latest;
-
-}
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
@@ -290,7 +290,7 @@ mainwindow.enter_script_name=输入要生成脚本的文件名
 mainwindow.make_launch_succeed=启动脚本已生成完毕:
 mainwindow.no_version=未找到任何版本，是否进入游戏下载？

-launcher.about=<html>默认背景图来自Liberty Dome服务器。<br/>关于作者：<br/>百度ID：huanghongxun20<br/>mcbbs：huanghongxun<br/>邮箱：huanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br/>欢迎提交Bug哦<br/>Copyright (c) 2013-2016 huangyuhui.<br/>免责声明：Minecraft软件版权归Mojang AB所有，使用本软件产生的版权问题本软件制作方概不负责。<br/>本启动器在GPLv3协议下开源:https://github.com/huanghongxun/HMCL/ ,感谢issues和pull requests贡献者<br/>本软件使用了基于Apache License 2.0的Gson项目，感谢贡献者。</html>
+launcher.about=<html>默认背景图感谢gamerteam提供。<br/>关于作者：<br/>百度ID：huanghongxun20<br/>mcbbs：huanghongxun<br/>邮箱：huanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br/>欢迎提交Bug哦<br/>Copyright (c) 2013-2016 huangyuhui.<br/>免责声明：Minecraft软件版权归Mojang AB所有，使用本软件产生的版权问题本软件制作方概不负责。<br/>本启动器在GPLv3协议下开源:https://github.com/huanghongxun/HMCL/ ,感谢issues和pull requests贡献者<br/>本软件使用了基于Apache License 2.0的Gson项目，感谢贡献者。</html>
 launcher.download_source=下载源
 launcher.background_location=背景地址
 launcher.exit_failed=强制退出失败，可能是Forge 1.7.10及更高版本导致的，无法解决。
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
@@ -290,7 +290,7 @@ mainwindow.enter_script_name=\u8f93\u5165\u8981\u751f\u6210\u811a\u672c\u7684\u6
 mainwindow.make_launch_succeed=\u542f\u52a8\u811a\u672c\u5df2\u751f\u6210\u5b8c\u6bd5:
 mainwindow.no_version=\u672a\u627e\u5230\u4efb\u4f55\u7248\u672c\uff0c\u662f\u5426\u8fdb\u5165\u6e38\u620f\u4e0b\u8f7d\uff1f

-launcher.about=<html>\u9ed8\u8ba4\u80cc\u666f\u56fe\u6765\u81eaLiberty Dome\u670d\u52a1\u5668\u3002<br/>\u5173\u4e8e\u4f5c\u8005\uff1a<br/>\u767e\u5ea6ID\uff1ahuanghongxun20<br/>mcbbs\uff1ahuanghongxun<br/>\u90ae\u7bb1\uff1ahuanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br/>\u6b22\u8fce\u63d0\u4ea4Bug\u54e6<br/>Copyright (c) 2013-2016 huangyuhui.<br/>\u514d\u8d23\u58f0\u660e\uff1aMinecraft\u8f6f\u4ef6\u7248\u6743\u5f52Mojang AB\u6240\u6709\uff0c\u4f7f\u7528\u672c\u8f6f\u4ef6\u4ea7\u751f\u7684\u7248\u6743\u95ee\u9898\u672c\u8f6f\u4ef6\u5236\u4f5c\u65b9\u6982\u4e0d\u8d1f\u8d23\u3002<br/>\u672c\u542f\u52a8\u5668\u5728GPLv3\u534f\u8bae\u4e0b\u5f00\u6e90:https://github.com/huanghongxun/HMCL/ ,\u611f\u8c22issues\u548cpull requests\u8d21\u732e\u8005<br/>\u672c\u8f6f\u4ef6\u4f7f\u7528\u4e86\u57fa\u4e8eApache License 2.0\u7684Gson\u9879\u76ee\uff0c\u611f\u8c22\u8d21\u732e\u8005\u3002</html>
+launcher.about=<html>\u9ed8\u8ba4\u80cc\u666f\u56fe\u611f\u8c22gamerteam\u63d0\u4f9b\u3002<br/>\u5173\u4e8e\u4f5c\u8005\uff1a<br/>\u767e\u5ea6ID\uff1ahuanghongxun20<br/>mcbbs\uff1ahuanghongxun<br/>\u90ae\u7bb1\uff1ahuanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br/>\u6b22\u8fce\u63d0\u4ea4Bug\u54e6<br/>Copyright (c) 2013-2016 huangyuhui.<br/>\u514d\u8d23\u58f0\u660e\uff1aMinecraft\u8f6f\u4ef6\u7248\u6743\u5f52Mojang AB\u6240\u6709\uff0c\u4f7f\u7528\u672c\u8f6f\u4ef6\u4ea7\u751f\u7684\u7248\u6743\u95ee\u9898\u672c\u8f6f\u4ef6\u5236\u4f5c\u65b9\u6982\u4e0d\u8d1f\u8d23\u3002<br/>\u672c\u542f\u52a8\u5668\u5728GPLv3\u534f\u8bae\u4e0b\u5f00\u6e90:https://github.com/huanghongxun/HMCL/ ,\u611f\u8c22issues\u548cpull requests\u8d21\u732e\u8005<br/>\u672c\u8f6f\u4ef6\u4f7f\u7528\u4e86\u57fa\u4e8eApache License 2.0\u7684Gson\u9879\u76ee\uff0c\u611f\u8c22\u8d21\u732e\u8005\u3002</html>
 launcher.download_source=\u4e0b\u8f7d\u6e90
 launcher.background_location=\u80cc\u666f\u5730\u5740
 launcher.exit_failed=\u5f3a\u5236\u9000\u51fa\u5931\u8d25\uff0c\u53ef\u80fd\u662fForge 1.7.10\u53ca\u66f4\u9ad8\u7248\u672c\u5bfc\u81f4\u7684\uff0c\u65e0\u6cd5\u89e3\u51b3\u3002
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang
@@ -16,7 +16,7 @@
 launch.failed=啟動失敗
 launch.failed_creating_process=啟動失敗，在創建新進程時發生錯誤，可能是Java路徑錯誤。
 launch.failed_sh_permission=為啟動資料添加權限時發生錯誤
-launch.failed_packing_jar=在打包jar時發生錯誤
+launch.failed_packing_jar=在打包jar時發生錯誤
 launch.unsupported_launcher_version=對不起，本啟動器現在可能不能啟動這個版本的Minecraft，但啟動器還是會嘗試啟動，請盡快將此問題報告給作者。
 launch.too_big_memory_alloc_64bit=您设置的内存大小过大，由于可能超过了32位Java的内存分配限制，所以可能无法启动游戏，请将内存调至1024MB或更小，启动器仍会尝试启动。
 launch.too_big_memory_alloc_free_space_too_low=您设置的内存大小过大，由于超过了系统内存大小%dMB，所以可能影响游戏体验或无法启动游戏，启动器仍会尝试启动。
@@ -290,7 +290,7 @@ mainwindow.enter_script_name=輸入要生成腳本的資料名
 mainwindow.make_launch_succeed=啟動腳本已生成完畢:
 mainwindow.no_version=未找到任何版本，是否進入遊戲下載？

-launcher.about=<html>默認背景圖來自Liberty Dome伺服器。 <br/>關於作者：<br/>百度ID：huanghongxun20<br/>mcbbs：huanghongxun<br/>郵箱：huanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br />歡迎提交Bug哦<br/>Copyright (c) 2013-2016 huangyuhui.<br/>免責聲明：Minecraft軟體版權歸Mojang AB所有，遊戲由於誤操作本啟動器而丟失數據的概不負責。 <br/>本啟動器在GPLv3協議下開源:http://github.com/huanghongxun/HMCL/ ,感谢issues和pull requests贡献者<br/>本軟體使用了基於Apache License 2.0的Gson項目，感謝貢獻者。</html>
+launcher.about=<html>默認背景圖感謝gamerteam提供。 <br/>關於作者：<br/>百度ID：huanghongxun20<br/>mcbbs：huanghongxun<br/>郵箱：huanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br />歡迎提交Bug哦<br/>Copyright (c) 2013-2016 huangyuhui.<br/>免責聲明：Minecraft軟體版權歸Mojang AB所有，遊戲由於誤操作本啟動器而丟失數據的概不負責。 <br/>本啟動器在GPLv3協議下開源:http://github.com/huanghongxun/HMCL/ ,感谢issues和pull requests贡献者<br/>本軟體使用了基於Apache License 2.0的Gson項目，感謝貢獻者。</html>
 launcher.download_source=下載源
 launcher.background_location=背景地址
 launcher.exit_failed=強制退出失敗，可能是Forge 1.7.10及更高版本導致的，無法解決。
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties
@@ -16,7 +16,7 @@
 launch.failed=\u555f\u52d5\u5931\u6557
 launch.failed_creating_process=\u555f\u52d5\u5931\u6557\uff0c\u5728\u5275\u5efa\u65b0\u9032\u7a0b\u6642\u767c\u751f\u932f\u8aa4\uff0c\u53ef\u80fd\u662fJava\u8def\u5f91\u932f\u8aa4\u3002
 launch.failed_sh_permission=\u70ba\u555f\u52d5\u8cc7\u6599\u6dfb\u52a0\u6b0a\u9650\u6642\u767c\u751f\u932f\u8aa4
-launch.failed_pa\u200b\u200bcking_jar=\u5728\u6253\u5305jar\u6642\u767c\u751f\u932f\u8aa4
+launch.failed_packing_jar=\u5728\u6253\u5305jar\u6642\u767c\u751f\u932f\u8aa4
 launch.unsupported_launcher_version=\u5c0d\u4e0d\u8d77\uff0c\u672c\u555f\u52d5\u5668\u73fe\u5728\u53ef\u80fd\u4e0d\u80fd\u555f\u52d5\u9019\u500b\u7248\u672c\u7684Minecraft\uff0c\u4f46\u555f\u52d5\u5668\u9084\u662f\u6703\u5617\u8a66\u555f\u52d5\uff0c\u8acb\u76e1\u5feb\u5c07\u6b64\u554f\u984c\u5831\u544a\u7d66\u4f5c\u8005\u3002
 launch.too_big_memory_alloc_64bit=\u60a8\u8bbe\u7f6e\u7684\u5185\u5b58\u5927\u5c0f\u8fc7\u5927\uff0c\u7531\u4e8e\u53ef\u80fd\u8d85\u8fc7\u4e8632\u4f4dJava\u7684\u5185\u5b58\u5206\u914d\u9650\u5236\uff0c\u6240\u4ee5\u53ef\u80fd\u65e0\u6cd5\u542f\u52a8\u6e38\u620f\uff0c\u8bf7\u5c06\u5185\u5b58\u8c03\u81f31024MB\u6216\u66f4\u5c0f\uff0c\u542f\u52a8\u5668\u4ecd\u4f1a\u5c1d\u8bd5\u542f\u52a8\u3002
 launch.too_big_memory_alloc_free_space_too_low=\u60a8\u8bbe\u7f6e\u7684\u5185\u5b58\u5927\u5c0f\u8fc7\u5927\uff0c\u7531\u4e8e\u8d85\u8fc7\u4e86\u7cfb\u7edf\u5185\u5b58\u5927\u5c0f%dMB\uff0c\u6240\u4ee5\u53ef\u80fd\u5f71\u54cd\u6e38\u620f\u4f53\u9a8c\u6216\u65e0\u6cd5\u542f\u52a8\u6e38\u620f\uff0c\u542f\u52a8\u5668\u4ecd\u4f1a\u5c1d\u8bd5\u542f\u52a8\u3002
@@ -290,7 +290,7 @@ mainwindow.enter_script_name=\u8f38\u5165\u8981\u751f\u6210\u8173\u672c\u7684\u8
 mainwindow.make_launch_succeed=\u555f\u52d5\u8173\u672c\u5df2\u751f\u6210\u5b8c\u7562:
 mainwindow.no_version=\u672a\u627e\u5230\u4efb\u4f55\u7248\u672c\uff0c\u662f\u5426\u9032\u5165\u904a\u6232\u4e0b\u8f09\uff1f

-launcher.about=<html>\u9ed8\u8a8d\u80cc\u666f\u5716\u4f86\u81eaLiberty Dome\u4f3a\u670d\u5668\u3002 <br/>\u95dc\u65bc\u4f5c\u8005\uff1a<br/>\u767e\u5ea6ID\uff1ahuanghongxun20<br/>mcbbs\uff1ahuanghongxun<br/>\u90f5\u7bb1\uff1ahuanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br />\u6b61\u8fce\u63d0\u4ea4Bug\u54e6<br/>Copyright (c) 2013-2016 huangyuhui.<br/>\u514d\u8cac\u8072\u660e\uff1aMinecraft\u8edf\u9ad4\u7248\u6b0a\u6b78Mojang AB\u6240\u6709\uff0c\u904a\u6232\u7531\u65bc\u8aa4\u64cd\u4f5c\u672c\u555f\u52d5\u5668\u800c\u4e1f\u5931\u6578\u64da\u7684\u6982\u4e0d\u8ca0\u8cac\u3002 <br/>\u672c\u555f\u52d5\u5668\u5728GPLv3\u5354\u8b70\u4e0b\u958b\u6e90:http://github.com/huanghongxun/HMCL/ ,\u611f\u8c22issues\u548cpull requests\u8d21\u732e\u8005<br/>\u672c\u8edf\u9ad4\u4f7f\u7528\u4e86\u57fa\u65bcApache License 2.0\u7684Gson\u9805\u76ee\uff0c\u611f\u8b1d\u8ca2\u737b\u8005\u3002</html>
+launcher.about=<html>\u9ed8\u8a8d\u80cc\u666f\u5716\u611f\u8b1dgamerteam\u63d0\u4f9b\u3002 <br/>\u95dc\u65bc\u4f5c\u8005\uff1a<br/>\u767e\u5ea6ID\uff1ahuanghongxun20<br/>mcbbs\uff1ahuanghongxun<br/>\u90f5\u7bb1\uff1ahuanghongxun2008@126.com<br/>Minecraft Forum ID: klkl6523<br />\u6b61\u8fce\u63d0\u4ea4Bug\u54e6<br/>Copyright (c) 2013-2016 huangyuhui.<br/>\u514d\u8cac\u8072\u660e\uff1aMinecraft\u8edf\u9ad4\u7248\u6b0a\u6b78Mojang AB\u6240\u6709\uff0c\u904a\u6232\u7531\u65bc\u8aa4\u64cd\u4f5c\u672c\u555f\u52d5\u5668\u800c\u4e1f\u5931\u6578\u64da\u7684\u6982\u4e0d\u8ca0\u8cac\u3002 <br/>\u672c\u555f\u52d5\u5668\u5728GPLv3\u5354\u8b70\u4e0b\u958b\u6e90:http://github.com/huanghongxun/HMCL/ ,\u611f\u8c22issues\u548cpull requests\u8d21\u732e\u8005<br/>\u672c\u8edf\u9ad4\u4f7f\u7528\u4e86\u57fa\u65bcApache License 2.0\u7684Gson\u9805\u76ee\uff0c\u611f\u8b1d\u8ca2\u737b\u8005\u3002</html>
 launcher.download_source=\u4e0b\u8f09\u6e90
 launcher.background_location=\u80cc\u666f\u5730\u5740
 launcher.exit_failed=\u5f37\u5236\u9000\u51fa\u5931\u6557\uff0c\u53ef\u80fd\u662fForge 1.7.10\u53ca\u66f4\u9ad8\u7248\u672c\u5c0e\u81f4\u7684\uff0c\u7121\u6cd5\u89e3\u6c7a\u3002