Fix #53

Fix cpu ratio for mac

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

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("Jce", "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/resources/org/jackhuang/hellominecraft/lang/I18N.lang

@@ -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

@@ -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

@@ -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

@@ -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);