Fix #53

Fix cpu ratio for mac

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

@@ -56,7 +56,8 @@ public class MinecraftAssetService extends IMinecraftAssetService {
     }
 
     public Task downloadAssets(final MinecraftVersion mv) {
-        Utils.requireNonNull(mv);
+        if (mv == null)
+            return null;
         return new TaskInfo("Download Assets") {
             Collection<Task> afters = new HashSet<>();
 

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

@@ -55,7 +55,7 @@ public class MinecraftDownloadService extends IMinecraftDownloadService {
             return downloadLibraries;
         MinecraftVersion v = mv.resolve(service.version());
         for (IMinecraftLibrary l : v.getLibraries())
-            if (l != null && l.allow()) {
+            if (l != null && l.allow() && l.getDownloadInfo() != null) {
                 File ff = l.getFilePath(service.baseDirectory());
                 if (!ff.exists()) {
                     String libURL = l.getDownloadInfo().getUrl(service.getDownloadType());

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

@@ -89,6 +89,8 @@ public class MinecraftLibrary extends IMinecraftLibrary {
 
     public String formatName() {
         String[] s = name.split(":");
+        if (s.length < 3)
+            return null;
         StringBuilder sb = new StringBuilder(s[0].replace('.', '/')).append('/').append(s[1]).append('/').append(s[2]).append('/').append(s[1]).append('-').append(s[2]);
         if (natives != null)
             sb.append('-').append(getNative());
@@ -120,8 +122,11 @@ public class MinecraftLibrary extends IMinecraftLibrary {
             downloads.artifact = info = new LibraryDownloadInfo();
         else
             info = downloads.artifact;
-        if (StrUtils.isBlank(info.path))
+        if (StrUtils.isBlank(info.path)) {
             info.path = formatName();
+            if (info.path == null)
+                return null;
+        }
         info.forgeURL = this.url;
         return info;
     }

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

@@ -46,8 +46,12 @@ public final class Profile {
     }
 
     public Profile(String name) {
+        this(name, new File(IOUtils.currentDir(), ".minecraft").getPath());
+    }
+
+    public Profile(String name, String gameDir) {
         this.name = name;
-        gameDir = MCUtils.getInitGameDir().getPath();
+        this.gameDir = gameDir;
     }
 
     public Profile(String name, Profile v) {

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

@@ -25,6 +25,7 @@ import java.util.Map;
 import org.jackhuang.hellominecraft.util.C;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.launcher.Main;
+import org.jackhuang.hellominecraft.launcher.core.MCUtils;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadType;
 import org.jackhuang.hellominecraft.util.CollectionUtils;
 import org.jackhuang.hellominecraft.util.EventHandler;
@@ -40,6 +41,7 @@ import org.jackhuang.hellominecraft.util.UpdateChecker;
 public final class Settings {
 
     public static final String DEFAULT_PROFILE = "Default";
+    public static final String HOME_PROFILE = "Home";
 
     public static final File SETTINGS_FILE = new File(IOUtils.currentDir(), "hmcl.json");
 
@@ -55,7 +57,7 @@ public final class Settings {
         SETTINGS.downloadTypeChangedEvent.register(DownloadType::setSuggestedDownloadType);
         DownloadType.setSuggestedDownloadType(SETTINGS.getDownloadSource());
         if (!getProfiles().containsKey(DEFAULT_PROFILE))
-            getProfiles().put(DEFAULT_PROFILE, new Profile());
+            getProfiles().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE));
 
         for (Map.Entry<String, Profile> entry : getProfiles().entrySet()) {
             Profile e = entry.getValue();
@@ -81,8 +83,11 @@ public final class Settings {
             } catch (IOException | JsonSyntaxException e) {
                 HMCLog.warn("Something happened wrongly when load settings.", e);
             }
-        else
+        else {
             HMCLog.log("No settings file here, may be first loading.");
+            if (!c.getConfigurations().containsKey(HOME_PROFILE))
+                c.getConfigurations().put(HOME_PROFILE, new Profile(HOME_PROFILE, MCUtils.getLocation().getPath()));
+        }
         return c;
     }
 
@@ -150,7 +155,13 @@ public final class Settings {
             MessageBox.Show(C.i18n("settings.cannot_remove_default_config"));
             return false;
         }
-        return getProfiles().remove(ver) != null;
+        boolean notify = false;
+        if (getLastProfile().getName().equals(ver))
+            notify = true;
+        boolean flag = getProfiles().remove(ver) != null;
+        if (notify && flag)
+            onProfileChanged();
+        return flag;
     }
 
     public static final EventHandler<Profile> profileChangedEvent = new EventHandler(null);

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

@@ -103,8 +103,10 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
         initExternalModsTable();
         initTabs();
 
+        isLoading = true;
         for (Java j : Java.JAVA)
             cboJava.addItem(j.getLocalizedName());
+        isLoading = false;
 
         Settings.profileLoadingEvent.register(onLoadingProfiles);
         Settings.profileChangedEvent.register(onSelectedProfilesChanged);
@@ -949,8 +951,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
     private void btnRemoveProfileActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRemoveProfileActionPerformed
         if (MessageBox.Show(C.i18n("ui.message.sure_remove", Settings.getLastProfile().getName()), MessageBox.YES_NO_OPTION) == MessageBox.NO_OPTION)
             return;
-        if (Settings.delProfile(Settings.getLastProfile()))
-            loadProfiles();
+        Settings.delProfile(Settings.getLastProfile());
     }//GEN-LAST:event_btnRemoveProfileActionPerformed
 
     private void cboVersionsItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboVersionsItemStateChanged

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form

@@ -153,7 +153,13 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/jackhuang/hellominecraft/lang/I18N.properties" key="launcher.about" replaceFormat="C.i18n(&quot;{key}&quot;)"/>
         </Property>
+        <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
+          <Color id="&#x624b;&#x578b;&#x5149;&#x6807;"/>
+        </Property>
       </Properties>
+      <Events>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lblAboutMouseClicked"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JButton" name="btnSelBackgroundPath">
       <Properties>

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

@@ -124,6 +124,12 @@ public class LauncherSettingsPanel extends AnimatedPanel {
         });
 
         lblAbout.setText(C.i18n("launcher.about")); // NOI18N
+        lblAbout.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
+        lblAbout.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
+                lblAboutMouseClicked(evt);
+            }
+        });
 
         btnSelBackgroundPath.setText(C.i18n("ui.button.explore")); // NOI18N
         btnSelBackgroundPath.addActionListener(new java.awt.event.ActionListener() {
@@ -380,7 +386,7 @@ public class LauncherSettingsPanel extends AnimatedPanel {
     }//GEN-LAST:event_cboThemeItemStateChanged
 
     private void lblModpackMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblModpackMouseClicked
-        SwingUtils.openLink("http://blog.163.com/huanghongxun2008@126/blog/static/7738046920160323812771/");
+        SwingUtils.openLink("http://huangyuhui.duapp.com/link.php?type=modpack");
     }//GEN-LAST:event_lblModpackMouseClicked
 
     private void cboLangItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboLangItemStateChanged
@@ -415,6 +421,10 @@ public class LauncherSettingsPanel extends AnimatedPanel {
         Settings.getInstance().setProxyPassword(txtProxyPassword.getText());
     }//GEN-LAST:event_txtProxyPasswordFocusLost
 
+    private void lblAboutMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblAboutMouseClicked
+        SwingUtils.openLink("http://huangyuhui.duapp.com/link.php?type=sponsor");
+    }//GEN-LAST:event_lblAboutMouseClicked
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btnCheckUpdate;
     private javax.swing.JButton btnSelBackgroundPath;

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/CrashReporter.java

@@ -47,8 +47,8 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
         {
             put("MessageBox", "");
             put("AWTError", "");
-            put("JFileChooser", "Has your operating system been installed completely or is a ghost system? ");
-            put("JceSecurity", "Has your operating system been installed completely or is a ghost system? ");
+            put("JFileChooser", "Has your operating system been installed completely or is a ghost system?");
+            put("Jce", "Has your operating system been installed completely or is a ghost system?");
             put("couldn't create component peer", "Fucking computer!");
             put("sun.awt.shell.Win32ShellFolder2", "crash.user_fault");
             put("UnsatisfiedLinkError", "crash.user_fault");
@@ -60,6 +60,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("java.lang.ClassFormatError", "crash.NoClassDefFound");
             put("java.lang.OutOfMemoryError", "FUCKING MEMORY LIMIT!");
             put("Trampoline", "ui.message.update_java");
+            put("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?");
         }
     };
 

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

@@ -53,20 +53,16 @@ public class DefaultPlugin implements IPlugin {
         OFFLINE_LOGIN.onLoadSettings(Settings.getInstance().getAuthenticatorConfig(OFFLINE_LOGIN.id()));
         YGGDRASIL_LOGIN = new YggdrasilAuthenticator(clientToken);
         YGGDRASIL_LOGIN.onLoadSettings(Settings.getInstance().getAuthenticatorConfig(YGGDRASIL_LOGIN.id()));
-        SKINME_LOGIN = new SkinmeAuthenticator(clientToken);
-        SKINME_LOGIN.onLoadSettings(Settings.getInstance().getAuthenticatorConfig(SKINME_LOGIN.id()));
 
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
                 Settings.getInstance().setAuthenticatorConfig(OFFLINE_LOGIN.id(), OFFLINE_LOGIN.onSaveSettings());
                 Settings.getInstance().setAuthenticatorConfig(YGGDRASIL_LOGIN.id(), YGGDRASIL_LOGIN.onSaveSettings());
-                Settings.getInstance().setAuthenticatorConfig(SKINME_LOGIN.id(), SKINME_LOGIN.onSaveSettings());
             }
         });
         apply.accept(OFFLINE_LOGIN);
         apply.accept(YGGDRASIL_LOGIN);
