This commit is contained in:
huanghongxun
2015-06-28 23:28:56 +08:00
parent b069753d07
commit 5f29c7e711
5 changed files with 32 additions and 27 deletions

View File

@@ -26,7 +26,7 @@ if (!hasProperty('mainClass')) {
} }
String mavenGroupId = 'HMCL' String mavenGroupId = 'HMCL'
String mavenVersion = '2.3.2' String mavenVersion = '2.3.3'
String bundleName = "Hello Minecraft! Launcher" String bundleName = "Hello Minecraft! Launcher"
group = mavenGroupId group = mavenGroupId

2
HMCL/proguard.pro vendored
View File

@@ -72,6 +72,8 @@
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public <fields>; }
-keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersions { public <fields>; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersions { public <fields>; }

View File

@@ -52,7 +52,7 @@ import org.jackhuang.hellominecraft.utils.StrUtils;
public final class Main implements DoneListener0 { public final class Main implements DoneListener0 {
public static String launcherName = "Hello Minecraft! Launcher"; public static String launcherName = "Hello Minecraft! Launcher";
public static byte firstVer = 2, secondVer = 3, thirdVer = 2; public static byte firstVer = 2, secondVer = 3, thirdVer = 3;
public static int minimumLauncherVersion = 16; public static int minimumLauncherVersion = 16;
/** /**

View File

@@ -1103,6 +1103,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
return; return;
} }
String s = StrUtils.formatVersion(minecraftVersion.version); String s = StrUtils.formatVersion(minecraftVersion.version);
if (StrUtils.isBlank(s)) return;
for (IAssetsHandler a : IAssetsHandler.getAssetsHandlers()) { for (IAssetsHandler a : IAssetsHandler.getAssetsHandlers()) {
if (a.isVersionAllowed(s)) { if (a.isVersionAllowed(s)) {
downloadAssets(a); downloadAssets(a);
@@ -1313,6 +1314,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
} }
class InstallerHelper { class InstallerHelper {
List<InstallerVersionList.InstallerVersion> versions; List<InstallerVersionList.InstallerVersion> versions;
InstallerVersionList list; InstallerVersionList list;
JTable jt; JTable jt;
@@ -1374,7 +1376,6 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
String mcVersion; String mcVersion;
// </editor-fold> // </editor-fold>
// </editor-fold> // </editor-fold>
public void versionChanged(Profile profile, String version) { public void versionChanged(Profile profile, String version) {
this.mcVersion = version; this.mcVersion = version;

View File

@@ -18,6 +18,7 @@ package org.jackhuang.hellominecraft.launcher.views;
import org.jackhuang.hellominecraft.launcher.utils.settings.Profile; import org.jackhuang.hellominecraft.launcher.utils.settings.Profile;
import org.jackhuang.hellominecraft.launcher.utils.settings.Settings; import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
import org.jackhuang.hellominecraft.utils.StrUtils;
/** /**
* *
@@ -31,10 +32,9 @@ public final class NewProfileWindow extends javax.swing.JDialog {
setLocationRelativeTo(null); setLocationRelativeTo(null);
for (Profile s : Settings.getProfiles()) { for (Profile s : Settings.getProfiles())
cboProfiles.addItem(s.getName()); cboProfiles.addItem(s.getName());
} }
}
/** /**
* This method is called from within the constructor to initialize the form. * This method is called from within the constructor to initialize the form.
@@ -135,9 +135,11 @@ public final class NewProfileWindow extends javax.swing.JDialog {
}//GEN-LAST:event_txtNewProfileNameKeyTyped }//GEN-LAST:event_txtNewProfileNameKeyTyped
private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOKActionPerformed private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOKActionPerformed
if (!StrUtils.isBlank(txtNewProfileName.getText())) {
Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString()));
newProfile.setName(txtNewProfileName.getText()); newProfile.setName(txtNewProfileName.getText());
Settings.trySetVersion(newProfile); Settings.trySetVersion(newProfile);
}
this.dispose(); this.dispose();
}//GEN-LAST:event_btnOKActionPerformed }//GEN-LAST:event_btnOKActionPerformed