aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-03-30 15:44:54 +0200
committerGitHub <noreply@github.com>2023-03-30 15:44:54 +0200
commitefc2a9774b3d69c666f77bf9b0b3dbe44b68c907 (patch)
tree34f029913b15282f29ec00ececf22c648d3db720 /src/main
parentf131a3b34562d3be0c65e046be73eeea5570b1db (diff)
downloadGT5-Unofficial-efc2a9774b3d69c666f77bf9b0b3dbe44b68c907.tar.gz
GT5-Unofficial-efc2a9774b3d69c666f77bf9b0b3dbe44b68c907.tar.bz2
GT5-Unofficial-efc2a9774b3d69c666f77bf9b0b3dbe44b68c907.zip
Allow me output hatch in compact fusion structure (#152)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java3
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java3
2 files changed, 4 insertions, 2 deletions
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;
}