-        apply.accept(SKINME_LOGIN);
     }
 
     @Override

HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/TaskWindow.java

@@ -322,7 +322,8 @@ public class TaskWindow extends javax.swing.JDialog
         boolean flag;
 
         public TaskWindowFactory append(Task t) {
-            ll.add(t);
+            if (t != null)
+                ll.add(t);
             return this;
         }
 

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang

@@ -297,7 +297,7 @@ mainwindow.enter_script_name=输入要生成脚本的文件名
 mainwindow.make_launch_succeed=启动脚本已生成完毕:
 mainwindow.no_version=未找到任何版本，是否进入游戏下载？
 
-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.about=<html>默认背景图感谢gamerteam提供。<br><a href="http://huangyuhui.duapp.com/link.php?type=sponsor">如果您希望本软件继续发展，请赞助</a><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及更高版本导致的，无法解决。
@@ -311,7 +311,7 @@ launcher.enable_shadow=启用窗口阴影
 launcher.theme=主题
 launcher.proxy=代理
 launcher.decorated=启用窗口边框(Linux下可解决程序界面全灰问题)
-launcher.modpack=<html><a href="http://blog.163.com/huanghongxun2008@126/blog/static/7738046920160323812771/">整合包作者帮助</a></html>
+launcher.modpack=<html><a href="http://huangyuhui.duapp.com/link.php?type=modpack">整合包作者帮助</a></html>
 launcher.enable_animation=启用动态效果
 launcher.lang=语言
 launcher.restart=本界面选项需要重启本启动器生效
