diff --git a/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeItemRenderer.java b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeItemRenderer.java
new file mode 100644
index 00000000..cb25ee3f
--- /dev/null
+++ b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeItemRenderer.java
@@ -0,0 +1,93 @@
+package net.minecraft.src.buildcraft.transport;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.BuildCraftTransport;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.Tessellator;
+import net.minecraft.src.buildcraft.core.Utils;
+import net.minecraft.src.forge.IItemRenderer;
+
+public class PipeItemRenderer implements IItemRenderer {
+	
+	private void renderPipeItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) {
+
+		// GL11.glBindTexture(GL11.GL_TEXTURE_2D, 10);
+		Tessellator tessellator = Tessellator.instance;
+
+		Block block = BuildCraftTransport.genericPipeBlock;
+		int textureID = ((ItemPipe) Item.itemsList[item.itemID]).getTextureIndex();
+		if (textureID > 255)
+			textureID -= 256;
+
+		block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos);
+		block.setBlockBoundsForItemRender();
+		GL11.glTranslatef(translateX, translateY, translateZ);
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(0.0F, -1F, 0.0F);
+		render.renderBottomFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(0.0F, 1.0F, 0.0F);
+		render.renderTopFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(0.0F, 0.0F, -1F);
+		render.renderEastFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(0.0F, 0.0F, 1.0F);
+		render.renderWestFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(-1F, 0.0F, 0.0F);
+		render.renderNorthFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		tessellator.startDrawingQuads();
+		tessellator.setNormal(1.0F, 0.0F, 0.0F);
+		render.renderSouthFace(block, 0.0D, 0.0D, 0.0D, textureID);
+		tessellator.draw();
+		GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+		block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+	}
+
+	
+	/** IItemRenderer implementation **/
+	
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		switch (type) {
+		case ENTITY:
+			return true;
+		case EQUIPPED:
+			return true;
+		case INVENTORY:
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		return true;
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+		switch (type) {
+		case ENTITY:
+			renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
+			break;
+		case EQUIPPED:
+			renderPipeItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f);
+			break;
+		case INVENTORY:
+			renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
+			break;
+		}
+	}
+
+}
diff --git a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
index 17fab803..89ddfa2f 100644
--- a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
+++ b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
@@ -10,18 +10,15 @@
 package net.minecraft.src;
 
 import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.Utils;
-import net.minecraft.src.buildcraft.transport.ItemPipe;
+import net.minecraft.src.buildcraft.transport.PipeItemRenderer;
 import net.minecraft.src.buildcraft.transport.RenderPipe;
-import net.minecraft.src.forge.IItemRenderer;
 import net.minecraft.src.forge.MinecraftForgeClient;
 import net.minecraft.src.forge.NetworkMod;
 
-import org.lwjgl.opengl.GL11;
-
-public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer {
+public class mod_BuildCraftTransport extends NetworkMod {
 
 	public static mod_BuildCraftTransport instance;
+	public static PipeItemRenderer pipeItemRenderer = new PipeItemRenderer();
 
 	public mod_BuildCraftTransport() {
 		instance = this;
@@ -32,95 +29,35 @@ public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer
 		super.modsLoaded();
 		BuildCraftTransport.initialize();
 
-		// CoreProxy.registerGUI(this,
-		// Utils.packetIdToInt(PacketIds.DiamondPipeGUI));
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsWood.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsCobblestone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsIron.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsGold.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsDiamond.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsObsidian.shiftedIndex, pipeItemRenderer);
 
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsWood.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsCobblestone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsIron.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsGold.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsDiamond.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsObsidian.shiftedIndex, this);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsWood.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsCobblestone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsStone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsIron.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsGold.shiftedIndex, pipeItemRenderer);
 
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsWood.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsCobblestone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsStone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsIron.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsGold.shiftedIndex, this);
-
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerWood.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerStone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerGold.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeStructureCobblestone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStipes.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsVoid.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsVoid.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsSandstone.shiftedIndex, this);
-		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsSandstone.shiftedIndex, this);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerWood.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerStone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerGold.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeStructureCobblestone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStipes.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsVoid.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsVoid.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsSandstone.shiftedIndex, pipeItemRenderer);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsSandstone.shiftedIndex, pipeItemRenderer);
 	}
 
 	public static void registerTilePipe(Class<? extends TileEntity> clas, String name) {
 		ModLoader.registerTileEntity(clas, name, new RenderPipe());
 	}
 
