diff --git a/src/net/bdew/gendustry/power/TilePoweredEU.scala b/src/net/bdew/gendustry/power/TilePoweredEU.scala index bbc155b..89830a6 100644 --- a/src/net/bdew/gendustry/power/TilePoweredEU.scala +++ b/src/net/bdew/gendustry/power/TilePoweredEU.scala @@ -26,25 +26,22 @@ trait TilePoweredEU extends TilePoweredBase with IEnergySink { private lazy val ratio = Tuning.getSection("Power").getFloat("EU_MJ_Ratio") lazy val maxSafe = Tuning.getSection("Power").getSection("IC2").getInt("MaxSafeInput") - if (PowerProxy.haveIC2 && PowerProxy.EUEnabled) { - serverTick.listen(() => { - if (!sentLoaded) { - MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)) - sentLoaded = true - } - }) - } + if (PowerProxy.haveIC2 && PowerProxy.EUEnabled) + serverTick.listen(sendLoad) override def invalidate() { - sendUnload() + if (PowerProxy.haveIC2 && PowerProxy.EUEnabled) + sendUnload() super.invalidate() } - override def onChunkUnload() = { - sendUnload() + override def onChunkUnload() { + if (PowerProxy.haveIC2 && PowerProxy.EUEnabled) + sendUnload() super.onChunkUnload() } + @Optional.Method(modid = PowerProxy.IC2_MOD_ID) def sendUnload() { if (PowerProxy.haveIC2 && sentLoaded) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)) @@ -52,6 +49,14 @@ trait TilePoweredEU extends TilePoweredBase with IEnergySink { } } + @Optional.Method(modid = PowerProxy.IC2_MOD_ID) + def sendLoad() { + if (PowerProxy.haveIC2 && !sentLoaded) { + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)) + sentLoaded = true + } + } + def acceptsEnergyFrom(emitter: TileEntity, direction: ForgeDirection) = PowerProxy.EUEnabled def getMaxSafeInput = maxSafe def demandedEnergyUnits() = Misc.clamp(power.capacity - power.stored, 0F, power.maxReceive) * ratio