From efc2a9774b3d69c666f77bf9b0b3dbe44b68c907 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 30 Mar 2023 15:44:54 +0200 Subject: Allow me output hatch in compact fusion structure (#152) --- .../java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 3 ++- .../goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/goodgenerator/blocks/tileEntity/base') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index 8316d051f2..dea3196584 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -48,6 +48,7 @@ import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.power.FusionPower; +import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -516,7 +517,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (aMetaTileEntity == null) return false; if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { GT_MetaTileEntity_Hatch tHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; + if (tHatch.mTier < hatchTier() && !(tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME)) return false; } else { return false; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index e004d19816..50c8deea74 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -48,6 +48,7 @@ import gregtech.api.util.AdvFusionPower; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -499,7 +500,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (aMetaTileEntity == null) return false; if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { GT_MetaTileEntity_Hatch tHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; - if (tHatch.mTier < hatchTier()) return false; + if (tHatch.mTier < hatchTier() && !(tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME)) return false; } else { return false; } -- cgit