From e7e3af4e7ff783036cb064adf67df5c9c7fbaf51 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 11 Sep 2016 15:37:22 +1000 Subject: + 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. --- .../multi/GregtechMetaTileEntityMultiTank.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities') 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; } -- cgit