@@ -364,7 +364,7 @@ setupwindow.no_empty_name=名字不可为空
 setupwindow.clean=清理游戏文件
 
 update.no_browser=无法打开浏览器，网址已经复制到剪贴板了，您可以手动粘贴网址打开页面
-update.should_open_link=是否前往发布页面更新？
+update.should_open_link=是否更新？
 update.newest_version=最新版本为：
 update.failed=检查更新失败
 update.found=(发现更新!)

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties

@@ -297,7 +297,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\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.about=<html>\u9ed8\u8ba4\u80cc\u666f\u56fe\u611f\u8c22gamerteam\u63d0\u4f9b\u3002<br><a href="http://huangyuhui.duapp.com/link.php?type=sponsor">\u5982\u679c\u60a8\u5e0c\u671b\u672c\u8f6f\u4ef6\u7ee7\u7eed\u53d1\u5c55\uff0c\u8bf7\u8d5e\u52a9</a><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
@@ -311,7 +311,7 @@ launcher.enable_shadow=\u542f\u7528\u7a97\u53e3\u9634\u5f71
 launcher.theme=\u4e3b\u9898
 launcher.proxy=\u4ee3\u7406
 launcher.decorated=\u542f\u7528\u7a97\u53e3\u8fb9\u6846(Linux\u4e0b\u53ef\u89e3\u51b3\u7a0b\u5e8f\u754c\u9762\u5168\u7070\u95ee\u9898)
