diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java index f76d74c01..de4f9d48f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java @@ -17,16 +17,12 @@ */ package org.jackhuang.hmcl; -import org.jackhuang.hmcl.setting.ConfigHolder; import org.jackhuang.hmcl.upgrade.UpdateHandler; - import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; import javax.swing.*; import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; @@ -40,6 +36,7 @@ public final class Main { public static void main(String[] args) { System.setProperty("java.net.useSystemProxies", "true"); + System.setProperty("http.agent", "HMCL/" + Metadata.VERSION); checkJavaFX(); checkDirectoryPath(); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java index 4796a3950..0f250a8dc 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java @@ -22,8 +22,6 @@ import java.net.*; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Map.Entry; -import java.util.Objects; -import java.util.function.Supplier; import org.jackhuang.hmcl.util.Lang; @@ -39,16 +37,6 @@ public final class NetworkUtils { private NetworkUtils() { } - private static Supplier userAgentSupplier = () -> "HMCLCore"; - - public static String getUserAgent() { - return userAgentSupplier.get(); - } - - public static void setUserAgentSupplier(Supplier userAgentSupplier) { - NetworkUtils.userAgentSupplier = Objects.requireNonNull(userAgentSupplier); - } - public static String withQuery(String baseUrl, Map params) { try { StringBuilder sb = new StringBuilder(baseUrl); @@ -76,7 +64,6 @@ public final class NetworkUtils { connection.setUseCaches(false); connection.setConnectTimeout(15000); connection.setReadTimeout(15000); - connection.setRequestProperty("User-Agent", getUserAgent()); return connection; }