Clean up of unneeded files

resources/mods/basiccomponents/languages/de_DE.properties

@@ -1,36 +0,0 @@
-# Basic Components Language Properties
-# @author Calclavia
-# @translator TheVanoq
- 
-# Blocks
-tile.bcOre.0.name=Kupfererz
-tile.bcOre.1.name=Zinnerz
-tile.oilMoving.name=Öl
-tile.oilStill.name=Öl
-tile.copperWire.name=Kupferkabel
-tile.bcMachine.0.name=Kohle Generator
-tile.bcMachine.1.name=Batteriekasten
-tile.bcMachine.2.name=Elektro-Ofen
- 
-# Items
-item.battery.name=Batterie
-item.circuit.name=Schaltkreis
-item.circuit.0.name=Einfacher Schaltkreis
-item.circuit.1.name=Erweiterter Schaltkreis
-item.circuit.2.name=Elite Schaltkreis
-item.bucketOil.name=Eimer mit Öl
-item.wrench.name=Schraubenschlüssel
-item.motor.name=Motor
- 
-item.plateCopper.name=Kupferplatte
-item.plateTin.name=Zinnplatte
-item.plateBronze.name=Bronzeplatte
-item.plateSteel.name=Stahlplatte
- 
-item.ingotCopper.name=Kupferbarren
-item.ingotTin.name=Zinnbarren
-item.ingotBronze.name=Bronzebarren
-item.ingotSteel.name=Stahlbarren
- 
-item.dustBronze.name=Bronzestaub
-item.dustSteel.name=Stahlstaub

resources/mods/basiccomponents/languages/en_US.properties

@@ -1,36 +0,0 @@
-# Basic Components Language Properties
-# @author Calclavia
-
-itemGroup.BasicComponents=Basic Components
-
-# Blocks
-tile.bcOre.0.name=Copper Ore
-tile.bcOre.1.name=Tin Ore
-tile.copperWire.name=Copper Wire
-tile.bcMachine.0.name=Coal Generator
-tile.bcMachine.1.name=Battery Box
-tile.bcMachine.2.name=Electric Furnace
-
-# Items
-item.battery.name=Battery
-item.infiniteBattery.name=Infinite Battery
-item.circuitBasic.name=Basic Circuit
-item.circuitAdvanced.name=Advanced Circuit
-item.circuitElite.name=Elite Circuit
-item.wrench.name=Wrench
-item.motor.name=Motor
-
-item.plateCopper.name=Copper Plate
-item.plateTin.name=Tin Plate
-item.plateBronze.name=Bronze Plate
-item.plateSteel.name=Steel Plate
-item.plateIron.name=Iron Plate
-item.plateGold.name=Gold Plate
-
-item.ingotCopper.name=Copper Ingot
-item.ingotTin.name=Tin Ingot
-item.ingotBronze.name=Bronze Ingot
-item.ingotSteel.name=Steel Ingot
-
-item.dustBronze.name=Bronze Dust
-item.dustSteel.name=Steel Dust

resources/mods/basiccomponents/languages/es_ES.properties

@@ -1,37 +0,0 @@
-# Basic Components Language Properties
-# @author francogp
-
-children=es_AR,es_MX,es_UY,es_VE
-
-# Blocks
-tile.bcOre.0.name=Mineral de Cobre
-tile.bcOre.1.name=Mineral de Esta\u00F1o
-tile.oilMoving.name=Petr\u00F3leo
-tile.oilStill.name=Petr\u00F3leo
-tile.copperWire.name=Cable de Cobre
-tile.bcMachine.0.name=Generador a Carb\u00F3n
-tile.bcMachine.1.name=Caja de Bater\u00EDa
-tile.bcMachine.2.name=Horno El\u00E9ctrico
-
-# Items
-item.battery.name=Bater\u00EDa
-item.circuit.name=Circuito
-item.circuit.0.name=Circuito B\u00E1sico
-item.circuit.1.name=Circuito Avanzado
-item.circuit.2.name=Circuito \u00E9lite
-item.bucketOil.name=Balde de Petr\u00F3leo
-item.wrench.name=Llave Inglesa
-item.motor.name=Motor
-
-item.plateCopper.name=Placa de Cobre
-item.plateTin.name=Placa de Esta\u00F1o
-item.plateBronze.name=Placa de Bronce
-item.plateSteel.name=Placa de Acero
-
-item.ingotCopper.name=Lingote de Cobre
-item.ingotTin.name=Lingote de Esta\u00F1o
-item.ingotBronze.name=Lingote de Bronce
-item.ingotSteel.name=Lingote de Acero
-
-item.dustBronze.name=Polvo de Bronce
-item.dustSteel.name=Polvo de Acero

