From de9f8b68b7a98059655dd6a94cabf16cfb09d8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 5 Oct 2014 20:01:10 +0200 Subject: [PATCH] Attempt to fix #573. --- .../tileentity/traits/power/IndustrialCraft2Classic.scala | 2 +- .../tileentity/traits/power/IndustrialCraft2Experimental.scala | 2 +- src/main/scala/li/cil/oc/util/mods/Mods.scala | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala index 5adbb7574..7cbd50519 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala @@ -48,7 +48,7 @@ trait IndustrialCraft2Classic extends Common with IndustrialCraft2Common { def getMaxSafeInput = Integer.MAX_VALUE @Optional.Method(modid = Mods.IDs.IndustrialCraft2Classic) - def acceptsEnergyFrom(emitter: TileEntity, direction: Direction) = Mods.IndustrialCraft2Classic.isAvailable && canConnectPower(direction.toForgeDirection) + def acceptsEnergyFrom(emitter: TileEntity, direction: Direction) = useIndustrialCraft2ClassicPower && canConnectPower(direction.toForgeDirection) @Optional.Method(modid = Mods.IDs.IndustrialCraft2Classic) def injectEnergy(directionFrom: Direction, amount: Int) = { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala index b66ca4e16..60c58bee2 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala @@ -43,7 +43,7 @@ trait IndustrialCraft2Experimental extends Common with IndustrialCraft2Common { def getSinkTier = Int.MaxValue @Optional.Method(modid = Mods.IDs.IndustrialCraft2) - def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = Mods.IndustrialCraft2.isAvailable && canConnectPower(direction) + def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = useIndustrialCraft2Power && canConnectPower(direction) @Optional.Method(modid = Mods.IDs.IndustrialCraft2) def injectEnergy(directionFrom: ForgeDirection, amount: Double, voltage: Double): Double = { diff --git a/src/main/scala/li/cil/oc/util/mods/Mods.scala b/src/main/scala/li/cil/oc/util/mods/Mods.scala index d7ac30d80..5e23c72c5 100644 --- a/src/main/scala/li/cil/oc/util/mods/Mods.scala +++ b/src/main/scala/li/cil/oc/util/mods/Mods.scala @@ -53,6 +53,7 @@ object Mods { val Galacticraft = new SimpleMod(IDs.Galacticraft, providesPower = true) val GregTech = new SimpleMod(IDs.GregTech) val IndustrialCraft2 = new ClassBasedMod(IDs.IndustrialCraft2, + "ic2.api.energy.tile.IEnergySink", "ic2.api.energy.tile.IEnergyTile", "ic2.api.energy.event.EnergyTileLoadEvent", "ic2.api.energy.event.EnergyTileUnloadEvent")(providesPower = true)