From 1d2f3f16abd5a446dc9129b83e8311ef0b8d72a4 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 25 Feb 2017 20:53:31 +0100 Subject: [PATCH] Fix #1582 Error in log related to forestry --- .../factory/recipes/jei/FactoryJeiPlugin.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index 877172197..13438ccca 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -5,6 +5,8 @@ import java.awt.Rectangle; import java.util.List; import com.google.common.base.Preconditions; + +import forestry.api.core.ForestryAPI; import forestry.core.gui.GuiForestry; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.utils.JeiUtil; @@ -49,6 +51,8 @@ import forestry.factory.recipes.jei.squeezer.SqueezerRecipeWrapper; import forestry.factory.recipes.jei.still.StillRecipeCategory; import forestry.factory.recipes.jei.still.StillRecipeHandler; import forestry.factory.recipes.jei.still.StillRecipeMaker; +import forestry.plugins.ForestryPluginUids; +import forestry.plugins.PluginManager; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; @@ -66,9 +70,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class FactoryJeiPlugin extends BlankModPlugin { @Nullable public static IJeiHelpers jeiHelpers; - + @Override public void register(IModRegistry registry) { + registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler()); + + if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){ + return; + } + jeiHelpers = registry.getJeiHelpers(); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); @@ -138,8 +148,6 @@ public class FactoryJeiPlugin extends BlankModPlugin { transferRegistry.addRecipeTransferHandler(new CarpenterRecipeTransferHandler(), ForestryRecipeCategoryUid.CARPENTER); transferRegistry.addRecipeTransferHandler(new FabricatorRecipeTransferHandler(), ForestryRecipeCategoryUid.FABRICATOR); - registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler()); - JeiUtil.addDescription(registry, blocks.raintank, blocks.worktable