Safety check for IC2 Plugin. #351

ForestryMC · Dec 4, 2014 · 38009bb · 38009bb
1 parent d132a0a
commit 38009bb
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java
@@ -173,12 +173,6 @@ public void preInit() {
 		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 void doInit() {
 
 		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();