summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattie <pugmatt@gmail.com>2022-02-14 16:44:46 -0500
committerGitHub <noreply@github.com>2022-02-14 16:44:46 -0500
commit2cf222fd4dbbc1084ab3ddcb6508f30e74e0a59b (patch)
tree4ab8e7295cf61f0ef0d539c0791d9ec0e09957dc
parent288dcc3f5a3340280597225edca3df51f8892333 (diff)
parent8276d69e4ab8bd7091c05a1902d1ca98233a5d8a (diff)
downloadBedrockConnect-1.16.tar.gz
BedrockConnect-1.16.tar.bz2
BedrockConnect-1.16.zip
Merge pull request #283 from nerrog/fix_garbled_text1.16
Open language files using UTF-8 encoding to avoid garbled text.
-rw-r--r--serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/config/Language.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/config/Language.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/config/Language.java
index 24e5beb..c45998c 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/config/Language.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/config/Language.java
@@ -7,6 +7,9 @@ import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.io.FileReader;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -59,7 +62,7 @@ public class Language {
}
private JSONObject loadCustom(String file) throws IOException, ParseException {
- return (JSONObject) new JSONParser().parse(new FileReader(file));
+ return (JSONObject) new JSONParser().parse(new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8")));
}
public String getWording(String rootKey, String key) {