From 9950bef2608036219a70c221a98ac2ba294a7b5b Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 15 Sep 2018 23:05:37 +0800
Subject: [PATCH 1/5] Change type of downloadType to string

---
 .../org/jackhuang/hmcl/setting/Accounts.java  |  2 +-
 .../org/jackhuang/hmcl/setting/Config.java    | 10 +++---
 .../hmcl/setting/ConfigUpgrader.java          | 12 +++++++
 .../hmcl/setting/DownloadProviders.java       | 36 +++++++++++++++----
 .../org/jackhuang/hmcl/setting/Profile.java   |  2 +-
 .../org/jackhuang/hmcl/setting/Settings.java  | 17 +--------
 .../org/jackhuang/hmcl/ui/SettingsPage.java   |  9 +++--
 .../org/jackhuang/hmcl/ui/SettingsView.java   | 15 ++++----
 .../resources/assets/lang/I18N.properties     |  4 +--
 .../resources/assets/lang/I18N_zh.properties  |  4 +--
 .../assets/lang/I18N_zh_CN.properties         |  4 +--
 .../download/BMCLAPIDownloadProvider.java     |  5 ---
 .../download/CurseCDNDownloadProvider.java    | 27 --------------
 .../hmcl/download/MojangDownloadProvider.java |  4 +--
 14 files changed, 73 insertions(+), 78 deletions(-)
 delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java
index 8f0c210ae..550be7665 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java
@@ -59,7 +59,7 @@ public final class Accounts {
     public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
     public static final YggdrasilAccountFactory FACTORY_YGGDRASIL = new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE);
     public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(
-            new AuthlibInjectorDownloader(Launcher.HMCL_DIRECTORY.toPath(), () -> Settings.instance().getDownloadProvider())::getArtifactInfo,
+            new AuthlibInjectorDownloader(Launcher.HMCL_DIRECTORY.toPath(), DownloadProviders::getDownloadProvider)::getArtifactInfo,
             Accounts::getOrCreateAuthlibInjectorServer);
 
     private static final String TYPE_OFFLINE = "offline";
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 5988f8621..386c01cc6 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
@@ -115,8 +115,8 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("localization")
     private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);
 
-    @SerializedName("downloadtype")
-    private IntegerProperty downloadType = new SimpleIntegerProperty(1);
+    @SerializedName("downloadType")
+    private StringProperty downloadType = new SimpleStringProperty("bmclapi");
 
     @SerializedName("configurations")
     private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
@@ -359,15 +359,15 @@ public final class Config implements Cloneable, Observable {
         return localization;
     }
 
