lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix platform's bug

Browse Source
This commit is contained in:
huanghongxun
2015-06-30 20:43:05 +08:00
parent bba82f5e24
commit 25b6d7297c
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/proguard.pro vendored
View File

@@ -45,7 +45,7 @@
-keep class org.jackhuang.hellominecraft.launcher.Launcher { public static void main(java.lang.String[]); } -keep class org.jackhuang.hellominecraft.launcher.Launcher { public static void main(java.lang.String[]); }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Profile { private <fields>; public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Profile { private <fields>; public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.settings.Config { private <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { <fields>; }

2
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
View File

@@ -105,7 +105,7 @@ public final class Launcher {
return; return;
} }
if (!JdkVersion.isJava64Bit() && Platform.getPlatform() == Platform.BIT_32) if (!JdkVersion.isJava64Bit() && Platform.getPlatform() == Platform.BIT_64)
MessageBox.Show(C.i18n("advice.os64butjdk32")); MessageBox.Show(C.i18n("advice.os64butjdk32"));
Method minecraftMain; Method minecraftMain;

2
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Config.java
View File

@@ -44,7 +44,7 @@ public final class Config {
private boolean enableShadow; private boolean enableShadow;
@SerializedName("theme") @SerializedName("theme")
private int theme; private int theme;
@SerializedName("java")
private List<JdkVersion> java; private List<JdkVersion> java;
public List<JdkVersion> getJava() { public List<JdkVersion> getJava() {

9
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
View File

@@ -19,6 +19,7 @@ package org.jackhuang.hellominecraft.launcher.views;
import java.awt.Color; import java.awt.Color;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -931,9 +932,15 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
}//GEN-LAST:event_btnRemoveProfileActionPerformed }//GEN-LAST:event_btnRemoveProfileActionPerformed
private void cboVersionsItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboVersionsItemStateChanged 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()); loadMinecraftVersion((String) cboVersions.getSelectedItem());
versionChanged(getProfile(), (String) cboVersions.getSelectedItem()); versionChanged(getProfile(), (String) cboVersions.getSelectedItem());
getProfile().setSelectedMinecraftVersion(cboVersions.getSelectedItem().toString());
cboVersions.setToolTipText(cboVersions.getSelectedItem().toString());
Settings.save();
}//GEN-LAST:event_cboVersionsItemStateChanged }//GEN-LAST:event_cboVersionsItemStateChanged
private void btnRefreshVersionsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRefreshVersionsActionPerformed private void btnRefreshVersionsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRefreshVersionsActionPerformed

2
HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/OS.java
View File

@@ -62,7 +62,7 @@ public enum OS {
OperatingSystemMXBean o = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); OperatingSystemMXBean o = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
return o.getTotalPhysicalMemorySize(); return o.getTotalPhysicalMemorySize();
} catch(Throwable t) { } catch(Throwable t) {
HMCLog.warn("Failed to get total physical memory size", t); HMCLog.warn("Failed to get total physical memory size");
return -1; return -1;
} }
} }

3
HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/Platform.java
View File

@@ -50,7 +50,6 @@ public enum Platform {
public abstract String getBit(); public abstract String getBit();
public static Platform getPlatform() { public static Platform getPlatform() {
String arch = System.getProperty("os.arch"); return System.getProperty("os.arch").contains("64") ? BIT_64 : BIT_32;
return arch.contains("64") ? Platform.BIT_64 : Platform.BIT_32;
} }
} }