From 1fe8aa5ef903c3d52972a7c6e41e4e2b45a7fbce Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Sat, 10 Dec 2022 22:12:08 +0100 Subject: Removed unnecessary hatches from QC and RS --- .../multi/GT_MetaTileEntity_EM_computer.java | 18 ++++++++++++++---- .../multi/GT_MetaTileEntity_EM_research.java | 11 ++++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index ad0fe07447..1a66eaf46d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -6,9 +6,9 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; import static com.github.technus.tectech.util.CommonValues.V; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket; @@ -74,7 +74,17 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB .addElement('B', ofBlock(sBlockCasingsTT, 1)) .addElement('C', ofBlock(sBlockCasingsTT, 2)) .addElement('D', ofBlock(sBlockCasingsTT, 3)) - .addElement('A', classicHatches(textureOffset + 1, 1, sBlockCasingsTT, 1)) + .addElement( + 'A', + buildHatchAdder(GT_MetaTileEntity_EM_computer.class) + .atLeast( + Energy.or(HatchElement.EnergyMulti), + Maintenance, + HatchElement.Uncertainty, + HatchElement.OutputData) + .casingIndex(textureOffset + 1) + .dot(1) + .buildAndChain(ofBlock(sBlockCasingsTT, 1))) .addElement( 'E', ofChain( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 3fc01b02a9..0508a24889 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -10,6 +10,9 @@ import static com.github.technus.tectech.util.CommonValues.V; import static com.github.technus.tectech.util.CommonValues.VN; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static mcp.mobius.waila.api.SpecialChars.*; import static mcp.mobius.waila.api.SpecialChars.RESET; import static net.minecraft.util.StatCollector.translateToLocal; @@ -94,7 +97,13 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB .addElement('A', ofBlock(sBlockCasingsTT, 1)) .addElement('B', ofBlock(sBlockCasingsTT, 2)) .addElement('C', ofBlock(sBlockCasingsTT, 3)) - .addElement('D', classicHatches(textureOffset + 1, 1, sBlockCasingsTT, 1)) + .addElement( + 'D', + buildHatchAdder(GT_MetaTileEntity_EM_research.class) + .atLeast(Energy.or(HatchElement.EnergyMulti), Maintenance, HatchElement.InputData) + .casingIndex(textureOffset + 1) + .dot(1) + .buildAndChain(ofBlock(sBlockCasingsTT, 1))) .addElement('E', HolderHatchElement.INSTANCE.newAny(textureOffset + 3, 2)) .build(); // endregion -- cgit