mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Add "send to mods in order" method to ModList and use it (#8759)
* Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. * Also preserve order in runAll * Do better comparator thanks @pupnewfster * postEvent as well.
This commit is contained in:
5 files changed
+22
-9
No files matched your search
@@ -16,6 +16,7 @@ import net.minecraftforge.fml.event.IModBusEvent;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -90,7 +91,7 @@ public class GatherDataEvent extends Event implements IModBusEvent
|
||||
}
|
||||
|
||||
public void runAll() {
|
||||
Map<Path, List<DataGenerator>> paths = generators.stream().collect(Collectors.groupingBy(DataGenerator::getOutputFolder));
|
||||
Map<Path, List<DataGenerator>> paths = generators.stream().collect(Collectors.groupingBy(DataGenerator::getOutputFolder, LinkedHashMap::new, Collectors.toList()));
|
||||
|
||||
paths.values().forEach(LamdbaExceptionUtils.rethrowConsumer(lst -> {
|
||||
DataGenerator parent = lst.get(0);
|
||||
|
||||
@@ -40,7 +40,6 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
|
||||
import net.minecraftforge.common.util.LogMessageAdapter;
|
||||
import net.minecraftforge.fluids.FluidType;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
import net.minecraftforge.fml.ModLoader;
|
||||
import net.minecraftforge.fml.ModLoadingContext;
|
||||
import net.minecraftforge.fml.StartupMessageManager;
|
||||
@@ -318,7 +317,7 @@ public class GameData
|
||||
if (forgeRegistry != null)
|
||||
forgeRegistry.unfreeze();
|
||||
|
||||
ModLoader.get().postEventWithWrap(registerEvent, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e)-> ModLoadingContext.get().setActiveContainer(null));
|
||||
ModLoader.get().postEventWithWrapInModOrder(registerEvent, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e)-> ModLoadingContext.get().setActiveContainer(null));
|
||||
|
||||
if (forgeRegistry != null)
|
||||
forgeRegistry.freeze();
|
||||
|
||||
@@ -153,7 +153,7 @@ public class RegistryManager
|
||||
NewRegistryEvent event = new NewRegistryEvent();
|
||||
vanillaRegistryKeys = Set.copyOf(Registry.REGISTRY.keySet());
|
||||
|
||||
ModLoader.get().postEventWithWrap(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
||||
ModLoader.get().postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
||||
|
||||
event.fill();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user