+ Added recipes for all 4 tiers of hand pump.

$ Fixed pumps not emptying Vanilla fluid tanks.
$ General pump behaviour fixes & improvements.

1 files changed, 30 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 3dca793fa2..2001248668 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -50,6 +50,7 @@ public class RECIPES_General {
 			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
 			run();
 			addCompressedObsidian();
+			addHandPumpRecipes();
 		}
 	}
 
@@ -282,6 +283,35 @@ public class RECIPES_General {
 		}
 		return true;
 	}
+	
+	private static boolean addHandPumpRecipes() {
+		boolean a[] = new boolean[4];		
+		a[0] = RecipeUtils.recipeBuilder(
+				CI.electricPump_LV, "circuitBasic", null,
+				"ringBrass", CI.electricMotor_LV, "circuitBasic",
+				"plateSteel", "plateSteel", "rodBrass",
+				ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1));	
+		Logger.INFO("Added recipe for Hand Pump I - "+a[0]);
+		a[1] = RecipeUtils.recipeBuilder(
+				CI.electricPump_MV, "circuitAdvanced", null,
+				"ringMagnalium", CI.electricMotor_MV, "circuitAdvanced",
+				"plateAluminium", "plateAluminium", "rodMagnalium",
+				ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1));	
+		Logger.INFO("Added recipe for Hand Pump II - "+a[1]);	
+		a[2] = RecipeUtils.recipeBuilder(
+				CI.electricPump_HV, "circuitData", null,
+				"ringChrome", CI.electricMotor_HV, "circuitData",
+				"plateStainlessSteel", "plateStainlessSteel", "rodChrome",
+				ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1));		
+		Logger.INFO("Added recipe for Hand Pump III - "+a[2]);
+		a[3] = RecipeUtils.recipeBuilder(
+				CI.electricPump_EV, "circuitElite", null,
+				"ringTitanium", CI.electricMotor_EV, "circuitElite",
+				"plateStungstenSteel", "plateTungstenSteel", "rodTitanium",
+				ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1));	
+		Logger.INFO("Added recipe for Hand Pump IV - "+a[3]);	
+		return a[0] && a[1] && a[2] && a[3];		
+	}
 
 
 }