diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 6df6673239..f273849bab 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -38,7 +38,7 @@ def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER") if (buildnumber == null) buildnumber = System.getenv("BUILD_NUMBER") if (buildnumber == null) -buildnumber = "33" +buildnumber = "40" def versionroot = System.getenv("VERSION_ROOT") if (versionroot == null) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java index 55c7b26bfa..26ff3bc860 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.Authenticator; import java.net.PasswordAuthentication; +import java.net.Proxy; import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; import java.util.Locale; @@ -199,10 +200,24 @@ public final class Main { Settings.UPDATE_CHECKER.upgrade.register(IUpgrader.NOW_UPGRADER); Settings.UPDATE_CHECKER.process(false).reg(t -> Main.invokeUpdate()).execute(); - if (StrUtils.isNotBlank(Settings.getInstance().getProxyHost()) && StrUtils.isNotBlank(Settings.getInstance().getProxyPort()) && MathUtils.canParseInt(Settings.getInstance().getProxyPort())) { - HMCLog.log("Initializing customized proxy"); - System.setProperty("http.proxyHost", Settings.getInstance().getProxyHost()); - System.setProperty("http.proxyPort", Settings.getInstance().getProxyPort()); + if (Settings.getInstance().getProxyType() != Proxy.Type.DIRECT && StrUtils.isNotBlank(Settings.getInstance().getProxyHost())) { + switch (Settings.getInstance().getProxyType()) { + case DIRECT: + break; + case HTTP: + System.setProperty("http.proxyHost", Settings.getInstance().getProxyHost()); + if (StrUtils.isNotBlank(Settings.getInstance().getProxyPort())) + System.setProperty("http.proxyPort", Settings.getInstance().getProxyPort()); + HMCLog.log("Initialized HTTP proxy."); + break; + case SOCKS: + System.setProperty("socksProxyHost", Settings.getInstance().getProxyHost()); + if (StrUtils.isNotBlank(Settings.getInstance().getProxyPort())) + System.setProperty("socksProxyPort", Settings.getInstance().getProxyPort()); + HMCLog.log("Initialized Socks v4/v5 proxy."); + break; + } + if (StrUtils.isNotBlank(Settings.getInstance().getProxyUserName()) && StrUtils.isNotBlank(Settings.getInstance().getProxyPassword())) Authenticator.setDefault(new Authenticator() { @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java index e63f1de676..2be2077c7f 100755 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java @@ -20,6 +20,7 @@ package org.jackhuang.hmcl.setting; import org.jackhuang.hmcl.core.download.DownloadType; import com.google.gson.annotations.SerializedName; import java.awt.Font; +import java.net.Proxy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,6 +61,8 @@ public final class Config implements Cloneable { private String proxyUserName; @SerializedName("proxyPassword") private String proxyPassword; + @SerializedName("proxyType") + private int proxyType; @SerializedName("enableShadow") private boolean enableShadow; @SerializedName("enableBlur") @@ -91,7 +94,7 @@ public final class Config implements Cloneable { public Config() { clientToken = UUID.randomUUID().toString(); - logintype = downloadtype = 0; + proxyType = logintype = downloadtype = 0; logLines = 100; enableAnimation = enableBlur = true; if (OS.os() == OS.WINDOWS) @@ -269,6 +272,19 @@ public final class Config implements Cloneable { Settings.save(); } + public Proxy.Type getProxyType() { + if (proxyType < 0 || proxyType >= 3) { + proxyType = 0; + Settings.save(); + } + return Proxy.Type.values()[proxyType]; + } + + public void setProxyType(Proxy.Type proxyType) { + this.proxyType = proxyType.ordinal(); + Settings.save(); + } + public String getProxyUserName() { return proxyUserName == null ? "" : proxyUserName; } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index 2d0d6000c9..ec6cd26cd9 100755 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -33,7 +33,7 @@ import org.jackhuang.hmcl.api.event.config.ProfileLoadingEvent; import org.jackhuang.hmcl.laf.utils.AnimationController; import org.jackhuang.hmcl.util.sys.FileUtils; import org.jackhuang.hmcl.util.ui.MessageBox; -import org.jackhuang.hmcl.util.UpdateChecker; +import org.jackhuang.hmcl.util.upgrade.UpdateChecker; import org.jackhuang.hmcl.util.sys.IOUtils; /** diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form index ca54d8164a..c86844cc6a 100755 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.form @@ -95,35 +95,36 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -168,6 +169,7 @@ + @@ -315,6 +317,23 @@ + + + + + + + + + + + + + + + + + @@ -348,7 +367,7 @@ - + @@ -500,7 +519,7 @@ - + @@ -549,7 +568,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java index bf483192fd..615b49fd07 100755 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LauncherSettingsPanel.java @@ -18,6 +18,7 @@ package org.jackhuang.hmcl.ui; import java.io.IOException; +import java.net.Proxy; import javax.swing.DefaultComboBoxModel; import javax.swing.filechooser.FileNameExtensionFilter; import org.jackhuang.hmcl.util.C; @@ -78,6 +79,7 @@ public class LauncherSettingsPanel extends RepaintPage { spinnerFontSize.setValue(Settings.getInstance().getFontSize()); cboFontFamily.setSelectedItem(Settings.getInstance().getFontFamily()); cboDownloadSource.setSelectedIndex(Settings.getInstance().getDownloadType()); + cboProxyType.setSelectedIndex(Settings.getInstance().getProxyType().ordinal()); cboTheme.setSelectedItem(Settings.getInstance().getTheme()); chkEnableShadow.setSelected(Settings.getInstance().isEnableShadow()); chkEnableBlur.setSelected(Settings.getInstance().isEnableBlur()); @@ -122,6 +124,7 @@ public class LauncherSettingsPanel extends RepaintPage { btnMCBBS = new javax.swing.JButton(); cboLang = new javax.swing.JComboBox(); lblLang = new javax.swing.JLabel(); + cboProxyType = new javax.swing.JComboBox<>(); pnlUI = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation()); lblTheme = new javax.swing.JLabel(); cboTheme = new javax.swing.JComboBox(); @@ -231,6 +234,13 @@ public class LauncherSettingsPanel extends RepaintPage { lblLang.setText(C.i18n("launcher.lang")); // NOI18N + cboProxyType.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Direct", "HTTP", "Socks" })); + cboProxyType.addItemListener(new java.awt.event.ItemListener() { + public void itemStateChanged(java.awt.event.ItemEvent evt) { + cboProxyTypeItemStateChanged(evt); + } + }); + javax.swing.GroupLayout pnlGeneralLayout = new javax.swing.GroupLayout(pnlGeneral); pnlGeneral.setLayout(pnlGeneralLayout); pnlGeneralLayout.setHorizontalGroup( @@ -242,32 +252,33 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(btnCheckUpdate) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnMCBBS) - .addGap(0, 418, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlGeneralLayout.createSequentialGroup() - .addComponent(lblProxy) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(lblProxyHost) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtProxyHost, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblProxyPort) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtProxyPort, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblProxyUserName) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtProxyUsername, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lblProxyPassword) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtProxyPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 0, Short.MAX_VALUE)) .addGroup(pnlGeneralLayout.createSequentialGroup() .addGroup(pnlGeneralLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lblDownloadSource) .addComponent(lblCommonPath) - .addComponent(lblLang)) + .addComponent(lblLang) + .addComponent(lblProxy)) .addGap(28, 28, 28) .addGroup(pnlGeneralLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnlGeneralLayout.createSequentialGroup() + .addComponent(cboProxyType, 0, 156, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lblProxyHost) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(txtProxyHost, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lblProxyPort) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(txtProxyPort, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lblProxyUserName) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(txtProxyUsername, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lblProxyPassword) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(txtProxyPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(cboLang, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(pnlGeneralLayout.createSequentialGroup() .addComponent(txtCommonPath) @@ -302,7 +313,8 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(txtProxyUsername, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lblProxyUserName) .addComponent(txtProxyPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblProxyPassword)) + .addComponent(lblProxyPassword) + .addComponent(cboProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 69, Short.MAX_VALUE) .addGroup(pnlGeneralLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnCheckUpdate, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -397,7 +409,7 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(chkEnableBlur) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkEnableAnimation))) - .addGap(0, 15, Short.MAX_VALUE)) + .addGap(0, 163, Short.MAX_VALUE)) .addGroup(pnlUILayout.createSequentialGroup() .addGroup(pnlUILayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lblBackground) @@ -460,7 +472,7 @@ public class LauncherSettingsPanel extends RepaintPage { .addGroup(pnlAboutLayout.createSequentialGroup() .addContainerGap() .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(104, Short.MAX_VALUE)) + .addContainerGap(252, Short.MAX_VALUE)) ); pnlAboutLayout.setVerticalGroup( pnlAboutLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -612,6 +624,10 @@ public class LauncherSettingsPanel extends RepaintPage { lblExample.setFont(Settings.getInstance().getConsoleFont()); }//GEN-LAST:event_spinnerFontSizeStateChanged + private void cboProxyTypeItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboProxyTypeItemStateChanged + Settings.getInstance().setProxyType(Proxy.Type.values()[cboProxyType.getSelectedIndex()]); + }//GEN-LAST:event_cboProxyTypeItemStateChanged + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnCheckUpdate; private javax.swing.JButton btnMCBBS; @@ -620,6 +636,7 @@ public class LauncherSettingsPanel extends RepaintPage { private javax.swing.JComboBox cboDownloadSource; private javax.swing.JComboBox cboFontFamily; private javax.swing.JComboBox cboLang; + private javax.swing.JComboBox cboProxyType; private javax.swing.JComboBox cboTheme; private javax.swing.JCheckBox chkDecorated; private javax.swing.JCheckBox chkEnableAnimation; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java index 4308071876..f295cd8972 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java @@ -252,7 +252,7 @@ public class LogWindow extends javax.swing.JFrame { }//GEN-LAST:event_btnClearActionPerformed private void btnCopyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCopyActionPerformed - Utils.setClipborad(this.txtLog.getText()); + Utils.setClipboard(this.txtLog.getText()); }//GEN-LAST:event_btnCopyActionPerformed private void btnContactActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnContactActionPerformed diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java index 9d7d777eff..6e95c4b025 100755 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/AppDataUpgrader.java @@ -47,7 +47,6 @@ import org.jackhuang.hmcl.util.task.TaskWindow; import org.jackhuang.hmcl.util.net.FileDownloadTask; import org.jackhuang.hmcl.util.ArrayUtils; import org.jackhuang.hmcl.util.ui.MessageBox; -import org.jackhuang.hmcl.util.UpdateChecker; import org.jackhuang.hmcl.util.Utils; import org.jackhuang.hmcl.api.VersionNumber; import org.jackhuang.hmcl.util.StrUtils; @@ -137,17 +136,17 @@ public class AppDataUpgrader extends IUpgrader { else { String url = C.URL_PUBLISH; if (map != null) - if (map.containsKey(OS.os().checked_name)) - url = map.get(OS.os().checked_name); - else if (map.containsKey(OS.UNKOWN.checked_name)) - url = map.get(OS.UNKOWN.checked_name); + if (map.containsKey(OS.os().checkedName)) + url = map.get(OS.os().checkedName); + else if (map.containsKey(OS.UNKNOWN.checkedName)) + url = map.get(OS.UNKNOWN.checkedName); if (url == null) url = C.URL_PUBLISH; try { java.awt.Desktop.getDesktop().browse(new URI(url)); } catch (URISyntaxException | IOException e) { HMCLog.err("Failed to browse uri: " + url, e); - Utils.setClipborad(url); + Utils.setClipboard(url); MessageBox.show(C.i18n("update.no_browser")); } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/UpdateChecker.java similarity index 95% rename from HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java rename to HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/UpdateChecker.java index 4cf53e5e2d..4c1aa105e6 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/UpdateChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/upgrade/UpdateChecker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hmcl.util; +package org.jackhuang.hmcl.util.upgrade; import org.jackhuang.hmcl.util.ui.MessageBox; import org.jackhuang.hmcl.api.VersionNumber; @@ -28,6 +28,9 @@ import java.util.Map; import org.jackhuang.hmcl.api.HMCLApi; import org.jackhuang.hmcl.api.event.SimpleEvent; import org.jackhuang.hmcl.api.event.OutOfDateEvent; +import org.jackhuang.hmcl.util.AbstractSwingWorker; +import org.jackhuang.hmcl.util.C; +import org.jackhuang.hmcl.util.IUpdateChecker; /** * diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java index 744dec9b2e..9289119882 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java @@ -249,7 +249,7 @@ public class MinecraftVersionManager extends IMinec ArrayList extractRules = new ArrayList<>(); for (IMinecraftLibrary l : v.libraries) { final File f = getLibraryFile(v, l); - if (l.isNative() && v.isAllowedToUnpackNatives() && f != null) { + if (l.isNative() && v.isAllowedToUnpackNatives() && l.allow() && f != null) { unzippings.add(f); extractRules.add(l.getDecompressExtractRules()); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java index 0fa4f86b63..b65c06f08e 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Utils.java @@ -38,7 +38,7 @@ public final class Utils { return ((URLClassLoader) Utils.class.getClassLoader()).getURLs(); } - public static void setClipborad(String text) { + public static void setClipboard(String text) { try { Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), null); } catch(HeadlessException ignored) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java index eed9b44e77..0923df057b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/OS.java @@ -31,14 +31,14 @@ public enum OS { LINUX('/', "linux"), WINDOWS('\\', "windows"), OSX('/', "osx"), - UNKOWN('/', "universal"); + UNKNOWN('/', "universal"); public final char fileSeparator; - public final String checked_name; + public final String checkedName; private OS(char fileSeparator, String n) { this.fileSeparator = fileSeparator; - checked_name = n; + checkedName = n; } public static OS os() { @@ -55,7 +55,7 @@ public enum OS { return OS.LINUX; if (str.contains("unix")) return OS.LINUX; - return OS.UNKOWN; + return OS.UNKNOWN; } /**