resources/mods/basiccomponents/languages/it_IT.properties

@@ -1,35 +0,0 @@
-# Basic Components Language Properties
-# @author Calclavia
-
-# Blocks
-tile.bcOre.0.name=Minerale Di Rame
-tile.bcOre.1.name=Minerale Di Stagno
-tile.oilMoving.name=Petrolio
-tile.oilStill.name=Petrolio
-tile.copperWire.name=Cavo Di Rame
-tile.bcMachine.0.name=Generatore A Carbone
-tile.bcMachine.1.name=Scatola Batteria
-tile.bcMachine.2.name=Fornace Elettrica
-
-# Items
-item.battery.name=Batteria
-item.circuit.name=Circuito
-item.circuit.0.name=Circuito Base
-item.circuit.1.name=Circuito Avanzato
-item.circuit.2.name=Circuito Elite
-item.bucketOil.name=Secchio Di Petrolio
-item.wrench.name=Chiave Inglese
-item.motor.name=Motore
-
-item.plateCopper.name=Piastra Di Rame
-item.plateTin.name=Piastra Di Stagno
-item.plateBronze.name=Piastra Di Bronzo
-item.plateSteel.name=Piastra D'Acciaio
-
-item.ingotCopper.name=Lingotto Di Rame
-item.ingotTin.name=Lingotto Di Stagno
-item.ingotBronze.name=Lingotto Di Bronzo
-item.ingotSteel.name=Lingotto D'Acciaio
-
-item.dustBronze.name=Polvere Di Bronzo
-item.dustSteel.name=Polvere D'Acciaio

resources/mods/basiccomponents/languages/nl_NL.properties

@@ -1,35 +0,0 @@
-# Basic Components Language Properties
-# @author Kees Nijenhuis
-
-# Blocks
-tile.bcOre.0.name=Koper Erts
-tile.bcOre.1.name=Tin Erts
-tile.oilMoving.name=Olie
-tile.oilStill.name=Olie
-tile.copperWire.name=Koper Draad
-tile.bcMachine.0.name=Kool Generator
-tile.bcMachine.1.name=Batterijen Doos
-tile.bcMachine.2.name=Elektrische Oven
-
-# Items
-item.battery.name=Batterij
-item.circuit.name=Stroomkring
-item.circuit.0.name=Basis Stroomkring
-item.circuit.1.name=Geavanceerde Stroomkring
-item.circuit.2.name=Elite Stroomkring
-item.bucketOil.name=Emmer Olie
-item.wrench.name=Moersleutel
-item.motor.name=Moter
-
-item.plateCopper.name=Koperen Plaat
-item.plateTin.name=Tinnen Plaat
-item.plateBronze.name=Bronzen Plaat
-item.plateSteel.name=Stalen Plaat
-
-item.ingotCopper.name=Koper Staaf
-item.ingotTin.name=Tin Staaf
-item.ingotBronze.name=Brons Staaf
-item.ingotSteel.name=Staal Staaf
-
-item.dustBronze.name=Brons Poeder
-item.dustSteel.name=Staal Poede

resources/mods/basiccomponents/languages/pl_PL.properties

@@ -1,35 +0,0 @@
-# Basic Components Language Properties
-# @author unekpl
- 
-# Bloki
-tile.bcOre.0.name=Ruda miedzi
-tile.bcOre.1.name=Ruda cyny
-tile.oilMoving.name=Ropa naftowa
-tile.oilStill.name=Ropa naftowa
-tile.copperWire.name=Miedziany kabel
-tile.bcMachine.0.name=Generator cieplny
-tile.bcMachine.1.name=Akumulator
-tile.bcMachine.2.name=Piec elektryczny
- 
-# Przedmioty
-item.battery.name=Ogniwo
-item.circuit.name=Obw\u00F3d elektroniczny
-item.circuit.0.name=Prosty obw\u00F3d elektroniczny
-item.circuit.1.name=Zaawansowany obw\u00F3d elektroniczny
-item.circuit.2.name=Skomplikowany obw\u00F3d elektroniczny
-item.bucketOil.name=Wiadro ropy
-item.wrench.name=Klucz
-item.motor.name=Silnik
- 
-item.plateCopper.name=Miedziana p\u0142ytka
-item.plateTin.name=Cynowa p\u0142ytka
-item.plateBronze.name=Br\u0105zowa p\u0142ytka
-item.plateSteel.name=Stalowa p\u0142ytka
- 
-item.ingotCopper.name=Sztabka miedzi
-item.ingotTin.name=Sztabka cyny
-item.ingotBronze.name=Sztabka br\u0105zu
-item.ingotSteel.name=Sztabka stali
- 
-item.dustBronze.name=Py\u0142 br\u0105zu
-item.dustSteel.name=Py\u0142 stali

resources/mods/basiccomponents/languages/zh_CN.properties

@@ -1,38 +0,0 @@
-#Basic Components Language Properties
-#@author Calclavia
-
-children=zh_TW
-
-itemGroup.BasicComponents=\u901A\u7528\u7535\u529B-\u57FA\u672C\u7EC4\u4EF6
-
-# Blocks
-tile.bcOre.0.name=\u94DC\u77FF\u77F3
-tile.bcOre.1.name=\u9521\u77FF\u77F3
-tile.copperWire.name=\u94DC\u7EBF
-tile.bcMachine.0.name=\u706B\u529B\u53D1\u7535\u673A
-tile.bcMachine.1.name=\u7535\u6C60\u7BB1
-tile.bcMachine.2.name=\u7535\u7089
-
-# Items
-item.battery.name=\u7535\u6C60
-item.infiniteBattery.name=\u65E0\u9650\u5BB9\u91CF\u7535\u6C60
-item.circuitBasic.name=\u57FA\u672C\u7535\u8DEF
-item.circuitAdvanced.name=\u8FDB\u9636\u7535\u8DEF
-item.circuitElite.name=\u9AD8\u7EA7\u7535\u8DEF
-item.wrench.name=\u6273\u624B
-item.motor.name=\u7535\u52A8\u673A
-
-item.plateCopper.name=\u94DC\u677F
-item.plateTin.name=\u9521\u677F
-item.plateBronze.name=\u9752\u94DC\u677F
-item.plateSteel.name=\u94A2\u677F
-item.plateIron.name=\u94C1\u677F
-item.plateGold.name=\u91D1\u677F
-
-item.ingotCopper.name=\u94DC\u952D
-item.ingotTin.name=\u9521\u952D
-item.ingotBronze.name=\u9752\u94DC\u952D
-item.ingotSteel.name=\u94A2\u952D
-
-item.dustBronze.name=\u9752\u94DC\u7C89
-item.dustSteel.name=\u94A2\u7C89

src/minecraft/fluidmech/client/ClientProxy.java

@@ -14,13 +14,13 @@ import fluidmech.client.render.RenderTank;
 import fluidmech.client.render.pipeextentions.RenderPipe;
 import fluidmech.common.CommonProxy;
 import fluidmech.common.FluidMech;
-import fluidmech.common.machines.TileEntityMinorPump;
 import fluidmech.common.machines.TileEntityReleaseValve;
 import fluidmech.common.machines.TileEntitySink;
 import fluidmech.common.machines.TileEntityTank;
 import fluidmech.common.machines.mech.TileEntityGenerator;
 import fluidmech.common.machines.mech.TileEntityRod;
 import fluidmech.common.machines.pipes.TileEntityPipe;
+import fluidmech.common.pump.TileEntityStarterPump;
 
 public class ClientProxy extends CommonProxy
 {
@@ -35,7 +35,7 @@ public class ClientProxy extends CommonProxy
 	{
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPipe.class, new RenderPipe());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPipe.class, new RenderPipe());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMinorPump.class, new RenderPump());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityStarterPump.class, new RenderPump());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRod.class, new RenderGearRod());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGenerator.class, new RenderGenerator());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank());

src/minecraft/fluidmech/client/render/RenderPump.java

@@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
 
 import fluidmech.client.model.ModelPump;
 import fluidmech.common.FluidMech;
-import fluidmech.common.machines.TileEntityMinorPump;
+import fluidmech.common.pump.TileEntityStarterPump;
 
 public class RenderPump extends TileEntitySpecialRenderer
 {
@@ -19,7 +19,7 @@ public class RenderPump extends TileEntitySpecialRenderer
         model = new ModelPump();
     }
 
-    public void renderAModelAt(TileEntityMinorPump te, double d, double d1, double d2, float f)
+    public void renderAModelAt(TileEntityStarterPump te, double d, double d1, double d2, float f)
     {
         int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
 
@@ -51,7 +51,7 @@ public class RenderPump extends TileEntitySpecialRenderer
     @Override
     public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
     {
-        this.renderAModelAt((TileEntityMinorPump) tileEntity, var2, var4, var6, var8);
+        this.renderAModelAt((TileEntityStarterPump) tileEntity, var2, var4, var6, var8);
     }
 
 }

src/minecraft/fluidmech/common/FluidMech.java

@@ -12,7 +12,6 @@ import fluidmech.common.item.ItemBlockTank;
 import fluidmech.common.item.ItemParts;
 import fluidmech.common.item.ItemParts.Parts;
 import fluidmech.common.item.ItemTools;
-import fluidmech.common.machines.TileEntityMinorPump;
 import fluidmech.common.machines.TileEntityReleaseValve;
 import fluidmech.common.machines.TileEntitySink;
 import fluidmech.common.machines.TileEntityTank;
@@ -23,6 +22,7 @@ import fluidmech.common.machines.mech.TileEntityRod;
 import fluidmech.common.machines.pipes.BlockPipe;
 import fluidmech.common.machines.pipes.TileEntityPipe;
 import fluidmech.common.machines.pipes.TileEntityPipeWindow;
+import fluidmech.common.pump.TileEntityStarterPump;
 import hydraulic.api.ColorCode;
 import hydraulic.helpers.FluidHelper;
 
@@ -168,7 +168,7 @@ public class FluidMech extends DummyModContainer
         proxy.Init();
         // TileEntities
         GameRegistry.registerTileEntity(TileEntityPipe.class, "lmPipeTile");
-        GameRegistry.registerTileEntity(TileEntityMinorPump.class, "lmPumpTile");
+        GameRegistry.registerTileEntity(TileEntityStarterPump.class, "lmPumpTile");
         GameRegistry.registerTileEntity(TileEntityRod.class, "lmRodTile");
         GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "lmeValve");
         GameRegistry.registerTileEntity(TileEntityTank.class, "lmTank");

src/minecraft/fluidmech/common/block/BlockPumpMachine.java

@@ -17,7 +17,7 @@ import universalelectricity.prefab.block.BlockAdvanced;
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.machines.TileEntityMinorPump;
+import fluidmech.common.pump.TileEntityStarterPump;
 
 public class BlockPumpMachine extends BlockAdvanced
 {
@@ -106,7 +106,7 @@ public class BlockPumpMachine extends BlockAdvanced
 		}
 		else
 		{
-			return new TileEntityMinorPump();
+			return new TileEntityStarterPump();
 		}
 		return null;
 	}
@@ -132,9 +132,9 @@ public class BlockPumpMachine extends BlockAdvanced
 		{
 			par1World.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
 		}
-		if (ent instanceof TileEntityMinorPump)
+		if (ent instanceof TileEntityStarterPump)
 		{
-			((TileEntityMinorPump) ent).getConnections();
+			((TileEntityStarterPump) ent).getConnections();
 		}
 		return true;
 	}

src/minecraft/fluidmech/common/item/ItemBasic.java

