From 38009bb32ac97d013a814922f3da43b59f75e662 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 3 Dec 2014 20:46:10 -0800 Subject: [PATCH] Safety check for IC2 Plugin. #351 --- src/main/java/forestry/plugins/PluginIC2.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index dc670c89d..227192bcc 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -173,12 +173,6 @@ public class PluginIC2 extends ForestryPlugin { ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_EFFICIENCY_I, "forestry.energyEfficiency1"); ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_BOOST_I, "forestry.energyBoost1"); ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_BOOST_II, "forestry.energyBoost2"); - - // Remove some items from the recycler - if (PluginManager.Module.APICULTURE.isEnabled()) { - Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beeQueenGE.getItemStack())); - Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack())); - } } @Override @@ -188,6 +182,16 @@ public class PluginIC2 extends ForestryPlugin { config = Config.config; + // Remove some items from the recycler + if (Recipes.recyclerBlacklist != null) { + if (PluginManager.Module.APICULTURE.isEnabled()) { + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beeQueenGE.getItemStack())); + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack())); + } + } else { + Proxies.log.severe("IC2 Recipes.recyclerBlacklist not found."); + } + definitionEngineTin.register(); definitionGenerator.register();