Skip to content

Commit 8cdd8b3

Browse files
committed
Fix not loading authlib-injector server name
1 parent 956b4e4 commit 8cdd8b3

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import javafx.application.Application;
2121
import javafx.application.Platform;
2222
import javafx.stage.Stage;
23-
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
24-
import org.jackhuang.hmcl.setting.Accounts;
25-
import org.jackhuang.hmcl.setting.AuthlibInjectorServers;
2623
import org.jackhuang.hmcl.setting.ConfigHolder;
2724
import org.jackhuang.hmcl.task.Schedulers;
2825
import org.jackhuang.hmcl.task.TaskExecutor;
@@ -44,7 +41,6 @@
4441
import java.util.List;
4542
import java.util.concurrent.TimeUnit;
4643

47-
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
4844
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
4945
import static org.jackhuang.hmcl.util.Logging.LOG;
5046
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -58,14 +54,6 @@ public void start(Stage primaryStage) {
5854
try {
5955
try {
6056
ConfigHolder.init();
61-
AuthlibInjectorServers.init();
62-
63-
if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
64-
config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
65-
AuthlibInjectorServers.getConfigInstance().getUrls().stream()
66-
.map(AuthlibInjectorServer::new)
67-
.forEach(config().getAuthlibInjectorServers()::add);
68-
}
6957
} catch (IOException e) {
7058
Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
7159
}

HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import javafx.beans.binding.Bindings;
2121
import org.jackhuang.hmcl.Metadata;
22+
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
2223
import org.jackhuang.hmcl.game.HMCLCacheRepository;
2324
import org.jackhuang.hmcl.util.CacheRepository;
2425
import org.jackhuang.hmcl.util.io.FileUtils;
@@ -44,6 +45,15 @@ static void init() {
4445
}
4546

4647
private Settings() {
48+
AuthlibInjectorServers.init();
49+
50+
if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
51+
config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
52+
AuthlibInjectorServers.getConfigInstance().getUrls().stream()
53+
.map(AuthlibInjectorServer::new)
54+
.forEach(config().getAuthlibInjectorServers()::add);
55+
}
56+
4757
DownloadProviders.init();
4858
ProxyManager.init();
4959
Accounts.init();

0 commit comments

Comments
 (0)