From f8c5d7c2b622d10fcf9c05f92ab4655499ece02e Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 13 Jul 2017 14:45:13 -0700 Subject: [PATCH] Fire recipe registry event after json recipes are loaded. --- .../net/minecraftforge/common/crafting/CraftingHelper.java | 3 +++ src/main/java/net/minecraftforge/fml/common/Loader.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index 8868a28f97..b470caf402 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -613,6 +613,9 @@ public class CraftingHelper { Loader.instance().getActiveModList().forEach(CraftingHelper::loadFactories); Loader.instance().getActiveModList().forEach(CraftingHelper::loadRecipes); Loader.instance().setActiveModContainer(null); + + GameData.fireRegistryEvents(rl -> rl.equals(GameData.RECIPES)); + //reg.freeze(); FMLCommonHandler.instance().resetClientRecipeBook(); } diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java index f5b0005ecf..5646f8b36c 100644 --- a/src/main/java/net/minecraftforge/fml/common/Loader.java +++ b/src/main/java/net/minecraftforge/fml/common/Loader.java @@ -602,7 +602,7 @@ public class Loader ItemStackHolderInjector.INSTANCE.findHolders(discoverer.getASMTable()); CapabilityManager.INSTANCE.injectCapabilities(discoverer.getASMTable()); modController.distributeStateMessage(LoaderState.PREINITIALIZATION, discoverer.getASMTable(), canonicalConfigDir); - GameData.fireRegistryEvents(); + GameData.fireRegistryEvents(rl -> !rl.equals(GameData.RECIPES)); FMLCommonHandler.instance().fireSidedRegistryEvents(); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); ItemStackHolderInjector.INSTANCE.inject();