fixes, optimizations, API changes for greater compatibility with pre-6.3.x mods

api/buildcraft/api/core/render/ITextureStateManager.java

@@ -0,0 +1,7 @@
+package buildcraft.api.core.render;
+
+import net.minecraft.util.IIcon;
+
+public interface ITextureStateManager {
+	void set(IIcon icon);
+}

api/buildcraft/api/core/render/ITextureStates.java

@@ -10,11 +10,10 @@ package buildcraft.api.core.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.util.IIcon;
-import buildcraft.transport.render.TextureStateManager;
 
 public interface ITextureStates extends ICullable {
 
-	TextureStateManager getTextureState();
+	ITextureStateManager getTextureState();
 	
 	IIcon getIcon(int side, int meta);
 	

api/buildcraft/api/gates/IGate.java

@@ -10,7 +10,7 @@ package buildcraft.api.gates;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.pipes.IPipe;
+import buildcraft.api.transport.IPipe;
 
 public interface IGate {
 	@Deprecated

api/buildcraft/api/pipes/IPipePluggableContainer.java

@@ -1,8 +0,0 @@
-package buildcraft.api.pipes;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IPipePluggableContainer {
-	PipePluggable getPipePluggable(ForgeDirection direction);
-	boolean hasPipePluggable(ForgeDirection direction);
-}

api/buildcraft/api/pipes/package-info.java

@@ -1,3 +0,0 @@
-@API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|pipes")
-package buildcraft.api.pipes;
-import cpw.mods.fml.common.API;

api/buildcraft/api/transport/IPipe.java

@@ -6,7 +6,7 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.gates.IGate;

api/buildcraft/api/transport/IPipeConnection.java

@@ -6,12 +6,10 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.pipes.IPipeContainer.PipeType;
-
 public interface IPipeConnection {
 
 	enum ConnectOverride {
@@ -27,5 +25,5 @@ public interface IPipeConnection {
 	 * @return CONNECT to force a connection, DISCONNECT to force no connection,
 	 * and DEFAULT to let the pipe decide.
 	 */
-	ConnectOverride overridePipeConnection(PipeType type, ForgeDirection with);
+	ConnectOverride overridePipeConnection(IPipeContainer.PipeType type, ForgeDirection with);
 }

api/buildcraft/api/transport/IPipeContainer.java

@@ -6,17 +6,16 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.core.EnumColor;
-import buildcraft.api.transport.IInjectable;
+import buildcraft.api.transport.pluggable.IPipePluggableContainer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 
-public interface IPipeContainer extends IInjectable, IPipePluggableContainer {
+public interface IPipeContainer extends IInjectable {
 
 	public enum PipeType {
 
@@ -46,4 +45,7 @@ public interface IPipeContainer extends IInjectable, IPipePluggableContainer {
 	IPipe getNeighborPipe(ForgeDirection dir);
 	
 	IPipe getPipe();
+
+	PipePluggable getPipePluggable(ForgeDirection direction);
+	boolean hasPipePluggable(ForgeDirection direction);
 }

api/buildcraft/api/transport/IPipeTile.java

@@ -0,0 +1,5 @@
+package buildcraft.api.transport;
+
+@Deprecated
+public interface IPipeTile extends IPipeContainer {
+}

api/buildcraft/api/transport/IStripesHandler.java

@@ -6,7 +6,7 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

api/buildcraft/api/transport/IStripesPipe.java

@@ -6,7 +6,7 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;

api/buildcraft/api/transport/PipeManager.java

@@ -6,7 +6,7 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import net.minecraft.world.World;
-import buildcraft.api.transport.IExtractionHandler;
+import buildcraft.api.transport.pluggable.PipePluggable;
 
 public abstract class PipeManager {
 

api/buildcraft/api/transport/PipeWire.java

@@ -6,7 +6,7 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport;
 
 import java.util.Locale;
 

api/buildcraft/api/transport/pluggable/IPipePluggableItem.java

@@ -1,7 +1,8 @@
-package buildcraft.api.pipes;
+package buildcraft.api.transport.pluggable;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
+import buildcraft.api.transport.IPipe;
 
 public interface IPipePluggableItem {
 	PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack);

api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java

@@ -1,8 +1,9 @@
-package buildcraft.api.pipes;
+package buildcraft.api.transport.pluggable;
 
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.core.render.ITextureStates;
+import buildcraft.api.transport.IPipe;
 
 public interface IPipePluggableRenderer {
 	void renderPluggable(RenderBlocks renderblocks, IPipe pipe, ForgeDirection side,

api/buildcraft/api/transport/pluggable/PipePluggable.java

@@ -6,10 +6,9 @@
  * Please check the contents of the license, which should be located
  * as "LICENSE.API" in the BuildCraft source code distribution.
  */
-package buildcraft.api.pipes;
+package buildcraft.api.transport.pluggable;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 
 import cpw.mods.fml.relauncher.Side;
@@ -17,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.core.INBTStoreable;
 import buildcraft.api.core.ISerializable;
+import buildcraft.api.transport.IPipeContainer;
 
 /**
  * An IPipePluggable MUST have an empty constructor for client-side

common/buildcraft/BuildCraftTransport.java

@@ -43,8 +43,8 @@ import buildcraft.api.statements.IActionInternal;
 import buildcraft.api.statements.ITriggerInternal;
 import buildcraft.api.statements.StatementManager;
 import buildcraft.api.transport.IExtractionHandler;
-import buildcraft.api.pipes.PipeManager;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeManager;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;

common/buildcraft/core/TileBuffer.java

@@ -15,6 +15,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.core.SafeTimeTracker;
+import buildcraft.core.utils.BlockUtils;
 
 public final class TileBuffer {
 
@@ -47,7 +48,7 @@ public final class TileBuffer {
 		block = world.getBlock(x, y, z);
 
 		if (block != null && block.hasTileEntity(world.getBlockMetadata(x, y, z))) {
-			tile = world.getTileEntity(x, y, z);
+			tile = BlockUtils.getTileEntity(world, x, y, z);
 		}
 	}
 

common/buildcraft/core/robots/AIRobotRecharge.java

@@ -10,7 +10,7 @@ package buildcraft.core.robots;
 
 import buildcraft.api.robots.AIRobot;
 import buildcraft.api.robots.EntityRobotBase;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.transport.PipeTransportPower;
 
 public class AIRobotRecharge extends AIRobot {

common/buildcraft/core/statements/DefaultActionProvider.java

@@ -20,7 +20,7 @@ import buildcraft.api.statements.IActionInternal;
 import buildcraft.api.statements.IActionProvider;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.tiles.IControllable;
-import buildcraft.api.pipes.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer;
 
 public class DefaultActionProvider implements IActionProvider {
 

common/buildcraft/core/utils/BlockUtils.java

@@ -19,10 +19,12 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.server.S27PacketExplosion;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 
@@ -221,4 +223,12 @@ public final class BlockUtils {
 	public static int computeBlockBreakEnergy(World world, int x, int y, int z) {
 		return (int) Math.floor(BuilderAPI.BREAK_ENERGY * BuildCraftFactory.miningMultiplier * ((world.getBlock(x, y, z).getBlockHardness(world, x, y, z) + 1) * 2));
 	}
+
+	public static TileEntity getTileEntity(World world, int x, int y, int z) {
+		if (world.blockExists(x, y, z)) {
+			return world.getChunkFromBlockCoords(x, z).getTileEntityUnsafe(x & 15, y, z & 15);
+		} else {
+			return null;
+		}
+	}
 }

common/buildcraft/core/utils/Utils.java

@@ -40,8 +40,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.core.IAreaProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.EntityBlock;
 import buildcraft.core.IDropControlInventory;
@@ -85,7 +85,7 @@ public final class Utils {
 			Position pos = new Position(x, y, z, orientation);
 			pos.moveForwards(1.0);
 
-			TileEntity tileInventory = world.getTileEntity((int) pos.x, (int) pos.y, (int) pos.z);
+			TileEntity tileInventory = BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z);
 			ITransactor transactor = Transactor.getTransactorFor(tileInventory);
 			if (transactor != null && !(tileInventory instanceof TileEngine) && transactor.add(stack, orientation.getOpposite(), false).stackSize > 0) {
 				return transactor.add(stack, orientation.getOpposite(), true).stackSize;
@@ -161,7 +161,7 @@ public final class Utils {
 
 			pos.moveForwards(1.0);
 
-			TileEntity tile = world.getTileEntity((int) pos.x, (int) pos.y, (int) pos.z);
+			TileEntity tile = BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z);
 
 			if (tile instanceof IPipeContainer) {
 				IPipeContainer pipe = (IPipeContainer) tile;
@@ -192,37 +192,42 @@ public final class Utils {
 		tmp.orientation = step;
 		tmp.moveForwards(1.0);
 
-		return world.getTileEntity((int) tmp.x, (int) tmp.y, (int) tmp.z);
+		return BlockUtils.getTileEntity(world, (int) tmp.x, (int) tmp.y, (int) tmp.z);
 	}
 
 	public static IAreaProvider getNearbyAreaProvider(World world, int i, int j, int k) {
-		TileEntity a1 = world.getTileEntity(i + 1, j, k);
-		TileEntity a2 = world.getTileEntity(i - 1, j, k);
-		TileEntity a3 = world.getTileEntity(i, j, k + 1);
-		TileEntity a4 = world.getTileEntity(i, j, k - 1);
-		TileEntity a5 = world.getTileEntity(i, j + 1, k);
-		TileEntity a6 = world.getTileEntity(i, j - 1, k);
+		TileEntity a1 = BlockUtils.getTileEntity(world, i + 1, j, k);
 
 		if (a1 instanceof IAreaProvider) {
 			return (IAreaProvider) a1;
 		}
 
+		TileEntity a2 = BlockUtils.getTileEntity(world, i - 1, j, k);
+
 		if (a2 instanceof IAreaProvider) {
 			return (IAreaProvider) a2;
 		}
 
+		TileEntity a3 = BlockUtils.getTileEntity(world, i, j, k + 1);
+
 		if (a3 instanceof IAreaProvider) {
 			return (IAreaProvider) a3;
 		}
 
+		TileEntity a4 = BlockUtils.getTileEntity(world, i, j, k - 1);
+
 		if (a4 instanceof IAreaProvider) {
 			return (IAreaProvider) a4;
 		}
 
+		TileEntity a5 = BlockUtils.getTileEntity(world, i, j + 1, k);
+
 		if (a5 instanceof IAreaProvider) {
 			return (IAreaProvider) a5;
 		}
 
+		TileEntity a6 = BlockUtils.getTileEntity(world, i, j - 1, k);
+
 		if (a6 instanceof IAreaProvider) {
 			return (IAreaProvider) a6;
 		}

common/buildcraft/energy/TileEnergyReceiver.java

@@ -16,8 +16,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyHandler;
 
-import buildcraft.api.pipes.IPipeConnection;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.TileBuffer;
 import buildcraft.core.TileBuildCraft;
 

common/buildcraft/energy/TileEngine.java

@@ -22,9 +22,9 @@ import buildcraft.BuildCraftEnergy;
 import buildcraft.api.power.IEngine;
 import buildcraft.api.tiles.IHeatable;
 import buildcraft.api.tools.IToolWrench;
-import buildcraft.api.pipes.IPipeConnection;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.core.utils.MathUtils;

common/buildcraft/energy/TileEngineWood.java

@@ -11,10 +11,9 @@ package buildcraft.energy;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.api.power.IRedstoneEngineReceiver;
-import buildcraft.factory.TilePump;
 
 public class TileEngineWood extends TileEngine {
 

common/buildcraft/factory/TileMiningWell.java

@@ -14,8 +14,8 @@ import buildcraft.BuildCraftFactory;
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.tiles.IControllable;
 import buildcraft.api.tiles.IHasWork;
-import buildcraft.api.pipes.IPipeConnection;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.RFBattery;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.core.utils.BlockUtils;

common/buildcraft/factory/TileQuarry.java

@@ -37,8 +37,8 @@ import buildcraft.api.core.SafeTimeTracker;
 import buildcraft.api.filler.FillerManager;
 import buildcraft.api.tiles.IControllable;
 import buildcraft.api.tiles.IHasWork;
-import buildcraft.api.pipes.IPipeConnection;
-import buildcraft.api.pipes.IPipeContainer;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeContainer;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.CoreConstants;

common/buildcraft/transport/BlockGenericPipe.java

@@ -52,11 +52,11 @@ import buildcraft.api.events.PipePlacedEvent;
 import buildcraft.api.events.RobotPlacementEvent;
 import buildcraft.api.gates.GateExpansions;
 import buildcraft.api.gates.IGateExpansion;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.api.robots.EntityRobotBase;
 import buildcraft.api.tools.IToolWrench;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.BlockBuildCraft;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.CreativeTabBuildCraft;
@@ -68,9 +68,7 @@ import buildcraft.core.robots.EntityRobot;
 import buildcraft.core.utils.MatrixTranformations;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.gates.GateDefinition;
-import buildcraft.transport.gates.GateFactory;
 import buildcraft.transport.gates.GatePluggable;
-import buildcraft.transport.gates.ItemGate;
 import buildcraft.transport.render.PipeRendererWorld;
 
 public class BlockGenericPipe extends BlockBuildCraft {

common/buildcraft/transport/FacadePluggable.java

@@ -7,9 +7,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.utils.MatrixTranformations;
 
 public class FacadePluggable extends PipePluggable {

common/buildcraft/transport/Gate.java

@@ -35,12 +35,11 @@ import buildcraft.api.statements.ITriggerExternal;
 import buildcraft.api.statements.ITriggerInternal;
 import buildcraft.api.statements.StatementManager;
 import buildcraft.api.statements.StatementParameterItemStack;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.GuiIds;
 import buildcraft.transport.gates.GateDefinition.GateLogic;
 import buildcraft.transport.gates.GateDefinition.GateMaterial;
-import buildcraft.transport.gates.GatePluggable;
 import buildcraft.transport.gates.ItemGate;
 import buildcraft.transport.gates.StatementSlot;
 import buildcraft.transport.gui.ContainerGateInterface;

common/buildcraft/transport/ItemFacade.java

@@ -25,7 +25,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -33,15 +32,13 @@ import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.JavaTools;
-import buildcraft.api.core.Position;
 import buildcraft.api.facades.FacadeType;
 import buildcraft.api.facades.IFacadeItem;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.api.recipes.BuildcraftRecipeRegistry;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.BlockSpring;
 import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;

common/buildcraft/transport/ItemGateCopier.java

@@ -11,7 +11,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.core.utils.NBTUtils;
 import buildcraft.transport.BlockGenericPipe.Part;

common/buildcraft/transport/ItemLens.java

@@ -19,9 +19,9 @@ import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.core.utils.ColorUtils;
 import buildcraft.core.utils.StringUtils;

common/buildcraft/transport/ItemPipeWire.java

@@ -20,7 +20,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.ItemBuildCraft;
 
 public class ItemPipeWire extends ItemBuildCraft {

common/buildcraft/transport/ItemPlug.java

@@ -11,7 +11,6 @@ package buildcraft.transport;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
@@ -19,11 +18,9 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.BuildCraftTransport;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.ItemBuildCraft;
 
 public class ItemPlug extends ItemBuildCraft implements IPipePluggableItem {

common/buildcraft/transport/ItemRobotStation.java

@@ -11,7 +11,6 @@ package buildcraft.transport;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
@@ -19,15 +18,11 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.BuildCraftTransport;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;
-import buildcraft.core.robots.DockingStation;
-import buildcraft.core.robots.RobotRegistry;
 
 public class ItemRobotStation extends ItemBuildCraft implements IPipePluggableItem {
 

common/buildcraft/transport/LensPluggable.java

@@ -11,10 +11,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.EnumColor;
 import buildcraft.api.core.render.ITextureStates;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.utils.ColorUtils;
 import buildcraft.core.utils.MatrixTranformations;
 import buildcraft.transport.pipes.events.PipeEventItem;

common/buildcraft/transport/Pipe.java

@@ -8,13 +8,10 @@
  */
 package buildcraft.transport;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Random;
 
 import net.minecraft.entity.Entity;
@@ -33,15 +30,14 @@ import buildcraft.api.core.IIconProvider;
 import buildcraft.api.gates.IGate;
 import buildcraft.api.statements.ActionState;
 import buildcraft.api.statements.IActionInternal;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.inventory.InvUtils;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.gates.GateFactory;
 import buildcraft.transport.gates.StatementSlot;
-import buildcraft.transport.pipes.events.PipeEvent;
 import buildcraft.transport.statements.ActionValve.ValveState;
 
 public abstract class Pipe<T extends PipeTransport> implements IDropControlInventory, IPipe {

common/buildcraft/transport/PipePluggableState.java

@@ -3,9 +3,8 @@ package buildcraft.transport;
 import io.netty.buffer.ByteBuf;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.core.ISerializable;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.PipeManager;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.PipeManager;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.transport.utils.ConnectionMatrix;
 
 public class PipePluggableState implements ISerializable {

common/buildcraft/transport/PipeTransport.java

@@ -17,7 +17,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.utils.BitSetUtils;
 
 public abstract class PipeTransport {

common/buildcraft/transport/PipeTransportFluids.java

@@ -25,7 +25,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.SafeTimeTracker;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.MathUtils;
 import buildcraft.transport.network.PacketFluidUpdate;

common/buildcraft/transport/PipeTransportItems.java

@@ -28,7 +28,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.Position;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.inventory.Transactor;
 import buildcraft.core.utils.BlockUtils;

common/buildcraft/transport/PipeTransportPower.java

@@ -22,7 +22,7 @@ import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.SafeTimeTracker;
 import buildcraft.api.power.IEngine;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.transport.network.PacketPowerUpdate;

common/buildcraft/transport/PipeTransportStructure.java

@@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.pipes.IPipeContainer.PipeType;
+import buildcraft.api.transport.IPipeContainer.PipeType;
 
 public class PipeTransportStructure extends PipeTransport {
 

common/buildcraft/transport/PlugPluggable.java

@@ -10,10 +10,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.render.ITextureStates;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.utils.MatrixTranformations;
 
 public class PlugPluggable extends PipePluggable {

common/buildcraft/transport/RobotStationPluggable.java

@@ -10,11 +10,11 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.render.ITextureStates;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.robots.DockingStation;
 import buildcraft.core.robots.RobotRegistry;
 import buildcraft.core.utils.MatrixTranformations;

common/buildcraft/transport/TileGenericPipe.java

@@ -37,12 +37,12 @@ import buildcraft.api.core.EnumColor;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
 import buildcraft.api.gates.IGateExpansion;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipeConnection;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.PipeManager;
-import buildcraft.api.pipes.PipePluggable;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.PipeManager;
+import buildcraft.api.transport.pluggable.PipePluggable;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.ITileBufferHolder;

common/buildcraft/transport/gates/GatePluggable.java

@@ -1,6 +1,5 @@
 package buildcraft.transport.gates;
 
-import java.util.HashSet;
 import java.util.Set;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.item.ItemStack;
@@ -11,11 +10,10 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.gates.GateExpansions;
-import buildcraft.api.gates.IGate;
 import buildcraft.api.gates.IGateExpansion;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.utils.MatrixTranformations;
 import buildcraft.transport.Gate;

common/buildcraft/transport/gates/ItemGate.java

@@ -13,7 +13,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -31,18 +30,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.GateExpansions;
 import buildcraft.api.gates.IGateExpansion;
-import buildcraft.api.pipes.IPipe;
-import buildcraft.api.pipes.IPipePluggableItem;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.pluggable.IPipePluggableItem;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.api.statements.StatementManager;
-import buildcraft.api.pipes.IPipeContainer;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.core.inventory.InvUtils;
 import buildcraft.core.utils.StringUtils;
 import buildcraft.transport.Gate;
 import buildcraft.transport.Pipe;
-import buildcraft.transport.TileGenericPipe;
 import buildcraft.transport.gates.GateDefinition.GateLogic;
 import buildcraft.transport.gates.GateDefinition.GateMaterial;
 

common/buildcraft/transport/pipes/PipeFluidsWood.java

@@ -25,8 +25,8 @@ import cofh.api.energy.IEnergyHandler;
 
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.PipeManager;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.PipeManager;
 import buildcraft.core.RFBattery;
 import buildcraft.api.core.ISerializable;
 import buildcraft.transport.Pipe;

common/buildcraft/transport/pipes/PipeItemsClay.java

@@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
-import buildcraft.api.pipes.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeTransportItems;

common/buildcraft/transport/pipes/PipeItemsStripes.java

@@ -23,10 +23,10 @@ import cofh.api.energy.IEnergyHandler;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.pipes.IStripesHandler;
-import buildcraft.api.pipes.IStripesHandler.StripesHandlerType;
-import buildcraft.api.pipes.IStripesPipe;
-import buildcraft.api.pipes.PipeManager;
+import buildcraft.api.transport.IStripesHandler;
+import buildcraft.api.transport.IStripesHandler.StripesHandlerType;
+import buildcraft.api.transport.IStripesPipe;
+import buildcraft.api.transport.PipeManager;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.BlockUtils;
 import buildcraft.transport.BlockGenericPipe;

common/buildcraft/transport/pipes/PipeItemsWood.java

@@ -25,8 +25,8 @@ import cofh.api.energy.IEnergyHandler;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.pipes.IPipeContainer;
-import buildcraft.api.pipes.PipeManager;
+import buildcraft.api.transport.IPipeContainer;
+import buildcraft.api.transport.PipeManager;
 import buildcraft.core.RFBattery;
 import buildcraft.core.inventory.InvUtils;
 import buildcraft.core.inventory.InventoryWrapper;

common/buildcraft/transport/pipes/PipePowerWood.java

@@ -17,7 +17,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cofh.api.energy.IEnergyHandler;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
-import buildcraft.api.pipes.IPipeContainer;
+import buildcraft.api.transport.IPipeContainer;
 import buildcraft.core.RFBattery;
 import buildcraft.transport.IPipeTransportPowerHook;
 import buildcraft.transport.Pipe;

common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java

@@ -15,7 +15,7 @@ import buildcraft.api.core.JavaTools;
 import buildcraft.api.facades.FacadeType;
 import buildcraft.api.facades.IFacadeItem;
 import buildcraft.api.recipes.CraftingResult;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.silicon.ItemRedstoneChipset;
 import buildcraft.silicon.TileIntegrationTable;
 import buildcraft.transport.ItemFacade;

common/buildcraft/transport/render/PipeRendererTESR.java

@@ -37,8 +37,8 @@ import buildcraft.BuildCraftCore.RenderMode;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.EnumColor;
 import buildcraft.api.gates.IGateExpansion;
-import buildcraft.api.pipes.IPipeContainer.PipeType;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.IPipeContainer.PipeType;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.render.RenderEntityBlock;

common/buildcraft/transport/render/PipeRendererWorld.java

@@ -17,8 +17,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.render.ITextureStates;
-import buildcraft.api.pipes.IPipePluggableRenderer;
-import buildcraft.api.pipes.PipePluggable;
+import buildcraft.api.transport.pluggable.IPipePluggableRenderer;
+import buildcraft.api.transport.pluggable.PipePluggable;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.utils.ColorUtils;
 import buildcraft.transport.PipeIconProvider;

common/buildcraft/transport/statements/ActionParameterSignal.java

@@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatement;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
 import buildcraft.api.statements.StatementMouseClick;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.utils.StringUtils;
 
 public class ActionParameterSignal implements IStatementParameter {

common/buildcraft/transport/statements/ActionSignalOutput.java

@@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import buildcraft.api.statements.IActionInternal;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.statements.BCStatement;
 import buildcraft.core.utils.StringUtils;
 import buildcraft.transport.Gate;

common/buildcraft/transport/statements/ActionValve.java

@@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.statements.IActionInternal;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
-import buildcraft.api.pipes.IPipe;
+import buildcraft.api.transport.IPipe;
 import buildcraft.core.statements.BCStatement;
 import buildcraft.core.statements.StatementParameterDirection;
 import buildcraft.core.utils.StringUtils;

common/buildcraft/transport/statements/TriggerParameterSignal.java

@@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatement;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
 import buildcraft.api.statements.StatementMouseClick;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.utils.StringUtils;
 
 public class TriggerParameterSignal implements IStatementParameter {

common/buildcraft/transport/statements/TriggerPipeSignal.java

@@ -15,7 +15,7 @@ import buildcraft.api.gates.IGate;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
 import buildcraft.api.statements.ITriggerInternal;
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 import buildcraft.core.statements.BCStatement;
 import buildcraft.core.utils.StringUtils;
 import buildcraft.transport.Pipe;

common/buildcraft/transport/stripes/StripesHandlerArrow.java

@@ -6,8 +6,8 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IStripesHandler;
-import buildcraft.api.pipes.IStripesPipe;
+import buildcraft.api.transport.IStripesHandler;
+import buildcraft.api.transport.IStripesPipe;
 
 public class StripesHandlerArrow implements IStripesHandler {
 

common/buildcraft/transport/stripes/StripesHandlerBucket.java

@@ -12,8 +12,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidBlock;
-import buildcraft.api.pipes.IStripesHandler;
-import buildcraft.api.pipes.IStripesPipe;
+import buildcraft.api.transport.IStripesHandler;
+import buildcraft.api.transport.IStripesPipe;
 
 public class StripesHandlerBucket implements IStripesHandler {
 	private static final ItemStack emptyBucket = new ItemStack(Items.bucket, 1);

common/buildcraft/transport/stripes/StripesHandlerRightClick.java

@@ -6,8 +6,8 @@ import net.minecraft.item.ItemPotion;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IStripesHandler;
-import buildcraft.api.pipes.IStripesPipe;
+import buildcraft.api.transport.IStripesHandler;
+import buildcraft.api.transport.IStripesPipe;
 
 public class StripesHandlerRightClick implements IStripesHandler {
 

common/buildcraft/transport/stripes/StripesHandlerShears.java

@@ -7,8 +7,8 @@ import net.minecraft.item.ItemShears;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.api.pipes.IStripesHandler;
-import buildcraft.api.pipes.IStripesPipe;
+import buildcraft.api.transport.IStripesHandler;
+import buildcraft.api.transport.IStripesPipe;
 
 public class StripesHandlerShears implements IStripesHandler {
 

common/buildcraft/transport/utils/WireMatrix.java

@@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.pipes.PipeWire;
+import buildcraft.api.transport.PipeWire;
 
 public class WireMatrix {