diff --git a/src/main/java/forestry/farming/FarmTarget.java b/src/main/java/forestry/farming/FarmTarget.java index f032340fb..2d3053395 100755 --- a/src/main/java/forestry/farming/FarmTarget.java +++ b/src/main/java/forestry/farming/FarmTarget.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.gadgets.StructureLogic; import forestry.core.vect.MutableVect; import forestry.core.vect.Vect; import forestry.core.vect.VectUtil; @@ -45,10 +44,6 @@ public class FarmTarget { return this.yOffset; } - public int getLimit() { - return limit; - } - public int getExtent() { return extent; } @@ -64,7 +59,7 @@ public class FarmTarget { } MutableVect position = new MutableVect(platformPosition); - for (extent = 0; extent < getLimit(); extent++) { + for (extent = 0; extent < limit; extent++) { Block platform = VectUtil.getBlock(world, position); Vect soilPosition = new Vect(position.x, position.y + 1, position.z); if (!StructureLogicFarm.bricks.contains(platform) || !FarmLogic.canBreakSoil(world, soilPosition)) { diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 4f6113ac8..4264ab3be 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -239,17 +239,25 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable ForgeDirection layoutDirection = getLayoutDirection(farmSide); Vect targetLocation = FarmHelper.getFarmMultiblockCorner(world, targetStart, farmSide, layoutDirection.getOpposite()); + Vect firstLocation = targetLocation.add(farmSide); + Vect firstGroundPosition = getGroundPosition(world, firstLocation); + if (firstGroundPosition == null) { + break; + } + int groundHeight = firstGroundPosition.getY(); + List farmSideTargets = new ArrayList(); for (int i = 0; i < allowedExtent; i++) { targetLocation = targetLocation.add(farmSide); + Vect groundLocation = new Vect(targetLocation.getX(), groundHeight, targetLocation.getZ()); int targetLimit = targetMaxLimit; if (!Config.squareFarms) { targetLimit = targetMaxLimit - i - 1; } - Block platform = VectUtil.getBlock(world, targetLocation); - Vect soilPosition = new Vect(targetLocation.x, targetLocation.y + 1, targetLocation.z); + Block platform = VectUtil.getBlock(world, groundLocation); + Vect soilPosition = new Vect(groundLocation.x, groundLocation.y + 1, groundLocation.z); if (!StructureLogicFarm.bricks.contains(platform) || !FarmLogic.canBreakSoil(world, soilPosition)) { break; } @@ -268,7 +276,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable for (ForgeDirection direction : targets.keySet()) { List targetsList = targets.get(direction); if (!targetsList.isEmpty()) { - Vect groundPosition = getGroundPosition(worldObj, targetsList.get(0)); + Vect groundPosition = getGroundPosition(worldObj, targetsList.get(0).getStart()); for (FarmTarget target : targetsList) { target.setExtentAndYOffset(worldObj, groundPosition); @@ -277,9 +285,9 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } } - private Vect getGroundPosition(World world, FarmTarget firstTarget) { + private static Vect getGroundPosition(World world, Vect targetPosition) { for (int yOffset = 2; yOffset > -4; yOffset--) { - Vect position = firstTarget.getStart().add(0, yOffset, 0); + Vect position = targetPosition.add(0, yOffset, 0); Block ground = VectUtil.getBlock(world, position); if (StructureLogicFarm.bricks.contains(ground)) { return position; @@ -317,7 +325,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public boolean doWork() { // System.out.println("Starting doWork()"); - if (targets == null) { + if (targets == null || checkTimer.delayPassed(worldObj, 400)) { Vect targetStart = new Vect(xCoord, yCoord, zCoord); int sizeNorthSouth = FarmHelper.getFarmSizeNorthSouth(worldObj, targetStart); @@ -328,8 +336,6 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable targets = createTargets(worldObj, targetStart, allowedExtent, sizeNorthSouth, sizeEastWest); setExtents(); - } else if (checkTimer.delayPassed(worldObj, 400)) { - setExtents(); } // System.out.println("Targets set");