lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor AuthlibInjectorServer

Browse Source
This commit is contained in:
yushijinhun
2018-11-23 21:34:54 +08:00
parent 1b40916046
commit dcd0a42705
4 changed files with 125 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java
View File

@@ -38,7 +38,6 @@ import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
import org.jackhuang.hmcl.task.Schedulers;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
@@ -235,16 +234,7 @@ public final class Accounts {
.filter(server -> url.equals(server.getUrl()))
.findFirst()
.orElseGet(() -> {
// this usually happens when migrating data from an older version
AuthlibInjectorServer server;
try {
server = AuthlibInjectorServer.fetchServerInfo(url);
LOG.info("Migrated authlib injector server " + server);
} catch (IOException e) {
server = new AuthlibInjectorServer(url, url);
LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
}
AuthlibInjectorServer server = new AuthlibInjectorServer(url);
config().getAuthlibInjectorServers().add(server);
return server;
});

2
HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
View File

@@ -137,7 +137,7 @@ public final class Config implements Cloneable, Observable {
private IntegerProperty logLines = new SimpleIntegerProperty(100);
@SerializedName("authlibInjectorServers")
private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
@SerializedName("updateChannel")
private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);