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

@@ -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();
}