-launcher.modpack=<html><a href="http://blog.163.com/huanghongxun2008@126/blog/static/7738046920160323812771/">\u6574\u5408\u5305\u4f5c\u8005\u5e2e\u52a9</a></html>
+launcher.modpack=<html><a href="http://huangyuhui.duapp.com/link.php?type=modpack">\u6574\u5408\u5305\u4f5c\u8005\u5e2e\u52a9</a></html>
 launcher.enable_animation=\u542f\u7528\u52a8\u6001\u6548\u679c
 launcher.lang=\u8bed\u8a00
 launcher.restart=\u672c\u754c\u9762\u9009\u9879\u9700\u8981\u91cd\u542f\u672c\u542f\u52a8\u5668\u751f\u6548
@@ -364,7 +364,7 @@ setupwindow.no_empty_name=\u540d\u5b57\u4e0d\u53ef\u4e3a\u7a7a
 setupwindow.clean=\u6e05\u7406\u6e38\u620f\u6587\u4ef6
 
 update.no_browser=\u65e0\u6cd5\u6253\u5f00\u6d4f\u89c8\u5668\uff0c\u7f51\u5740\u5df2\u7ecf\u590d\u5236\u5230\u526a\u8d34\u677f\u4e86\uff0c\u60a8\u53ef\u4ee5\u624b\u52a8\u7c98\u8d34\u7f51\u5740\u6253\u5f00\u9875\u9762
-update.should_open_link=\u662f\u5426\u524d\u5f80\u53d1\u5e03\u9875\u9762\u66f4\u65b0\uff1f
+update.should_open_link=\u662f\u5426\u66f4\u65b0\uff1f
 update.newest_version=\u6700\u65b0\u7248\u672c\u4e3a\uff1a
 update.failed=\u68c0\u67e5\u66f4\u65b0\u5931\u8d25
 update.found=(\u53d1\u73b0\u66f4\u65b0!)

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang

@@ -364,7 +364,7 @@ setupwindow.no_empty_name=Version name cannot be empty.
 setupwindow.clean=Clean game files
 
 update.no_browser=Cannot open any browser. The link has been copied to the clipboard. You can paste it to the address bar.
-update.should_open_link=Are you willing to open the update link?
+update.should_open_link=Are you willing to upgrade this app?
 update.newest_version=Newest version:
 update.failed=Failed to check for updates.
 update.found=(Found Update!)

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties

@@ -364,7 +364,7 @@ setupwindow.no_empty_name=Version name cannot be empty.
 setupwindow.clean=Clean game files
 
 update.no_browser=Cannot open any browser. The link has been copied to the clipboard. You can paste it to the address bar.
-update.should_open_link=Are you willing to open the update link?
+update.should_open_link=Are you willing to upgrade this app?
 update.newest_version=Newest version:
 update.failed=Failed to check for updates.
 update.found=(Found Update!)

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang

@@ -297,7 +297,7 @@ mainwindow.enter_script_name=輸入要生成腳本的資料名
 mainwindow.make_launch_succeed=啟動腳本已生成完畢:
 mainwindow.no_version=未找到任何版本，是否進入遊戲下載？
 
-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.about=<html>默認背景圖感謝gamerteam提供。<br><a href="http://huangyuhui.duapp.com/link.php?type=sponsor">如果您希望本軟件繼續發展，請贊助</a><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及更高版本導致的，無法解決。
@@ -311,7 +311,7 @@ launcher.enable_shadow=启用窗口阴影
 launcher.theme=主题
 launcher.proxy=代理
 launcher.decorated=啟用窗口邊框(Linux下可解決程序界面全灰問題)
-launcher.modpack=<html><a href="http://blog.163.com/huanghongxun2008@126/blog/static/7738046920160323812771/">整合包作者帮助</a></html>
+launcher.modpack=<html><a href="http://huangyuhui.duapp.com/link.php?type=modpack">整合包作者帮助</a></html>
 launcher.enable_animation=啟用動態效果
 launcher.lang=語言
 launcher.restart=本界面選項需要重啟本啟動器生效
