diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index 74dfa842c..77172eeb5 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core; +import forestry.plugins.PluginManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,9 +24,14 @@ import forestry.core.config.ForestryItem; public class CreativeTabForestry extends CreativeTabs { static { - Tabs.tabApiculture = new CreativeTabForestry(1, "apiculture"); - Tabs.tabArboriculture = new CreativeTabForestry(2, "arboriculture"); - Tabs.tabLepidopterology = new CreativeTabForestry(3, "lepidopterology"); + if (PluginManager.Module.APICULTURE.isEnabled()) + Tabs.tabApiculture = new CreativeTabForestry(1, "apiculture"); + + if (PluginManager.Module.ARBORICULTURE.isEnabled()) + Tabs.tabArboriculture = new CreativeTabForestry(2, "arboriculture"); + + if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) + Tabs.tabLepidopterology = new CreativeTabForestry(3, "lepidopterology"); } public static final CreativeTabs tabForestry = new CreativeTabForestry(0, "forestry"); diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 89d991511..e7139023d 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -244,13 +244,19 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl ForestryItem.crate.registerItem((new ItemForestry()), "crate"); // BACKPACKS - BackpackDefinition definition = new BackpackDefinitionApiarist("apiarist", 0xc4923d); - BackpackManager.definitions.put(definition.getKey(), definition); - ForestryItem.apiaristBackpack.registerItem(new ItemNaturalistBackpack(GuiId.ApiaristBackpackGUI.ordinal(), definition).setCreativeTab(Tabs.tabApiculture), "apiaristBag"); + BackpackDefinition definition; - definition = new BackpackDefinitionLepidopterist("lepidopterist", 0x995b31); - BackpackManager.definitions.put(definition.getKey(), definition); - ForestryItem.lepidopteristBackpack.registerItem(new ItemNaturalistBackpack(GuiId.LepidopteristBackpackGUI.ordinal(), definition).setCreativeTab(Tabs.tabLepidopterology), "lepidopteristBag"); + if (PluginManager.Module.APICULTURE.isEnabled()) { + definition = new BackpackDefinitionApiarist("apiarist", 0xc4923d); + BackpackManager.definitions.put(definition.getKey(), definition); + ForestryItem.apiaristBackpack.registerItem(new ItemNaturalistBackpack(GuiId.ApiaristBackpackGUI.ordinal(), definition).setCreativeTab(Tabs.tabApiculture), "apiaristBag"); + } + + if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { + definition = new BackpackDefinitionLepidopterist("lepidopterist", 0x995b31); + BackpackManager.definitions.put(definition.getKey(), definition); + ForestryItem.lepidopteristBackpack.registerItem(new ItemNaturalistBackpack(GuiId.LepidopteristBackpackGUI.ordinal(), definition).setCreativeTab(Tabs.tabLepidopterology), "lepidopteristBag"); + } definition = new BackpackDefinition("miner", 0x36187d); BackpackManager.definitions.put(definition.getKey(), definition);