mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-28 13:15:31 +01:00
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From a66db9be317a66333b470b91eeaeac13b4d7264c Mon Sep 17 00:00:00 2001
|
|
From: kamcio96 <k.nadworski@icloud.com>
|
|
Date: Sat, 21 May 2016 17:17:36 -0600
|
|
Subject: [PATCH] Fix unicode characters in configuration files
|
|
|
|
|
|
diff --git a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
|
|
index db8aa4be..9258d7dd 100644
|
|
--- a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
|
|
+++ b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
|
|
@@ -1,16 +1,25 @@
|
|
package net.md_5.bungee.config;
|
|
|
|
+import java.io.BufferedReader;
|
|
+import java.io.BufferedWriter;
|
|
import java.io.File;
|
|
+import java.io.FileInputStream;
|
|
+import java.io.FileOutputStream;
|
|
import java.io.FileReader;
|
|
import java.io.FileWriter;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
+import java.io.InputStreamReader;
|
|
+import java.io.OutputStreamWriter;
|
|
import java.io.Reader;
|
|
import java.io.Writer;
|
|
import java.util.LinkedHashMap;
|
|
import java.util.Map;
|
|
import lombok.AccessLevel;
|
|
import lombok.NoArgsConstructor;
|
|
+
|
|
+import com.google.common.base.Charsets;
|
|
+
|
|
import org.yaml.snakeyaml.DumperOptions;
|
|
import org.yaml.snakeyaml.Yaml;
|
|
import org.yaml.snakeyaml.constructor.Constructor;
|
|
@@ -51,7 +60,7 @@ public class YamlConfiguration extends ConfigurationProvider
|
|
@Override
|
|
public void save(Configuration config, File file) throws IOException
|
|
{
|
|
- try ( FileWriter writer = new FileWriter( file ) )
|
|
+ try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8)))
|
|
{
|
|
save( config, writer );
|
|
}
|
|
@@ -72,7 +81,7 @@ public class YamlConfiguration extends ConfigurationProvider
|
|
@Override
|
|
public Configuration load(File file, Configuration defaults) throws IOException
|
|
{
|
|
- try ( FileReader reader = new FileReader( file ) )
|
|
+ try (Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)))
|
|
{
|
|
return load( reader, defaults );
|
|
}
|
|
--
|
|
2.14.3
|
|
|