From ec910ff188fe0600182e00f3c279c37998ebaf4b Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 25 May 2024 13:32:28 +0100 Subject: Update formatting to GT5u spotless config --- src/main/java/common/tileentities/GTMTE_TFFT.java | 249 ++++++++++++---------- 1 file changed, 141 insertions(+), 108 deletions(-) (limited to 'src/main/java/common/tileentities/GTMTE_TFFT.java') diff --git a/src/main/java/common/tileentities/GTMTE_TFFT.java b/src/main/java/common/tileentities/GTMTE_TFFT.java index a32f461053..18867c0656 100644 --- a/src/main/java/common/tileentities/GTMTE_TFFT.java +++ b/src/main/java/common/tileentities/GTMTE_TFFT.java @@ -152,44 +152,46 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase s != null && s.stackSize >= 0 - && s.getItem() == TFFT_FIELD_ITEM - && s.getItemDamage() != CASING_META - && s.getItemDamage() <= fieldTier, + && s.getItem() == TFFT_FIELD_ITEM + && s.getItemDamage() != CASING_META + && s.getItemDamage() <= fieldTier, true); if (result == null) return PlaceResult.REJECT; return StructureUtility.survivalPlaceBlock( - result, - ItemStackPredicate.NBTMode.EXACT, - null, - true, - world, - x, - y, - z, - env.getSource(), - env.getActor(), - env.getChatter()); + result, + ItemStackPredicate.NBTMode.EXACT, + null, + true, + world, + x, + y, + z, + env.getSource(), + env.getActor(), + env.getChatter()); } } private static final IIconContainer TEXTURE_TFFT = new Textures.BlockIcons.CustomIcon("iconsets/TFFT"); private static final IIconContainer TEXTURE_TFFT_ACTIVE = new Textures.BlockIcons.CustomIcon( - "iconsets/TFFT_ACTIVE"); + "iconsets/TFFT_ACTIVE"); private static final IIconContainer TEXTURE_TFFT_ACTIVE_GLOW = new Textures.BlockIcons.CustomIcon( - "iconsets/TFFT_ACTIVE_GLOW"); + "iconsets/TFFT_ACTIVE_GLOW"); private static final int CASING_TEXTURE_ID_1 = (12 << 7) | 127; private static final int CASING_TEXTURE_ID_2 = 176; private static final Block TFFT_FIELD = Blocks.tfftStorageField; private static final Item TFFT_FIELD_ITEM = Item.getItemFromBlock(TFFT_FIELD); public static final int MAX_DISTINCT_FLUIDS = 25; - private static final BigInteger MAX_CAPACITY = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf(25)); + private static final BigInteger MAX_CAPACITY = BigInteger.valueOf(Long.MAX_VALUE) + .multiply(BigInteger.valueOf(25)); private static final int CASING_META = 0; private static final int MIN_CASING_AMOUNT = 20; private static final int MAX_LAYER_AMOUNT = 13; @@ -205,56 +207,60 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase STRUCTURE_DEFINITION = IStructureDefinition - .builder() - .addShape( - STRUCTURE_PIECE_TOP, - transpose(new String[][] { { "ccccc" }, { "cCCCc" }, { "cC~Cc" }, { "cCCCc" }, { "ccccc" } })) - .addShape( - STRUCTURE_PIECE_MID, - transpose(new String[][] { { "gGGGg" }, { "GfffG" }, { "GfffG" }, { "GfffG" }, { "gGGGg" } })) - .addShape( - STRUCTURE_PIECE_BOTTOM, - transpose(new String[][] { { "ccccc" }, { "cCCCc" }, { "cCCCc" }, { "cCCCc" }, { "ccccc" } })) - .addElement( - 'c', - buildHatchAdder(GTMTE_TFFT.class).atLeast(Energy, Maintenance).casingIndex(CASING_TEXTURE_ID_1) - .dot(1) - .buildAndChain(onElementPass(te -> te.casingAmount++, ofBlock(TFFT_FIELD, CASING_META)))) - .addElement( - 'C', - buildHatchAdder(GTMTE_TFFT.class).casingIndex(CASING_TEXTURE_ID_1) - .atLeast( - Energy, - Maintenance, - InputHatch.or(TFFTMultiHatch.INSTANCE), - OutputHatch.or(TFFTMultiHatch.INSTANCE)) - .dot(2) - .buildAndChain(onElementPass(te -> te.casingAmount++, ofBlock(TFFT_FIELD, CASING_META)))) - .addElement( - 'G', - buildHatchAdder(GTMTE_TFFT.class) - .atLeast(InputHatch.or(TFFTMultiHatch.INSTANCE), OutputHatch.or(TFFTMultiHatch.INSTANCE)) - .casingIndex(CASING_TEXTURE_ID_2).dot(3).buildAndChain( - ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false), - ofGlassTieredMixed((byte) 4, (byte) 127, 3))) - .addElement( - 'g', - ofChain( - ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false), - ofGlassTieredMixed((byte) 4, (byte) 127, 4))) - .addElement('f', ofChain(TFFTStorageFieldElement.INSTANCE)).build(); + .builder() + .addShape( + STRUCTURE_PIECE_TOP, + transpose(new String[][] { { "ccccc" }, { "cCCCc" }, { "cC~Cc" }, { "cCCCc" }, { "ccccc" } })) + .addShape( + STRUCTURE_PIECE_MID, + transpose(new String[][] { { "gGGGg" }, { "GfffG" }, { "GfffG" }, { "GfffG" }, { "gGGGg" } })) + .addShape( + STRUCTURE_PIECE_BOTTOM, + transpose(new String[][] { { "ccccc" }, { "cCCCc" }, { "cCCCc" }, { "cCCCc" }, { "ccccc" } })) + .addElement( + 'c', + buildHatchAdder(GTMTE_TFFT.class).atLeast(Energy, Maintenance) + .casingIndex(CASING_TEXTURE_ID_1) + .dot(1) + .buildAndChain(onElementPass(te -> te.casingAmount++, ofBlock(TFFT_FIELD, CASING_META)))) + .addElement( + 'C', + buildHatchAdder(GTMTE_TFFT.class).casingIndex(CASING_TEXTURE_ID_1) + .atLeast( + Energy, + Maintenance, + InputHatch.or(TFFTMultiHatch.INSTANCE), + OutputHatch.or(TFFTMultiHatch.INSTANCE)) + .dot(2) + .buildAndChain(onElementPass(te -> te.casingAmount++, ofBlock(TFFT_FIELD, CASING_META)))) + .addElement( + 'G', + buildHatchAdder(GTMTE_TFFT.class) + .atLeast(InputHatch.or(TFFTMultiHatch.INSTANCE), OutputHatch.or(TFFTMultiHatch.INSTANCE)) + .casingIndex(CASING_TEXTURE_ID_2) + .dot(3) + .buildAndChain( + ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false), + ofGlassTieredMixed((byte) 4, (byte) 127, 3))) + .addElement( + 'g', + ofChain( + ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false), + ofGlassTieredMixed((byte) 4, (byte) 127, 4))) + .addElement('f', ofChain(TFFTStorageFieldElement.INSTANCE)) + .build(); public final FluidTankGT[] STORE = new FluidTankGT[MAX_DISTINCT_FLUIDS]; @@ -297,13 +303,23 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase MAX_LAYER_AMOUNT || layer - 1 < DEFAULT_LAYER_AMOUNT) return false; if (!checkPiece(STRUCTURE_PIECE_BOTTOM, 2, 2, -layer)) return false; if (casingAmount >= MIN_CASING_AMOUNT - && (tfftHatch != null || (!mInputHatches.isEmpty() && !mOutputHatches.isEmpty())) - && mInputHatches.size() + mOutputHatches.size() <= MAX_DISTINCT_FLUIDS * 2 - && mMaintenanceHatches.size() == 1) { + && (tfftHatch != null || (!mInputHatches.isEmpty() && !mOutputHatches.isEmpty())) + && mInputHatches.size() + mOutputHatches.size() <= MAX_DISTINCT_FLUIDS * 2 + && mMaintenanceHatches.size() == 1) { BigInteger tempCap = BigInteger.ZERO; for (int i = 0; i < this.FIELDS.length; i++) { tempCap = tempCap.add( - BigInteger.valueOf(Field.VALUES[i].getCapacity()).multiply(BigInteger.valueOf(this.FIELDS[i]))); + BigInteger.valueOf(Field.VALUES[i].getCapacity()) + .multiply(BigInteger.valueOf(this.FIELDS[i]))); this.runningCost += Field.VALUES[i].getCost() * this.FIELDS[i]; } this.setCapacity(tempCap); @@ -417,8 +440,8 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase inputFluids = getStoredFluids(); @@ -447,7 +470,9 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase 0 ? String.valueOf(STORE[i].amount() * 100 / capacityPerFluid) - : ""; + : ""; ll.add(MessageFormat.format("{0} - {1}: {2}L ({3}%)", i, localizedName, amount, percentage)); } @@ -512,9 +541,9 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase= 0) { return STORE[index].fill(aFluid, doPull); } else if (fluidCount() < MAX_DISTINCT_FLUIDS) { - return STORE[getNullSlot()].setCapacity(capacityPerFluid).fill(aFluid, doPull); + return STORE[getNullSlot()].setCapacity(capacityPerFluid) + .fill(aFluid, doPull); } return 0; } @@ -617,7 +647,7 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase tank.capacity() ? tank.capacity() - tank.amount() : amount; + : tank.amount() + amount > tank.capacity() ? tank.capacity() - tank.amount() : amount; } else if (fluidCount() < MAX_DISTINCT_FLUIDS) { FluidTankGT tank = STORE[getNullSlot()]; if (doPull) return tank.add(amount, aFluid); @@ -658,12 +688,14 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase capacityPerFluid) { + if (tank.setCapacity(capacityPerFluid) + .amount() > capacityPerFluid) { STORE[i] = new FluidTankGT(tank.get(), capacityPerFluid, capacityPerFluid); } } @@ -679,7 +711,8 @@ public class GTMTE_TFFT extends GT_MetaTileEntity_EnhancedMultiBlockBase