From 022d7892088a1a4d2c327e963b1aaaee5c477780 Mon Sep 17 00:00:00 2001 From: Craftingmod Date: Tue, 27 Feb 2018 14:18:22 +0900 Subject: [PATCH] read as utf8 in windows --- src/main/java/net/tarks/craftingmod/nccauth/Main.java | 3 ++- .../net/tarks/craftingmod/nccauth/discord/DiscordPipe.java | 7 +++---- target/maven-archiver/pom.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/tarks/craftingmod/nccauth/Main.java b/src/main/java/net/tarks/craftingmod/nccauth/Main.java index 66dd4b2..50336da 100644 --- a/src/main/java/net/tarks/craftingmod/nccauth/Main.java +++ b/src/main/java/net/tarks/craftingmod/nccauth/Main.java @@ -17,6 +17,7 @@ import java.io.*; import java.net.URISyntaxException; import java.net.URLDecoder; +import java.nio.charset.Charset; import java.security.CodeSource; import java.time.*; import java.time.format.DateTimeFormatter; @@ -41,7 +42,7 @@ public Main(String[] args){ trace("Config file: " + config_file.getAbsolutePath()); if(config_file.exists() && config_file.canRead()){ try { - JsonReader reader = new JsonReader(new FileReader(config_file)); + JsonReader reader = new JsonReader(new InputStreamReader(new FileInputStream(config_file), Charset.forName("utf-8"))); cfg = g.fromJson(reader, new TypeToken(){}.getType()); } catch (FileNotFoundException e) { e.printStackTrace(); diff --git a/src/main/java/net/tarks/craftingmod/nccauth/discord/DiscordPipe.java b/src/main/java/net/tarks/craftingmod/nccauth/discord/DiscordPipe.java index 2f29a31..bd11d76 100644 --- a/src/main/java/net/tarks/craftingmod/nccauth/discord/DiscordPipe.java +++ b/src/main/java/net/tarks/craftingmod/nccauth/discord/DiscordPipe.java @@ -24,9 +24,8 @@ import net.tarks.craftingmod.nccauth.Util; import javax.security.auth.login.LoginException; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; +import java.io.*; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import java.util.StringJoiner; @@ -56,7 +55,7 @@ public DiscordPipe(Config c,ICommander cmd){ if(dbfile.exists() && dbfile.canRead()){ try { - JsonReader reader = new JsonReader(new FileReader(dbfile)); + JsonReader reader = new JsonReader(new InputStreamReader(new FileInputStream(dbfile), Charset.forName("utf-8"))); authlist = g.fromJson(reader, new TypeToken(){}.getType()); } catch (FileNotFoundException e) { e.printStackTrace(); diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index a9d0fa9..ac0e2dc 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Feb 27 13:51:30 KST 2018 +#Tue Feb 27 14:18:02 KST 2018 version=1.0.0 groupId=net.tarks.craftingmod artifactId=ncc_auth