From cfaa3a9a91f49b922f436fea045461264f9db092 Mon Sep 17 00:00:00 2001 From: hilburn Date: Tue, 30 Dec 2014 18:31:45 +0000 Subject: [PATCH] CustomSeedFarmer can disable TreeFarmer Only used for cocoa beans currently but might prove useful - if the seed item is in that quadrant it won't chop trees even with an axe --- .../machine/farm/farmers/CocoaFarmer.java | 1 + .../farm/farmers/CustomSeedFarmer.java | 5 +++++ .../machine/farm/farmers/FarmersCommune.java | 20 ++++++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) 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 6db2447c..964a53fb 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java @@ -17,6 +17,7 @@ public class CocoaFarmer extends CustomSeedFarmer { super(Blocks.cocoa, new ItemStack(Items.dye,1,3)); this.requiresFarmland = false; + this.disableTreeFarm = true; } @Override diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java index 57cf6e1c..f1308e50 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java @@ -22,6 +22,7 @@ public class CustomSeedFarmer implements IFarmerJoe { protected boolean requiresFarmland = true; protected List tilledBlocks = new ArrayList(); protected boolean ignoreSustainCheck = false; + protected boolean disableTreeFarm; public CustomSeedFarmer(Block plantedBlock, ItemStack seeds) { this(plantedBlock, 0, 7, seeds); @@ -207,4 +208,8 @@ public class CustomSeedFarmer implements IFarmerJoe { return false; } + public boolean doesDisableTreeFarm() + { + return disableTreeFarm; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java index 74f683db..dcb19be5 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java @@ -16,8 +16,14 @@ import crazypants.util.Lang; public class FarmersCommune implements IFarmerJoe { public static FarmersCommune instance = new FarmersCommune(); + private static List disableTrees = new ArrayList(); public static void joinCommune(IFarmerJoe joe) { + if (joe instanceof CustomSeedFarmer) + { + CustomSeedFarmer customSeedFarmer = (CustomSeedFarmer) joe; + if (customSeedFarmer.doesDisableTreeFarm()) disableTrees.add(customSeedFarmer.getSeeds()); + } instance.farmers.add(joe); } @@ -43,7 +49,8 @@ public class FarmersCommune implements IFarmerJoe { @Override public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { for (IFarmerJoe joe : farmers) { - if(joe.canHarvest(farm, bc, block, meta)) { + if (ignoreTreeHarvest(farm, bc, joe)) continue; + if (joe.canHarvest(farm, bc, block, meta)) { return joe.harvestBlock(farm, bc, block, meta); } } @@ -69,4 +76,15 @@ public class FarmersCommune implements IFarmerJoe { } return false; } + + private boolean ignoreTreeHarvest(TileFarmStation farm, BlockCoord bc, IFarmerJoe joe) + { + ItemStack stack = farm.getSeedTypeInSuppliesFor(bc); + if (!(joe instanceof TreeFarmer) || stack == null) return false; + for (ItemStack disableTreeStack : disableTrees) + { + if (disableTreeStack.isItemEqual(stack)) return true; + } + return false; + } }