Update for BuildCraft 6.3

build.gradle

@@ -79,7 +79,7 @@ configurations {
 
 dependencies {
 	api 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api'
-	api 'com.mod-buildcraft:buildcraft:6.2.1:dev'
+	api 'com.mod-buildcraft:buildcraft:6.3.1:dev'
 }
 
 processResources {

src/main/java/forestry/core/inventory/InvTools.java

@@ -13,7 +13,6 @@ package forestry.core.inventory;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +54,6 @@ import forestry.core.utils.StackUtils;
 import forestry.plugins.PluginManager;
 
 import buildcraft.api.transport.IPipeTile;
-import buildcraft.api.transport.PipeManager;
 
 public abstract class InvTools {
 
@@ -155,11 +153,6 @@ public abstract class InvTools {
 		if (tile == null || !(tile instanceof IInventory))
 			return null;
 
-		if (PluginManager.Module.BUILDCRAFT_TRANSPORT.isEnabled()) {
-			if(!internal_canExtractFromBuildCraftPipe(tile))
-				return null;
-		}
-
 		if (tile instanceof TileEntityChest) {
 			TileEntityChest chest = (TileEntityChest) tile;
 			return new ChestWrapper(chest);
@@ -167,11 +160,6 @@ public abstract class InvTools {
 		return getInventory((IInventory) tile, side);
 	}
 
-	@Optional.Method(modid = "BuildCraftAPI|transport")
-	private static boolean internal_canExtractFromBuildCraftPipe(TileEntity tile) {
-		return PipeManager.canExtractItems(null, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord);
-	}
-
 	public static IInventory getInventory(IInventory inv, ForgeDirection side) {
 		if (inv == null)
 			return null;
@@ -797,9 +785,9 @@ public abstract class InvTools {
 
 		int choice = tileCache.getSource().getWorldObj().rand.nextInt(pipes.size());
 		Map.Entry<ForgeDirection, IPipeTile> pipe = pipes.get(choice);
-		if (pipe.getValue().injectItem(stackToMove, false, pipe.getKey().getOpposite()) > 0)
+		if (pipe.getValue().injectItem(stackToMove, false, pipe.getKey().getOpposite(), null) > 0)
 			if (removeOneItem(source, stackToMove) != null) {
-				pipe.getValue().injectItem(stackToMove, true, pipe.getKey().getOpposite());
+				pipe.getValue().injectItem(stackToMove, true, pipe.getKey().getOpposite(), null);
 				return true;
 			}
 		return false;

src/main/java/forestry/plugins/PluginBuildCraftFuels.java

@@ -26,7 +26,7 @@ public class PluginBuildCraftFuels extends ForestryPlugin {
 
 	@Override
 	public boolean isAvailable() {
-		return Proxies.common.isAPILoaded("buildcraft.api.fuels", "[2.0, 2.1)");
+		return Proxies.common.isAPILoaded("buildcraft.api.fuels", "[2.0, 3.0)");
 	}
 
 	@Override

src/main/java/forestry/plugins/PluginBuildCraftRecipes.java

@@ -21,7 +21,7 @@ public class PluginBuildCraftRecipes extends ForestryPlugin {
 
 	@Override
 	public boolean isAvailable() {
-		return Proxies.common.isAPILoaded("buildcraft.api.recipes", "[2.0, 2.1)");
+		return Proxies.common.isAPILoaded("buildcraft.api.recipes", "[2.0, 3.0)");
 	}
 
 	@Override

src/main/java/forestry/plugins/PluginBuildCraftStatements.java

@@ -28,7 +28,7 @@ public class PluginBuildCraftStatements extends ForestryPlugin implements ITrigg
 
 	@Override
 	public boolean isAvailable() {
-		return Proxies.common.isAPILoaded("buildcraft.api.statements", "[1.0, 1.1)");
+		return Proxies.common.isAPILoaded("buildcraft.api.statements", "[1.0, 2.0)");
 	}
 
 	@Override

src/main/java/forestry/plugins/PluginBuildCraftTransport.java

@@ -22,7 +22,7 @@ public class PluginBuildCraftTransport extends ForestryPlugin {
 
 	@Override
 	public boolean isAvailable() {
-		return Proxies.common.isModLoaded("BuildCraft|Transport");
+		return Proxies.common.isAPILoaded("buildcraft.api.transport", "[2.0, 4.0)");
 	}
 
 	@Override