diff --git a/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java b/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java index 39eff20fc7..06db36c408 100644 --- a/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java +++ b/src/main/java/net/minecraftforge/fml/common/discovery/ASMDataTable.java @@ -35,6 +35,7 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; import net.minecraftforge.fml.common.ModContainer; +import org.apache.commons.lang3.tuple.Pair; public class ASMDataTable { @@ -103,7 +104,7 @@ public class ASMDataTable return container.getSource().equals(data.candidate.getModContainer()); } } - private SetMultimap globalAnnotationData = HashMultimap.create(); + private final SetMultimap globalAnnotationData = HashMultimap.create(); private Map> containerAnnotationData; private List containers = Lists.newArrayList(); @@ -113,13 +114,10 @@ public class ASMDataTable { if (containerAnnotationData == null) { - ImmutableMap.Builder> mapBuilder = ImmutableMap.builder(); - for (ModContainer cont : containers) - { - Multimap values = Multimaps.filterValues(globalAnnotationData, new ModContainerPredicate(cont)); - mapBuilder.put(cont, ImmutableSetMultimap.copyOf(values)); - } - containerAnnotationData = mapBuilder.build(); + //concurrently filter the values to speed this up + containerAnnotationData = containers.parallelStream() + .map(cont -> Pair.of(cont, ImmutableSetMultimap.copyOf(Multimaps.filterValues(globalAnnotationData, new ModContainerPredicate(cont))))) + .collect(ImmutableMap.toImmutableMap(Pair::getKey, Pair::getValue)); } return containerAnnotationData.get(container); }