-    public int getDownloadType() {
+    public String getDownloadType() {
         return downloadType.get();
     }
 
-    public void setDownloadType(int downloadType) {
+    public void setDownloadType(String downloadType) {
         this.downloadType.set(downloadType);
     }
 
-    public IntegerProperty downloadTypeProperty() {
+    public StringProperty downloadTypeProperty() {
         return downloadType;
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigUpgrader.java
index 85b006662..f89408111 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigUpgrader.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigUpgrader.java
@@ -86,5 +86,17 @@ final class ConfigUpgrader {
             deserialized.setHasProxy(StringUtils.isNotBlank(deserialized.getProxyHost()));
         if (!rawJson.containsKey("hasProxyAuth"))
             deserialized.setHasProxyAuth(StringUtils.isNotBlank(deserialized.getProxyUser()));
+
+        if (!rawJson.containsKey("downloadType")) {
+            tryCast(rawJson.get("downloadtype"), Number.class)
+                    .map(Number::intValue)
+                    .ifPresent(id -> {
+                        if (id == 0) {
+                            deserialized.setDownloadType("mojang");
+                        } else if (id == 1) {
+                            deserialized.setDownloadType("bmclapi");
+                        }
+                    });
+        }
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java
index b345c4ace..306192664 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java
@@ -17,20 +17,44 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+import java.util.Map;
+import java.util.Optional;
+
 import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
-import org.jackhuang.hmcl.download.CurseCDNDownloadProvider;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.MojangDownloadProvider;
-import org.jackhuang.hmcl.util.Lang;
 
-import java.util.List;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableObjectValue;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
+    public static final Map<String, DownloadProvider> providersById = mapOf(
+            pair("mojang", new MojangDownloadProvider()),
+            pair("bmclapi", new BMCLAPIDownloadProvider()));
 
-    public static DownloadProvider getDownloadProvider(int index) {
-        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
+    public static final String DEFAULT_PROVIDER_ID = "bmclapi";
+
+    private static ObjectBinding<DownloadProvider> downloadProviderProperty;
+
+    static void init() {
+        downloadProviderProperty = Bindings.createObjectBinding(
+                () -> Optional.ofNullable(providersById.get(config().getDownloadType()))
+                        .orElse(providersById.get(DEFAULT_PROVIDER_ID)),
+                config().downloadTypeProperty());
+    }
+
+    public static DownloadProvider getDownloadProvider() {
+        return downloadProviderProperty.get();
+    }
+
+    public static ObservableObjectValue<DownloadProvider> downloadProviderProperty() {
+        return downloadProviderProperty;
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
index de989f716..adab394f7 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
@@ -162,7 +162,7 @@ public final class Profile implements Observable {
     }
 
     public DefaultDependencyManager getDependency() {
-        return new DefaultDependencyManager(repository, Settings.instance().getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
+        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
     }
 
     public VersionSetting getVersionSetting(String id) {
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 a262a8e38..20c274cad 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting;
 
 import javafx.scene.text.Font;
 import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.util.CacheRepository;
 
@@ -44,6 +43,7 @@ public class Settings {
     }
 
     private Settings() {
+        DownloadProviders.init();
         ProxyManager.init();
         Accounts.init();
         Profiles.init();
@@ -83,19 +83,4 @@ public class Settings {
                 return null;
         }
     }
-
-    /****************************************
-     *        DOWNLOAD PROVIDERS            *
-     ****************************************/
-
-    public DownloadProvider getDownloadProvider() {
-        return DownloadProviders.getDownloadProvider(config().getDownloadType());
-    }
-
-    public void setDownloadProvider(DownloadProvider downloadProvider) {
-        int index = DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(downloadProvider);
-        if (index == -1)
-            throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
-        config().setDownloadType(index);
-    }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
index d60c0ff7c..363774178 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
@@ -60,10 +60,13 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
     public SettingsPage() {
         FXUtils.smoothScrolling(scroll);
 
-        chkEnableGameList.selectedProperty().bindBidirectional(config().enableMainPageGameListProperty());
+        // ==== Download sources ====
+        cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet());
+        cboDownloadSource.getSelectionModel().select(config().getDownloadType());
+        cboDownloadSource.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> config().setDownloadType(newValue));
+        // ====
 
-        cboDownloadSource.getSelectionModel().select(DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(Settings.instance().getDownloadProvider()));
-        cboDownloadSource.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> Settings.instance().setDownloadProvider(DownloadProviders.getDownloadProvider(newValue.intValue())));
+        chkEnableGameList.selectedProperty().bindBidirectional(config().enableMainPageGameListProperty());
 
         cboFont.initValue(Settings.instance().getFont());
         cboFont.valueProperty().addListener((a, b, newValue) -> {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
index 4ef9ea2ef..05bcf58bb 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
@@ -26,6 +26,11 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.*;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
+
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+
+import java.util.function.Function;
+
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Theme;
@@ -39,7 +44,7 @@ public abstract class SettingsView extends StackPane {
     protected final JFXPasswordField txtProxyPassword;
     protected final JFXTextField txtFontSize;
     protected final JFXComboBox<Label> cboLanguage;
-    protected final JFXComboBox<Label> cboDownloadSource;
+    protected final JFXComboBox<String> cboDownloadSource;
     protected final FontComboBox cboFont;
     protected final MultiFileItem<EnumCommonDirectory> fileCommonLocation;
     protected final Label lblDisplay;
@@ -162,11 +167,9 @@ public abstract class SettingsView extends StackPane {
 
                     {
                         cboDownloadSource = new JFXComboBox<>();
-                        FXUtils.setLimitWidth(cboDownloadSource, 400);
-                        cboDownloadSource.getItems().setAll(
-                                new Label(I18n.i18n("download.mojang")),
-                                new Label(I18n.i18n("download.BMCL"))
-                        );
+                        Function<String, String> nameConverter = key -> I18n.i18n("download.provider." + key);
+                        cboDownloadSource.setCellFactory(FXUtils.jfxListCellFactory(nameConverter.andThen(Label::new)));
+                        cboDownloadSource.setConverter(stringConverter(nameConverter));
                         downloadSourcePane.setRight(cboDownloadSource);
                     }
                     settingsPane.getContent().add(downloadSourcePane);
diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties
index c977c639a..2500dd67f 100644
--- a/HMCL/src/main/resources/assets/lang/I18N.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N.properties
@@ -83,11 +83,11 @@ crash.NoClassDefFound=Please check "HMCL" software is complete.
 crash.user_fault=Your OS or Java environment may not be properly installed resulting in crashing of this software, please check your Java Environment or your computer!
 
 download=Download
-download.BMCL=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
 download.failed=Failed to download
 download.failed.empty=No candidates. Click here to return.
 download.failed.refresh=Unable to load version list. Click here to retry.
-download.mojang=Mojang
+download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/)
+download.provider.mojang=Mojang
 
 extension.bat=Windows Bat file
 extension.mod=Mod file
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
index c9ea96367..0fb148cee 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
@@ -83,11 +83,11 @@ crash.NoClassDefFound=請確認 HMCL 本體是否完整，或更新您的 Java
 crash.user_fault=您的系統或 Java 環境可能安裝不當導致本軟體崩潰，請檢查您的 Java 環境或您的電腦！可以嘗試重新安裝 Java。
 
 download=下載
-download.BMCL=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
 download.failed=下載失敗
 download.failed.empty=沒有可供安裝的版本，點擊此處返回。
 download.failed.refresh=載入版本列表失敗，點擊此處重試。
-download.mojang=官方伺服器（Mojang）
+download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
+download.provider.mojang=官方伺服器（Mojang）
 
 extension.bat=Windows 腳本
 extension.mod=模組檔案
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
index 00436eba7..9f800a1d3 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -83,11 +83,11 @@ crash.NoClassDefFound=请确认 HMCL 本体是否完整，或更新您的 Java
 crash.user_fault=您的系统或 Java 环境可能安装不当导致本软件崩溃，请检查您的 Java 环境或您的电脑！可以尝试重新安装 Java。
 
 download=下载
-download.BMCL=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
 download.failed=下载失败
 download.failed.empty=没有可供安装的版本，点击此处返回。
 download.failed.refresh=加载版本列表失败，点击此处重试。
-download.mojang=官方（Mojang）
+download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
+download.provider.mojang=官方（Mojang）
 
 extension.bat=Windows 脚本
 extension.mod=模组文件
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java
index 0f6468ebf..d8f4de694 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java
@@ -28,11 +28,6 @@ import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
  */
 public class BMCLAPIDownloadProvider implements DownloadProvider {
 
-    public static final BMCLAPIDownloadProvider INSTANCE = new BMCLAPIDownloadProvider();
-
-    private BMCLAPIDownloadProvider() {
-    }
-
     @Override
     public String getVersionListURL() {
         return "https://bmclapi2.bangbang93.com/mc/game/version_manifest.json";
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java
deleted file mode 100644
index f40c839d2..000000000
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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.download;
-
-public class CurseCDNDownloadProvider extends MojangDownloadProvider {
-    public static final CurseCDNDownloadProvider INSTANCE = new CurseCDNDownloadProvider();
-
-    @Override
-    public String injectURL(String baseURL) {
-        return baseURL == null ? null : baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://ftb.cursecdn.com/FTB2/maven");
-    }
-}
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java
index 9342e3731..73bf1b907 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java
@@ -23,7 +23,7 @@ import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;
 
 /**
- * @see <a href="http://wiki.vg">http://wiki,vg</a>
+ * @see <a href="http://wiki.vg">http://wiki.vg</a>
  * @author huangyuhui
  */
 public class MojangDownloadProvider implements DownloadProvider {
@@ -56,6 +56,6 @@ public class MojangDownloadProvider implements DownloadProvider {
 
     @Override
     public String injectURL(String baseURL) {
-            return baseURL;
+        return baseURL;
     }
 }

From afad52066946c0e14eb0a41f5134c47b606c603c Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 15 Sep 2018 23:13:25 +0800
Subject: [PATCH 2/5] Move ProxyManager.proxyProperty initialization to init()

---
 .../jackhuang/hmcl/setting/ProxyManager.java  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
index 723af4bb3..52a9e0d60 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
@@ -35,20 +35,7 @@ public final class ProxyManager {
     private ProxyManager() {
     }
 
-    private static ObjectBinding<Proxy> proxyProperty = Bindings.createObjectBinding(
-            () -> {
-                String host = config().getProxyHost();
-                Integer port = Lang.toIntOrNull(config().getProxyPort());
-                if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
-                    return Proxy.NO_PROXY;
-                } else {
-                    return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
-                }
-            },
-            config().proxyTypeProperty(),
-            config().proxyHostProperty(),
-            config().proxyPortProperty(),
-            config().hasProxyProperty());
+    private static ObjectBinding<Proxy> proxyProperty;
 
     public static Proxy getProxy() {
         return proxyProperty.get();
@@ -59,12 +46,25 @@ public final class ProxyManager {
     }
 
     static void init() {
-        proxyProperty.addListener(observable -> updateSystemProxy());
+        proxyProperty = Bindings.createObjectBinding(
+                () -> {
+                    String host = config().getProxyHost();
+                    Integer port = Lang.toIntOrNull(config().getProxyPort());
+                    if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
+                        return Proxy.NO_PROXY;
+                    } else {
+                        return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
+                    }
+                },
+                config().proxyTypeProperty(),
+                config().proxyHostProperty(),
+                config().proxyPortProperty(),
+                config().hasProxyProperty());
 
+        proxyProperty.addListener(any -> updateSystemProxy());
         updateSystemProxy();
 
         Authenticator.setDefault(new Authenticator() {
-
             @Override
             protected PasswordAuthentication getPasswordAuthentication() {
                 if (config().hasProxyAuth()) {

From 4a5ac1b899dd81254c983c589e492fa721b51306 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 15 Sep 2018 23:18:59 +0800
Subject: [PATCH 3/5] Remove Settings.logLines

---
 .../main/java/org/jackhuang/hmcl/game/LauncherHelper.java | 4 ++--
 .../main/java/org/jackhuang/hmcl/setting/Settings.java    | 8 --------
 HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java   | 8 ++++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
index dd0a388cf..a4206e683 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
@@ -32,7 +32,6 @@ import org.jackhuang.hmcl.mod.CurseCompletionTask;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -50,6 +49,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -443,7 +443,7 @@ public final class LauncherHelper {
                 System.out.print(log);
 
             logs.add(pair(log, level));
-            if (logs.size() > Settings.instance().getLogLines())
+            if (logs.size() > config().getLogLines())
                 logs.removeFirst();
 
             if (setting.isShowLogs()) {
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 20c274cad..4e68466db 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
@@ -61,14 +61,6 @@ public class Settings {
         config().setFontSize(font.getSize());
     }
 
-    public int getLogLines() {
-        return Math.max(config().getLogLines(), 100);
-    }
-
-    public void setLogLines(int logLines) {
-        config().setLogLines(logLines);
-    }
-
     public static String getDefaultCommonDirectory() {
         return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
     }
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 2662fc632..437a336b9 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java
@@ -181,7 +181,7 @@ public final class LogWindow extends Stage {
                 if (newValue == Worker.State.SUCCEEDED) {
                     document = engine.getDocument();
                     body = document.getElementsByTagName("body").item(0);
-                    engine.executeScript("limitedLogs=" + Settings.instance().getLogLines());
+                    engine.executeScript("limitedLogs=" + config().getLogLines());
                     latch.countDown();
                     onDone.fireEvent(new Event(LogWindow.this));
                 }
@@ -189,14 +189,14 @@ public final class LogWindow extends Stage {
 
             boolean flag = false;
             for (String i : cboLines.getItems())
-                if (Integer.toString(Settings.instance().getLogLines()).equals(i)) {
+                if (Integer.toString(config().getLogLines()).equals(i)) {
                     cboLines.getSelectionModel().select(i);
                     flag = true;
                 }
 
             cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-                Settings.instance().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-                engine.executeScript("limitedLogs=" + Settings.instance().getLogLines());
+                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
+                engine.executeScript("limitedLogs=" + config().getLogLines());
             });
 
             if (!flag)

From 09287f9c7266f4c7de94da248d6a358cfe7a4421 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 15 Sep 2018 23:24:42 +0800
Subject: [PATCH 4/5] Rename WeakListenerHelper to WeakListenerHolder

---
 .../src/main/java/org/jackhuang/hmcl/setting/Profile.java | 6 +++---
 .../{WeakListenerHelper.java => WeakListenerHolder.java}  | 6 +++---
 .../jackhuang/hmcl/ui/versions/GameAdvancedListItem.java  | 8 ++++----
 .../java/org/jackhuang/hmcl/ui/versions/GameList.java     | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{WeakListenerHelper.java => WeakListenerHolder.java} (93%)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
index adab394f7..a5b58e64e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
@@ -29,7 +29,7 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.mod.ModManager;
-import org.jackhuang.hmcl.ui.WeakListenerHelper;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
@@ -43,7 +43,7 @@ import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
  * @author huangyuhui
  */
 public final class Profile implements Observable {
-    private final WeakListenerHelper helper = new WeakListenerHelper();
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
     private final HMCLGameRepository repository;
     private final ModManager modManager;
 
@@ -136,7 +136,7 @@ public final class Profile implements Observable {
 
         gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
         this.selectedVersion.addListener(o -> checkSelectedVersion());
-        helper.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
 
         addPropertyChangedListener(onInvalidating(this::invalidate));
     }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHolder.java
similarity index 93%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHelper.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHolder.java
index 3d8f0dde8..1e34d01e0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/WeakListenerHolder.java
@@ -27,10 +27,10 @@ import javafx.collections.WeakListChangeListener;
 import java.util.LinkedList;
 import java.util.List;
 
-public class WeakListenerHelper {
-    List<Object> refs = new LinkedList<>();
+public class WeakListenerHolder {
+    private List<Object> refs = new LinkedList<>();
 
-    public WeakListenerHelper() {
+    public WeakListenerHolder() {
     }
 
     public WeakInvalidationListener weak(InvalidationListener listener) {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java
index 6048e42d9..f3b859c37 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java
@@ -24,7 +24,7 @@ import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.WeakListenerHelper;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 
 import java.io.File;
@@ -32,16 +32,16 @@ import java.io.File;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameAdvancedListItem extends AdvancedListItem {
-    private final WeakListenerHelper helper = new WeakListenerHelper();
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
 
     private Profile profile;
     private InvalidationListener listener = o -> loadVersion();
 
     public GameAdvancedListItem() {
-        Profiles.selectedProfileProperty().addListener(helper.weak((a, b, newValue) -> {
+        Profiles.selectedProfileProperty().addListener(listenerHolder.weak((a, b, newValue) -> {
             JFXUtilities.runInFX(() -> loadProfile(newValue));
         }));
-        helper.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
             JFXUtilities.runInFX(() -> {
                 if (profile != null && profile.getRepository() == event.getSource())
                     loadVersion();
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
index 427ffa1d7..1b116a549 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
@@ -31,7 +31,7 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.WeakListenerHelper;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.util.VersionNumber;
@@ -70,8 +70,8 @@ public class GameList extends Control implements DecoratorPage {
 
     private void loadVersions(HMCLGameRepository repository) {
         toggleGroup = new ToggleGroup();
-        WeakListenerHelper helper = new WeakListenerHelper();
-        toggleGroup.getProperties().put("ReferenceHolder", helper);
+        WeakListenerHolder listenerHolder = new WeakListenerHolder();
+        toggleGroup.getProperties().put("ReferenceHolder", listenerHolder);
         List<GameListItem> children = repository.getVersions().parallelStream()
                 .filter(version -> !version.isHidden())
                 .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
@@ -83,7 +83,7 @@ public class GameList extends Control implements DecoratorPage {
                 items.setAll(children);
                 children.forEach(GameListItem::checkSelection);
 
-                profile.selectedVersionProperty().addListener(helper.weak((a, b, newValue) -> {
+                profile.selectedVersionProperty().addListener(listenerHolder.weak((a, b, newValue) -> {
                     Platform.runLater(() -> {
                         children.forEach(it -> it.selectedProperty().set(false));
                         children.stream()

From 68fdfb36fd6214d44ea6773dc560133d0d9f4616 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sun, 16 Sep 2018 00:52:03 +0800
Subject: [PATCH 5/5] Add selectedItemPropertyFor(ComboBox)

---
 .../java/org/jackhuang/hmcl/ui/FXUtils.java   |  3 ++
 .../org/jackhuang/hmcl/ui/SettingsPage.java   | 18 +++-----
 .../org/jackhuang/hmcl/ui/SettingsView.java   | 11 +++--
 .../SelectionModelSelectedItemProperty.java   | 42 +++++++++++++++++++
 4 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/SelectionModelSelectedItemProperty.java

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
index 19b96d32e..bc50bff89 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
@@ -325,8 +325,10 @@ public final class FXUtils {
      * @param comboBox the combo box being bound with {@code property}.
      * @param property the property being bound with {@code combo box}.
      * @see #unbindEnum(JFXComboBox)
+     * @deprecated Use {@link SelectionModelSelectedItemProperty#selectedItemPropertyFor(ComboBox)}
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
         unbindEnum(comboBox);
         ChangeListener<Number> listener = (a, b, newValue) ->
@@ -343,6 +345,7 @@ public final class FXUtils {
      * @see #bindEnum(JFXComboBox, Property)
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     public static void unbindEnum(JFXComboBox<?> comboBox) {
         ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
         if (listener == null) return;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
index 363774178..ffa339cf5 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
@@ -25,9 +25,6 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.When;
 import javafx.beans.property.*;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.Label;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
@@ -48,6 +45,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.SelectionModelSelectedItemProperty.selectedItemPropertyFor;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class SettingsPage extends SettingsView implements DecoratorPage {
@@ -62,8 +60,7 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
 
         // ==== Download sources ====
         cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet());
-        cboDownloadSource.getSelectionModel().select(config().getDownloadType());
-        cboDownloadSource.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> config().setDownloadType(newValue));
+        selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
         // ====
 
         chkEnableGameList.selectedProperty().bindBidirectional(config().enableMainPageGameListProperty());
@@ -87,13 +84,10 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
 
         lblDisplay.setStyle("-fx-font: " + Settings.instance().getFont().getSize() + " \"" + Settings.instance().getFont().getFamily() + "\";");
 
-        ObservableList<Label> list = FXCollections.observableArrayList();
-        for (Locales.SupportedLocale locale : Locales.LOCALES)
-            list.add(new Label(locale.getName(config().getLocalization().getResourceBundle())));
-
-        cboLanguage.setItems(list);
-        cboLanguage.getSelectionModel().select(Locales.LOCALES.indexOf(config().getLocalization()));
-        cboLanguage.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> config().setLocalization(Locales.getLocale(newValue.intValue())));
+        // ==== Languages ====
+        cboLanguage.getItems().setAll(Locales.LOCALES);
+        selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
+        // ====
 
         // ==== Proxy ====
         txtProxyHost.textProperty().bindBidirectional(config().proxyHostProperty());
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
index 05bcf58bb..3304e9fa2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java
@@ -27,15 +27,15 @@ import javafx.scene.layout.*;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 
-import java.util.function.Function;
-
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
 
 public abstract class SettingsView extends StackPane {
     protected final JFXTextField txtProxyHost;
@@ -43,7 +43,7 @@ public abstract class SettingsView extends StackPane {
     protected final JFXTextField txtProxyUsername;
     protected final JFXPasswordField txtProxyPassword;
     protected final JFXTextField txtFontSize;
-    protected final JFXComboBox<Label> cboLanguage;
+    protected final JFXComboBox<SupportedLocale> cboLanguage;
     protected final JFXComboBox<String> cboDownloadSource;
     protected final FontComboBox cboFont;
     protected final MultiFileItem<EnumCommonDirectory> fileCommonLocation;
@@ -167,9 +167,7 @@ public abstract class SettingsView extends StackPane {
 
                     {
                         cboDownloadSource = new JFXComboBox<>();
-                        Function<String, String> nameConverter = key -> I18n.i18n("download.provider." + key);
-                        cboDownloadSource.setCellFactory(FXUtils.jfxListCellFactory(nameConverter.andThen(Label::new)));
-                        cboDownloadSource.setConverter(stringConverter(nameConverter));
+                        cboDownloadSource.setConverter(stringConverter(key -> I18n.i18n("download.provider." + key)));
                         downloadSourcePane.setRight(cboDownloadSource);
                     }
                     settingsPane.getContent().add(downloadSourcePane);
@@ -183,6 +181,7 @@ public abstract class SettingsView extends StackPane {
                     languagePane.setLeft(left);
 
                     cboLanguage = new JFXComboBox<>();
+                    cboLanguage.setConverter(stringConverter(locale -> locale.getName(config().getLocalization().getResourceBundle())));
                     FXUtils.setLimitWidth(cboLanguage, 400);
                     languagePane.setRight(cboLanguage);
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/SelectionModelSelectedItemProperty.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/SelectionModelSelectedItemProperty.java
new file mode 100644
index 000000000..e6b3ff6fd
--- /dev/null
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/SelectionModelSelectedItemProperty.java
@@ -0,0 +1,42 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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;
+
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.SelectionModel;
+
+public class SelectionModelSelectedItemProperty<T> extends SimpleObjectProperty<T> {
+
+    public static <T> SelectionModelSelectedItemProperty<T> selectedItemPropertyFor(ComboBox<T> comboBox) {
+        return new SelectionModelSelectedItemProperty<>(comboBox.getSelectionModel());
+    }
+
+    private SelectionModel<T> model;
+
+    public SelectionModelSelectedItemProperty(SelectionModel<T> model) {
+        this.model = model;
+        model.selectedItemProperty().addListener((observable, oldValue, newValue) -> set(newValue));
+        set(model.getSelectedItem());
+    }
+
+    @Override
+    protected void invalidated() {
+        model.select(get());
+    }
+}