diff options
| author | Blood-Asp <Blood@Asp> | 2015-06-07 21:25:40 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-06-07 21:25:40 +0200 |
| commit | f6fc2a6df60811b84bb929560921b02095cc035e (patch) | |
| tree | 6aa543231323eca9205ba8a840ffdc5abdc70f80 /main/java/gregtech/api/metatileentity/implementations | |
| parent | 7e0b4194ac6c5651fab4b24e4f30c447697e11ab (diff) | |
| download | GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.tar.gz GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.tar.bz2 GT5-Unofficial-f6fc2a6df60811b84bb929560921b02095cc035e.zip | |
Update 5.08.19
Diffstat (limited to 'main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 2 | ||||
| -rw-r--r-- | main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index aada4db823..c859f5345f 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -193,7 +193,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile mConnections |= (1<<i); continue; } - if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver){ + if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver)tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))){ mConnections |= (1<<i); continue; } 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 a89db1ceda..45b9205d9f 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -425,8 +425,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { public boolean addOutput(ItemStack aStack) { if (GT_Utility.isStackInvalid(aStack)) return false; aStack = GT_Utility.copy(aStack); - FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); - if (aLiquid == null) { +// FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); +// if (aLiquid == null) { for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) { if (isValidMetaTileEntity(tHatch)) { for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) { @@ -439,16 +439,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, aStack)) return true; } } - } else { - for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { - if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) { - int tAmount = tHatch.fill(aLiquid, false); - if (tAmount >= aLiquid.amount) { - return tHatch.fill(aLiquid, true) >= aLiquid.amount; - } - } - } - } +// }else { +// for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { +// if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) { +// int tAmount = tHatch.fill(aLiquid, false); +// if (tAmount >= aLiquid.amount) { +// return tHatch.fill(aLiquid, true) >= aLiquid.amount; +// } +// } +// } +// } return false; } |