+ Basework for a GT++ based Hand Pump.

+ Added some ore veins to Australia Dimension.

2 files changed, 24 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index a71f951fa7..47c1f35f93 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -12,6 +12,7 @@ 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.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
@@ -91,7 +92,9 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 		}
 	}
 
+	@Override
 	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+		Logger.INFO("Item Right Click");
 		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)));
@@ -103,9 +106,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 						if (g instanceof TOOL_Gregtech_Pump) {
 							TOOL_Gregtech_Pump t = (TOOL_Gregtech_Pump) g;
 							if (t != null) {
+								Logger.INFO("Right clicked with Pump tool.");
 								aStack = g.onItemRightClick(this, aStack, aWorld, aPlayer);
 								FluidStack f = t.getBehaviour().getStoredFluid();
 								if (f != null) {
+									Logger.INFO("Found Fluid '"+f.getLocalizedName()+"', trying to set fluid contents of tool.");
 									this.setFluidContent(aStack, f);
 								}
 							}
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
index aa3a2973a1..1c48c7401f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
@@ -57,18 +57,17 @@ extends Behaviour_None {
 					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;
-						}
+						this.mStoredFluid = aStored;
+						boolean b = setStoredFluidOfGTMachine((IGregTechTileEntity)tTileEntity);
+						Logger.INFO("Cleared Tank? "+b);
+						Logger.INFO("Returning True - Behaviour Class.");
+						return true;						
 					}
 					else {
 						Logger.INFO("Found no valid Fluidstack - Behaviour Class.");
 					}
 				}
-				
+
 			}
 		}
 		Logger.INFO("Returning False - Behaviour Class.");
@@ -77,7 +76,7 @@ extends Behaviour_None {
 
 	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"));		
+		aList.add("Stored Fluid: "+(mStoredFluid != null ? mStoredFluid.getLocalizedName()+" - "+mStoredFluid.amount+"L" : "None"));		
 		return aList;
 	}
 
@@ -113,11 +112,12 @@ extends Behaviour_None {
 
 	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();
+		Logger.INFO("Returning Fluid stack from tile. Found: "+(f != null ? f.getLocalizedName()+" - "+f.amount+"L" : "Nothing"));		
+		return f.copy();
 	}
 
 	public boolean setStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity) {
+		Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [1]");
 		if (aTileEntity == null) {
 			return false;
 		}
@@ -126,6 +126,7 @@ extends Behaviour_None {
 			return false;
 		}
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+			Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]");
 			return setStoredFluidOfGTMachine((IGregTechTileEntity) aMetaTileEntity);
 		}
 		else {
@@ -134,17 +135,16 @@ extends Behaviour_None {
 	}
 
 	public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {
-		if (aTileEntity == null) {
-			return false;
+		try {
+			aTileEntity.mFluid = null;	
+			boolean b = aTileEntity.mFluid == null;
+			Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [3] "+b);
+			return aTileEntity.mFluid == null;
 		}
-		final IMetaTileEntity aMetaTileEntity = aTileEntity;
-		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank){				
-				((GT_MetaTileEntity_BasicTank) aMetaTileEntity).mFluid = null;	
-				return true;				
-			}
+		catch (Throwable t) {
+			Logger.INFO("Trying to clear Tile's tank. FAILED - Behaviour Class. [x]");
+			return false;
 		}
-		return false;
 	}
 
 	public synchronized final FluidStack getStoredFluid() {