lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the problem of garbled logs on Java 18+ (#1866)

Browse Source
This commit is contained in:
Glavo
2022-11-25 17:17:31 +08:00
committed by GitHub
parent e1eb40c129
commit 6611774aa9
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@@ -108,30 +108,16 @@ public class DefaultLauncher extends Launcher {
res.addAllWithoutParsing(options.getJavaArguments()); res.addAllWithoutParsing(options.getJavaArguments());
Charset encoding = OperatingSystem.NATIVE_CHARSET; Charset encoding = OperatingSystem.NATIVE_CHARSET;
if (options.getJava().getParsedVersion() < JavaVersion.JAVA_8) {
try {
String fileEncoding = res.addDefault("-Dfile.encoding=", encoding.name()); String fileEncoding = res.addDefault("-Dfile.encoding=", encoding.name());
if (fileEncoding != null) if (fileEncoding != null && !"-Dfile.encoding=COMPAT".equals(fileEncoding)) {
try {
encoding = Charset.forName(fileEncoding.substring("-Dfile.encoding=".length())); encoding = Charset.forName(fileEncoding.substring("-Dfile.encoding=".length()));
} catch (Throwable ex) { } catch (Throwable ex) {
LOG.log(Level.WARNING, "Bad file encoding", ex); LOG.log(Level.WARNING, "Bad file encoding", ex);
} }
} else {
if (options.getJava().getParsedVersion() > JavaVersion.JAVA_17
&& VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("1.13"), "1.13") < 0) {
res.addDefault("-Dfile.encoding=", "COMPAT");
} }
res.addDefault("-Dsun.stdout.encoding=", encoding.name());
try {
String stdoutEncoding = res.addDefault("-Dsun.stdout.encoding=", encoding.name());
if (stdoutEncoding != null)
encoding = Charset.forName(stdoutEncoding.substring("-Dsun.stdout.encoding=".length()));
} catch (Throwable ex) {
LOG.log(Level.WARNING, "Bad stdout encoding", ex);
}
res.addDefault("-Dsun.stderr.encoding=", encoding.name()); res.addDefault("-Dsun.stderr.encoding=", encoding.name());
}
// JVM Args // JVM Args
if (!options.isNoGeneratedJVMArgs()) { if (!options.isNoGeneratedJVMArgs()) {