Added recipes for the new Hatches.

4 files changed, 89 insertions, 12 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index 460b29e802..c77db21800 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -68,6 +68,13 @@ public class LOADER_Machine_Components {
 		CI.sensor_HV = ItemList.Sensor_HV.get(1);
 		CI.sensor_EV = ItemList.Sensor_EV.get(1);
 		CI.sensor_IV = ItemList.Sensor_IV.get(1);
+		if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+			CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+			CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+			CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
+			CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
+		}
 	}
 
 	private static void registerGTExperimentalComponents(){
@@ -96,7 +103,13 @@ public class LOADER_Machine_Components {
 		CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
 		CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
 		CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
-
+		
+		if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+			CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+			CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
+		}
+		
 		registerComponentsULV();
 		registerComponentsMAX();
 	}
@@ -135,6 +148,12 @@ public class LOADER_Machine_Components {
 		CI.sensor_UV = GregtechItemList.Sensor_UV.get(1);
 		CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
 
+		if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+			CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+			CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
+		}
+		
 		registerComponentsULV();
 	}
 
@@ -171,6 +190,12 @@ public class LOADER_Machine_Components {
 		CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
 		CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
 		CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
+		
+		if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1);
+			CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1);
+			CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
+		}
 
 		// Thanks 0lafe
 		CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1);
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 1c95467770..d47b65391c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -439,12 +439,6 @@ public class RECIPES_General {
 			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
 		}
 
-		RecipeUtils.addShapedGregtechRecipe(
-				CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
-				CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
-				CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
-				GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
-
 		RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[6], ALLOY.MARAGING250.getGear(1), CI.component_Plate[6],
 				CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1),
 				CI.getTieredCircuitOreDictName(4), CI.component_Plate[5], ItemList.Hatch_Input_IV.get(1),
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e190bc67fa..985e783430 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1406,14 +1406,24 @@ public class RECIPES_Machines {
 			}
 
 			//Air Intake Hatch
-			ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);				
-			ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1);
 			RecipeUtils.addShapedGregtechRecipe(
 					CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6],
-					CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6],
-					CI.getTieredCircuit(4), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(4),
+					CI.component_Plate[6], CI.getFluidRegulator(5, 1), CI.component_Plate[6],
+					CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5),
 					GregtechItemList.Hatch_Air_Intake.get(1));
-
+			
+			
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getPlate(6, 1), ItemList.Casing_Grate.get(1), CI.getPlate(6, 1),
+					CI.getPlate(6, 1), CI.getFluidRegulator(6, 1), CI.getPlate(6, 1),
+					CI.getTieredCircuit(6), ItemList.Hatch_Input_LuV.get(1), CI.getTieredCircuit(6),
+					GregtechItemList.Hatch_Reservoir.get(1));
+			
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getPlate(7, 1), GregtechItemList.Hatch_Air_Intake.get(1), CI.getPlate(7, 1),
+					CI.getPlate(7, 1), CI.getFluidRegulator(7, 1), CI.getPlate(7, 1),
+					CI.getTieredCircuit(7), ItemList.Hatch_Input_ZPM.get(1), CI.getTieredCircuit(7),
+					GregtechItemList.Hatch_Air_Intake_Extreme.get(1));
 			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
 
 				//Thorium Reactor
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index 0a1b762a97..fbf54d6672 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -128,6 +128,15 @@ public class CI {
 	public static ItemStack sensor_ZPM;
 	public static ItemStack sensor_UV;
 	public static ItemStack sensor_MAX;
+	
+	public static ItemStack fluidRegulator_LV;
+	public static ItemStack fluidRegulator_MV;
+	public static ItemStack fluidRegulator_HV;
+	public static ItemStack fluidRegulator_EV;
+	public static ItemStack fluidRegulator_IV;
+	public static ItemStack fluidRegulator_LuV;
+	public static ItemStack fluidRegulator_ZPM;
+	public static ItemStack fluidRegulator_UV;
 
 	//Machine Casings
 	public static ItemStack machineCasing_ULV;
@@ -881,6 +890,45 @@ public class CI {
 		}		
 		return ItemUtils.getSimpleStack(aType, aSize);
 	}
+	
+	public static ItemStack getFluidRegulator(int aTier, int aSize) {
+		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			return CI.getElectricPump(aTier, aSize);
+		}
+		ItemStack aType;
+		int aLazyTier = 0;
+		if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_LV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_MV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_HV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_EV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_IV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_LuV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_ZPM;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_UV;			
+		}
+		else if (aTier == aLazyTier++) {
+			aType = CI.fluidRegulator_UV;			
+		}
+		else {
+			aType = CI.fluidRegulator_LV;			
+		}		
+		return ItemUtils.getSimpleStack(aType, aSize);
+	}
 
 	public static ItemStack getElectricPiston(int aTier, int aSize) {
 		ItemStack aType;