Fix JEI errors for disabled modules

ForestryMC · Mar 11, 2018 · f328efa · f328efa
1 parent e9019fd
commit f328efa
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 3 deletions.
diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java
@@ -1,12 +1,19 @@
 package forestry.apiculture.compat;
 
 import com.google.common.base.Preconditions;
+
+import net.minecraft.util.ResourceLocation;
+
 import forestry.api.apiculture.BeeManager;
+import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.apiculture.ModuleApiculture;
 import forestry.apiculture.items.ItemRegistryApiculture;
+import forestry.core.config.Constants;
 import forestry.core.genetics.Genome;
 import forestry.core.utils.JeiUtil;
+import forestry.modules.ForestryModuleUids;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.ISubtypeRegistry;
@@ -16,6 +23,10 @@
 public class ApicultureJeiPlugin implements IModPlugin {
 	@Override
 	public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
+			return;
+		}
+
 		ItemRegistryApiculture items = ModuleApiculture.getItems();
 		Preconditions.checkNotNull(items);
 
@@ -31,6 +42,10 @@ public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
 
 	@Override
 	public void register(IModRegistry registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
+			return;
+		}
+
 		ItemRegistryApiculture items = ModuleApiculture.getItems();
 		Preconditions.checkNotNull(items);
 

diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java
@@ -1,10 +1,14 @@
 package forestry.arboriculture.charcoal.jei;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 import forestry.api.arboriculture.TreeManager;
+import forestry.api.core.ForestryAPI;
 import forestry.arboriculture.ModuleCharcoal;
 import forestry.arboriculture.charcoal.CharcoalPileWall;
+import forestry.core.config.Constants;
+import forestry.modules.ForestryModuleUids;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.IModPlugin;
@@ -19,15 +23,23 @@ public class CharcoalJeiPlugin implements IModPlugin {
 
 	@Override
 	public void registerCategories(IRecipeCategoryRegistration registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CHARCOAL))) {
+			return;
+		}
+
 		IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper();
 		registry.addRecipeCategories(new CharcoalPileWallCategory(guiHelper));
 	}
 
 	@Override
 	public void register(IModRegistry registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CHARCOAL))) {
+			return;
+		}
+
 		registry.handleRecipes(CharcoalPileWall.class, CharcoalPileWallWrapper::new, RECIPE_UID);
 		registry.addRecipes(TreeManager.pileWalls, RECIPE_UID);
 		registry.addRecipeCatalyst(new ItemStack(ModuleCharcoal.getBlocks().woodPile), RECIPE_UID);
 	}
-	
+
 }
diff --git a/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java b/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java
@@ -2,9 +2,15 @@
 
 import com.google.common.base.Preconditions;
 
+import net.minecraft.util.ResourceLocation;
+
+import forestry.api.core.ForestryAPI;
 import forestry.arboriculture.ModuleArboriculture;
 import forestry.arboriculture.items.ItemRegistryArboriculture;
+import forestry.core.config.Constants;
 import forestry.core.utils.JeiUtil;
+import forestry.modules.ForestryModuleUids;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
@@ -13,6 +19,10 @@
 public class ArboricultureJeiPlugin implements IModPlugin {
 	@Override
 	public void register(IModRegistry registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
+			return;
+		}
+
 		ItemRegistryArboriculture items = ModuleArboriculture.getItems();
 		Preconditions.checkNotNull(items);
 

diff --git a/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java b/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java
@@ -22,7 +22,7 @@ public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
 		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) {
 			return;
 		}
-		
+
 		BlockRegistryFarming blocks = ModuleFarming.getBlocks();
 		Item farmBlock = Item.getItemFromBlock(blocks.farm);
 		subtypeRegistry.registerSubtypeInterpreter(farmBlock, itemStack -> {

diff --git a/src/main/java/forestry/mail/compat/MailJeiPlugin.java b/src/main/java/forestry/mail/compat/MailJeiPlugin.java
@@ -1,8 +1,14 @@
 package forestry.mail.compat;
 
+import net.minecraft.util.ResourceLocation;
+
+import forestry.api.core.ForestryAPI;
+import forestry.core.config.Constants;
 import forestry.core.utils.JeiUtil;
 import forestry.mail.ModuleMail;
 import forestry.mail.blocks.BlockRegistryMail;
+import forestry.modules.ForestryModuleUids;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
@@ -11,6 +17,10 @@
 public class MailJeiPlugin implements IModPlugin {
 	@Override
 	public void register(IModRegistry registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.MAIL))) {
+			return;
+		}
+
 		BlockRegistryMail blocks = ModuleMail.getBlocks();
 		JeiUtil.addDescription(registry,
 				blocks.mailbox,

diff --git a/src/main/java/forestry/storage/compat/StorageJeiPlugin.java b/src/main/java/forestry/storage/compat/StorageJeiPlugin.java
@@ -1,8 +1,14 @@
 package forestry.storage.compat;
 
+import net.minecraft.util.ResourceLocation;
+
+import forestry.api.core.ForestryAPI;
+import forestry.core.config.Constants;
 import forestry.core.utils.JeiUtil;
+import forestry.modules.ForestryModuleUids;
 import forestry.storage.ModuleBackpacks;
 import forestry.storage.items.ItemRegistryBackpacks;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
@@ -11,6 +17,10 @@
 public class StorageJeiPlugin implements IModPlugin {
 	@Override
 	public void register(IModRegistry registry) {
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.BACKPACKS))) {
+			return;
+		}
+
 		ItemRegistryBackpacks items = ModuleBackpacks.getItems();
 
 		JeiUtil.addDescription(registry, "minerBag",

diff --git a/src/main/java/forestry/worktable/compat/WorktableJeiPlugin.java b/src/main/java/forestry/worktable/compat/WorktableJeiPlugin.java
@@ -14,6 +14,7 @@
 import forestry.modules.ForestryModuleUids;
 import forestry.worktable.ModuleWorktable;
 import forestry.worktable.blocks.BlockRegistryWorktable;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
@@ -26,7 +27,7 @@ public class WorktableJeiPlugin implements IModPlugin {
 
 	@Override
 	public void register(IModRegistry registry) {
-		if(!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.WORKTABLE))){
+		if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.WORKTABLE))) {
 			return;
 		}
 		BlockRegistryWorktable blocks = ModuleWorktable.getBlocks();