From 56c2e72748f9f082a60fa8acb7bb86f79286f554 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:33:07 -0400 Subject: [PATCH] Remove module configs We don't support disabling parts --- src/main/java/binnie/botany/Botany.java | 5 ---- src/main/java/binnie/core/AbstractMod.java | 2 +- src/main/java/binnie/core/BinnieCore.java | 13 ++------- .../java/binnie/core/config/ModsConfig.java | 29 ------------------- .../binnie/core/config/ModsConfigGUI.java | 14 --------- .../core/config/ModsConfigGUIFactory.java | 11 ------- .../binnie/core/genetics/ManagerGenetics.java | 5 ++-- .../java/binnie/core/item/ModuleItems.java | 2 +- .../binnie/core/machines/IMachineType.java | 2 -- .../binnie/core/machines/MachineGroup.java | 6 ++-- .../core/machines/storage/Compartment.java | 5 ---- .../apiary/machine/AlvearyMachine.java | 5 ---- .../extratrees/machines/ExtraTreeMachine.java | 20 ++++--------- src/main/java/binnie/genetics/Genetics.java | 6 ++-- .../java/binnie/genetics/item/ModuleItem.java | 2 +- .../genetics/machine/AdvGeneticMachine.java | 5 ---- .../genetics/machine/ComponentGUIHolder.java | 5 ++-- .../genetics/machine/GeneticMachine.java | 5 ---- .../genetics/machine/LaboratoryMachine.java | 5 ---- .../machine/acclimatiser/Acclimatiser.java | 20 ++++++------- .../nei/AcclimatiserRecipeHandler.java | 18 +++++------- .../genetics/nei/AnalyserRecipeHandler.java | 9 +++--- .../genetics/nei/GenepoolRecipeHandler.java | 9 +++--- .../genetics/nei/InoculatorRecipeHandler.java | 4 +-- .../genetics/nei/IsolatorRecipeHandler.java | 9 +++--- .../genetics/nei/SplicerRecipeHandler.java | 4 +-- 26 files changed, 52 insertions(+), 168 deletions(-) delete mode 100644 src/main/java/binnie/core/config/ModsConfig.java delete mode 100644 src/main/java/binnie/core/config/ModsConfigGUI.java delete mode 100644 src/main/java/binnie/core/config/ModsConfigGUIFactory.java diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index ff84ef0c..76b0ee96 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -303,11 +303,6 @@ public class Botany extends AbstractMod { } } - @Override - public boolean isActive() { - return BinnieCore.isBotanyActive(); - } - @Mod.EventHandler public void onIMC(FMLInterModComms.IMCEvent event) { for (FMLInterModComms.IMCMessage message : event.getMessages()) { diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 3b9fbf37..bdfecd13 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -30,7 +30,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { MinecraftForge.EVENT_BUS.register(this); } - public abstract boolean isActive(); + public boolean isActive() { return true; } @Override public abstract String getChannel(); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 0d0f5f87..55219c04 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -3,7 +3,6 @@ package binnie.core; import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; -import binnie.core.config.ModsConfig; import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; @@ -134,20 +133,12 @@ public class BinnieCore extends AbstractMod { return PluginManager.Module.ARBORICULTURE.isEnabled(); } - public static boolean isBotanyActive() { - return ModsConfig.botany; - } - - public static boolean isGeneticsActive() { - return ModsConfig.genetics; - } - public static boolean isExtraBeesActive() { - return ModsConfig.extraBees && isApicultureActive(); + return isApicultureActive(); } public static boolean isExtraTreesActive() { - return ModsConfig.extraTrees && isArboricultureActive(); + return isArboricultureActive(); } @Override diff --git a/src/main/java/binnie/core/config/ModsConfig.java b/src/main/java/binnie/core/config/ModsConfig.java deleted file mode 100644 index a7ad8444..00000000 --- a/src/main/java/binnie/core/config/ModsConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package binnie.core.config; - -import static binnie.core.BinnieCore.CORE_MODID; - -import com.gtnewhorizon.gtnhlib.config.Config; - -@Config(modid = CORE_MODID) -public class ModsConfig { - - @Config.Comment("Enables the Extra Bees Mod.") - @Config.DefaultBoolean(true) - @Config.RequiresMcRestart - public static boolean extraBees; - - @Config.Comment("Enables the Extra Trees Mod.") - @Config.DefaultBoolean(true) - @Config.RequiresMcRestart - public static boolean extraTrees; - - @Config.Comment("Enables the Botany Mod.") - @Config.DefaultBoolean(true) - @Config.RequiresMcRestart - public static boolean botany; - - @Config.Comment("Enables the Genetics Mod.") - @Config.DefaultBoolean(true) - @Config.RequiresMcRestart - public static boolean genetics; -} diff --git a/src/main/java/binnie/core/config/ModsConfigGUI.java b/src/main/java/binnie/core/config/ModsConfigGUI.java deleted file mode 100644 index 3d609776..00000000 --- a/src/main/java/binnie/core/config/ModsConfigGUI.java +++ /dev/null @@ -1,14 +0,0 @@ -package binnie.core.config; - -import static binnie.core.BinnieCore.CORE_MODID; -import static binnie.core.BinnieCore.CORE_MOD_NAME; - -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig; -import net.minecraft.client.gui.GuiScreen; - -public class ModsConfigGUI extends SimpleGuiConfig { - public ModsConfigGUI(GuiScreen parent) throws ConfigException { - super(parent, ModsConfig.class, CORE_MODID, CORE_MOD_NAME); - } -} diff --git a/src/main/java/binnie/core/config/ModsConfigGUIFactory.java b/src/main/java/binnie/core/config/ModsConfigGUIFactory.java deleted file mode 100644 index f87e8d23..00000000 --- a/src/main/java/binnie/core/config/ModsConfigGUIFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package binnie.core.config; - -import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory; -import net.minecraft.client.gui.GuiScreen; - -public class ModsConfigGUIFactory implements SimpleGuiFactory { - @Override - public Class mainConfigGuiClass() { - return ModsConfigGUI.class; - } -} diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index d471e6fe..8d2c3b6f 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -58,9 +58,8 @@ public class ManagerGenetics extends ManagerBase { if (BinnieCore.isLepidopteryActive()) { mothBreedingSystem = new MothBreedingSystem(); } - if (BinnieCore.isBotanyActive()) { - flowerBreedingSystem = new FlowerBreedingSystem(); - } + + flowerBreedingSystem = new FlowerBreedingSystem(); } @Override diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 187b59b2..bcc771c4 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -51,7 +51,7 @@ public class ModuleItems implements IInitializable { @SubscribeEvent public void onUseFieldKit(PlayerInteractEvent event) { - if (!BinnieCore.isBotanyActive() || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { + if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { return; } diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/src/main/java/binnie/core/machines/IMachineType.java index 3cb44f9a..51f14498 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/src/main/java/binnie/core/machines/IMachineType.java @@ -5,6 +5,4 @@ import binnie.core.network.IOrdinaled; public interface IMachineType extends IOrdinaled { Class getPackageClass(); - - boolean isActive(); } diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index e1d869f3..2079240a 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -31,14 +31,14 @@ public class MachineGroup { this.blockName = blockName; for (IMachineType type : types) { - if (type.getPackageClass() != null && type.isActive()) { + if (type.getPackageClass() != null) { try { MachinePackage pack = type.getPackageClass().newInstance(); pack.assignMetadata(type.ordinal()); - pack.setActive(type.isActive()); + pack.setActive(true); addPackage(pack); } catch (Exception e) { - throw new RuntimeException("Failed to create machine package " + type.toString(), e); + throw new RuntimeException("Failed to create machine package " + type, e); } } } diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 16f38c9b..91d7f765 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -32,11 +32,6 @@ enum Compartment implements IMachineType { return clss; } - @Override - public boolean isActive() { - return true; - } - public ItemStack get(int i) { return new ItemStack(BinnieCore.packageCompartment.getBlock(), i, ordinal()); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index 4015ea81..19d43a70 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -46,11 +46,6 @@ public enum AlvearyMachine implements IMachineType { return new ItemStack(ModuleApiary.blockComponent, size, ordinal()); } - @Override - public boolean isActive() { - return true; - } - public abstract static class AlvearyPackage extends MachinePackage { protected BinnieResource machineTexture; diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index b24733f5..4c0b9793 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,13 +1,6 @@ package binnie.extratrees.machines; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; @@ -23,6 +16,11 @@ import binnie.extratrees.machines.designer.PanelworkerPackage; import binnie.extratrees.machines.designer.TileworkerPackage; import binnie.extratrees.machines.designer.WoodworkerPackage; import binnie.extratrees.machines.lumbermill.LumbermillPackage; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public enum ExtraTreeMachine implements IMachineType { @@ -43,14 +41,6 @@ public enum ExtraTreeMachine implements IMachineType { return cls; } - @Override - public boolean isActive() { - if (this == ExtraTreeMachine.Tileworker) { - return BinnieCore.isBotanyActive(); - } - return true; - } - public ItemStack get(int i) { return new ItemStack(ExtraTrees.blockMachine, i, ordinal()); } diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 3d5e6193..ff1456a5 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,9 +1,6 @@ package binnie.genetics; -import net.minecraft.item.Item; - import binnie.core.AbstractMod; -import binnie.core.BinnieCore; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; import binnie.core.machines.MachineGroup; @@ -24,6 +21,7 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.item.Item; @Mod( modid = "Genetics", @@ -106,7 +104,7 @@ public class Genetics extends AbstractMod { @Override public boolean isActive() { - return BinnieCore.isGeneticsActive(); + return true; } public static class PacketHandler extends BinniePacketHandler { diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 050d7491..dffd7e87 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -306,7 +306,7 @@ public class ModuleItem implements IInitializable { // as above, there are only 24 permutations here; let's find a way to just get those recipes rather than trying // 256 combinations in an n^4 loop. This will help performance and maybe be a bit more maintainable. - if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { + if (BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { // 24 full recipe lines is a bit much to maintain; so we'll use a loop here, but we're only going // to run it 24 times. Start by making an array of all 24 valid dictionary permutations... String[] permutations = new String[] { "btlf", "btfl", "bltf", "blft", "bftl", "bflt", "tblf", "tbfl", diff --git a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index 4a123072..6f3aefea 100644 --- a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -23,11 +23,6 @@ public enum AdvGeneticMachine implements IMachineType { return cls; } - @Override - public boolean isActive() { - return true; - } - public ItemStack get(int i) { return new ItemStack(Genetics.packageAdvGenetic.getBlock(), i, ordinal()); } diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 4bd67e45..36688c36 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -116,9 +116,8 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til } List validSelections = new ArrayList<>(); - if (BinnieCore.isBotanyActive()) { - validSelections.add(Botany.database); - } + validSelections.add(Botany.database); + if (BinnieCore.isExtraBeesActive()) { validSelections.add(ExtraBees.dictionary); } diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index 2b7ba639..916b115c 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -28,11 +28,6 @@ public enum GeneticMachine implements IMachineType { return clss; } - @Override - public boolean isActive() { - return true; - } - public ItemStack get(int i) { return new ItemStack(Genetics.packageGenetic.getBlock(), i, ordinal()); } diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 87065ab9..4b4cd025 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -30,11 +30,6 @@ public enum LaboratoryMachine implements IMachineType { return clss; } - @Override - public boolean isActive() { - return true; - } - public ItemStack get(int i) { return new ItemStack(Genetics.packageLabMachine.getBlock(), i, ordinal()); } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 95a48e95..af8de313 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -106,17 +106,15 @@ public class Acclimatiser { ToleranceType.Temperature); } - if (BinnieCore.isBotanyActive()) { - addTolerance( - Binnie.Genetics.getFlowerRoot().getUID(), - EnumFlowerChromosome.HUMIDITY_TOLERANCE, - ToleranceType.Humidity); - addTolerance( - Binnie.Genetics.getFlowerRoot().getUID(), - EnumFlowerChromosome.TEMPERATURE_TOLERANCE, - ToleranceType.Temperature); - addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); - } + addTolerance( + Binnie.Genetics.getFlowerRoot().getUID(), + EnumFlowerChromosome.HUMIDITY_TOLERANCE, + ToleranceType.Humidity); + addTolerance( + Binnie.Genetics.getFlowerRoot().getUID(), + EnumFlowerChromosome.TEMPERATURE_TOLERANCE, + ToleranceType.Temperature); + addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); addTemperatureItem(new ItemStack(Items.blaze_powder), 0.5f); addTemperatureItem(new ItemStack(Items.blaze_rod), 0.75f); diff --git a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java index c3f69400..6a4f006a 100644 --- a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java @@ -37,11 +37,10 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { targets.add(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE)); targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); } - if (BinnieCore.isBotanyActive()) { - targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); - } + + targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Temperature)); }); Acclimatiser.humidityItems.forEach((resource, effect) -> { @@ -57,11 +56,10 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { targets.add(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE)); targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); } - if (BinnieCore.isBotanyActive()) { - targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); - targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); - } + + targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)); + targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Humidity)); }); } diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index fa1053b7..7c94e227 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -42,11 +42,10 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { recipes.add(new AnalyserRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE))); recipes.add(new AnalyserRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - if (BinnieCore.isBotanyActive()) { - recipes.add(new AnalyserRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new AnalyserRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new AnalyserRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); - } + + recipes.add(new AnalyserRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new AnalyserRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index 10178c3e..40b76e33 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -44,11 +44,10 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { recipes.add(new GenepoolRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE))); recipes.add(new GenepoolRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - if (BinnieCore.isBotanyActive()) { - recipes.add(new GenepoolRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new GenepoolRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new GenepoolRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); - } + + recipes.add(new GenepoolRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new GenepoolRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new GenepoolRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index 07ba13ca..c6a8c5b7 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -44,8 +44,8 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { createInoculatorRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE)); if (BinnieCore.isLepidopteryActive()) createInoculatorRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); - if (BinnieCore.isBotanyActive()) - createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + + createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); } @Override diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index 1fb197f6..7e2a0e7d 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -50,11 +50,10 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase { recipes.add(new IsolatorRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE))); recipes.add(new IsolatorRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE))); } - if (BinnieCore.isBotanyActive()) { - recipes.add(new IsolatorRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new IsolatorRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new IsolatorRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); - } + + recipes.add(new IsolatorRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new IsolatorRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new IsolatorRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index 1248ccfd..27760195 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -44,8 +44,8 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { createSplicerRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE)); if (BinnieCore.isLepidopteryActive()) createSplicerRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)); - if (BinnieCore.isBotanyActive()) - createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); + + createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)); } @Override