From 0568510a88f1532af2009662c61d6559230c5af6 Mon Sep 17 00:00:00 2001
From: SpaceTeleport <naivesimple@outlook.com>
Date: Sat, 26 Mar 2022 11:51:30 +0800
Subject: [PATCH] Fixed potential charset bug again. These may cause annoying
 garbled characters in the future so that I fixed them as bugs.

---
 src/main/java/ru/bclib/util/JsonFactory.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/bclib/util/JsonFactory.java b/src/main/java/ru/bclib/util/JsonFactory.java
index fe6e9cbd..2da2ee9b 100644
--- a/src/main/java/ru/bclib/util/JsonFactory.java
+++ b/src/main/java/ru/bclib/util/JsonFactory.java
@@ -30,7 +30,7 @@ public class JsonFactory {
 	
 	public static JsonObject getJsonObject(InputStream stream) {
 		try {
-			Reader reader = new InputStreamReader(stream);
+			Reader reader = new InputStreamReader(stream,StandardCharsets.UTF_8);
 			JsonElement json = loadJson(reader);
 			if (json != null && json.isJsonObject()) {
 				JsonObject jsonObject = json.getAsJsonObject();
@@ -83,7 +83,7 @@ public class JsonFactory {
 	
 	public static JsonElement loadJson(File jsonFile) {
 		if (jsonFile.exists()) {
-			try (Reader reader = new FileReader(jsonFile)) {
+			try (Reader reader = new FileReader(jsonFile, StandardCharsets.UTF_8)) {
 				return loadJson(reader);
 			}
 			catch (Exception ex) {
@@ -98,7 +98,7 @@ public class JsonFactory {
 	}
 	
 	public static void storeJson(File jsonFile, JsonElement jsonObject) {
-		try (FileWriter writer = new FileWriter(jsonFile)) {
+		try (FileWriter writer = new FileWriter(jsonFile,StandardCharsets.UTF_8)) {
 			String json = GSON.toJson(jsonObject);
 			writer.write(json);
 			writer.flush();
@@ -109,7 +109,7 @@ public class JsonFactory {
 	}
 	
 	public static void storeJson(OutputStream outStream, JsonElement jsonObject) {
-		OutputStreamWriter writer = new OutputStreamWriter(outStream);
+		OutputStreamWriter writer = new OutputStreamWriter(outStream,StandardCharsets.UTF_8);
 		GSON.toJson(jsonObject, writer);
 		try {
 			writer.flush();