Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x

common/buildcraft/core/robots/boards/BoardRobotPlanter.java

@@ -12,24 +12,25 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockDirt;
+import net.minecraft.init.Blocks;
-import net.minecraft.block.BlockGrass;
+import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemSeeds;
+import net.minecraft.item.ItemReed;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
+import net.minecraftforge.common.IPlantable;
+import net.minecraftforge.common.util.ForgeDirection;
+
 import buildcraft.api.boards.RedstoneBoardRobot;
 import buildcraft.api.boards.RedstoneBoardRobotNBT;
 import buildcraft.api.core.BlockIndex;
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.robots.AIRobot;
 import buildcraft.api.robots.EntityRobotBase;
 import buildcraft.core.inventory.filters.ArrayStackFilter;
 import buildcraft.core.inventory.filters.ArrayStackOrListFilter;
 import buildcraft.core.inventory.filters.CompositeFilter;
 import buildcraft.core.inventory.filters.IStackFilter;
-import buildcraft.core.inventory.filters.OreStackFilter;
 import buildcraft.core.robots.AIRobotFetchAndEquipItemStack;
 import buildcraft.core.robots.AIRobotGotoBlock;
 import buildcraft.core.robots.AIRobotGotoRandomGroundBlock;
@@ -42,7 +43,7 @@ import buildcraft.silicon.statements.ActionRobotFilter;
 
 public class BoardRobotPlanter extends RedstoneBoardRobot {
 
-	private IStackFilter stackFilter = new CompositeFilter(new OreStackFilter("treeSapling"), new SeedFilter());
+	private IStackFilter stackFilter = new CompositeFilter(new PlantableFilter(), new ReedFilter());
 	private BlockIndex blockFound;
 
 	public BoardRobotPlanter(EntityRobotBase iRobot) {
@@ -81,25 +82,40 @@ public class BoardRobotPlanter extends RedstoneBoardRobot {
 				startDelegateAI(new AIRobotFetchAndEquipItemStack(robot, stackFilter));
 			}
 		} else {
-			if (robot.getHeldItem().getItem() instanceof ItemSeeds) {
+			final ItemStack itemStack = robot.getHeldItem();
-				startDelegateAI(new AIRobotSearchBlock(robot, new IBlockFilter() {
+			IBlockFilter blockFilter;
+			if (itemStack.getItem() instanceof ItemReed) {
+				blockFilter = new IBlockFilter() {
 					@Override
 					public boolean matches(World world, int x, int y, int z) {
-						return BuildCraftAPI.isFarmlandProperty.get(world, x, y, z)
+						return world.getBlock(x, y, z).canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) Blocks.reeds)
+								&& world.getBlock(x, y, z) != Blocks.reeds
 								&& !robot.getRegistry().isTaken(new ResourceIdBlock(x, y, z))
 								&& isAirAbove(world, x, y, z);
 					}
-				}));
+				};
-			} else {
+			} else if (itemStack.getItem() instanceof ItemBlock) {
-				startDelegateAI(new AIRobotGotoRandomGroundBlock(robot, 100, new IBlockFilter() {
+				final Block plantBlock = ((ItemBlock) itemStack.getItem()).field_150939_a;
+				blockFilter = new IBlockFilter() {
 					@Override
 					public boolean matches(World world, int x, int y, int z) {
-						Block b = robot.worldObj.getBlock(x, y, z);
+						return world.getBlock(x, y, z).canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) plantBlock)
-
+								&& world.getBlock(x, y, z) != plantBlock
-						return b instanceof BlockDirt || b instanceof BlockGrass;
+								&& !robot.getRegistry().isTaken(new ResourceIdBlock(x, y, z))
+								&& isAirAbove(world, x, y, z);
 					}
-				}, robot.getZoneToWork()));
+				};
+			} else {
+				blockFilter = new IBlockFilter() {
+					@Override
+					public boolean matches(World world, int x, int y, int z) {
+						return world.getBlock(x, y, z).canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) itemStack.getItem())
+								&& !robot.getRegistry().isTaken(new ResourceIdBlock(x, y, z))
+								&& isAirAbove(world, x, y, z);
 					}
+				};
+			}
+			startDelegateAI(new AIRobotSearchBlock(robot, blockFilter));
 		}
 	}
 
@@ -124,6 +140,7 @@ public class BoardRobotPlanter extends RedstoneBoardRobot {
 				}
 
 				blockFound = gotoBlock.blockFound;
+				gotoBlock.path.removeLast();
 				startDelegateAI(new AIRobotGotoBlock(robot, gotoBlock.path));
 			} else {
 				startDelegateAI(new AIRobotGotoSleep(robot));
@@ -137,10 +154,23 @@ public class BoardRobotPlanter extends RedstoneBoardRobot {
 		}
 	}
 
-	private static class SeedFilter implements IStackFilter {
+	private static class PlantableFilter implements IStackFilter {
 		@Override
 		public boolean matches(ItemStack stack) {
-			return stack.getItem() instanceof ItemSeeds;
+			if (stack.getItem() instanceof IPlantable) {
+				return true;
+			}
+			if (stack.getItem() instanceof ItemBlock && ((ItemBlock) stack.getItem()).field_150939_a instanceof IPlantable) {
+				return true;
+			}
+			return false;
+		}
+	}
+
+	private static class ReedFilter implements IStackFilter {
+		@Override
+		public boolean matches(ItemStack stack) {
+			return stack.getItem() instanceof ItemReed;
 		}
 	}
 

common/buildcraft/core/utils/PathFinding.java

@@ -101,11 +101,13 @@ public class PathFinding {
 
 	private boolean searchForTarget(int range) {
 		for (int dx = -range; dx <= range; dx++) {
-			for (int dy = -range; dy <= range; dy++) {
 			for (int dz = -range; dz <= range; dz++) {
 				int x = start.x + dx;
-					int y = Math.max(0, start.y + dy);
 				int z = start.z + dz;
+				if (world.getChunkProvider().chunkExists (x >> 4, z >> 4)) {
+					int height = world.getChunkFromChunkCoords(x >> 4, z >> 4).getHeightValue(x & 0xF, z & 0xF);
+					for (int dy = -range; dy <= height; dy++) {
+						int y = Math.max(0, start.y + dy);
 						if (zone != null && !zone.contains(x, y, z)) {
 							continue;
 						}
@@ -115,6 +117,7 @@ public class PathFinding {
 					}
 				}
 			}
+		}
 		return true;
 	}
 

common/buildcraft/transport/gates/ActionIterator.java

@@ -77,9 +77,7 @@ public class ActionIterator implements Iterable<StatementSlot> {
 			}
 
 			if (isValid()) {
-				next = new StatementSlot();
+				next = pipe.gates[curDir.ordinal()].activeActions.get(index);
-				next.statement = pipe.gates[curDir.ordinal()].actions[index];
-				next.parameters = pipe.gates[curDir.ordinal()].actionParameters[index];
 			} else {
 				next = null;
 			}