@@ -364,7 +364,7 @@ setupwindow.no_empty_name=名字不可為空
 setupwindow.clean=清理遊戲資料
 
 update.no_browser=無法打開瀏覽器，網址已經復製到剪貼板了，您可以手動粘貼網址打開頁面
-update.should_open_link=是否前往發布頁面更新？
+update.should_open_link=是否更新？
 update.newest_version=最新版本為：
 update.failed=檢查更新失敗
 update.found=(發現更新!)

HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties

@@ -297,7 +297,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\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.about=<html>\u9ed8\u8a8d\u80cc\u666f\u5716\u611f\u8b1dgamerteam\u63d0\u4f9b\u3002<br><a href="http://huangyuhui.duapp.com/link.php?type=sponsor">\u5982\u679c\u60a8\u5e0c\u671b\u672c\u8edf\u4ef6\u7e7c\u7e8c\u767c\u5c55\uff0c\u8acb\u8d0a\u52a9</a><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
@@ -311,7 +311,7 @@ launcher.enable_shadow=\u542f\u7528\u7a97\u53e3\u9634\u5f71
 launcher.theme=\u4e3b\u9898
 launcher.proxy=\u4ee3\u7406
 launcher.decorated=\u555f\u7528\u7a97\u53e3\u908a\u6846(Linux\u4e0b\u53ef\u89e3\u6c7a\u7a0b\u5e8f\u754c\u9762\u5168\u7070\u554f\u984c)
-launcher.modpack=<html><a href="http://blog.163.com/huanghongxun2008@126/blog/static/7738046920160323812771/">\u6574\u5408\u5305\u4f5c\u8005\u5e2e\u52a9</a></html>
+launcher.modpack=<html><a href="http://huangyuhui.duapp.com/link.php?type=modpack">\u6574\u5408\u5305\u4f5c\u8005\u5e2e\u52a9</a></html>
 launcher.enable_animation=\u555f\u7528\u52d5\u614b\u6548\u679c
 launcher.lang=\u8a9e\u8a00
 launcher.restart=\u672c\u754c\u9762\u9078\u9805\u9700\u8981\u91cd\u555f\u672c\u555f\u52d5\u5668\u751f\u6548
@@ -364,7 +364,7 @@ setupwindow.no_empty_name=\u540d\u5b57\u4e0d\u53ef\u70ba\u7a7a
 setupwindow.clean=\u6e05\u7406\u904a\u6232\u8cc7\u6599
 
 update.no_browser=\u7121\u6cd5\u6253\u958b\u700f\u89bd\u5668\uff0c\u7db2\u5740\u5df2\u7d93\u5fa9\u88fd\u5230\u526a\u8cbc\u677f\u4e86\uff0c\u60a8\u53ef\u4ee5\u624b\u52d5\u7c98\u8cbc\u7db2\u5740\u6253\u958b\u9801\u9762
-update.should_open_link=\u662f\u5426\u524d\u5f80\u767c\u5e03\u9801\u9762\u66f4\u65b0\uff1f
+update.should_open_link=\u662f\u5426\u66f4\u65b0\uff1f
 update.newest_version=\u6700\u65b0\u7248\u672c\u70ba\uff1a
 update.failed=\u6aa2\u67e5\u66f4\u65b0\u5931\u6557
 update.found=(\u767c\u73fe\u66f4\u65b0!)

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java

@@ -242,9 +242,9 @@ public final class MainWindow extends javax.swing.JFrame
         itm.addActionListener(new ActionListenerImpl("time set 0"));
         ppmBasically.add(itm);
         itm = new JMenuItem("广播");
-        itm.addActionListener(new ActionListenerImpl("say {}", JOptionPane.showInputDialog("广播讯息")));
+        itm.addActionListener(new ActionListenerImpl("say {}", "广播讯息"));
         itm = new JMenuItem("红字广播");
