+ Added a Thaumcraft check to Void metal Pipe generation.

% Changed Cell recipes to be cheaper.
% Changed All generated pipes EU/t and time taken, to fall in line with other materials and their tiers.

7 files changed, 45 insertions, 26 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 90b8bb4256..59f7c4e889 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -156,7 +156,7 @@ implements ActionListener
 		Utils.LOG_INFO("Activating GT OreDictionary Handler, this can take some time.");
 		Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 		Meta_GT_Proxy.activateOreDictHandler();
-		Utils.LOG_INFO("Congratulations, a second cake has been baked for you.");
+		Utils.LOG_INFO("Finally, we are finished. Have some cripsy bacon as a reward.");
 	}
 
 	@EventHandler
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index aef0686424..927423d060 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -30,6 +30,7 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiTank;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
@@ -87,7 +88,7 @@ public class COMPAT_HANDLER {
 		GregtechPowerSubStation.run();
 		GregtechDehydrator.run();
 		GregtechTieredFluidTanks.run();
-		//GregtechIndustrialMultiTank.run();
+		GregtechIndustrialMultiTank.run();
 		}
 
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 528ca324e1..4eb5c5bef3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -122,7 +122,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L, 
 	
 	//Multitank
-	Industrial_MultiTank;
+	Industrial_MultiTank, Industrial_MultiTankDense;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 63cbff1bc5..54560fd9e1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -191,10 +191,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         GregtechItemList.Fluid_Cell_1L.set(addItem(tLastID = 64, "1L Wrought Iron Fluid Cell", "Holds exactly one litre worth of liquid.", new Object[]{new ItemData(Materials.WroughtIron, OrePrefixes.plate.mMaterialAmount * 8L + 4L * OrePrefixes.ring.mMaterialAmount, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)}));
         setFluidContainerStats(32000 + tLastID, 1L, 64L);
         
-        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 4L), GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]), 50, 32);
-        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 4L), GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]), 50, 32);
-        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 4L), GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]), 75, 32);
-        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L), GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), 75, 32);
+        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 4L), GregtechItemList.Fluid_Cell_1L.get(4L, new Object[0]), 50, 32);
+        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 4L), GregtechItemList.Fluid_Cell_16L.get(4L, new Object[0]), 50, 32);
+        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 4L), GregtechItemList.Fluid_Cell_36L.get(4L, new Object[0]), 75, 32);
+        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L), GregtechItemList.Fluid_Cell_144L.get(4L, new Object[0]), 75, 32);
 
     }
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
index 265b8b2a90..316fcff2ec 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMultiTank.java
@@ -27,8 +27,8 @@ public class GregtechMetaTileEntityMultiTank
         super(aID, aName, aNameRegional);
     }
 
-    private long fluidStored;
-    private short multiblockCasingCount;
+    private long fluidStored = 0;
+    private short multiblockCasingCount = 0;
     private short storageMultiplier = getStorageMultiplier();
     private long maximumFluidStorage = getMaximumTankStorage();
     
@@ -76,9 +76,12 @@ public class GregtechMetaTileEntityMultiTank
     }
 
     private long getMaximumTankStorage(){
-    	long tempTankStorageMax = (64000*getStorageMultiplier());
+    	int multiplier = getStorageMultiplier();
+    	Utils.LOG_INFO("x = "+multiplier+" * 96000");
+    	long tempTankStorageMax = (96000*multiplier);
+    	Utils.LOG_INFO("x = "+tempTankStorageMax);
     	if (tempTankStorageMax <= 0){
-    		return 64000;
+    		return 96000;
     	}
     	return tempTankStorageMax;
     }
@@ -123,8 +126,10 @@ public class GregtechMetaTileEntityMultiTank
     @Override
 	public String[] getDescription() {
         return new String[]{
-        		"Controller Block for the Vacuum Freezer",
-        		"Size: 3x4x3 (Hollow) LxHxW", 
+        		"Controller Block for the Multitank",
+        		"Size: 3xHx3 (Block behind controller must be air)", 
+        		"Structure must be at least 4 blocks tall, maximum 20.",
+        		"Each casing within the structure adds 96000L storage.",
         		"Controller (front centered)",
         		"1x Input hatch (anywhere)", 
         		"1x Output hatch (anywhere)",
@@ -218,7 +223,7 @@ public class GregtechMetaTileEntityMultiTank
                                     return false;
                             	}
                             	else if (h >= 3){
-                                	Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+                                	//Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
                             	}
                             }
                             if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) {
@@ -227,7 +232,7 @@ public class GregtechMetaTileEntityMultiTank
                                     return false;
                             	}
                             	else if (h >= 3){
-                                	Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+                                	//Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
                             	}
                             }
                             if (h < 3){
@@ -248,7 +253,8 @@ public class GregtechMetaTileEntityMultiTank
             }
         }
         multiblockCasingCount = (short) tAmount;
