From 0103ad309de7db65be8bc93fe5e99d0afc218e51 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 2 May 2014 20:07:25 +0800 Subject: [PATCH] Added proper support for auto-planting four different types of crops. --- .../enderio/farm/TileFarmStation.java | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/crazypants/enderio/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/farm/TileFarmStation.java index 976ec926..3769e4ed 100644 --- a/src/main/java/crazypants/enderio/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/TileFarmStation.java @@ -39,7 +39,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit private crazypants.util.BlockCoord lastScanned; private FakePlayer farmerJoe; - private int farmSize = 1; + private int farmSize = 3; private int minToolSlot = 0; private int maxToolSlot = 1; @@ -62,7 +62,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit } private ItemStack getTool(Class class1) { - for(int i=minToolSlot;i<=maxToolSlot;i++) { + for (int i = minToolSlot; i <= maxToolSlot; i++) { if(Util.isType(inventory[i], class1)) { return inventory[i]; } @@ -83,7 +83,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit public int getMaxLootingValue() { int result = 0; - for(int i=minToolSlot;i<=maxToolSlot;i++) { + for (int i = minToolSlot; i <= maxToolSlot; i++) { if(inventory[i] != null) { int level = EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, inventory[i]); if(level > result) { @@ -97,7 +97,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit public void damageMaxLootingItem() { int maxLooting = 0; ItemStack toDamage = null; - for(int i=minToolSlot;i<=maxToolSlot;i++) { + for (int i = minToolSlot; i <= maxToolSlot; i++) { if(inventory[i] != null) { int level = EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, inventory[i]); if(level > maxLooting) { @@ -165,11 +165,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit } public boolean hasSeed(ItemStack seeds, BlockCoord bc) { - for(int i=minSupSlot;i zCoord) { + return minSupSlot; + } else if(forBlock.x > xCoord && forBlock.z > zCoord - 1) { + return minSupSlot + 1; + } else if(forBlock.x < xCoord && forBlock.z <= zCoord) { + return minSupSlot + 2; + } + return minSupSlot + 3; + } + private void doHoover() { if(isFull()) { return; @@ -386,5 +396,4 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit } } - }