re-tiered Tanks a bit for GTNH pack (#66)

* re-tiered Tanks a bit for GTNH pack

* fix recipes

* recipes not shown before

* Change Tank HV recipes

* so this is better

2 files changed, 23 insertions, 31 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 507e09153a..d0f8db1f02 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -9,6 +9,7 @@ import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Machines {
@@ -686,55 +687,46 @@ public class RECIPES_Machines {
 
 				plateTier1 = "plateTin";
 				pipeTier1 = "pipeLargeClay";
+				circuitTier1 = "circuitPrimitive";
 				plateTier2 = "plateCopper";
 				pipeTier2 = "pipeHugeClay";
-				plateTier3 = "plateIron";
-				pipeTier3 = "pipeMediumCopper";
-				plateTier4 = "plateBronze";
-				pipeTier4 = "pipeLargeCopper";
+				plateTier3 = "plateBronze";
+				pipeTier3 = "pipeMediumBronze";
+				plateTier4 = "plateIron";
+				pipeTier4 = "pipeMediumSteel";
 				plateTier5 = "plateSteel";
-				pipeTier5 = "pipeLargeBronze";
-				plateTier6 = "plateAluminium";
-				pipeTier6 = "pipeMediumSteel";
+				plateTier6 = "plateRedstone";
+				plateTier7 = "plateRedstoneAlloy";
+				plateTier8 = "plateDarkSteel";
+				ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
+
 
 				Utils.LOG_INFO("Loading New Horizon Tanks, with custom recipes.");
 				Utils.LOG_INFO("Using "+plateTier1+" with "+pipeTier1);
 				Utils.LOG_INFO("Using "+plateTier2+" with "+pipeTier2);
-				Utils.LOG_INFO("Using "+plateTier3+" with "+pipeTier3);
-				Utils.LOG_INFO("Using "+plateTier4+" with "+pipeTier4);
-				Utils.LOG_INFO("Using "+plateTier5+" with "+pipeTier5);
-				Utils.LOG_INFO("Using "+plateTier6+" with "+pipeTier6);
+				Utils.LOG_INFO("Using " + plateTier3 + " with " + pipeTier3);
+				Utils.LOG_INFO("Using " + plateTier4 + " with " + pipeTier4);
 
 				RecipeUtils.addShapedGregtechRecipe(
-						plateTier1, plateTier1, plateTier1,
+						plateTier1, plateTier4, plateTier1,
 						plateTier1, pipeTier1, plateTier1,
-						plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1,
+						plateTier1, waterBucket, plateTier1,
 						GregtechItemList.GT_FluidTank_ULV.get(1));
 				RecipeUtils.addShapedGregtechRecipe(
-						plateTier2, plateTier2, plateTier2,
+						plateTier2, plateTier5, plateTier2,
 						plateTier2, pipeTier2, plateTier2,
 						plateTier2, electricPump_LV, plateTier2,
 						GregtechItemList.GT_FluidTank_LV.get(1));
 				RecipeUtils.addShapedGregtechRecipe(
-						plateTier3, plateTier3, plateTier3,
+						plateTier6, plateTier7, plateTier6,
 						plateTier3, pipeTier3, plateTier3,
-						plateTier3, electricPump_MV, plateTier3,
+						plateTier6, electricPump_LV, plateTier6,
 						GregtechItemList.GT_FluidTank_MV.get(1));
 				RecipeUtils.addShapedGregtechRecipe(
-						plateTier4, plateTier4, plateTier4,
+						circuitTier1, plateTier8, circuitTier1,
 						plateTier4, pipeTier4, plateTier4,
-						plateTier4, electricPump_HV, plateTier4,
+						circuitTier1, electricPump_LV, circuitTier1,
 						GregtechItemList.GT_FluidTank_HV.get(1));
-				RecipeUtils.addShapedGregtechRecipe(
-						plateTier5, plateTier5, plateTier5,
-						plateTier5, pipeTier5, plateTier5,
-						plateTier5, electricPump_EV, plateTier5,
-						GregtechItemList.GT_FluidTank_EV.get(1));
-				RecipeUtils.addShapedGregtechRecipe(
-						plateTier6, plateTier6, plateTier6,
-						plateTier6, pipeTier6, plateTier6,
-						plateTier6, electricPump_IV, plateTier6,
-						GregtechItemList.GT_FluidTank_IV.get(1));
 			}
 
 			//Industrial Multi Tank Casing
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index 340cb12f5b..81a0f643ee 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -21,7 +21,7 @@ public class GregtechTieredFluidTanks
 
 	private static void run1()	{
 		int ID = 817;
-		Utils.LOG_INFO("Is New Horizons Loaded? "+CORE.GTNH);
+		Utils.LOG_INFO("Is New Horizons Loaded? " + CORE.GTNH);
 		if (CORE.GTNH){
 			Utils.LOG_INFO("Only loading ULV-IV tier tanks for New Horizons Modpack.");
 		}
@@ -29,9 +29,9 @@ public class GregtechTieredFluidTanks
 		GregtechItemList.GT_FluidTank_LV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1).getStackForm(1L));
 		GregtechItemList.GT_FluidTank_MV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2).getStackForm(1L));
 		GregtechItemList.GT_FluidTank_HV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.03", "High Voltage Fluid Tank", 3).getStackForm(1L));
-		GregtechItemList.GT_FluidTank_EV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.04", "Extreme Voltage Fluid Tank", 4).getStackForm(1L));
-		GregtechItemList.GT_FluidTank_IV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.05", "Insane Voltage Fluid Tank", 5).getStackForm(1L));
 		if (!CORE.GTNH){
+			GregtechItemList.GT_FluidTank_EV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.04", "Extreme Voltage Fluid Tank", 4).getStackForm(1L));
+			GregtechItemList.GT_FluidTank_IV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.05", "Insane Voltage Fluid Tank", 5).getStackForm(1L));
 			GregtechItemList.GT_FluidTank_LuV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.06", "Ludicrous Voltage Fluid Tank", 6).getStackForm(1L));
 			GregtechItemList.GT_FluidTank_ZPM.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7).getStackForm(1L));
 			GregtechItemList.GT_FluidTank_UV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8).getStackForm(1L));