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

Attempt to fix #573.

Browse Source
This commit is contained in:
Florian Nücke 2014-10-05 20:01:10 +02:00
parent 28950dd5f4
commit de9f8b68b7
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
View File

@ -48,7 +48,7 @@ trait IndustrialCraft2Classic extends Common with IndustrialCraft2Common {
def getMaxSafeInput = Integer.MAX_VALUE def getMaxSafeInput = Integer.MAX_VALUE
@Optional.Method(modid = Mods.IDs.IndustrialCraft2Classic) @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) @Optional.Method(modid = Mods.IDs.IndustrialCraft2Classic)
def injectEnergy(directionFrom: Direction, amount: Int) = { def injectEnergy(directionFrom: Direction, amount: Int) = {

2
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
View File

@ -43,7 +43,7 @@ trait IndustrialCraft2Experimental extends Common with IndustrialCraft2Common {
def getSinkTier = Int.MaxValue def getSinkTier = Int.MaxValue
@Optional.Method(modid = Mods.IDs.IndustrialCraft2) @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) @Optional.Method(modid = Mods.IDs.IndustrialCraft2)
def injectEnergy(directionFrom: ForgeDirection, amount: Double, voltage: Double): Double = { def injectEnergy(directionFrom: ForgeDirection, amount: Double, voltage: Double): Double = {

1
src/main/scala/li/cil/oc/util/mods/Mods.scala
View File

@ -53,6 +53,7 @@ object Mods {
val Galacticraft = new SimpleMod(IDs.Galacticraft, providesPower = true) val Galacticraft = new SimpleMod(IDs.Galacticraft, providesPower = true)
val GregTech = new SimpleMod(IDs.GregTech) val GregTech = new SimpleMod(IDs.GregTech)
val IndustrialCraft2 = new ClassBasedMod(IDs.IndustrialCraft2, val IndustrialCraft2 = new ClassBasedMod(IDs.IndustrialCraft2,
"ic2.api.energy.tile.IEnergySink",
"ic2.api.energy.tile.IEnergyTile", "ic2.api.energy.tile.IEnergyTile",
"ic2.api.energy.event.EnergyTileLoadEvent", "ic2.api.energy.event.EnergyTileLoadEvent",
"ic2.api.energy.event.EnergyTileUnloadEvent")(providesPower = true) "ic2.api.energy.event.EnergyTileUnloadEvent")(providesPower = true)