From fbf7ff6ebd5dae16d63ec1f69090d53af9dec5d3 Mon Sep 17 00:00:00 2001 From: Glavo Date: Mon, 13 Dec 2021 13:13:34 +0800 Subject: [PATCH] Lifting GB2312 to GB18030 --- .../java/org/jackhuang/hmcl/util/platform/OperatingSystem.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java index 18f9e2789..965ad4658 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java @@ -124,9 +124,10 @@ public enum OperatingSystem { if (nativeEncoding != null && !nativeEncoding.equalsIgnoreCase(nativeCharset.name())) { nativeCharset = Charset.forName(nativeEncoding); } + if (nativeCharset == StandardCharsets.UTF_8 || nativeCharset == StandardCharsets.US_ASCII) { nativeCharset = StandardCharsets.UTF_8; - } else if ("GBK".equalsIgnoreCase(nativeCharset.name())) { + } else if ("GBK".equalsIgnoreCase(nativeCharset.name()) || "GB2312".equalsIgnoreCase(nativeCharset.name())) { nativeCharset = Charset.forName("GB18030"); } }