AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-03 18:13:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
This commit is contained in:
Florian Nücke 2014-03-27 19:59:51 +01:00
commit ef2e6ed290
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala
View File

@ -1,7 +1,7 @@
package li.cil.oc.common.tileentity.traits.power package li.cil.oc.common.tileentity.traits.power
import buildcraft.api.power.{PowerHandler, IPowerReceptor} import buildcraft.api.power.{PowerHandler, IPowerReceptor}
import cpw.mods.fml.common.Optional import cpw.mods.fml.common.{ModAPIManager, Optional}
import li.cil.oc.Settings import li.cil.oc.Settings
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
@ -9,12 +9,13 @@ import net.minecraftforge.common.util.ForgeDirection
trait BuildCraft extends Common with IPowerReceptor { trait BuildCraft extends Common with IPowerReceptor {
private var powerHandler: Option[AnyRef] = None private var powerHandler: Option[AnyRef] = None
private lazy val useBuildCraftPower = isServer && !Settings.get.ignorePower && ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|power")
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@Optional.Method(modid = "BuildCraftAPI|power")
override def updateEntity() { override def updateEntity() {
super.updateEntity() super.updateEntity()
if (isServer && !Settings.get.ignorePower && world.getWorldTime % Settings.get.tickFrequency == 0) { if (useBuildCraftPower && world.getWorldTime % Settings.get.tickFrequency == 0) {
for (side <- ForgeDirection.VALID_DIRECTIONS) { for (side <- ForgeDirection.VALID_DIRECTIONS) {
val demand = globalBufferSize(side) - globalBuffer(side) val demand = globalBufferSize(side) - globalBuffer(side)
if (demand > 1) { if (demand > 1) {

13
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
View File

@ -1,6 +1,6 @@
package li.cil.oc.common.tileentity.traits.power package li.cil.oc.common.tileentity.traits.power
import cpw.mods.fml.common.Optional import cpw.mods.fml.common.{Loader, Optional}
import ic2.api.energy.tile.IEnergySink import ic2.api.energy.tile.IEnergySink
import li.cil.oc.common.EventHandler import li.cil.oc.common.EventHandler
import li.cil.oc.Settings import li.cil.oc.Settings
@ -10,24 +10,23 @@ import net.minecraftforge.common.util.ForgeDirection
trait IndustrialCraft2 extends Common with IEnergySink { trait IndustrialCraft2 extends Common with IEnergySink {
var addedToPowerGrid = false var addedToPowerGrid = false
private val useIndustrialCraft2Power = isServer && !Settings.get.ignorePower && Loader.isModLoaded("IC2")
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@Optional.Method(modid = "IC2")
override def validate() { override def validate() {
super.validate() super.validate()
if (!addedToPowerGrid) EventHandler.scheduleIC2Add(this) if (useIndustrialCraft2Power && !addedToPowerGrid) EventHandler.scheduleIC2Add(this)
} }
@Optional.Method(modid = "IC2")
override def invalidate() { override def invalidate() {
super.invalidate() super.invalidate()
if (addedToPowerGrid) EventHandler.scheduleIC2Remove(this) if (useIndustrialCraft2Power && addedToPowerGrid) EventHandler.scheduleIC2Remove(this)
} }
@Optional.Method(modid = "IC2")
override def onChunkUnload() { override def onChunkUnload() {
super.onChunkUnload() super.onChunkUnload()
if (addedToPowerGrid) EventHandler.scheduleIC2Remove(this) if (useIndustrialCraft2Power && addedToPowerGrid) EventHandler.scheduleIC2Remove(this)
} }
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //