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

2.3.3

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/build.gradle
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>; }

2
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java
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;
/** /**

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

@@ -76,7 +76,7 @@ public class GameSettingsPanel extends javax.swing.JPanel {
initComponents(); initComponents();
setBackground(Color.white); setBackground(Color.white);
setOpaque(true); setOpaque(true);
forge = new InstallerHelper(lstForge, "forge"); forge = new InstallerHelper(lstForge, "forge");
liteloader = new InstallerHelper(lstLiteLoader, "liteloader"); liteloader = new InstallerHelper(lstLiteLoader, "liteloader");
optifine = new InstallerHelper(lstOptifine, "optifine"); optifine = new InstallerHelper(lstOptifine, "optifine");
@@ -1087,12 +1087,12 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
private void cboGameDirTypeFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_cboGameDirTypeFocusLost private void cboGameDirTypeFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_cboGameDirTypeFocusLost
if (cboGameDirType.getSelectedIndex() >= 0) if (cboGameDirType.getSelectedIndex() >= 0)
profile.setGameDirType(GameDirType.values()[cboGameDirType.getSelectedIndex()]); profile.setGameDirType(GameDirType.values()[cboGameDirType.getSelectedIndex()]);
}//GEN-LAST:event_cboGameDirTypeFocusLost }//GEN-LAST:event_cboGameDirTypeFocusLost
private void cboLauncherVisibilityFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_cboLauncherVisibilityFocusLost private void cboLauncherVisibilityFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_cboLauncherVisibilityFocusLost
if (cboLauncherVisibility.getSelectedIndex() >= 0) if (cboLauncherVisibility.getSelectedIndex() >= 0)
profile.setLauncherVisibility(cboLauncherVisibility.getSelectedIndex()); profile.setLauncherVisibility(cboLauncherVisibility.getSelectedIndex());
}//GEN-LAST:event_cboLauncherVisibilityFocusLost }//GEN-LAST:event_cboLauncherVisibilityFocusLost
private void btnDownloadAllAssetsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDownloadAllAssetsActionPerformed private void btnDownloadAllAssetsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDownloadAllAssetsActionPerformed
@@ -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);
@@ -1114,7 +1115,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
Selector selector = new Selector(MainFrame.instance, al.toArray(new String[0]), C.i18n("assets.unkown_type_select_one", mcVersion)); Selector selector = new Selector(MainFrame.instance, al.toArray(new String[0]), C.i18n("assets.unkown_type_select_one", mcVersion));
selector.setVisible(true); selector.setVisible(true);
if (selector.sel != -1) if (selector.sel != -1)
downloadAssets(IAssetsHandler.getAssetsHandler(selector.sel)); downloadAssets(IAssetsHandler.getAssetsHandler(selector.sel));
} }
}//GEN-LAST:event_btnDownloadAllAssetsActionPerformed }//GEN-LAST:event_btnDownloadAllAssetsActionPerformed
@@ -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;

42
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java
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;
/** /**
* *
@@ -26,14 +27,13 @@ import org.jackhuang.hellominecraft.launcher.utils.settings.Settings;
public final class NewProfileWindow extends javax.swing.JDialog { public final class NewProfileWindow extends javax.swing.JDialog {
public NewProfileWindow(java.awt.Frame parent) { public NewProfileWindow(java.awt.Frame parent) {
super(parent, true); super(parent, true);
initComponents(); initComponents();
setLocationRelativeTo(null); setLocationRelativeTo(null);
for (Profile s : Settings.getProfiles()) { for (Profile s : Settings.getProfiles())
cboProfiles.addItem(s.getName()); cboProfiles.addItem(s.getName());
}
} }
/** /**
@@ -124,25 +124,27 @@ public final class NewProfileWindow extends javax.swing.JDialog {
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void txtNewProfileNameKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtNewProfileNameKeyTyped private void txtNewProfileNameKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtNewProfileNameKeyTyped
switch(evt.getKeyCode()) { switch (evt.getKeyCode()) {
case 13: case 13:
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);
case 27: case 27:
this.dispose(); this.dispose();
} }
}//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
Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); if (!StrUtils.isBlank(txtNewProfileName.getText())) {
newProfile.setName(txtNewProfileName.getText()); Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString()));
Settings.trySetVersion(newProfile); newProfile.setName(txtNewProfileName.getText());
this.dispose(); Settings.trySetVersion(newProfile);
}
this.dispose();
}//GEN-LAST:event_btnOKActionPerformed }//GEN-LAST:event_btnOKActionPerformed
private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
this.dispose(); this.dispose();
}//GEN-LAST:event_btnCancelActionPerformed }//GEN-LAST:event_btnCancelActionPerformed