Add method with pre/post wrap to allow setting/clearing mod context. (#8682)

Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680
This commit is contained in:
cpw authored and GitHub committed 2022-06-08 08:38:53 -07:00
1 parent 0e66b7b217
commit 0c35436217
3 files changed
+17 -2

No files matched your search

@@ -28,6 +28,8 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -283,6 +285,17 @@ public class ModLoader
}
ModList.get().forEachModContainer((id, mc) -> mc.acceptEvent(e));
}
public <T extends Event & IModBusEvent> void postEventWithWrap(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
if (!loadingStateValid) {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return;
}
ModList.get().forEachModContainer((id, mc) -> {
pre.accept(mc, e);
mc.acceptEvent(e);
post.accept(mc, e);
});
}
public List<ModLoadingWarning> getWarnings()
{
@@ -39,6 +39,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
import net.minecraftforge.common.util.LogMessageAdapter;
import net.minecraftforge.common.world.ForgeWorldPreset;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.StartupMessageManager;
@@ -322,7 +323,7 @@ public class GameData
if (forgeRegistry != null)
forgeRegistry.unfreeze();
ModLoader.get().postEvent(registerEvent);
ModLoader.get().postEventWithWrap(registerEvent, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e)-> ModLoadingContext.get().setActiveContainer(null));
if (forgeRegistry != null)
forgeRegistry.freeze();
@@ -24,6 +24,7 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.Registry;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.network.HandshakeMessages;
import net.minecraftforge.registries.ForgeRegistry.Snapshot;
import org.apache.commons.lang3.tuple.Pair;
@@ -152,7 +153,7 @@ public class RegistryManager
NewRegistryEvent event = new NewRegistryEvent();
vanillaRegistryKeys = Set.copyOf(Registry.REGISTRY.keySet());
ModLoader.get().postEvent(event);
ModLoader.get().postEventWithWrap(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
event.fill();
}