From 36ccd5c3e1f1aa3f600bbcdd6111b2bd090c64ca Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 9 Apr 2018 18:55:51 +0200 Subject: [PATCH] Fix #2077 Crash from disabling the Arboriculture Module --- .../java/forestry/arboriculture/ModuleArboriculture.java | 2 +- .../java/forestry/core/genetics/alleles/AlleleHelper.java | 2 +- src/main/java/forestry/factory/ModuleFactory.java | 2 +- src/main/java/forestry/modules/ModuleHelper.java | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/arboriculture/ModuleArboriculture.java b/src/main/java/forestry/arboriculture/ModuleArboriculture.java index 0de3f26b9..c35dfc8f9 100644 --- a/src/main/java/forestry/arboriculture/ModuleArboriculture.java +++ b/src/main/java/forestry/arboriculture/ModuleArboriculture.java @@ -390,7 +390,7 @@ public class ModuleArboriculture extends BlankForestryModule { '#', fireproofPlanks.copy()); // Fabricator recipes - if (ModuleHelper.isEnabled(ForestryModuleUids.FACTORY, ForestryModuleUids.APICULTURE)) { + if (ModuleHelper.allEnabled(ForestryModuleUids.FACTORY, ForestryModuleUids.APICULTURE)) { logs.setCount(1); fireproofLogs.setCount(1); RecipeManagers.fabricatorManager.addRecipe(ItemStack.EMPTY, Fluids.GLASS.getFluid(500), fireproofLogs.copy(), new Object[]{ diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index da9418493..061dd83d4 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -56,7 +56,7 @@ public class AlleleHelper implements IAlleleHelper { createAlleles(EnumAllele.Territory.class, EnumBeeChromosome.TERRITORY); } - if (ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE, ForestryModuleUids.LEPIDOPTEROLOGY)) { + if (ModuleHelper.anyEnabled(ForestryModuleUids.APICULTURE, ForestryModuleUids.LEPIDOPTEROLOGY)) { createAlleles(EnumAllele.Speed.class, EnumBeeChromosome.SPEED, EnumButterflyChromosome.SPEED diff --git a/src/main/java/forestry/factory/ModuleFactory.java b/src/main/java/forestry/factory/ModuleFactory.java index ec46673e8..52450a534 100644 --- a/src/main/java/forestry/factory/ModuleFactory.java +++ b/src/main/java/forestry/factory/ModuleFactory.java @@ -483,7 +483,7 @@ public class ModuleFactory extends BlankForestryModule { // RAIN SUBSTRATES - if (ModuleHelper.isEnabled(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) { + if (ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) { ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), ItemStack.EMPTY, coreItems.iodineCharge.getItemStack(), "Z#Z", diff --git a/src/main/java/forestry/modules/ModuleHelper.java b/src/main/java/forestry/modules/ModuleHelper.java index 34bdc3c7f..5eb8a87f0 100644 --- a/src/main/java/forestry/modules/ModuleHelper.java +++ b/src/main/java/forestry/modules/ModuleHelper.java @@ -22,10 +22,14 @@ public final class ModuleHelper { return isModuleEnabled(Constants.MOD_ID, moduleID); } - public static boolean isEnabled(String... moduleIDs) { + public static boolean allEnabled(String... moduleIDs) { return Stream.of(moduleIDs).allMatch(ModuleHelper::isEnabled); } + public static boolean anyEnabled(String... moduleIDs) { + return Stream.of(moduleIDs).anyMatch(ModuleHelper::isEnabled); + } + public static boolean isModuleEnabled(String containerID, String moduleID){ ModuleManager manager = ModuleManager.getInstance(); return manager.isModuleEnabled(containerID, moduleID);