-        itm.addActionListener(new ActionListenerImpl("me {}", JOptionPane.showInputDialog("广播讯息")));
+        itm.addActionListener(new ActionListenerImpl("me {}", "广播讯息"));
         itm = new JMenuItem("私聊");
         itm.addActionListener(e -> {
             InputDialog id = new InputDialog(MainWindow.this, true, new String[] { "玩家", "讯息" });
@@ -253,16 +253,16 @@ public final class MainWindow extends javax.swing.JFrame
         });
         ppmBasically.add(itm);
         itm = new JMenuItem("给予OP");
-        itm.addActionListener(new ActionListenerImpl("op {}", JOptionPane.showInputDialog("新OP的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("op {}", "新OP的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("卸除OP");
-        itm.addActionListener(new ActionListenerImpl("deop {}", JOptionPane.showInputDialog("要卸除OP的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("deop {}", "要卸除OP的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("给予玩家白名单");
-        itm.addActionListener(new ActionListenerImpl("whitelist add {}", JOptionPane.showInputDialog("要添入白名单的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("whitelist add {}", "要添入白名单的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("解除玩家白名单");
-        itm.addActionListener(new ActionListenerImpl("whitelist remove {}", JOptionPane.showInputDialog("要解除白名单的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("whitelist remove {}", "要解除白名单的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("启用白名单");
         itm.addActionListener(new ActionListenerImpl("whitelist on"));
@@ -274,31 +274,31 @@ public final class MainWindow extends javax.swing.JFrame
         itm.addActionListener(new ActionListenerImpl("whitelist list"));
         ppmBasically.add(itm);
         itm = new JMenuItem("封禁玩家");
-        itm.addActionListener(new ActionListenerImpl("ban {}", JOptionPane.showInputDialog("要封禁玩家的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("ban {}", "要封禁玩家的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("封禁玩家IP");
-        itm.addActionListener(new ActionListenerImpl("ban-ip {}", JOptionPane.showInputDialog("要封禁玩家IP的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("ban-ip {}", "要封禁玩家IP的游戏名"));
         itm = new JMenuItem("解封玩家");
-        itm.addActionListener(new ActionListenerImpl("pardon {}", JOptionPane.showInputDialog("要解封玩家的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("pardon {}", "要解封玩家的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("解封玩家IP");
-        itm.addActionListener(new ActionListenerImpl("pardon-ip {}", JOptionPane.showInputDialog("要解封玩家IP的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("pardon-ip {}", "要解封玩家IP的游戏名"));
         itm = new JMenuItem("封禁玩家");
-        itm.addActionListener(new ActionListenerImpl("ban {}", JOptionPane.showInputDialog("要封禁玩家的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("ban {}", "要封禁玩家的游戏名"));
         ppmBasically.add(itm);
         itm = new JMenuItem("封禁玩家IP");
-        itm.addActionListener(new ActionListenerImpl("ban-ip {}", JOptionPane.showInputDialog("要封禁玩家IP的游戏名")));
+        itm.addActionListener(new ActionListenerImpl("ban-ip {}", "要封禁玩家IP的游戏名"));
         itm = new JMenuItem("封禁玩家列表");
         itm.addActionListener(new ActionListenerImpl("banlist"));
         ppmBasically.add(itm);
         itm = new JMenuItem("修改时间");
-        itm.addActionListener(new ActionListenerImpl("time set {}", JOptionPane.showInputDialog("要调整的时间值")));
+        itm.addActionListener(new ActionListenerImpl("time set {}", "要调整的时间值"));
         ppmBasically.add(itm);
         itm = new JMenuItem("往后调整时间");
-        itm.addActionListener(new ActionListenerImpl("time add {}", JOptionPane.showInputDialog("要往后调整的时间值")));
+        itm.addActionListener(new ActionListenerImpl("time add {}", "要往后调整的时间值"));
         ppmBasically.add(itm);
         itm = new JMenuItem("调整天气");
-        itm.addActionListener(new ActionListenerImpl("weather {}", JOptionPane.showInputDialog("要调整的天气（只能填：clear[意思是取消所有天气]或rain[意思是下雨]或thunder[意思是打雷]")));
+        itm.addActionListener(new ActionListenerImpl("weather {}", "要调整的天气（只能填：clear[意思是取消所有天气]或rain[意思是下雨]或thunder[意思是打雷]"));
         ppmBasically.add(itm);
         itm = new JMenuItem("调整一定时间的天气");
         itm.addActionListener(e -> {
@@ -314,10 +314,10 @@ public final class MainWindow extends javax.swing.JFrame
         });
         ppmBasically.add(itm);
         itm = new JMenuItem("清除背包");
-        itm.addActionListener(new ActionListenerImpl("clear {}", JOptionPane.showInputDialog("要被清除背包的玩家")));
+        itm.addActionListener(new ActionListenerImpl("clear {}", "要被清除背包的玩家"));
         ppmBasically.add(itm);
         itm = new JMenuItem("踢出玩家");
-        itm.addActionListener(new ActionListenerImpl("kick {}", JOptionPane.showInputDialog("要被踢出的玩家")));
+        itm.addActionListener(new ActionListenerImpl("kick {}", "要被踢出的玩家"));
         ppmBasically.add(itm);
         itm = new JMenuItem("在线玩家");
         itm.addActionListener(new ActionListenerImpl("list"));
@@ -343,10 +343,10 @@ public final class MainWindow extends javax.swing.JFrame
         itm.addActionListener(new ActionListenerImpl("save-off"));
         ppmBasically.add(itm);
         itm = new JMenuItem("难度");
-        itm.addActionListener(new ActionListenerImpl("difficulty {}", JOptionPane.showInputDialog("难度")));
+        itm.addActionListener(new ActionListenerImpl("difficulty {}", "难度"));
         ppmBasically.add(itm);
         itm = new JMenuItem("默认游戏模式");
-        itm.addActionListener(new ActionListenerImpl("defaultgamemode {}", JOptionPane.showInputDialog("默认游戏模式")));
+        itm.addActionListener(new ActionListenerImpl("defaultgamemode {}", "默认游戏模式"));
         ppmBasically.add(itm);
         itm = new JMenuItem("地图种子");
         itm.addActionListener(new ActionListenerImpl("seed"));

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java

@@ -22,9 +22,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.lang.management.ManagementFactory;
 import java.util.StringTokenizer;
 import com.sun.management.OperatingSystemMXBean;
 import org.jackhuang.hellominecraft.util.StrUtils;
+import org.jackhuang.hellominecraft.util.logging.HMCLog;
 
 /**
  *
@@ -56,7 +58,7 @@ public class MonitorServiceImpl implements IMonitorService {
         long freeMemory = Runtime.getRuntime().freeMemory() / kb;
         // 最大可使用内存
         long maxMemory = Runtime.getRuntime().maxMemory() / kb;
-        OperatingSystemMXBean osmxb = (OperatingSystemMXBean) java.lang.management.ManagementFactory.getOperatingSystemMXBean();
+        OperatingSystemMXBean osmxb = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
         // 操作系统
         String osName = System.getProperty("os.name");
         // 总的物理内存
@@ -72,8 +74,10 @@ public class MonitorServiceImpl implements IMonitorService {
         double cpuRatio = 0;
         if (osName.toLowerCase().startsWith("windows"))
             cpuRatio = this.getCpuRatioForWindows();
+        else if (osName.toLowerCase().startsWith("mac"))
+            cpuRatio = this.getCpuRatioForMac();
         else
-            cpuRatio = getCpuRateForLinux();
+            cpuRatio = this.getCpuRatioForLinux();
         // 构造返回对象
         MonitorInfoBean infoBean = new MonitorInfoBean();
         infoBean.setFreeMemory(freeMemory);
@@ -88,56 +92,86 @@ public class MonitorServiceImpl implements IMonitorService {
         return infoBean;
     }
 
-    private static double getCpuRateForLinux() {
+    private static double getCpuRatioForLinux() {
+        float cpuUsage = 0;
+        Process pro1, pro2;
+        Runtime r = Runtime.getRuntime();
+        try {
+            String command = "cat /proc/stat";
+            long startTime = System.currentTimeMillis();
+            pro1 = r.exec(command);
+            BufferedReader in1 = new BufferedReader(new InputStreamReader(pro1.getInputStream()));
+            String line = null;
+            long idleCpuTime1 = 0, totalCpuTime1 = 0;   //分别为系统启动后空闲的CPU时间和总的CPU时间
+            while ((line = in1.readLine()) != null)
+                if (line.startsWith("cpu")) {
+                    line = line.trim();
+                    String[] temp = line.split("\\s+");
+                    idleCpuTime1 = Long.parseLong(temp[4]);
+                    for (String s : temp)
+                        if (!s.equals("cpu"))
+                            totalCpuTime1 += Long.parseLong(s);
+                    break;
+                }
+            in1.close();
+            pro1.destroy();
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                HMCLog.err("Failed to catch sysout", e);
+            }
+            //第二次采集CPU时间
+            long endTime = System.currentTimeMillis();
+            pro2 = r.exec(command);
+            BufferedReader in2 = new BufferedReader(new InputStreamReader(pro2.getInputStream()));
+            long idleCpuTime2 = 0, totalCpuTime2 = 0;   //分别为系统启动后空闲的CPU时间和总的CPU时间
+            while ((line = in2.readLine()) != null)
+                if (line.startsWith("cpu")) {
+                    line = line.trim();
+                    String[] temp = line.split("\\s+");
+                    idleCpuTime2 = Long.parseLong(temp[4]);
+                    for (String s : temp)
+                        if (!s.equals("cpu"))
+                            totalCpuTime2 += Long.parseLong(s);
+                    break;
+                }
+            if (idleCpuTime1 != 0 && totalCpuTime1 != 0 && idleCpuTime2 != 0 && totalCpuTime2 != 0)
+                cpuUsage = 1 - (float) (idleCpuTime2 - idleCpuTime1) / (float) (totalCpuTime2 - totalCpuTime1);
+            in2.close();
+            pro2.destroy();
+        } catch (IOException e) {
+            HMCLog.err("Failed to catch sysout", e);
+        }
+        return cpuUsage * 100;
+    }
+
+    private double getCpuRatioForMac() {
         InputStream is = null;
         InputStreamReader isr = null;
         BufferedReader brStat = null;
         StringTokenizer tokenStat;
         try {
-            Process process = Runtime.getRuntime().exec("top -b -n 1");
+            Process process = Runtime.getRuntime().exec("top -l 1");
             is = process.getInputStream();
             isr = new InputStreamReader(is);
             brStat = new BufferedReader(isr);
-            if (linuxVersion == null || linuxVersion.equals("2.4")) {
-                brStat.readLine();
-                brStat.readLine();
-                brStat.readLine();
-                brStat.readLine();
-                tokenStat = new StringTokenizer(brStat.readLine());
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                String user = tokenStat.nextToken();
-                tokenStat.nextToken();
-                String system = tokenStat.nextToken();
-                tokenStat.nextToken();
-                String nice = tokenStat.nextToken();
-                System.out.println(user + " , " + system + " , " + nice);
-                user = user.substring(0, user.indexOf("%"));
-                system = system.substring(0, system.indexOf("%"));
-                nice = nice.substring(0, nice.indexOf("%"));
-                float userUsage = new Float(user);
-                float systemUsage = new Float(system);
-                float niceUsage = new Float(nice);
-                return (userUsage + systemUsage + niceUsage) / 100;
-            } else {
-                brStat.readLine();
-                brStat.readLine();
-                tokenStat = new StringTokenizer(brStat.readLine());
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                tokenStat.nextToken();
-                String cpuUsage = tokenStat.nextToken();
-                System.out.println("CPU idle : " + cpuUsage);
-                Float usage = new Float(cpuUsage.substring(0, cpuUsage.indexOf("%")));
-                return (1 - usage / 100);
-            }
+            brStat.readLine();
+            brStat.readLine();
+            brStat.readLine();
+            tokenStat = new StringTokenizer(brStat.readLine());
+            tokenStat.nextToken();
+            tokenStat.nextToken();
+            String user = tokenStat.nextToken();
+            tokenStat.nextToken();
+            String system = tokenStat.nextToken();
+            tokenStat.nextToken();
+            user = user.substring(0, user.indexOf("%"));
+            system = system.substring(0, system.indexOf("%"));
+            float userUsage = new Float(user);
+            float systemUsage = new Float(system);
+            return (userUsage + systemUsage) / 100;
         } catch (IOException ioe) {
             System.out.println(ioe.getMessage());
-            freeResource(is, isr, brStat);
             return 1;
         } finally {
             freeResource(is, isr, brStat);