diff --git a/gradle.properties b/gradle.properties index 09cd295..291a024 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version_base=1.0 -version_patch=5 \ No newline at end of file +version_patch=6 \ No newline at end of file diff --git a/src/main/java/com/hypherionmc/modfusioner/actions/JarMergeAction.java b/src/main/java/com/hypherionmc/modfusioner/actions/JarMergeAction.java index 1d757c9..78756b7 100644 --- a/src/main/java/com/hypherionmc/modfusioner/actions/JarMergeAction.java +++ b/src/main/java/com/hypherionmc/modfusioner/actions/JarMergeAction.java @@ -598,27 +598,18 @@ public class JarMergeAction { * @throws IOException - Thrown if an IO error occurs */ public void removeDuplicateResources(File mergedTemps) throws IOException { - if (ignoredPackages != null) { for (File file : getTextFiles(mergedTemps)) { - FileInputStream fis = new FileInputStream(file); - Scanner scanner = new Scanner(fis); + List lines = FileUtils.readLines(file, StandardCharsets.UTF_8); StringBuilder sb = new StringBuilder(); - while (scanner.hasNext()) { - String line = scanner.nextLine(); - for (Map.Entry entry : removeDuplicateRelocationResources.entrySet()) { + for (String line : lines) { + for (HashMap.Entry entry : removeDuplicateRelocationResources.entrySet()) { line = line.replace(entry.getKey(), entry.getValue()); } sb.append(line).append("\n"); } - - scanner.close(); - fis.close(); - FileOutputStream fos = new FileOutputStream(file); - fos.write(sb.toString().getBytes()); - fos.flush(); - fos.close(); + FileUtils.write(file, sb.toString().trim(), StandardCharsets.UTF_8); } } }