From 14b6613a6ae5759b5ec7cd773f6def6479b52a31 Mon Sep 17 00:00:00 2001 From: Runakai1 <48415331+Runakai1@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:42:00 +0200 Subject: YOTTANK glorification (#61) * YOTTANK glorification Added remainining 4 cores + cells to YOTTANK Made the Multiblock allow up to neutronium borosilicate glas * Recipe changes supercoolant added plus pumps exchanged * Request changes Made all cores 20 seconds in Assline made cells 50 seconds in Assline added recursive recipes to make 128 cores of one Tier to 1 of the next one Fixed Voltages Fixed Pump Quantity * Fixed Quantity Fixed Pump Quantity on Cells as well * spotless Co-authored-by: Dream-MasterXXL --- .../java/goodgenerator/blocks/tileEntity/YottaFluidTank.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/goodgenerator/blocks/tileEntity') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java index 9c4b404fb6..39132cfba9 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java @@ -139,9 +139,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i } private int calGlassTier(int meta) { - if (meta >= 1 && meta <= 6) return meta; - if (meta >= 7 && meta <= 12) return 1; - return 3; + if (meta >= 1 && meta <= 6) return meta; // returns correct meta for Tiers 1-6, 7-12 is colour variations of HV + if (meta >= 7 && meta <= 12) return 1; // For all the HV Glass colour variations + return meta; // returns the rest } @Override @@ -156,6 +156,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i } if (cnt > 15 || cnt < 1) return false; if (!structureCheck_EM(YOTTANK_TOP, 2, cnt + 2, 0)) return false; + // maxCell+1 = Tier of highest Cell. maxCell itself just return Tier-1 if (mMaintenanceHatches.size() == 1 && maxCell + 1 <= calGlassTier(glassMeta)) { if (mStorage.compareTo(mStorageCurrent) < 0) mStorageCurrent = mStorage; if (FluidRegistry.getFluidStack(mFluidName, 1) == null) { @@ -184,7 +185,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i .addElement( 'G', addTieredBlock( - ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 12)) + ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 14)) .addElement('R', ofChain(cells(10))) .addElement('F', addFrame(Materials.Steel)) .addElement( -- cgit