diff options
| author | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-08-07 18:10:33 -0600 |
|---|---|---|
| committer | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-08-08 10:55:12 -0600 |
| commit | 4bf2f1f72906c2a9fa64b4dd127a1d6a37529419 (patch) | |
| tree | b32002587069bcc1150e9d3706da6f89ad275db8 /src | |
| parent | 9f839d9841d8a107022d16cd7605db827563363b (diff) | |
| download | GT5-Unofficial-4bf2f1f72906c2a9fa64b4dd127a1d6a37529419.tar.gz GT5-Unofficial-4bf2f1f72906c2a9fa64b4dd127a1d6a37529419.tar.bz2 GT5-Unofficial-4bf2f1f72906c2a9fa64b4dd127a1d6a37529419.zip | |
Handle tier out of bounds
Former-commit-id: 82c6160b47472af821b83dc518442f90bbe4c365
Diffstat (limited to 'src')
4 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java index f13352e09d..18d075bc36 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java @@ -346,7 +346,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_MetaTileEntity_ElectricBl FluidStack[] tFluids = this.getStoredFluids().toArray(new FluidStack[0]); long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(nominalV)); + byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); GT_Recipe tRecipe; if (circuitMode > 0 && Arrays.stream(tInputs).anyMatch(e -> GT_Utility.areStacksEqual(e, GT_Utility.getIntegratedCircuit(circuitMode), true))) { List<ItemStack> modInputs = Arrays.stream(tInputs).filter(Objects::nonNull).filter(e -> !e.getItem().equals(GT_Utility.getIntegratedCircuit(circuitMode).getItem())).collect(Collectors.toList()); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java index 7c1f13d200..15105babf0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java @@ -45,6 +45,7 @@ import java.util.ArrayList; import java.util.List; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; public class GT_TileEntity_MegaDistillTower extends GT_MetaTileEntity_DistillationTower { @@ -219,7 +220,7 @@ public class GT_TileEntity_MegaDistillTower extends GT_MetaTileEntity_Distillati } long tVoltage = this.getMaxInputVoltage(); - byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage)); + byte tTier = (byte) Math.max(0, Math.min(GT_Utility.getTier(tVoltage), V.length - 1)); long nominalV = BW_Util.getnominalVoltage(this); FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java index 865f06e6a7..1877a88183 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java @@ -99,7 +99,7 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_MetaTileEntity_VacuumFre long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(nominalV)); + byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.findRecipe(this.getBaseMetaTileEntity(), false, V[tTier], null, tInputs); boolean found_Recipe = false; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/emt/tileentities/multi/GT_Industrial_Alchemic_Construct.java b/src/main/java/com/github/bartimaeusnek/crossmod/emt/tileentities/multi/GT_Industrial_Alchemic_Construct.java index dd0dc8f325..cb74678162 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/emt/tileentities/multi/GT_Industrial_Alchemic_Construct.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/emt/tileentities/multi/GT_Industrial_Alchemic_Construct.java @@ -106,7 +106,7 @@ public class GT_Industrial_Alchemic_Construct extends GT_MetaTileEntity_MultiBlo ItemStack outputItems = null; long tVoltage = this.getMaxInputVoltage(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(tVoltage), V.length - 1)); GT_Recipe tRecipe = TCRecipeHandler.alchemicalConstructHandler.findRecipe(this.getBaseMetaTileEntity(),null,false, false, V[tTier], null, stack, tInputs); ItemStack helper = (ItemStack) tRecipe.mSpecialItems; NBTTagCompound tagCompound = helper.getTagCompound(); |