From b60b5c12513f410fd990eb61adae4c9e7989ae35 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 11 Oct 2014 16:52:10 -0700 Subject: [PATCH] Fix #283 Crash from Disabling Arboriculture --- src/main/java/forestry/plugins/PluginLepidopterology.java | 8 ++++++++ src/main/java/forestry/plugins/PluginStorage.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 33cc33267..4b97b7602 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.plugins; +import java.util.EnumSet; import java.util.Locale; import net.minecraft.block.material.Material; @@ -88,6 +89,13 @@ public class PluginLepidopterology extends ForestryPlugin { createAlleles(); } + @Override + public EnumSet getDependancies() { + EnumSet deps = super.getDependancies(); + deps.add(PluginManager.Module.ARBORICULTURE); + return deps; + } + @Override public void doInit() { config = new Configuration(); diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index e7139023d..dc609de97 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -354,7 +354,9 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl foresterItems.add(new ItemStack(Items.pumpkin_seeds)); foresterItems.add(new ItemStack(Items.melon_seeds)); foresterItems.add(new ItemStack(Items.wheat)); - foresterItems.add(ForestryBlock.saplingGE.getWildcard()); + if (PluginManager.Module.ARBORICULTURE.isEnabled()) { + foresterItems.add(ForestryBlock.saplingGE.getWildcard()); + } // [3] Set valid items in hunter's backpack hunterItems.add(new ItemStack(Items.feather));