diff --git a/HMCL/build.gradle b/HMCL/build.gradle index c39fdd0ed..84de328de 100644 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -26,7 +26,7 @@ if (!hasProperty('mainClass')) { } String mavenGroupId = 'HMCL' -String mavenVersion = '2.3.2' +String mavenVersion = '2.3.3' String bundleName = "Hello Minecraft! Launcher" group = mavenGroupId diff --git a/HMCL/proguard.pro b/HMCL/proguard.pro index 6cf3060db..f51d49365 100644 --- a/HMCL/proguard.pro +++ b/HMCL/proguard.pro @@ -72,6 +72,8 @@ -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public ; } +-keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { public ; } + -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public ; } -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersions { public ; } diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java index 436134609..01dd1e7d7 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -52,7 +52,7 @@ import org.jackhuang.hellominecraft.utils.StrUtils; public final class Main implements DoneListener0 { 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; /** 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 10e377fd0..33a7f60f5 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 @@ -76,7 +76,7 @@ public class GameSettingsPanel extends javax.swing.JPanel { initComponents(); setBackground(Color.white); setOpaque(true); - + forge = new InstallerHelper(lstForge, "forge"); liteloader = new InstallerHelper(lstLiteLoader, "liteloader"); 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 if (cboGameDirType.getSelectedIndex() >= 0) - profile.setGameDirType(GameDirType.values()[cboGameDirType.getSelectedIndex()]); + profile.setGameDirType(GameDirType.values()[cboGameDirType.getSelectedIndex()]); }//GEN-LAST:event_cboGameDirTypeFocusLost private void cboLauncherVisibilityFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_cboLauncherVisibilityFocusLost if (cboLauncherVisibility.getSelectedIndex() >= 0) - profile.setLauncherVisibility(cboLauncherVisibility.getSelectedIndex()); + profile.setLauncherVisibility(cboLauncherVisibility.getSelectedIndex()); }//GEN-LAST:event_cboLauncherVisibilityFocusLost private void btnDownloadAllAssetsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDownloadAllAssetsActionPerformed @@ -1103,6 +1103,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() { return; } String s = StrUtils.formatVersion(minecraftVersion.version); + if (StrUtils.isBlank(s)) return; for (IAssetsHandler a : IAssetsHandler.getAssetsHandlers()) { if (a.isVersionAllowed(s)) { 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.setVisible(true); if (selector.sel != -1) - downloadAssets(IAssetsHandler.getAssetsHandler(selector.sel)); + downloadAssets(IAssetsHandler.getAssetsHandler(selector.sel)); } }//GEN-LAST:event_btnDownloadAllAssetsActionPerformed @@ -1313,6 +1314,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() { } class InstallerHelper { + List versions; InstallerVersionList list; JTable jt; @@ -1374,7 +1376,6 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() { String mcVersion; // - // public void versionChanged(Profile profile, String version) { this.mcVersion = version; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java index 64dab0e30..42cf4b9a6 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/NewProfileWindow.java @@ -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.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 NewProfileWindow(java.awt.Frame parent) { - super(parent, true); - initComponents(); - + super(parent, true); + initComponents(); + setLocationRelativeTo(null); - - for (Profile s : Settings.getProfiles()) { - cboProfiles.addItem(s.getName()); - } + + for (Profile s : Settings.getProfiles()) + cboProfiles.addItem(s.getName()); } /** @@ -124,25 +124,27 @@ public final class NewProfileWindow extends javax.swing.JDialog { }// //GEN-END:initComponents private void txtNewProfileNameKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtNewProfileNameKeyTyped - switch(evt.getKeyCode()) { - case 13: - Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); - newProfile.setName(txtNewProfileName.getText()); - Settings.trySetVersion(newProfile); - case 27: - this.dispose(); - } + switch (evt.getKeyCode()) { + case 13: + Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); + newProfile.setName(txtNewProfileName.getText()); + Settings.trySetVersion(newProfile); + case 27: + this.dispose(); + } }//GEN-LAST:event_txtNewProfileNameKeyTyped private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOKActionPerformed - Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); - newProfile.setName(txtNewProfileName.getText()); - Settings.trySetVersion(newProfile); - this.dispose(); + if (!StrUtils.isBlank(txtNewProfileName.getText())) { + Profile newProfile = new Profile(Settings.getVersion(cboProfiles.getSelectedItem().toString())); + newProfile.setName(txtNewProfileName.getText()); + Settings.trySetVersion(newProfile); + } + this.dispose(); }//GEN-LAST:event_btnOKActionPerformed private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed - this.dispose(); + this.dispose(); }//GEN-LAST:event_btnCancelActionPerformed