diff --git a/src/minecraft/mekanism/api/GasTransmission.java b/src/minecraft/mekanism/api/GasTransmission.java index 9bff9df7f..e1332b13e 100644 --- a/src/minecraft/mekanism/api/GasTransmission.java +++ b/src/minecraft/mekanism/api/GasTransmission.java @@ -25,7 +25,7 @@ public class GasTransmission { TileEntity tube = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); - if(tube instanceof IPressurizedTube && ((IPressurizedTube)tube).canTransferGas()) + if(tube instanceof IPressurizedTube && ((IPressurizedTube)tube).canTransferGas(tileEntity)) { tubes[orientation.ordinal()] = tube; } diff --git a/src/minecraft/mekanism/api/IPressurizedTube.java b/src/minecraft/mekanism/api/IPressurizedTube.java index feae258df..eebb07cb7 100644 --- a/src/minecraft/mekanism/api/IPressurizedTube.java +++ b/src/minecraft/mekanism/api/IPressurizedTube.java @@ -1,10 +1,12 @@ package mekanism.api; +import net.minecraft.tileentity.TileEntity; + public interface IPressurizedTube { /** * Whether or not this tube can transfer gas. * @return if the tube can transfer gas */ - public boolean canTransferGas(); + public boolean canTransferGas(TileEntity fromTile); } diff --git a/src/minecraft/mekanism/api/IUniversalCable.java b/src/minecraft/mekanism/api/IUniversalCable.java index b8d485394..447bbfea4 100644 --- a/src/minecraft/mekanism/api/IUniversalCable.java +++ b/src/minecraft/mekanism/api/IUniversalCable.java @@ -1,5 +1,7 @@ package mekanism.api; +import net.minecraft.tileentity.TileEntity; + /** * Implement this in your TileEntity class if the block can transfer energy as a Universal Cable. * @author AidanBrady @@ -11,5 +13,5 @@ public interface IUniversalCable * Whether or not this cable can transfer energy. * @return if the cable can transfer energy */ - public boolean canTransferEnergy(); + public boolean canTransferEnergy(TileEntity fromTile); } diff --git a/src/minecraft/mekanism/common/CableUtils.java b/src/minecraft/mekanism/common/CableUtils.java index 95855eeea..c5a252577 100644 --- a/src/minecraft/mekanism/common/CableUtils.java +++ b/src/minecraft/mekanism/common/CableUtils.java @@ -53,7 +53,7 @@ public final class CableUtils { TileEntity cable = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); - if(cable instanceof IUniversalCable && ((IUniversalCable)cable).canTransferEnergy()) + if(cable instanceof IUniversalCable && ((IUniversalCable)cable).canTransferEnergy(tileEntity)) { cables[orientation.ordinal()] = cable; } diff --git a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java b/src/minecraft/mekanism/common/TileEntityPressurizedTube.java index 9493c3d4d..109d23cd4 100644 --- a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java +++ b/src/minecraft/mekanism/common/TileEntityPressurizedTube.java @@ -11,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection; public class TileEntityPressurizedTube extends TileEntity implements IPressurizedTube, ITubeConnection { @Override - public boolean canTransferGas() + public boolean canTransferGas(TileEntity fromTile) { return worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) == 0; } diff --git a/src/minecraft/mekanism/common/TileEntityUniversalCable.java b/src/minecraft/mekanism/common/TileEntityUniversalCable.java index 8c2831879..8eaf4ff17 100644 --- a/src/minecraft/mekanism/common/TileEntityUniversalCable.java +++ b/src/minecraft/mekanism/common/TileEntityUniversalCable.java @@ -30,7 +30,7 @@ public class TileEntityUniversalCable extends TileEntity implements IUniversalCa } @Override - public boolean canTransferEnergy() + public boolean canTransferEnergy(TileEntity fromTile) { return worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) == 0; } @@ -58,7 +58,7 @@ public class TileEntityUniversalCable extends TileEntity implements IUniversalCa { ArrayList ignored = new ArrayList(); ignored.add(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(xCoord, yCoord, zCoord), from)); - return canTransferEnergy() ? (int)Math.min(100, new EnergyTransferProtocol(this, this, ignored).neededEnergy()) : 0; + return canTransferEnergy(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(xCoord, yCoord, zCoord), from)) ? (int)Math.min(100, new EnergyTransferProtocol(this, this, ignored).neededEnergy()) : 0; } @Override