Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Improved output bus handling

Browse source
This commit is contained in:
MauveCloud 2016-04-27 17:31:20 -07:00
parent 784c65a884
commit 9036858017
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
View file

@ -562,16 +562,21 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
aStack = GT_Utility.copy(aStack); aStack = GT_Utility.copy(aStack);
// FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); // FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true);
// if (aLiquid == null) { // if (aLiquid == null) {
for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) { boolean outputSuccess = true;
if (isValidMetaTileEntity(tHatch)) { while (outputSuccess && aStack.stackSize > 0) {
for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) { outputSuccess = false;
if (tHatch.getBaseMetaTileEntity().addStackToSlot(i, aStack)) return true; ItemStack single = aStack.splitStack(1);
for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) {
if (!outputSuccess && isValidMetaTileEntity(tHatch)) {
for (int i = tHatch.getSizeInventory() - 1; i >= 0 && !outputSuccess; i--) {
if (tHatch.getBaseMetaTileEntity().addStackToSlot(i, single)) outputSuccess = true;
}
} }
} }
} for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) {
for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { if (!outputSuccess && isValidMetaTileEntity(tHatch) && tHatch.outputsItems()) {
if (isValidMetaTileEntity(tHatch) && tHatch.outputsItems()) { if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, single)) outputSuccess = true;
if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, aStack)) return true; }
} }
} }
// }else { // }else {
@ -584,7 +589,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
// } // }
// } // }
// } // }
return false; return outputSuccess;
} }
public boolean depleteInput(ItemStack aStack) { public boolean depleteInput(ItemStack aStack) {