Fix not include file encoding to UTF-8

EngineHub · Sep 17, 2018 · 6546bd9 · 6546bd9
1 parent ddefc88
commit 6546bd9
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/main/java/com/laytonsmith/core/AliasCore.java b/src/main/java/com/laytonsmith/core/AliasCore.java
@@ -34,7 +34,7 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -43,6 +43,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URI;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -536,14 +537,14 @@ public boolean reloadExtensions() {
 	 * @throws Exception if the file cannot be found
 	 */
 	public static String file_get_contents(String fileLocation) throws IOException {
-		BufferedReader in = new BufferedReader(new FileReader(fileLocation));
+		StringBuilder ret = new StringBuilder();
-		String ret = "";
+		try(BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(fileLocation), Charset.forName("UTF-8")))) {
-		String str;
+			String str;
-		while((str = in.readLine()) != null) {
+			while((str = in.readLine()) != null) {
-			ret += str + "\n";
+				ret.append(str).append('\n');
+			}
 		}
-		in.close();
+		return ret.toString();
-		return ret;
 	}
 
 	/**