Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

force utf8 to save config. #378

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/com/dre/brewery/filedata/ConfigUpdater.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.dre.brewery.filedata;

import com.dre.brewery.P;
import com.dre.brewery.utility.BUtil;
import com.dre.brewery.utility.LegacyUtil;
import com.dre.brewery.utility.Tuple;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -79,21 +81,17 @@ public void saveConfig() {
stringBuilder.append(line).append("\n");
}
String configString = stringBuilder.toString().trim();

try {
BufferedWriter writer = new BufferedWriter(new FileWriter(file));
writer.write(configString);
writer.flush();
writer.close();

InputStream utf8ConfigInput = new ByteArrayInputStream(configString.getBytes(StandardCharsets.UTF_8));
BUtil.saveFile(utf8ConfigInput, file, true);
} catch (IOException e) {
e.printStackTrace();
}
}

private void getConfigString() {
try {
BufferedReader reader = new BufferedReader(new FileReader(file));
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
String currentLine;
while((currentLine = reader.readLine()) != null) {
config.add(currentLine);
Expand Down
3 changes: 3 additions & 0 deletions src/com/dre/brewery/utility/BUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -358,4 +358,7 @@ public static void saveFile(InputStream in, File dest, String name, boolean over
out.close();
}

public static void saveFile(InputStream in, File file, boolean overwrite) throws IOException {
saveFile(in, file.getParentFile(), file.getName(), overwrite);
}
}