diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-08-31 01:48:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-30 17:48:23 +0000 |
| commit | 9fee35c065e197199f57ef1df31ac303e94d1d50 (patch) | |
| tree | 66437da0c2422d10ddfc9211040ebbd180af5f54 /src/main/java/goodgenerator/blocks | |
| parent | 55ebcb3bdf0f54b76642c03b3a58112081138c10 (diff) | |
| download | GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.tar.gz GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.tar.bz2 GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.zip | |
Add duration since last shutdown (#2977)
* machine message
* fix & prass channel
* machine message
* fix & prass channel
* fix machines that dont use regular onPostTick
* follow error fixes and fix hatch check
* oops
* sa
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/goodgenerator/blocks')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java | 77 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 1 |
2 files changed, 42 insertions, 36 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index f6ea2596a2..3d8c0df58c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -120,45 +120,50 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB { "CCCC~CCCC", "CMMMMMMMC", "CMMMMMMMC", "CMMMMMMMC", "CCCCCCCCC" } })) .addElement( 'C', - GT_HatchElementBuilder.<PreciseAssembler>builder() - .atLeast( - InputBus, - InputHatch, - OutputHatch, - OutputBus, - Maintenance, - Muffler, - ExoticEnergy.or(Energy)) - .adder(PreciseAssembler::addToPAssList) - .casingIndex(CASING_INDEX) - .dot(1) - .buildAndChain( - onElementPass( - x -> x.casingAmount++, - StructureUtility.ofBlocksTiered( - (block, meta) -> block == Loaders.impreciseUnitCasing ? -1 - : block == Loaders.preciseUnitCasing ? meta : -2, - ImmutableList.of( - Pair.of(Loaders.impreciseUnitCasing, 0), - Pair.of(Loaders.preciseUnitCasing, 0), - Pair.of(Loaders.preciseUnitCasing, 1), - Pair.of(Loaders.preciseUnitCasing, 2), - Pair.of(Loaders.preciseUnitCasing, 3)), - -3, - PreciseAssembler::setCasingTier, - PreciseAssembler::getCasingTier)))) + withChannel( + "unit casing", + GT_HatchElementBuilder.<PreciseAssembler>builder() + .atLeast( + InputBus, + InputHatch, + OutputHatch, + OutputBus, + Maintenance, + Muffler, + ExoticEnergy.or(Energy)) + .adder(PreciseAssembler::addToPAssList) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass( + x -> x.casingAmount++, + StructureUtility.ofBlocksTiered( + (block, meta) -> block == Loaders.impreciseUnitCasing ? -1 + : block == Loaders.preciseUnitCasing ? meta : -2, + ImmutableList.of( + Pair.of(Loaders.impreciseUnitCasing, 0), + Pair.of(Loaders.preciseUnitCasing, 0), + Pair.of(Loaders.preciseUnitCasing, 1), + Pair.of(Loaders.preciseUnitCasing, 2), + Pair.of(Loaders.preciseUnitCasing, 3)), + -3, + PreciseAssembler::setCasingTier, + PreciseAssembler::getCasingTier))))) .addElement('F', ofFrame(Materials.TungstenSteel)) - .addElement('G', ofGlassTieredMixed((byte) 4, (byte) 127, 2)) + .addElement('G', withChannel("glass", ofGlassTieredMixed((byte) 4, (byte) 127, 2))) .addElement( 'M', - StructureUtility.ofBlocksTiered( - (block, meta) -> block == GregTech_API.sBlockCasings1 ? meta : -2, - IntStream.range(0, 10) - .mapToObj(meta -> org.apache.commons.lang3.tuple.Pair.of(GregTech_API.sBlockCasings1, meta)) - .collect(Collectors.toList()), - -1, - PreciseAssembler::setMachineTier, - PreciseAssembler::getMachineTier)) + withChannel( + "machine casing", + StructureUtility.ofBlocksTiered( + (block, meta) -> block == GregTech_API.sBlockCasings1 ? meta : -2, + IntStream.range(0, 10) + .mapToObj( + meta -> org.apache.commons.lang3.tuple.Pair.of(GregTech_API.sBlockCasings1, meta)) + .collect(Collectors.toList()), + -1, + PreciseAssembler::setMachineTier, + PreciseAssembler::getMachineTier))) .build(); } return multiDefinition; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index 50039e19c5..5c31d55b16 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -274,6 +274,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } if (aBaseMetaTileEntity.isServerSide()) { + mTotalRunTime++; if (mEfficiency < 0) mEfficiency = 0; if (mRunningOnLoad && checkMachine(aBaseMetaTileEntity, mInventory[1])) { checkRecipe(); |