-	/**
-	 * Needs to handle all rendering types.
-	 */
-	@Override
-	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-		switch (type) {
-		case ENTITY:
-			return true;
-		case EQUIPPED:
-			return true;
-		case INVENTORY:
-			return true;
-		}
-		return false;
-	}
-
-	private void renderPipeItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) {
-
-		// GL11.glBindTexture(GL11.GL_TEXTURE_2D, 10);
-		Tessellator tessellator = Tessellator.instance;
-
-		Block block = BuildCraftTransport.genericPipeBlock;
-		int textureID = ((ItemPipe) Item.itemsList[item.itemID]).getTextureIndex();
-		if (textureID > 255)
-			textureID -= 256;
-
-		block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos);
-		block.setBlockBoundsForItemRender();
-		GL11.glTranslatef(translateX, translateY, translateZ);
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, -1F, 0.0F);
-		render.renderBottomFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 1.0F, 0.0F);
-		render.renderTopFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 0.0F, -1F);
-		render.renderEastFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 0.0F, 1.0F);
-		render.renderWestFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(-1F, 0.0F, 0.0F);
-		render.renderNorthFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(1.0F, 0.0F, 0.0F);
-		render.renderSouthFace(block, 0.0D, 0.0D, 0.0D, textureID);
-		tessellator.draw();
-		GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-		block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-	}
-
 	@Override
 	public String getVersion() {
 		return DefaultProps.VERSION;
@@ -131,53 +68,6 @@ public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer
 		BuildCraftTransport.load();
 	}
 
-	/*
-	 * @Override public GuiScreen handleGUI(int i) { if (Utils.intToPacketId(i)
-	 * == PacketIds.DiamondPipeGUI) { TileGenericPipe tmp = new
-	 * TileGenericPipe(); tmp.pipe = new PipeItemsDiamond(
-	 * BuildCraftTransport.pipeItemsDiamond.shiftedIndex);
-	 * 
-	 * return new GuiDiamondPipe(
-	 * ModLoader.getMinecraftInstance().thePlayer.inventory, tmp); } else {
-	 * return null; } }
-	 */
-
-	/*
-	 * @Override public void handlePacket(Packet230ModLoader packet) { int x =
-	 * packet.dataInt [0]; int y = packet.dataInt [1]; int z = packet.dataInt
-	 * [2];
-	 * 
-	 * World w = ModLoader.getMinecraftInstance().theWorld;
-	 * 
-	 * if (packet.packetType == PacketIds.PipeItem.ordinal()) { if
-	 * (w.blockExists(x, y, z)) { TileEntity tile = w.getBlockTileEntity(x, y,
-	 * z);
-	 * 
-	 * if (tile instanceof TileGenericPipe) { TileGenericPipe pipe =
-	 * ((TileGenericPipe) tile);
-	 * 
-	 * if (pipe.pipe != null && pipe.pipe.transport instanceof
-	 * PipeTransportItems) { ((PipeTransportItems)
-	 * pipe.pipe.transport).handleItemPacket(packet); } } }
-	 * 
-	 * return; } else if (packet.packetType ==
-	 * PacketIds.DiamondPipeContents.ordinal()) { if (w.blockExists(x, y, z)) {
-	 * TileEntity tile = w.getBlockTileEntity(x, y, z);
-	 * 
-	 * if (tile instanceof TileGenericPipe) { TileGenericPipe pipe =
-	 * ((TileGenericPipe) tile);
-	 * 
-	 * if (pipe.pipe.logic instanceof PipeLogicDiamond) { ((PipeLogicDiamond)
-	 * pipe.pipe.logic).handleContentsPacket(packet); } } }
-	 * 
-	 * BlockIndex index = new BlockIndex(x, y, z);
-	 * 
-	 * if (BuildCraftCore.bufferedDescriptions.containsKey(index)) {
-	 * BuildCraftCore.bufferedDescriptions.remove(index); }
-	 * 
-	 * BuildCraftCore.bufferedDescriptions.put(index, packet); } }
-	 */
-
 	@Override
 	public boolean clientSideRequired() {
 		return true;
@@ -188,24 +78,6 @@ public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer
 		return true;
 	}
 
-	@Override
-	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
-		return true;
-	}
-
-	@Override
-	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-		switch (type) {
-		case ENTITY:
-			renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
-			break;
-		case EQUIPPED:
-			renderPipeItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f);
-			break;
-		case INVENTORY:
-			renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
-			break;
-		}
-	}
+	
 
 }