From fa38c53915ef77035529586735d43691ce253fab Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 22 Sep 2018 12:54:15 +0800 Subject: [PATCH] Remove Constants.SYSTEM_CHARSET --- .../src/main/java/org/jackhuang/hmcl/launch/StreamPump.java | 4 ++-- .../src/main/java/org/jackhuang/hmcl/util/Constants.java | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/StreamPump.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/StreamPump.java index be692dca1..651db6e76 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/StreamPump.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/StreamPump.java @@ -17,13 +17,13 @@ */ package org.jackhuang.hmcl.launch; -import org.jackhuang.hmcl.util.Constants; import org.jackhuang.hmcl.util.Logging; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.Charset; import java.util.function.Consumer; import java.util.logging.Level; @@ -49,7 +49,7 @@ final class StreamPump implements Runnable { @Override public void run() { - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, Constants.SYSTEM_CHARSET))) { + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, Charset.defaultCharset()))) { String line; while ((line = bufferedReader.readLine()) != null) { if (Thread.currentThread().isInterrupted()) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java index 4d03a4679..7d8a5e6b8 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java @@ -18,10 +18,7 @@ package org.jackhuang.hmcl.util; import org.jackhuang.hmcl.task.Schedulers; -import org.jackhuang.hmcl.util.platform.OperatingSystem; - import java.awt.*; -import java.nio.charset.Charset; import java.util.function.Consumer; /** @@ -34,8 +31,6 @@ public final class Constants { private Constants() { } - public static final Charset SYSTEM_CHARSET = Charset.forName(OperatingSystem.ENCODING); - public static final String DEFAULT_LIBRARY_URL = "https://libraries.minecraft.net/"; public static final String DEFAULT_VERSION_DOWNLOAD_URL = "https://s3.amazonaws.com/Minecraft.Download/versions/"; public static final String DEFAULT_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/";