-        Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+maximumFluidStorage+"L");
+        Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+        Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+getMaximumTankStorage()+"L");
         return tAmount >= 16;
     }
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 1f3537f355..0d9193ba3c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -60,9 +60,9 @@ public class GregtechConduits {
 		generateNonGTFluidPipes(GT_Materials.Staballoy, BasePipeID, 6250, 7500, true);
 		generateNonGTFluidPipes(GT_Materials.Tantalloy60, BasePipeID+5, 5000, 4250, true);
 		generateNonGTFluidPipes(GT_Materials.Tantalloy61, BasePipeID+10, 6000, 5800, true);
-		generateNonGTFluidPipes(GT_Materials.VoidMetal, BasePipeID+15, 250, 25000, true);
+		if (LoadedMods.Thaumcraft){
+		generateNonGTFluidPipes(GT_Materials.VoidMetal, BasePipeID+15, 250, 25000, true);}
 		generateGTFluidPipes(Materials.Europium, BasePipeID+20, 12000, 7500, true);
-		
 		generateNonGTFluidPipes(GT_Materials.Potin, BasePipeID+25, 375, 2000, true);
 		generateNonGTFluidPipes(GT_Materials.MaragingSteel300, BasePipeID+30, 7000, 2500, true);
 		generateNonGTFluidPipes(GT_Materials.MaragingSteel350, BasePipeID+35, 8000, 2500, true);
@@ -215,8 +215,7 @@ public class GregtechConduits {
 		String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1);
 		output = output.replace("-", "").replace("_", "").replace(" ", "");
 		
-		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");
-		int multi = 5;		
+		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");		
 		
 		ItemStack pipeIngot = UtilsItems.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
 		ItemStack pipePlate = UtilsItems.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
@@ -227,6 +226,17 @@ public class GregtechConduits {
 		Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
 		Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
 		Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
+				
+		int eut = 128;
+		if (materialName.toLowerCase().contains("hastelloy") ||
+				materialName.toLowerCase().contains("staballoy") ||
+				materialName.toLowerCase().contains("tantalloy") ||
+				materialName.toLowerCase().contains("europium")){
+			eut = 512;
+		}
+		else {
+			eut = 128;
+		}
 		
 		//Add the Three Shaped Recipes First		
 		UtilsRecipe.recipeBuilder(
@@ -251,31 +261,31 @@ public class GregtechConduits {
 				UtilsItems.getSimpleStack(pipeIngot, 1),
 				ItemList.Shape_Extruder_Pipe_Tiny.get(0),
 				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 2),
-				32*multi, 8*multi);
+				5, eut);
 		
 		GT_Values.RA.addExtruderRecipe(
 				UtilsItems.getSimpleStack(pipeIngot, 1),
 				ItemList.Shape_Extruder_Pipe_Small.get(0),
 				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1),
-				32*multi, 16*multi);
+				10, eut);
 		
 		GT_Values.RA.addExtruderRecipe(
 				UtilsItems.getSimpleStack(pipeIngot, 3),
 				ItemList.Shape_Extruder_Pipe_Medium.get(0),
 				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1),
-				32*multi, 32*multi);
+				20, eut);
 		
 		GT_Values.RA.addExtruderRecipe(
 				UtilsItems.getSimpleStack(pipeIngot, 6),
 				ItemList.Shape_Extruder_Pipe_Large.get(0),
 				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1),
-				32*multi, 64*multi);
+				2*20, eut);
 		
 		GT_Values.RA.addExtruderRecipe(
 				UtilsItems.getSimpleStack(pipeIngot, 12),
 				ItemList.Shape_Extruder_Pipe_Huge.get(0),
 				UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
-				32*multi, 128*multi);
+				4*20, eut);
 		
 	}
 	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
index dcd3e0450a..d444a53894 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMultiTank;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMultiTankDense;
 
 public class GregtechIndustrialMultiTank
 {
@@ -12,7 +13,7 @@ public class GregtechIndustrialMultiTank
 	public static void run()
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank Multiblock.");
+			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks.");
 			run1();
 		}
 
@@ -21,6 +22,7 @@ public class GregtechIndustrialMultiTank
 	private static void run1()
 	{
 		GregtechItemList.Industrial_MultiTank.set(new GregtechMetaTileEntityMultiTank(827, "multitank.controller.tier.single", "Gregtech Multitank").getStackForm(1L));
+		GregtechItemList.Industrial_MultiTankDense.set(new GregtechMetaTileEntityMultiTankDense(828, "multitankdense.controller.tier.single", "Gregtech Dense Multitank").getStackForm(1L));
 		
 	}
 }