From e04298b8e12f73196ca6e4b74898ac9a654cc70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 27 Nov 2014 23:06:33 +0100 Subject: [PATCH] Revert "Switched to more specific IEnergyReceiver from IEnergyHandler." This reverts commit 779599bb3c331028b4c35d9649badd869a5370f6. --- .../cil/oc/common/tileentity/traits/power/RedstoneFlux.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala index 1a6168e05..a29af1a46 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala @@ -6,7 +6,7 @@ import li.cil.oc.common.asm.Injectable import li.cil.oc.integration.Mods import net.minecraftforge.common.util.ForgeDirection -@Injectable.Interface(value = "cofh.api.energy.IEnergyReceiver", modid = Mods.IDs.CoFHEnergy) +@Injectable.Interface(value = "cofh.api.energy.IEnergyHandler", modid = Mods.IDs.CoFHEnergy) trait RedstoneFlux extends Common { @Optional.Method(modid = Mods.IDs.CoFHEnergy) def canConnectEnergy(from: ForgeDirection) = Mods.CoFHEnergy.isAvailable && canConnectPower(from) @@ -21,4 +21,7 @@ trait RedstoneFlux extends Common { @Optional.Method(modid = Mods.IDs.CoFHEnergy) def getMaxEnergyStored(from: ForgeDirection) = (globalBufferSize(from) / Settings.get.ratioRedstoneFlux).toInt + + @Optional.Method(modid = Mods.IDs.CoFHEnergy) + def extractEnergy(from: ForgeDirection, maxExtract: Int, simulate: Boolean) = 0 }