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.

Sign up for GitHub

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

Jump to bottom

Add temporary bodge to MIO Enigma dir writer to support deltas #543

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Add temporary bodge to MIO Enigma dir writer to support deltas #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,21 @@ public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> d
}

try {
if (this == PROGUARD) {
mappings = MappingOperations.invert(mappings);
if (this == ENIGMA_DIRECTORY) { // TODO: Remove once MIO supports deltas
EnigmaMappingsWriter.DIRECTORY.write(mappings, lastUsedMappingIoWriter ? MappingDelta.added(mappings) : delta, path, progressListener, saveParameters, true);
} else {
if (this == PROGUARD) {
mappings = MappingOperations.invert(mappings);
}

VisitableMappingTree tree = MappingIoConverter.toMappingIo(mappings, progressListener);
progressListener.init(1, I18n.translate("progress.mappings.writing"));
progressListener.step(1, null); // Reset message

tree.accept(MappingWriter.create(path, mappingIoCounterpart), VisitOrder.createByName());
progressListener.step(1, I18n.translate("progress.done"));
}

VisitableMappingTree tree = MappingIoConverter.toMappingIo(mappings, progressListener);
progressListener.init(1, I18n.translate("progress.mappings.writing"));
progressListener.step(1, null); // Reset message

tree.accept(MappingWriter.create(path, mappingIoCounterpart), VisitOrder.createByName());
progressListener.step(1, I18n.translate("progress.done"));
lastUsedMappingIoWriter = true;
} catch (IOException e) {
throw new UncheckedIOException(e);
Expand Down
44 changes: 42 additions & 2 deletions ...ma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaMappingsWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,21 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.annotation.Nonnull;

import net.fabricmc.mappingio.MappingWriter;
import net.fabricmc.mappingio.format.MappingFormat;
import net.fabricmc.mappingio.tree.VisitOrder;
import net.fabricmc.mappingio.tree.VisitableMappingTree;
import org.jetbrains.annotations.ApiStatus;

import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.translation.MappingTranslator;
import cuchaz.enigma.translation.Translator;
Expand All @@ -41,10 +49,12 @@
import cuchaz.enigma.translation.mapping.serde.LfPrintWriter;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingHelper;
import cuchaz.enigma.translation.mapping.serde.MappingIoConverter;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.FieldEntry;
Expand Down Expand Up @@ -75,6 +85,12 @@ public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> d
DIRECTORY {
@Override
public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> delta, Path path, ProgressListener progress, MappingSaveParameters saveParameters) {
write(mappings, delta, path, progress, saveParameters, false);
}

@Override
@ApiStatus.Internal
public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> delta, Path path, ProgressListener progress, MappingSaveParameters saveParameters, boolean useMio) {
Collection<ClassEntry> changedClasses = delta.getChangedRoots().filter(entry -> entry instanceof ClassEntry).map(entry -> (ClassEntry) entry).toList();

applyDeletions(path, changedClasses, mappings, delta.getBaseMappings(), saveParameters.getFileNameFormat());
Expand All @@ -98,8 +114,26 @@ public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> d
Files.createDirectories(classPath.getParent());
Files.deleteIfExists(classPath);

try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(classPath))) {
writeRoot(writer, mappings, classEntry);
if (useMio) {
EntryTree<EntryMapping> currentMappings = new HashEntryTree<>();
Set<Entry<?>> children = new HashSet<>();
children.add(classEntry);

while (!children.isEmpty()) {
Entry<?> child = children.stream().findFirst().get();
children.remove(child);
children.addAll(mappings.getChildren(child));

EntryMapping mapping = mappings.get(child);
currentMappings.insert(child, mapping != null ? mapping : EntryMapping.DEFAULT);
}

VisitableMappingTree tree = MappingIoConverter.toMappingIo(currentMappings, ProgressListener.none());
tree.accept(MappingWriter.create(classPath, MappingFormat.ENIGMA_FILE), VisitOrder.createByName());
} else {
try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(classPath))) {
writeRoot(writer, mappings, classEntry);
}
}
} catch (Throwable t) {
System.err.println("Failed to write class '" + classEntry.getFullName() + "'");
Expand Down Expand Up @@ -325,4 +359,10 @@ protected boolean isClassEmpty(EntryTree<EntryMapping> mappings, ClassEntry clas
private boolean isMappingEmpty(EntryMapping mapping) {
return mapping.targetName() == null && mapping.accessModifier() == AccessModifier.UNCHANGED && mapping.javadoc() == null;
}

@ApiStatus.Internal
public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> mappingDelta, Path path,
ProgressListener progressListener, MappingSaveParameters saveParameters, boolean useMio) {
throw new UnsupportedOperationException("Not implemented");
}
}