diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala index 32b48578c..84ed26e75 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala @@ -45,7 +45,7 @@ trait BuildCraft extends Common with IPowerReceptor { @Optional.Method(modid = "BuildCraftAPI|power") def getPowerReceiver(side: ForgeDirection) = - if (canConnect(side)) + if (canConnectPower(side)) getPowerProvider.getPowerReceiver else null diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala index bb13a16fc..b86a153b5 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala @@ -14,7 +14,7 @@ trait Common extends TileEntity { // ----------------------------------------------------------------------- // - def canConnect(side: ForgeDirection) = + def canConnectPower(side: ForgeDirection) = !Settings.get.ignorePower && side != null && side != ForgeDirection.UNKNOWN && (if (isClient) hasConnector(side) else connector(side).isDefined) diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala index 7d2e8757f..8c07ca07a 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala @@ -33,7 +33,7 @@ trait IndustrialCraft2 extends Common with IEnergySink { // ----------------------------------------------------------------------- // @Optional.Method(modid = "IC2") - def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = canConnect(direction) + def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = canConnectPower(direction) @Optional.Method(modid = "IC2") def injectEnergyUnits(directionFrom: ForgeDirection, amount: Double) = diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala index 919142545..715881215 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala @@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection @Optional.Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "ThermalExpansion") trait ThermalExpansion extends Common with IEnergyHandler { @Optional.Method(modid = "ThermalExpansion") - def canInterface(from: ForgeDirection) = canConnect(from) + def canInterface(from: ForgeDirection) = canConnectPower(from) @Optional.Method(modid = "ThermalExpansion") def receiveEnergy(from: ForgeDirection, maxReceive: Int, simulate: Boolean) = diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala index b0edaf979..a6532bb16 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala @@ -11,7 +11,7 @@ import universalelectricity.api.energy.{IEnergyInterface, IEnergyContainer} )) trait UniversalElectricity extends Common with IEnergyInterface with IEnergyContainer { @Optional.Method(modid = "UniversalElectricity") - override def canConnect(direction: ForgeDirection, source: AnyRef) = canConnect(direction) + override def canConnect(direction: ForgeDirection, source: AnyRef) = canConnectPower(direction) @Optional.Method(modid = "UniversalElectricity") override def onReceiveEnergy(from: ForgeDirection, receive: Long, doReceive: Boolean) =