From d5978e0213bb2f0f9569799469cc5b3fc8db4c20 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 20 May 2014 15:12:29 +0800 Subject: [PATCH] Added support for multi-layer natura berry bushes. --- .../machine/farm/NaturaBerryFarmer.java | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java index b3db31d8..82b1b820 100644 --- a/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/NaturaBerryFarmer.java @@ -21,39 +21,43 @@ public class NaturaBerryFarmer extends PickableFarmer { if(block != getPlantedBlock()) { return null; } - BlockCoord upLoc = bc.getLocation(ForgeDirection.UP); - Block aboveBlock = farm.getBlock(upLoc); - ArrayList drops = null; - - if(aboveBlock == getPlantedBlock()) { - drops = block.getDrops(farm.getWorld(), upLoc.x, upLoc.y, upLoc.z, meta, farm.getMaxLootingValue()); - farm.damageMaxLootingItem(); - farm.actionPerformed(); - farm.getWorld().setBlockToAir(upLoc.x, upLoc.y, upLoc.z); - - } - IHarvestResult res = super.harvestBlock(farm, bc, block, meta); - if(drops != null) { - if(res == null) { - res = new HarvestResult(); - } - res.getHarvestedBlocks().add(upLoc); - List addToDrops = res.getDrops(); - for(ItemStack stack : drops) { - addToDrops.add(new EntityItem(farm.getWorld(), upLoc.x + 0.5, upLoc.y + 1, upLoc.z + 0.5, stack.copy())); + + IHarvestResult res = new HarvestResult(); + + BlockCoord checkBlock = bc; + for(int i=0; i < 5; i++) { + meta = farm.getBlockMeta(checkBlock); + IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); + + if(blockRes != null) { + res.getHarvestedBlocks().add(checkBlock); + List addToDrops = blockRes.getDrops(); + for(EntityItem stack : addToDrops) { + res.getDrops().add(stack); + } } + checkBlock = checkBlock.getLocation(ForgeDirection.UP); } + + if(res.getHarvestedBlocks().isEmpty()) { + return null; + } + return res; } @Override public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - BlockCoord upLoc = bc.getLocation(ForgeDirection.UP); - Block aboveBlock = farm.getBlock(upLoc); - if(aboveBlock == getPlantedBlock()) { - return true; - } - return super.canHarvest(farm, bc, block, meta); + BlockCoord checkBlock = bc; + + for(int i=0; i < 5; i++) { + meta = farm.getBlockMeta(checkBlock); + if(super.canHarvest(farm, checkBlock, block, meta)) { + return true; + } + checkBlock = checkBlock.getLocation(ForgeDirection.UP); + } + return false; } } \ No newline at end of file