From 45128e7f18477fa1a21db8022a227389fe815ba7 Mon Sep 17 00:00:00 2001 From: Lyfts <127234178+Lyfts@users.noreply.github.com> Date: Sat, 10 Feb 2024 09:27:09 +0100 Subject: Compact fusion structure fixes (#236) * update bs+deps+address deprecation * compact fusion autobuild fixes --- .../blocks/tileEntity/base/LargeFusionComputer.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/main/java/goodgenerator/blocks/tileEntity') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index 93faf16968..af41493ba3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -2,6 +2,7 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.filterByMTETier; import static gregtech.api.util.GT_StructureUtility.ofFrame; import static gregtech.api.util.GT_Utility.filterValidMTEs; @@ -85,17 +86,20 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti lazy( x -> GT_HatchElementBuilder.builder() .atLeast( - GT_HatchElement.InputHatch, - GT_HatchElement.OutputHatch, - GT_HatchElement.InputBus) + GT_HatchElement.InputHatch.or(GT_HatchElement.InputBus), + GT_HatchElement.OutputHatch) .adder(LargeFusionComputer::addFluidIO).casingIndex(x.textureIndex()).dot(1) + .hatchItemFilterAnd( + x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) .addElement( 'E', lazy( x -> GT_HatchElementBuilder.builder() - .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + .anyOf(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) .adder(LargeFusionComputer::addEnergyInjector).casingIndex(x.textureIndex()) + .hatchItemFilterAnd( + x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .dot(2).buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); } -- cgit