From f6cc1baa74d3f4540a53bc8df4732e7a331800a6 Mon Sep 17 00:00:00 2001 From: NebelNidas <48808497+NebelNidas@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:42:25 +0200 Subject: [PATCH] Fix Enigma dir writer behaving incorrectly after the first write (#546) * Fix Enigma dir writer behaving incorrectly after first write when using MIO * Fix checkstyle * Fix misleading field name --- .../translation/mapping/serde/MappingFormat.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java index 7daa5d48..c9707b9c 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java @@ -52,7 +52,7 @@ public enum MappingFormat { private final FileType fileType; private final net.fabricmc.mappingio.format.MappingFormat mappingIoCounterpart; private final boolean hasMappingIoWriter; - private boolean lastUsedMappingIoWriter; + private boolean usedMappingIoWriterLast; MappingFormat(MappingsWriter writer, MappingsReader reader, FileType fileType, net.fabricmc.mappingio.format.MappingFormat mappingIoCounterpart, boolean hasMappingIoWriter) { this.writer = writer; @@ -72,14 +72,15 @@ public void write(EntryTree mappings, MappingDelta d throw new IllegalStateException(name() + " does not support writing"); } - writer.write(mappings, lastUsedMappingIoWriter ? MappingDelta.added(mappings) : delta, path, progressListener, saveParameters); - lastUsedMappingIoWriter = false; + writer.write(mappings, usedMappingIoWriterLast ? MappingDelta.added(mappings) : delta, path, progressListener, saveParameters); + usedMappingIoWriterLast = false; return; } try { if (this == ENIGMA_DIRECTORY) { // TODO: Remove once MIO supports deltas - EnigmaMappingsWriter.DIRECTORY.write(mappings, lastUsedMappingIoWriter ? MappingDelta.added(mappings) : delta, path, progressListener, saveParameters, true); + EnigmaMappingsWriter.DIRECTORY.write(mappings, usedMappingIoWriterLast ? MappingDelta.added(mappings) : delta, path, progressListener, saveParameters, true); + usedMappingIoWriterLast = false; } else { if (this == PROGUARD) { mappings = MappingOperations.invert(mappings); @@ -91,9 +92,8 @@ public void write(EntryTree mappings, MappingDelta d tree.accept(MappingWriter.create(path, mappingIoCounterpart), VisitOrder.createByName()); progressListener.step(1, I18n.translate("progress.done")); + usedMappingIoWriterLast = true; } - - lastUsedMappingIoWriter = true; } catch (IOException e) { throw new UncheckedIOException(e); }