From aa999fadb02102cfb8db308c5e2af9a78687d29a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 3 May 2014 15:39:39 +0800 Subject: [PATCH] #641 Fluid conduits not connecting to BuildCraft 5.0.5 Waterproof Pipes --- .../conduit/liquid/AbstractLiquidConduit.java | 16 ++++++++++------ .../enderio/machine/still/BlockVat.java | 2 -- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 3c123994..7a5fb8db 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -9,7 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; @@ -59,11 +58,16 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I if(h == null) { return false; } - FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); - if(info == null) { - return false; - } - return info.length > 0; + //TODO: This check was added to work around a bug in dynamic tanks, but + //it causes issues with not conecting to empty tanks such as dim. trans + + //BC fluid pipes, so I am removing it for now. + +// FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); +// if(info == null) { +// return false; +// } +// return info.length > 0; + return true; } @Override diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index c7749833..fd9b221b 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -219,8 +219,6 @@ public class BlockVat extends AbstractMachineBlock { return GuiHandler.GUI_ID_STILL; } - - @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {