+ Added the Base work for a Hand pump, that removes fluids from the input tanks of GT machines.

9 files changed, 616 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index 2a8802b6f4..554983c41c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -13,22 +13,10 @@ import gtPlusPlus.core.lib.CORE;
 
 public class CustomGtTextures {
 	public enum ItemIcons implements IIconContainer, Runnable {
-		VOID // The Empty Texture
-		, RENDERING_ERROR, WRENCH, MORTAR, CROWBAR,
-		JACKHAMMER, WIRE_CUTTER, KNIFE, BUTCHERYKNIFE,
-		SICKLE, SCOOP, GRAFTER, PLUNGER, ROLLING_PIN,
-		HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW,
-		HANDLE_SCREWDRIVER, HANDLE_BUZZSAW,
-		HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING,
-		POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV,
-		DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2,
-		DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5,
-		DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8,
-		ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3,
-		ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7,
-		ENERGY_BAR_8,
-
-		SKOOKUMCHOOCHER, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+		VOID, // The Empty Texture
+		RENDERING_ERROR,
+		PUMP, 
+		SKOOKUMCHOOCHER;
 
 		public static final ITexture[] ERROR_RENDERING = new ITexture[]{new GT_RenderedTexture(RENDERING_ERROR)};
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index d2554de225..5b1a34590f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -111,6 +111,7 @@ public class GregtechTextures {
 		VOID, // The Empty Texture
 		RENDERING_ERROR, //The Purple/Black Texture
 		SKOOKUMCHOOCHER, //The Skookum Tool Texture
+		PUMP, // The Hand Pump Texture
 		TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
 
 		/* public static final Interface_IconContainer[]
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
index 2471e84f54..a6b5e78473 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
@@ -2,6 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 
 public enum GregtechToolDictNames {
 
-	craftingToolSkookumChoocher;
+	craftingToolSkookumChoocher, craftingToolHandPump;
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java
new file mode 100644
index 0000000000..f62d9e5cfa
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java
@@ -0,0 +1,150 @@
+package gtPlusPlus.xmod.gregtech.api.items.types;
+
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+
+import ic2.api.tile.IWrenchable;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class ToolType_Pump
+extends ToolType_Base {
+	private final int mCosts;
+	private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.pump", "Sucks in Machine Input Fluid tank contents on Rightclick");
+
+	public ToolType_Pump(final int aCosts) {
+		this.mCosts = aCosts;
+	}
+
+	public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, final float hitY, final float hitZ) {
+		if (aWorld.isRemote) {
+			return false;
+		}
+		final Block aBlock = aWorld.getBlock(aX, aY, aZ);
+		if (aBlock == null) {
+			return false;
+		}
+		final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
+		final byte aTargetSide = GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ);
+		final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+		/*try {
+			if ((aTileEntity != null) && ((aTileEntity instanceof IWrenchable))) {
+				if (((IWrenchable) aTileEntity).wrenchCanSetFacing(aPlayer, aTargetSide)) {
+					if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+						((IWrenchable) aTileEntity).setFacing(aTargetSide);
+						GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+					}
+					return true;
+				}
+				if (((IWrenchable) aTileEntity).wrenchCanRemove(aPlayer)) {
+					final int tDamage = ((IWrenchable) aTileEntity).getWrenchDropRate() < 1.0F ? 10 : 3;
+					if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, tDamage * this.mCosts))) {
+						ItemStack tOutput = ((IWrenchable) aTileEntity).getWrenchDrop(aPlayer);
+						for (final ItemStack tStack : aBlock.getDrops(aWorld, aX, aY, aZ, aMeta, 0)) {
+							if (tOutput == null) {
+								aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tStack));
+							} else {
+								aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tOutput));
+								tOutput = null;
+							}
+						}
+						aWorld.setBlockToAir(aX, aY, aZ);
+						GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+					}
+					return true;
+				}
+				return true;
+			}
+		} catch (final Throwable e) {
+		}
+		if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) {
+			if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+				aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3);
+				GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+			}
+			return true;
+		}
+		if ((aBlock == Blocks.powered_repeater) || (aBlock == Blocks.unpowered_repeater)) {
+			if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+				aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
+				GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+			}
+			return true;
+		}
+		if ((aBlock == Blocks.powered_comparator) || (aBlock == Blocks.unpowered_comparator)) {
+			if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+				aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
+				GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+			}
+			return true;
+		}
+		if ((aBlock == Blocks.crafting_table) || (aBlock == Blocks.bookshelf)) {
+			if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+				aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, aMeta)));
+				aWorld.setBlockToAir(aX, aY, aZ);
+				GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+			}
+			return true;
+		}
+		if (aMeta == aTargetSide) {
+			if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper) || (aBlock == Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock == Blocks.trapped_chest) || (aBlock == Blocks.ender_chest) || (aBlock == Blocks.hopper)) {
+				if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+					aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, 0)));
+					aWorld.setBlockToAir(aX, aY, aZ);
+					GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+				}
+				return true;
+			}
+		} else {
+			if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper)) {
+				if ((aMeta < 6) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+					aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
+					GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+				}
+				return true;
+			}
+			if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock == Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock == Blocks.ender_chest) || (aBlock == Blocks.trapped_chest)) {
+				if ((aTargetSide > 1) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+					aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
+					GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+				}
+				return true;
+			}
+			if (aBlock == Blocks.hopper) {
+				if ((aTargetSide != 1) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+					aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
+					GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+				}
+				return true;
+			}
+		}
+		if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ)).contains(ForgeDirection.getOrientation(aTargetSide))) &&
+				((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack)) || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) &&
+				(aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) {
+			if (!aPlayer.capabilities.isCreativeMode) {
+				((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+			}
+			GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+		}*/
+		return false;
+	}
+
+	public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+		aList.add(this.mTooltip);
+		return aList;
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index 92f65935b4..31347e0b22 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -13,6 +13,7 @@ import gtPlusPlus.core.lib.CORE;
 public final class TexturesGtTools {
 
 	public final static CustomIcon SKOOKUM_CHOOCHER = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
+	public final static CustomIcon PUMP = new CustomIcon("iconsets/PUMP");
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index b20de51fe3..a71f951fa7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,21 +1,37 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
+
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
+import gregtech.api.interfaces.IItemBehaviour;
+import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.items.GT_MetaGenerated_Tool;
-
+import gregtech.api.util.GT_Log;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Pump;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
 
 public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
 	public static final short SKOOKUM_CHOOCHER = 7734;
-	public static MetaGeneratedGregtechTools INSTANCE;
+	public static final short HAND_PUMP = 7736;
+	public static GT_MetaGenerated_Tool INSTANCE;
 
 	public MetaGeneratedGregtechTools() {
 		super("plusplus.metatool.01");
 		INSTANCE = this;
+
+		//Skookum Choocher
 		GregTech_API.registerTool(
 				this.addTool(
 						SKOOKUM_CHOOCHER, "Skookum Choocher",
@@ -28,5 +44,85 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 								new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
 								new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}),
 				GregTech_API.sWrenchList);
+
+		//Pump
+		this.addTool(
+				HAND_PUMP,
+				"Electric Pump",
+				"Holds Fluids from GT Machines.",
+				new TOOL_Gregtech_Pump(),
+				new Object[]{GregtechToolDictNames.craftingToolHandPump,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)});
+		this.setFluidContainerStats(HAND_PUMP, 16000L, 16L);
+	}
+
+	
+
+	public final ConcurrentHashMap<Short, Long[]> mFluidContainerStats = new ConcurrentHashMap<Short, Long[]>();
+	
+	public final MetaGeneratedGregtechTools setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) {
+		if (aMetaValue >= 0) {
+			if (aCapacity > 0L) {
+				this.mFluidContainerStats.put(Short.valueOf((short) aMetaValue),
+						new Long[]{Long.valueOf(aCapacity), Long.valueOf(Math.max(1L, aStacksize))});
+			}
+			return this;
+		} else {
+			return this;
+		}
 	}
+
+	@Override
+	public final Long[] getFluidContainerStats(ItemStack aStack) {
+		return (Long[]) this.mFluidContainerStats.get(Short.valueOf((short) aStack.getItemDamage()));
+	}
+	
+
+	@SuppressWarnings("unchecked")
+	private ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> getItemBehaviours() {
+		try {			
+			ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> aItemBehaviors;
+			aItemBehaviors = (ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>>) ReflectionUtils.getField(getClass(), "mItemBehaviors").get(this);
+			return aItemBehaviors != null ? aItemBehaviors : null;
+		} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+			return null;
+		}
+	}
+
+	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+		this.use(aStack, 0.0D, aPlayer);
+		this.isItemStackUsable(aStack);
+		ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = (ArrayList<IItemBehaviour<GT_MetaBase_Item>>) this.getItemBehaviours().get(Short.valueOf((short) this.getDamage(aStack)));
+		try {
+			IItemBehaviour<GT_MetaBase_Item> tBehavior;
+			if (tList != null) {				
+				for (IItemBehaviour<GT_MetaBase_Item> g : tList) {
+					if (g != null) {
+						if (g instanceof TOOL_Gregtech_Pump) {
+							TOOL_Gregtech_Pump t = (TOOL_Gregtech_Pump) g;
+							if (t != null) {
+								aStack = g.onItemRightClick(this, aStack, aWorld, aPlayer);
+								FluidStack f = t.getBehaviour().getStoredFluid();
+								if (f != null) {
+									this.setFluidContent(aStack, f);
+								}
+							}
+						}
+						else {
+							aStack = g.onItemRightClick(this, aStack, aWorld, aPlayer);
+						}
+					}
+				}
+			}
+		} catch (Throwable arg6) {
+			if (GT_Values.D1) {
+				arg6.printStackTrace(GT_Log.err);
+			}
+		}
+		return aStack;
+	}
+	
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
new file mode 100644
index 0000000000..aa3a2973a1
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
@@ -0,0 +1,157 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gtPlusPlus.api.objects.Logger;
+
+public class Behaviour_Pump
+extends Behaviour_None {
+
+	private final int mCosts;
+	private FluidStack mStoredFluid;
+	private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.pump", "Sucks in Machine Input Fluid tank contents on Rightclick");
+
+	public Behaviour_Pump(final int aCosts) {
+		this.mCosts = aCosts;
+	}
+
+	@Override
+	public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, final float hitY, final float hitZ) {
+		if (aWorld.isRemote) {
+			return false;
+		}
+		else {
+			final Block aBlock = aWorld.getBlock(aX, aY, aZ);
+			if (aBlock == null) {
+				return false;
+			}
+			//final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
+			TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+			if (tTileEntity == null) {
+				return false;
+			}
+			if ((tTileEntity instanceof IGregTechTileEntity)) {
+				Logger.INFO("Right Clicking on GT Tile - Behaviour Class.");
+				if (((IGregTechTileEntity) tTileEntity).getTimer() < 50L) {
+					Logger.INFO("Returning False - Behaviour Class. Timer < 50");
+					return false;
+				}
+				else if ((!aWorld.isRemote) && (!((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer))) {
+					Logger.INFO("Returning True - Behaviour Class. NotUsable()");
+					return true;
+				}
+				else {
+					Logger.INFO("Trying to find Stored Fluid - Behaviour Class.");
+					FluidStack aStored = getStoredFluidOfGTMachine((IGregTechTileEntity)tTileEntity);
+					if (aStored != null) {
+						if (this.mStoredFluid == null) {
+							this.mStoredFluid = aStored;
+							setStoredFluidOfGTMachine((IGregTechTileEntity)tTileEntity);
+							Logger.INFO("Returning True - Behaviour Class.");
+							return true;
+						}
+					}
+					else {
+						Logger.INFO("Found no valid Fluidstack - Behaviour Class.");
+					}
+				}
+				
+			}
+		}
+		Logger.INFO("Returning False - Behaviour Class.");
+		return false;
+	}
+
+	public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+		aList.add(this.mTooltip);
+		aList.add("Stored Fluid: "+(mStoredFluid != null ? mStoredFluid.getLocalizedName() : "None"));		
+		return aList;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+		// TODO Auto-generated method stub
+		return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
+	}
+
+	@Override
+	public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
+			boolean aIsInHand) {
+		// TODO Auto-generated method stub
+		super.onUpdate(aItem, aStack, aWorld, aPlayer, aTimer, aIsInHand);
+	}
+
+	public FluidStack getStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity) {
+		if (aTileEntity == null) {
+			return null;
+		}
+		final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
+		if (aMetaTileEntity == null) {
+			return null;
+		}
+		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+			Logger.INFO("Tile Was Instanceof BasicTank.");
+			return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity);
+		}
+		else {
+			return null;
+		}
+	}
+
+	public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {	
+		FluidStack f = aTileEntity.mFluid;
+			Logger.INFO("Returning Fluid stack from tile. Found: "+(f != null ? f.getLocalizedName() : "Nothing"));		
+			return f.copy();
+	}
+
+	public boolean setStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity) {
+		if (aTileEntity == null) {
+			return false;
+		}
+		final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
+		if (aMetaTileEntity == null) {
+			return false;
+		}
+		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+			return setStoredFluidOfGTMachine((IGregTechTileEntity) aMetaTileEntity);
+		}
+		else {
+			return false;
+		}
+	}
+
+	public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {
+		if (aTileEntity == null) {
+			return false;
+		}
+		final IMetaTileEntity aMetaTileEntity = aTileEntity;
+		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank){				
+				((GT_MetaTileEntity_BasicTank) aMetaTileEntity).mFluid = null;	
+				return true;				
+			}
+		}
+		return false;
+	}
+
+	public synchronized final FluidStack getStoredFluid() {
+		return mStoredFluid;
+	}
+
+	public synchronized final void setStoredFluid(FluidStack mStoredFluid) {
+		this.mStoredFluid = mStoredFluid;
+	}
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java
new file mode 100644
index 0000000000..731e742f2a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java
@@ -0,0 +1,203 @@
+package gtPlusPlus.xmod.gregtech.common.tools;
+
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.World;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.tools.GT_Tool;
+
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Pump;
+import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fluids.FluidStack;
+
+public class TOOL_Gregtech_Pump
+extends GT_Tool {
+
+	public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+	private final Behaviour_Pump mBehaviour;
+	private FluidStack mStoredFluid;
+	
+	public TOOL_Gregtech_Pump() {
+		mBehaviour = new Behaviour_Pump(100);
+		//this.setFluidContainerStats(32000, 16000L, 16L);
+	}
+
+	@Override
+	public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+		String tName = aEntity.getClass().getName();
+		tName = tName.substring(tName.lastIndexOf(".") + 1);
+		return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
+	}
+	
+	public Behaviour_Pump getBehaviour() {
+		return this.mBehaviour;
+	}
+
+	@Override
+	public int getToolDamagePerBlockBreak() {
+		return 1000;
+	}
+
+	@Override
+	public int getToolDamagePerDropConversion() {
+		return 100;
+	}
+
+	@Override
+	public int getToolDamagePerContainerCraft() {
+		return 400;
+	}
+
+	@Override
+	public int getToolDamagePerEntityAttack() {
+		return 1000;
+	}
+
+	@Override
+	public int getBaseQuality() {
+		return 1;
+	}
+
+	@Override
+	public float getBaseDamage() {
+		return 0.0F;
+	}
+
+	@Override
+	public float getSpeedMultiplier() {
+		return 1.0F;
+	}
+
+	@Override
+	public float getMaxDurabilityMultiplier() {
+		return 1.5F;
+	}
+
+	@Override
+	public String getCraftingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(1));
+	}
+
+	@Override
+	public String getEntityHitSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(2));
+	}
+
+	@Override
+	public String getBreakingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(0));
+	}
+
+	@Override
+	public String getMiningSound() {
+		return null;
+	}
+
+	@Override
+	public boolean canBlock() {
+		return false;
+	}
+
+	public boolean isWrench(){
+		return false;
+	}
+
+	@Override
+	public boolean isCrowbar() {
+		return false;
+	}
+
+	@Override
+	public boolean isWeapon() {
+		return true;
+	}
+
+	@Override
+	public boolean isMinableBlock(final Block aBlock, final byte aMetaData) {
+		return false;
+	}
+
+	@Override
+	public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
+		int rConversions = 0;		
+		return rConversions;
+	}
+
+	@Override
+	public ItemStack getBrokenItem(final ItemStack aStack) {
+		return null;
+	}
+
+	@Override
+	public IIconContainer getIcon(final boolean aIsToolHead, final ItemStack aStack) {
+		return TexturesGtTools.PUMP;
+	}
+
+	@Override
+	public short[] getRGBa(final boolean aIsToolHead, final ItemStack aStack) {
+		return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+	}
+
+	@Override
+	public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) {
+		super.onToolCrafted(aStack, aPlayer);
+		aPlayer.triggerAchievement(AchievementList.buildSword);
+		try {
+			GT_Mod.achievements.issueAchievement(aPlayer, "tools");
+			GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+		} catch (final Exception e) {
+		}
+	}
+
+	@Override
+	public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
+		return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got pumped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+	}
+
+	@Override
+	public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
+		aItem.addItemBehavior(aID, mBehaviour);
+	}
+
+	@Override
+	public boolean isGrafter() {
+		return false;
+	}
+
+	@Override
+	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj,
+			int aX, int aY, int aZ) {
+		return 0f;
+	}
+
+	@Override
+	public boolean isChainsaw() {
+		return false;
+	}
+
+	@Override
+	public boolean isMiningTool() {
+		return false;
+	}
+
+	@Override
+	public boolean isRangedWeapon() {
+		return false;
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
index 845fb6db68..ae559db232 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
@@ -5,6 +5,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
 public class Processing_Textures_Items {
 
 	public static final CustomIcon itemSkookumChoocher = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
+	public static final CustomIcon itemElectricPump = new CustomIcon("iconsets/PUMP");
 
 }