Add: Common folder to save libraries and assets

2017-02-13 13:10:11 +08:00
parent eb311abe83
commit 20be2f76c6
25 changed files with 388 additions and 179 deletions
--- a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java
+++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java
@@ -0,0 +1,39 @@
+/*
+ * 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.util;
+
+/**
+ *
+ * @author huang
+ */
+public class Wrapper<T> {
+    T value;
+
+    public Wrapper(T value) {
+        this.value = value;
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public void setValue(T value) {
+        this.value = value;
+    }
+    
+}
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang
@@ -308,11 +308,14 @@ mainwindow.no_version=No version found. Switch to Game Downloads Tab?
 launcher.about=<html>About Author<br/>Minecraft Forum ID: klkl6523<br/>Copyright (c) 2013 huangyuhui<br/>Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/<br/>This software used project Gson which is under Apache License 2.0, thanks contributors.</html>
 launcher.download_source=Download Source
 launcher.background_location=Background Location
+launcher.common_location=Common Location
 launcher.exit_failed=Failed to shutdown.
 launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem?
 launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it?
 launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it?
 launcher.choose_bgpath=Choose background path.
+launcher.choose_commonpath=Choose common path.
+launcher.commpath_tooltip=<html><body>This app will save all game libraries and assets here unless there are existant files in game folder.</body></html>
 launcher.background_tooltip=<html><body>The laucher uses a default background.<br/>If you use custom background.png, link it and it will be used.<br />If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.<br />If you set the background setting, this app will use it.</body></html>
 launcher.update_launcher=Check for update
 launcher.enable_shadow=Enable Window Shadow
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties
@@ -308,11 +308,14 @@ mainwindow.no_version=No version found. Switch to Game Downloads Tab?
 launcher.about=<html>About Author<br/>Minecraft Forum ID: klkl6523<br/>Copyright (c) 2013 huangyuhui<br/>Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/<br/>This software used project Gson which is under Apache License 2.0, thanks contributors.</html>
 launcher.download_source=Download Source
 launcher.background_location=Background Location
+launcher.common_location=Common Location
 launcher.exit_failed=Failed to shutdown.
 launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem?
 launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it?
 launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it?
 launcher.choose_bgpath=Choose background path.
+launcher.choose_commonpath=Choose common path.
+launcher.commpath_tooltip=<html><body>This app will save all game libraries and assets here unless there are existant files in game folder.</body></html>
 launcher.background_tooltip=<html><body>The laucher uses a default background.<br/>If you use custom background.png, link it and it will be used.<br />If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.<br />If you set the background setting, this app will use it.</body></html>
 launcher.update_launcher=Check for update
 launcher.enable_shadow=Enable Window Shadow
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang
@@ -306,11 +306,14 @@ mainwindow.no_version=Không có phiên bản minecraft nào được tìm thấ
 launcher.about=<html>Về tác giả<br/>Minecraft Forum ID: klkl6523<br/>Copyright (c) 2013 huangyuhui<br/>http://github.com/huanghongxun/HMCL/<br/>Phần mềm này dùng project Gson, cảm ơn người đóng góp.</html>
 launcher.download_source=Download Source
 launcher.background_location=Background Location
+launcher.common_location=Common Location
 launcher.exit_failed=Tắt launcher thất bại.
 launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem?
 launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it?
 launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it?
 launcher.choose_bgpath=Choose background path.
+launcher.choose_commonpath=Choose common path.
+launcher.commpath_tooltip=<html><body>This app will save all game libraries and assets here unless there are existant files in game folder.</body></html>
 launcher.background_tooltip=<html><body>This app uses the default background at first.<br />If there is background.png in the directory, it will be used.<br />If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.<br />If you set the background setting, this app will use it.</body></html>
 launcher.update_launcher=Check for update
 launcher.enable_shadow=Enable Window Shadow
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties
@@ -306,11 +306,14 @@ mainwindow.no_version=Kh\u00f4ng c\u00f3 phi\u00ean b\u1ea3n minecraft n\u00e0o
 launcher.about=<html>V\u1ec1 t\u00e1c gi\u1ea3<br/>Minecraft Forum ID: klkl6523<br/>Copyright (c) 2013 huangyuhui<br/>http://github.com/huanghongxun/HMCL/<br/>Ph\u1ea7n m\u1ec1m n\u00e0y d\u00f9ng project Gson, c\u1ea3m \u01a1n ng\u01b0\u1eddi \u0111\u00f3ng g\u00f3p.</html>
 launcher.download_source=Download Source
 launcher.background_location=Background Location
+launcher.common_location=Common Location
 launcher.exit_failed=T\u1eaft launcher th\u1ea5t b\u1ea1i.
 launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem?
 launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it?
 launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it?
 launcher.choose_bgpath=Choose background path.
+launcher.choose_commonpath=Choose common path.
+launcher.commpath_tooltip=<html><body>This app will save all game libraries and assets here unless there are existant files in game folder.</body></html>
 launcher.background_tooltip=<html><body>This app uses the default background at first.<br />If there is background.png in the directory, it will be used.<br />If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.<br />If you set the background setting, this app will use it.</body></html>
 launcher.update_launcher=Check for update
 launcher.enable_shadow=Enable Window Shadow
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang
@@ -308,11 +308,14 @@ mainwindow.no_version=未找到任何版本，是否进入游戏下载？
 launcher.about=<html>默认背景图感谢gamerteam提供。<br/>关于作者：<br/>百度ID：huanghongxun20<br/>mcbbs：huanghongxun<br/>Minecraft Forum ID: klkl6523<br/>欢迎提交Bug哦<br/>Copyright (c) 2013-2017 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.common_location=公共文件夹
 launcher.exit_failed=强制退出失败，可能是Forge 1.7.10及更高版本导致的，无法解决。
 launcher.versions_json_not_matched=版本%s格式不规范！该版本文件夹下有json:%s，是否更名这个文件来规范格式？
 launcher.versions_json_not_matched_cannot_auto_completion=版本%s缺失必要的版本信息文件，是否删除该版本？
 launcher.versions_json_not_formatted=版本%s信息文件格式错误，是否重新下载？
 launcher.choose_bgpath=选择背景路径
+launcher.choose_commonpath=选择公共路径
+launcher.commpath_tooltip=<html><body>启动器将所有游戏资源及依赖库文件放于此集中管理，如果游戏文件夹内有现成的将不会使用公共库文件</body></html>
 launcher.background_tooltip=<html><body>启动器默认使用自带的背景<br />如果当前目录有background.png，则会使用该文件作为背景<br />如果当前目录有bg子目录，则会随机使用里面的一张图作为背景<br />如果该背景地址被修改，则会使用背景地址里的一张图作为背景<br />背景地址允许有多个地址，使用半角分号";"(不包含双引号)分隔</body></html>
 launcher.update_launcher=检查更新
 launcher.enable_shadow=启用窗口阴影
--- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties
+++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties
@@ -308,11 +308,14 @@ mainwindow.no_version=\u672a\u627e\u5230\u4efb\u4f55\u7248\u672c\uff0c\u662f\u54
 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/>Minecraft Forum ID: klkl6523<br/>\u6b22\u8fce\u63d0\u4ea4Bug\u54e6<br/>Copyright (c) 2013-2017 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.common_location=\u516c\u5171\u6587\u4ef6\u5939
 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
 launcher.versions_json_not_matched=\u7248\u672c%s\u683c\u5f0f\u4e0d\u89c4\u8303\uff01\u8be5\u7248\u672c\u6587\u4ef6\u5939\u4e0b\u6709json:%s\uff0c\u662f\u5426\u66f4\u540d\u8fd9\u4e2a\u6587\u4ef6\u6765\u89c4\u8303\u683c\u5f0f\uff1f
 launcher.versions_json_not_matched_cannot_auto_completion=\u7248\u672c%s\u7f3a\u5931\u5fc5\u8981\u7684\u7248\u672c\u4fe1\u606f\u6587\u4ef6\uff0c\u662f\u5426\u5220\u9664\u8be5\u7248\u672c\uff1f
 launcher.versions_json_not_formatted=\u7248\u672c%s\u4fe1\u606f\u6587\u4ef6\u683c\u5f0f\u9519\u8bef\uff0c\u662f\u5426\u91cd\u65b0\u4e0b\u8f7d\uff1f
 launcher.choose_bgpath=\u9009\u62e9\u80cc\u666f\u8def\u5f84
+launcher.choose_commonpath=\u9009\u62e9\u516c\u5171\u8def\u5f84
+launcher.commpath_tooltip=<html><body>\u542f\u52a8\u5668\u5c06\u6240\u6709\u6e38\u620f\u8d44\u6e90\u53ca\u4f9d\u8d56\u5e93\u6587\u4ef6\u653e\u4e8e\u6b64\u96c6\u4e2d\u7ba1\u7406\uff0c\u5982\u679c\u6e38\u620f\u6587\u4ef6\u5939\u5185\u6709\u73b0\u6210\u7684\u5c06\u4e0d\u4f1a\u4f7f\u7528\u516c\u5171\u5e93\u6587\u4ef6</body></html>
 launcher.background_tooltip=<html><body>\u542f\u52a8\u5668\u9ed8\u8ba4\u4f7f\u7528\u81ea\u5e26\u7684\u80cc\u666f<br />\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709background.png\uff0c\u5219\u4f1a\u4f7f\u7528\u8be5\u6587\u4ef6\u4f5c\u4e3a\u80cc\u666f<br />\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709bg\u5b50\u76ee\u5f55\uff0c\u5219\u4f1a\u968f\u673a\u4f7f\u7528\u91cc\u9762\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f<br />\u5982\u679c\u8be5\u80cc\u666f\u5730\u5740\u88ab\u4fee\u6539\uff0c\u5219\u4f1a\u4f7f\u7528\u80cc\u666f\u5730\u5740\u91cc\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f<br />\u80cc\u666f\u5730\u5740\u5141\u8bb8\u6709\u591a\u4e2a\u5730\u5740\uff0c\u4f7f\u7528\u534a\u89d2\u5206\u53f7";"(\u4e0d\u5305\u542b\u53cc\u5f15\u53f7)\u5206\u9694</body></html>
 launcher.update_launcher=\u68c0\u67e5\u66f4\u65b0
 launcher.enable_shadow=\u542f\u7528\u7a97\u53e3\u9634\u5f71