From 110f136f20ca8491123fc431f422d25556ab79cd Mon Sep 17 00:00:00 2001 From: IotaBread Date: Thu, 4 Jan 2024 23:20:25 -0300 Subject: [PATCH] Remove a redundant filter --- .../impl/translation/mapping/MappingsChecker.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/enigma/src/main/java/org/quiltmc/enigma/impl/translation/mapping/MappingsChecker.java b/enigma/src/main/java/org/quiltmc/enigma/impl/translation/mapping/MappingsChecker.java index 7d15e8ab7..5fe858726 100644 --- a/enigma/src/main/java/org/quiltmc/enigma/impl/translation/mapping/MappingsChecker.java +++ b/enigma/src/main/java/org/quiltmc/enigma/impl/translation/mapping/MappingsChecker.java @@ -7,17 +7,14 @@ import org.quiltmc.enigma.api.translation.mapping.ResolutionStrategy; import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree; import org.quiltmc.enigma.api.translation.mapping.tree.EntryTreeNode; -import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry; import org.quiltmc.enigma.api.translation.representation.entry.Entry; -import org.quiltmc.enigma.api.translation.representation.entry.FieldEntry; -import org.quiltmc.enigma.api.translation.representation.entry.LocalVariableEntry; import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.function.BiConsumer; -import java.util.stream.Stream; import java.util.stream.StreamSupport; public class MappingsChecker { @@ -33,15 +30,12 @@ private Dropped dropMappings(ProgressListener progress, BiConsumer> allEntries = StreamSupport.stream(this.mappings.spliterator(), false).map(EntryTreeNode::getEntry); - Collection> obfEntries = allEntries - .filter(e -> e instanceof ClassEntry || e instanceof MethodEntry || e instanceof FieldEntry || e instanceof LocalVariableEntry) - .toList(); + List> entries = StreamSupport.stream(this.mappings.spliterator(), false).map(EntryTreeNode::getEntry).toList(); - progress.init(obfEntries.size(), "Checking for dropped mappings"); + progress.init(entries.size(), "Checking for dropped mappings"); int steps = 0; - for (Entry entry : obfEntries) { + for (Entry entry : entries) { progress.step(steps++, entry.toString()); dropper.accept(dropped, entry); }