From 550178729778595cf9af6ca465f2c3c644d3e0a8 Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Mon, 20 Sep 2021 19:11:17 -0700 Subject: [PATCH 1/2] Fix Crash from Fusion Reactor when forming with incorrect tier energy inputs --- .../multi/electric/MetaTileEntityFusionReactor.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java index 46f9711b3b6..33d317db423 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java @@ -1,8 +1,5 @@ package gregtech.common.metatileentities.multi.electric; -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.vec.Matrix4; import gregtech.api.GTValues; import gregtech.api.capability.IEnergyContainer; import gregtech.api.capability.IMultipleTankHandler; @@ -33,6 +30,7 @@ import net.minecraft.util.text.*; import net.minecraftforge.items.IItemHandlerModifiable; +import javax.annotation.Nonnull; import java.util.List; import static gregtech.api.util.RelativeDirection.*; @@ -85,7 +83,7 @@ protected BlockPattern createStructurePattern() { .where('c', statePredicate(getCoilState())) .where('O', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.EXPORT_FLUIDS))) .where('E', statePredicate(getCasingState()).or(tilePredicate((state, tile) -> { - for (int i = tier; i < GTValues.V.length; i++) { + for (int i = tier; i < GTValues.UV; i++) { if (tile.metaTileEntityId.equals(MetaTileEntities.ENERGY_INPUT_HATCH[i].metaTileEntityId)) return true; } @@ -194,6 +192,7 @@ protected void addDisplayText(List textList) { textList.add(new TextComponentTranslation("gregtech.multiblock.fusion_reactor.heat", heat)); } + @Nonnull @Override protected OrientedOverlayRenderer getFrontOverlay() { return Textures.FUSION_REACTOR_OVERLAY; From 5c0f517f22cbaaf299cff69608a4c4dfa6232b41 Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Mon, 20 Sep 2021 19:16:24 -0700 Subject: [PATCH 2/2] Fix off by one tier --- .../multi/electric/MetaTileEntityFusionReactor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java index 33d317db423..15b233f919f 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java @@ -83,7 +83,7 @@ protected BlockPattern createStructurePattern() { .where('c', statePredicate(getCoilState())) .where('O', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.EXPORT_FLUIDS))) .where('E', statePredicate(getCasingState()).or(tilePredicate((state, tile) -> { - for (int i = tier; i < GTValues.UV; i++) { + for (int i = tier; i < GTValues.UV + 1; i++) { if (tile.metaTileEntityId.equals(MetaTileEntities.ENERGY_INPUT_HATCH[i].metaTileEntityId)) return true; }