From a819618a477ff06d326407ca5fbf07afa720324c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 30 Dec 2014 15:29:22 -0500 Subject: [PATCH] Add config for harvesting jungle wood when cocoa exists --- src/main/java/crazypants/enderio/config/Config.java | 5 ++++- .../enderio/machine/farm/farmers/CocoaFarmer.java | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 07052fbc..d741645f 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -263,7 +263,7 @@ public final class Config { public static boolean disableFarmNotification = false; public static boolean farmEssenceBerriesEnabled = true; public static boolean farmManaBeansEnabled = false; - + public static boolean farmHarvestJungleWhenCocoa = false; public static int magnetPowerUsePerSecondRF = 1; public static int magnetPowerCapacityRF = 100000; @@ -921,6 +921,9 @@ public final class Config { farmManaBeansEnabled = config.get(sectionFarm.name, "farmEssenceBerriesEnabled", farmManaBeansEnabled, "This setting controls whether mana beans from Thaumcraft can be harvested by the farm.").getBoolean(); + + farmHarvestJungleWhenCocoa = config.get(sectionFarm.name, "farmHarvestJungleWhenCocoa", farmHarvestJungleWhenCocoa, + "If this is enabled the farm will harvest jungle wood even if it has cocoa beans in its inventory.").getBoolean(); combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic.name, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel); diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java index 964a53fb..4c519d94 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine.farm.farmers; -import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.init.Blocks; @@ -10,6 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.TileFarmStation; +import crazypants.util.BlockCoord; public class CocoaFarmer extends CustomSeedFarmer { @@ -17,7 +18,9 @@ public class CocoaFarmer extends CustomSeedFarmer { super(Blocks.cocoa, new ItemStack(Items.dye,1,3)); this.requiresFarmland = false; - this.disableTreeFarm = true; + if (!Config.farmHarvestJungleWhenCocoa) { + this.disableTreeFarm = true; + } } @Override