From c996288a50f30eacf79e6aa2ca989e654c13859c Mon Sep 17 00:00:00 2001 From: Tungstend Date: Mon, 15 Jan 2024 20:46:28 +0800 Subject: [PATCH] Update Accounts.java --- .../com/tungsten/fcl/setting/Accounts.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/FCL/src/main/java/com/tungsten/fcl/setting/Accounts.java b/FCL/src/main/java/com/tungsten/fcl/setting/Accounts.java index 68dd3bc8..a3319bb3 100644 --- a/FCL/src/main/java/com/tungsten/fcl/setting/Accounts.java +++ b/FCL/src/main/java/com/tungsten/fcl/setting/Accounts.java @@ -62,7 +62,6 @@ import com.tungsten.fclcore.auth.authlibinjector.AuthlibInjectorDownloadExceptio import com.tungsten.fclcore.auth.authlibinjector.AuthlibInjectorDownloader; import com.tungsten.fclcore.auth.authlibinjector.AuthlibInjectorServer; import com.tungsten.fclcore.auth.authlibinjector.BoundAuthlibInjectorAccountFactory; -import com.tungsten.fclcore.auth.authlibinjector.SimpleAuthlibInjectorArtifactProvider; import com.tungsten.fclcore.auth.microsoft.MicrosoftAccount; import com.tungsten.fclcore.auth.microsoft.MicrosoftAccountFactory; import com.tungsten.fclcore.auth.microsoft.MicrosoftService; @@ -375,24 +374,19 @@ public final class Accounts { // ==== authlib-injector ==== private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() { String authlibinjectorLocation = FCLPath.AUTHLIB_INJECTOR_PATH; - if (!new File(authlibinjectorLocation).exists()) { - return new AuthlibInjectorDownloader( - new File(authlibinjectorLocation).toPath(), - DownloadProviders::getDownloadProvider) { - @Override - public Optional getArtifactInfoImmediately() { - Optional local = super.getArtifactInfoImmediately(); - if (local.isPresent()) { - return local; - } - // search authlib-injector.jar in current directory, it's used as a fallback - return parseArtifact(Paths.get("authlib-injector.jar")); + return new AuthlibInjectorDownloader( + new File(authlibinjectorLocation).toPath(), + DownloadProviders::getDownloadProvider) { + @Override + public Optional getArtifactInfoImmediately() { + Optional local = super.getArtifactInfoImmediately(); + if (local.isPresent()) { + return local; } - }; - } else { - LOG.info("Using specified authlib-injector: " + authlibinjectorLocation); - return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation)); - } + // search authlib-injector.jar in current directory, it's used as a fallback + return parseArtifact(Paths.get("authlib-injector.jar")); + } + }; } private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {