From 7b619fef1ddbe0360b81e97e084f0c8034f06fda Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Sat, 21 Jul 2018 20:24:54 +0800 Subject: [PATCH] Fix always using BMCLAPIDownloadProvider --- HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java | 2 +- .../jackhuang/hmcl/ui/download/InstallerWizardProvider.java | 4 +++- HMCL/src/main/resources/assets/fxml/main.fxml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java index 50d20c5bb..ba39ab8f9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java @@ -71,7 +71,7 @@ public final class VersionItem extends StackPane { private void initializeComponents() { setPickOnBounds(false); FXUtils.setLimitWidth(this, 160); - FXUtils.setLimitHeight(this, 156); + FXUtils.setLimitHeight(this, 149); content = new VBox(); { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java index ae6d00066..1c89146be 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java @@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.download; import javafx.scene.Node; import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider; +import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.setting.Profile; @@ -100,9 +101,10 @@ public final class InstallerWizardProvider implements WizardProvider { @Override public Node createPage(WizardController controller, int step, Map settings) { + DownloadProvider provider = profile.getDependency().getDownloadProvider(); switch (step) { case 0: - return new AdditionalInstallersPage(this, controller, profile.getRepository(), BMCLAPIDownloadProvider.INSTANCE); + return new AdditionalInstallersPage(this, controller, profile.getRepository(), provider); default: throw new IllegalStateException(); } diff --git a/HMCL/src/main/resources/assets/fxml/main.fxml b/HMCL/src/main/resources/assets/fxml/main.fxml index 6eb7f3dfa..11835a8fd 100644 --- a/HMCL/src/main/resources/assets/fxml/main.fxml +++ b/HMCL/src/main/resources/assets/fxml/main.fxml @@ -13,7 +13,7 @@ - +