aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorBlood Asp <Blood@Asp>2015-04-26 02:04:07 +0200
committerBlood Asp <Blood@Asp>2015-04-26 02:04:07 +0200
commitf1610b1721ed22fcbd4cafb61b0867d8611c00f6 (patch)
tree8261a571accdd074239edd332398c37b01c77258 /main/java/gregtech/api/metatileentity/implementations
parent6b80bc2d1cb91bc377a0e549bfffaf3fe7ae08c1 (diff)
downloadGT5-Unofficial-f1610b1721ed22fcbd4cafb61b0867d8611c00f6.tar.gz
GT5-Unofficial-f1610b1721ed22fcbd4cafb61b0867d8611c00f6.tar.bz2
GT5-Unofficial-f1610b1721ed22fcbd4cafb61b0867d8611c00f6.zip
Fusion GUI and Distillation Tower
Diffstat (limited to 'main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 9d015cbf10..058a396593 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -169,7 +169,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
if (mMaxProgresstime > 0 && ++mProgresstime>=mMaxProgresstime) {
if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack);
- if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);
+ if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);}
+ else if(mOutputFluids!=null&&mOutputFluids.length>1){
+ System.out.println("addfluids");
+ addFluidOutputs(mOutputFluids);}
mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000)));
mOutputItems = null;
mProgresstime = 0;
@@ -197,7 +200,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
aBaseMetaTileEntity.setActive(mMaxProgresstime>0);
}
}
-
+
public boolean polluteEnvironment(int aPollutionLevel) {
mPollution += aPollutionLevel;
for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) {
@@ -378,6 +381,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
return false;
}
+ private void addFluidOutputs(FluidStack[] mOutputFluids2) {
+ for(int i=0;i<mOutputFluids2.length;i++){
+ if(mOutputHatches.size()>=i&&mOutputHatches.get(i)!=null&&mOutputFluids2[i]!=null&&isValidMetaTileEntity(mOutputHatches.get(i))){
+ mOutputHatches.get(i).fill(mOutputFluids2[i], true);
+ }
+ }
+
+ }
+
public boolean depleteInput(FluidStack aLiquid) {
if (aLiquid == null) return false;
for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) {