From ae63b9712e35665051ab0006510ac384de8ebcb8 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 7 Aug 2020 17:23:27 +0800 Subject: [PATCH] Revert "add: accept authlib-injector artifact in current working directory" This reverts commit 02cb2a3fb1fae0488c0b2bd1425effcfba865311. --- .../main/java/org/jackhuang/hmcl/setting/Accounts.java | 8 +------- .../auth/authlibinjector/AuthlibInjectorDownloader.java | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) 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 ac89e0f46..4427fb687 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java @@ -40,7 +40,6 @@ import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory; import org.jackhuang.hmcl.task.Schedulers; import java.io.IOException; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; @@ -244,12 +243,7 @@ public final class Accounts { private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() { String authlibinjectorLocation = System.getProperty("hmcl.authlibinjector.location"); if (authlibinjectorLocation == null) { - Path currentDirectory = Paths.get("."); - Path artifactsDirectory = AuthlibInjectorDownloader.isArtifactsDirectory(currentDirectory) - ? currentDirectory - : Metadata.HMCL_DIRECTORY; - - return new AuthlibInjectorDownloader(artifactsDirectory, DownloadProviders::getDownloadProvider); + return new AuthlibInjectorDownloader(Metadata.HMCL_DIRECTORY, DownloadProviders::getDownloadProvider); } else { LOG.info("Using specified authlib-injector: " + authlibinjectorLocation); return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation)); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java index 33fe053be..82953f662 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java @@ -127,10 +127,6 @@ public class AuthlibInjectorDownloader implements AuthlibInjectorArtifactProvide } } - public static boolean isArtifactsDirectory(Path artifactsDirectory) { - return Files.exists(artifactsDirectory.resolve("authlib-injector.jar")); - } - private static class AuthlibInjectorVersionInfo { @SerializedName("build_number") public int buildNumber;