diff options
| author | Alkalus <draknyte1@hotmail.com> | 2018-02-07 19:55:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 19:55:27 +1000 |
| commit | 54cb60e2ba5a9feef685ac369d7eb4b51fc847c0 (patch) | |
| tree | 8b66b9cb5ac1f5ce33bbfa888f35b7b93ba7121f /src/Java | |
| parent | cdf5f8ba6d8045cb9a0569ecf8c8cbd33e4a293c (diff) | |
| parent | cdeae91a18c4f9e8df5d568a8cca52c965b70adf (diff) | |
| download | GT5-Unofficial-54cb60e2ba5a9feef685ac369d7eb4b51fc847c0.tar.gz GT5-Unofficial-54cb60e2ba5a9feef685ac369d7eb4b51fc847c0.tar.bz2 GT5-Unofficial-54cb60e2ba5a9feef685ac369d7eb4b51fc847c0.zip | |
Merge pull request #212 from codewarrior0/industrial-centrifuge-gendustry-comb-fix
Fix Industrial Centrifuge not processing Gendustry customized combs.
Pass the buffer check if the recipe has more than 16 outputs.
Diffstat (limited to 'src/Java')
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index e0da8e9fc2..492872d37d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -121,6 +121,11 @@ GT_MetaTileEntity_MultiBlockBase { public String getSound() { return ""; } public boolean canBufferOutputs(final GT_Recipe aRecipe, int aParallelRecipes) { + if (aRecipe.mOutputs.length > 16) { + // Gendustry custom comb with a billion centrifuge outputs? Do it anyway. + return true; + } + // Count slots available in output buses ArrayList<ItemStack> tBusStacks = new ArrayList<>(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java index 770575dc7c..1546bf39ab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -55,7 +55,7 @@ extends GregtechMeta_MultiBlockBase { "1x Input Hatch", "1x Output Hatch", "1x Input Bus", - "1x Output Bus", + "1x [HV] Output Bus", "1x [EV] Energy Hatch (Can be higher Tier) [Blue]", "Centrifuge Casings for the rest (16 at least)", CORE.GT_Tooltip}; |