@@ -7,10 +7,10 @@ import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
-import universalelectricity.components.common.BasicComponents;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import fluidmech.common.FluidMech;
+import fluidmech.common.TabFluidMech;
 
 public class ItemBasic extends Item
 {
@@ -20,7 +20,7 @@ public class ItemBasic extends Item
 	{
 		super(id);
 		this.setUnlocalizedName(name);
-		this.setCreativeTab(BasicComponents.TAB);
+		this.setCreativeTab(TabFluidMech.INSTANCE);
 	}
 
 	@SideOnly(Side.CLIENT)

src/minecraft/fluidmech/common/machines/TileEntityDrain.java

@@ -1,24 +0,0 @@
-package fluidmech.common.machines;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
-import hydraulic.prefab.tile.TileEntityFluidDevice;
-
-public class TileEntityDrain extends TileEntityFluidDevice
-{
-	private ForgeDirection face = ForgeDirection.UNKNOWN;
-
-	@Override
-	public String getMeterReading(EntityPlayer user, ForgeDirection side)
-	{
-		return null;
-	}
-
-	@Override
-	public boolean canPipeConnect(TileEntity entity, ForgeDirection dir)
-	{
-		return dir == face.getOpposite();
-	}
-
-}

src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java

@@ -1,209 +0,0 @@
-package fluidmech.common.machines;
-
-import hydraulic.api.ColorCode;
-import hydraulic.api.IColorCoded;
-import hydraulic.api.IPipeConnection;
-import hydraulic.api.IReadOut;
-import hydraulic.helpers.FluidHelper;
-import hydraulic.helpers.MetaGroup;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.liquids.ITankContainer;
-import net.minecraftforge.liquids.LiquidContainerRegistry;
-import net.minecraftforge.liquids.LiquidStack;
-import universalelectricity.core.electricity.ElectricityPack;
-import universalelectricity.core.vector.Vector3;
-import universalelectricity.core.vector.VectorHelper;
-import universalelectricity.prefab.network.IPacketReceiver;
-import universalelectricity.prefab.tile.TileEntityElectricityRunnable;
-
-import com.google.common.io.ByteArrayDataInput;
-
-public class TileEntityMinorPump extends TileEntityElectricityRunnable implements IPacketReceiver, IReadOut, IPipeConnection
-{
-	public final double WATTS_PER_TICK = (400 / 20);
-	private double percentPumped = 0.0;
-
-	public int pos = 0;
-
-	public ColorCode color = ColorCode.BLUE;
-
-	ForgeDirection wireConnection = ForgeDirection.EAST;
-	ForgeDirection pipeConnection = ForgeDirection.EAST;
-
-	/**
-	 * gets the side connection for the wire and pipe
-	 */
-	public void getConnections()
-	{
-		int notchMeta = MetaGroup.getFacingMeta(worldObj.getBlockMetadata(xCoord, yCoord, zCoord));
-
-		wireConnection = ForgeDirection.getOrientation(notchMeta);
-		pipeConnection = VectorHelper.getOrientationFromSide(wireConnection, ForgeDirection.WEST);
-
-		if (notchMeta == 2 || notchMeta == 3)
-		{
-			pipeConnection = pipeConnection.getOpposite();
-		}
-	}
-
-	@Override
-	public void initiate()
-	{
-		this.getConnections();
-	}
-
-	@Override
-	public void updateEntity()
-	{
-		super.updateEntity();
-
-		this.getConnections();
-
-		if (!this.worldObj.isRemote && !this.isDisabled())
-		{
-			if (this.canPump(xCoord, yCoord - 1, zCoord) && this.wattsReceived >= this.WATTS_PER_TICK)
-			{
-				wattsReceived -= this.WATTS_PER_TICK;
-				if (percentPumped < 10)
-				{
-					percentPumped++;
-				}
-				else if (percentPumped >= 10 && this.drainBlock(new Vector3(xCoord, yCoord - 1, zCoord)))
-				{
-					percentPumped = 0;
-				}
-
-				/* DO ANIMATION CHANGE */
-				this.pos++;
-				if (pos >= 8)
-				{
-					pos = 0;
-				}
-			}
-			if (this.ticks % 10 == 0)
-			{
-				// Packet packet = PacketManager.getPacket(FluidMech.CHANNEL, this, color.ordinal(),
-				// this.wattsReceived);
-				// PacketManager.sendPacketToClients(packet, worldObj, new Vector3(this), 60);
-			}
-		}
-
-	}
-
-	@Override
-	public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data)
-	{
-		try
-		{
-			this.color = ColorCode.get(data.readInt());
-			this.wattsReceived = data.readDouble();
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * gets the fluidConductor or storageTank to ouput its pumped liquids too if there is not one it
-	 * will not function
-	 */
-	public ITankContainer getFillTarget()
-	{
-		TileEntity ent = worldObj.getBlockTileEntity(xCoord + pipeConnection.offsetX, yCoord + pipeConnection.offsetY, zCoord + pipeConnection.offsetZ);
-
-		if (ent instanceof ITankContainer)
-		{
-			return (ITankContainer) ent;
-		}
-		return null;
-	}
-
-	/**
-	 * gets the search range the pump used to find valid block to pump
-	 */
-	public int getPumpRange()
-	{
-		int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
-		switch (MetaGroup.getGrouping(meta))
-		{
-			case 2:
-				return 20;
-			case 3:
-				return 50;
-		}
-		return 1;
-	}
-
-	@Override
-	public ElectricityPack getRequest()
-	{
-		double amps = (this.WATTS_PER_TICK / this.getVoltage());
-		return new ElectricityPack(amps, this.getVoltage());
-	}
-
-	/**
-	 * checks to see if this pump can pump the selected target block
-	 * 
-	 * @param x y z - location of the block, use the tileEntities world
-	 * @return true if it can pump
-	 */
-	boolean canPump(int x, int y, int z)
-	{
-		return getFillTarget() != null && FluidHelper.getLiquidId(worldObj.getBlockId(x, y, z)) != -1 && worldObj.getBlockMetadata(x, y, z) == 0 ;
-	}
-
-	/**
-	 * drains the block(removes) at the location given
-	 * 
-	 * @param loc - vector 3 location
-	 * @return true if the block was drained
-	 */
-	boolean drainBlock(Vector3 loc)
-	{
-		int blockID = worldObj.getBlockId(loc.intX(), loc.intY(), loc.intZ());
-
-		LiquidStack stack = FluidHelper.getLiquidFromBlockId(blockID);
-		if (color.isValidLiquid(stack) && getFillTarget() != null)
-		{
-			stack.amount = LiquidContainerRegistry.BUCKET_VOLUME;
-			int fillAmmount = getFillTarget().fill(pipeConnection.getOpposite(), stack, true);
-
-			if (fillAmmount > 0)
-			{
-				worldObj.setBlockMetadataWithNotify(xCoord, yCoord - 1, zCoord, 0, 0);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	public String getMeterReading(EntityPlayer user, ForgeDirection side)
-	{
-		return String.format("%.2f/%.2f  %f Done", this.wattsReceived,this.WATTS_PER_TICK,this.percentPumped);
-	}
-
-	@Override
-	public boolean canConnect(ForgeDirection direction)
-	{
-		return direction == wireConnection;
-	}
-
-	@Override
-	public boolean canPipeConnect(TileEntity entity, ForgeDirection dir)
-	{
-		if (dir == this.pipeConnection.getOpposite())
-		{
-			return entity != null && entity instanceof IColorCoded && (((IColorCoded) entity).getColor() == ColorCode.NONE || ((IColorCoded) entity).getColor() == this.color);
-		}
-		return false;
-	}
-
-}

src/minecraft/fluidmech/common/machines/TileEntityPump.java

@@ -1,26 +0,0 @@
-package fluidmech.common.machines;
-
-import net.minecraftforge.common.ForgeDirection;
-import universalelectricity.core.electricity.ElectricityPack;
-import universalelectricity.prefab.tile.TileEntityElectricityRunnable;
-
-public class TileEntityPump extends TileEntityElectricityRunnable
-{
-	public static final double WATTS_PER_TICK = 100;
-	private ForgeDirection outputSide = ForgeDirection.UNKNOWN;
-	private ForgeDirection inputSide = ForgeDirection.UNKNOWN;
-	
-	
-	@Override
-	public ElectricityPack getRequest()
-	{
-		return new ElectricityPack(WATTS_PER_TICK / this.getVoltage(), this.getVoltage());
-	}
-
-	@Override
-	public boolean canConnect(ForgeDirection direction)
-	{
-		return direction != outputSide && direction != inputSide ;
-	}
-
-}

src/minecraft/hydraulic/fluidnetwork/HydraulicNetwork.java

@@ -179,6 +179,8 @@ public class HydraulicNetwork
 	 */
 	public double getPressureProduced(TileEntity... ignoreTiles)
 	{
+		// TODO pressure is not added as a sum but rather as a collective sum of the largest
+		// pressures. IF the pressure is to small it will be ignored and stop producing pressure.
 		int totalPressure = 0;
 
 		Iterator it = this.pressureProducers.entrySet().iterator();

src/minecraft/hydraulic/helpers/FluidHelper.java

@@ -2,10 +2,12 @@ package hydraulic.helpers;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import net.minecraftforge.liquids.ILiquid;
 import net.minecraftforge.liquids.LiquidContainerRegistry;
 import net.minecraftforge.liquids.LiquidDictionary;
 import net.minecraftforge.liquids.LiquidStack;
+import universalelectricity.core.vector.Vector3;
 
 public class FluidHelper
 {
@@ -132,4 +134,21 @@ public class FluidHelper
 		}
 		return null;
 	}
+
+	/**
+	 * is block at the location is a still source block
+	 * 
+	 */
+	public static boolean isStillLiquid(World world, Vector3 pos)
+	{
+		int blockID = pos.getBlockID(world);
+		int meta = pos.getBlockMetadata(world);
+		int LiquidID = FluidHelper.getLiquidId(blockID);
+
+		if (LiquidID != -1 && meta == 0)
+		{
+			return true;
+		}
+		return false;
+	}
 }