DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1.14+] Fix reading of lang files with CRLFs (mitigates #132)

Browse Source
This commit is contained in:
Jonas Herzig
2020-04-16 14:54:24 +02:00
parent 0d3a689f17
commit 5953435dc5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/replaymod/core/versions/LangResourcePack.java
View File

@@ -19,6 +19,7 @@ import java.nio.file.Path;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
@@ -106,13 +107,13 @@ public class LangResourcePack extends AbstractFileResourcePack {
Path langPath = langPath(path); Path langPath = langPath(path);
if (langPath == null) throw new ResourceNotFoundException(this.base, path); if (langPath == null) throw new ResourceNotFoundException(this.base, path);
String langFile; List<String> langFile;
try (InputStream in = Files.newInputStream(langPath)) { try (InputStream in = Files.newInputStream(langPath)) {
langFile = IOUtils.toString(in, StandardCharsets.UTF_8); langFile = IOUtils.readLines(in, StandardCharsets.UTF_8);
} }
Map<String, String> properties = new HashMap<>(); Map<String, String> properties = new HashMap<>();
for (String line : langFile.split("\n")) { for (String line : langFile) {
if (line.trim().isEmpty() || line.trim().startsWith("#")) continue; if (line.trim().isEmpty() || line.trim().startsWith("#")) continue;
int i = line.indexOf('='); int i = line.indexOf('=');
String key = line.substring(0, i); String key = line.substring(0, i);