diff --git a/HMCL/proguard.pro b/HMCL/proguard.pro index a972927cc..591e972cf 100644 --- a/HMCL/proguard.pro +++ b/HMCL/proguard.pro @@ -45,7 +45,7 @@ -keep class org.jackhuang.hellominecraft.launcher.Launcher { public static void main(java.lang.String[]); } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Profile { private ; public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { private ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { ; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java index 29ccbb2e7..e6d7e6606 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java @@ -105,7 +105,7 @@ public final class Launcher { return; } - if (!JdkVersion.isJava64Bit() && Platform.getPlatform() == Platform.BIT_32) + if (!JdkVersion.isJava64Bit() && Platform.getPlatform() == Platform.BIT_64) MessageBox.Show(C.i18n("advice.os64butjdk32")); Method minecraftMain; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java index 8ddd51835..690ab3b51 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java @@ -44,7 +44,7 @@ public final class Config { private boolean enableShadow; @SerializedName("theme") private int theme; - + @SerializedName("java") private List java; public List getJava() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java index 33a7f60f5..53f349937 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java @@ -19,6 +19,7 @@ package org.jackhuang.hellominecraft.launcher.views; import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -931,9 +932,15 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() { }//GEN-LAST:event_btnRemoveProfileActionPerformed private void cboVersionsItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboVersionsItemStateChanged - if (isLoading || cboVersions.getSelectedIndex() < 0 || StrUtils.isBlank((String) cboVersions.getSelectedItem()) || getProfile() == null) return; + + if (isLoading || evt.getStateChange() != ItemEvent.SELECTED || cboVersions.getSelectedIndex() < 0 || StrUtils.isBlank((String) cboVersions.getSelectedItem()) || getProfile() == null) + return; loadMinecraftVersion((String) cboVersions.getSelectedItem()); versionChanged(getProfile(), (String) cboVersions.getSelectedItem()); + + getProfile().setSelectedMinecraftVersion(cboVersions.getSelectedItem().toString()); + cboVersions.setToolTipText(cboVersions.getSelectedItem().toString()); + Settings.save(); }//GEN-LAST:event_cboVersionsItemStateChanged private void btnRefreshVersionsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRefreshVersionsActionPerformed diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java index f09989409..c79732b7a 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java @@ -62,7 +62,7 @@ public enum OS { OperatingSystemMXBean o = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); return o.getTotalPhysicalMemorySize(); } catch(Throwable t) { - HMCLog.warn("Failed to get total physical memory size", t); + HMCLog.warn("Failed to get total physical memory size"); return -1; } } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java index 525bb4178..26827c6d6 100644 --- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java @@ -50,7 +50,6 @@ public enum Platform { public abstract String getBit(); public static Platform getPlatform() { - String arch = System.getProperty("os.arch"); - return arch.contains("64") ? Platform.BIT_64 : Platform.BIT_32; + return System.getProperty("os.arch").contains("64") ? BIT_64 : BIT_32; } }