From 6fe451c247ec0edc268d1821666a92d8498e78c6 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Thu, 9 Feb 2017 12:31:57 +0800 Subject: [PATCH] Fixed messy reading caused by charset. --- HMCL/build.gradle | 2 +- .../jackhuang/hellominecraft/launcher/setting/Settings.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 167cc189c..a5d0f74bc 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -33,7 +33,7 @@ def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER") if (buildnumber == null) buildnumber = System.getenv("BUILD_NUMBER") if (buildnumber == null) - buildnumber = "4" + buildnumber = "5" def versionroot = System.getenv("VERSION_ROOT") if (versionroot == null) diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java index c1d7ca9ba..95ba5f9d3 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Settings.java @@ -32,6 +32,7 @@ import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.sys.FileUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.UpdateChecker; +import org.jackhuang.hellominecraft.util.sys.IOUtils; /** * @@ -70,7 +71,7 @@ public final class Settings { Config c = new Config(); if (SETTINGS_FILE.exists()) try { - String str = FileUtils.read(SETTINGS_FILE); + String str = FileUtils.read(SETTINGS_FILE, IOUtils.DEFAULT_CHARSET); if (str == null || str.trim().equals("")) HMCLog.log("Settings file is empty, use the default settings."); else { @@ -92,7 +93,7 @@ public final class Settings { public static void save() { try { - FileUtils.write(SETTINGS_FILE, C.GSON.toJson(SETTINGS)); + FileUtils.write(SETTINGS_FILE, C.GSON.toJson(SETTINGS), IOUtils.DEFAULT_CHARSET); } catch (IOException ex) { HMCLog.err("Failed to save config", ex); }