Anvilcraft/ModularPowersuits
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

added RF support back in (untested)

Browse source
This commit is contained in:
MachineMuse 2014-09-09 14:55:01 -06:00
parent 85eb3cb972
commit 649d72111f
2 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build.gradle
View file

@ -48,17 +48,18 @@ def getLibrary(filename) {
}
}
getLibrary("industrialcraft-2-api_1.118.401-lf.zip")
getLibrary("Atomic-Science-1.1.0.16-api.zip")
getLibrary("ThermalExpansion-API-2.3.0b.zip")
getLibrary("CoFHCore-API.zip")
getLibrary("CoFHLib-pre1.zip")
getLibrary("galacticraft-src-2.zip")
getLibrary("Railcraft_API_latest.zip")
getLibrary("MFR-API-2.5.2B2-642.zip")
getLibrary("forestry-api-2.3.0.1.zip")
getLibrary("Thaumcraft4.0.5-API.zip")
getLibrary("MFFS2_API.zip")
getLibrary("CoFHCore-[1.7.10]3.0.0B2-dev-24.jar")
//getLibrary("industrialcraft-2-api_1.118.401-lf.zip")
//getLibrary("Atomic-Science-1.1.0.16-api.zip")
//getLibrary("ThermalExpansion-API-2.3.0b.zip")
//getLibrary("CoFHCore-API.zip")
//getLibrary("CoFHLib-pre1.zip")
//getLibrary("galacticraft-src-2.zip")
//getLibrary("Railcraft_API_latest.zip")
//getLibrary("MFR-API-2.5.2B2-642.zip")
//getLibrary("forestry-api-2.3.0.1.zip")
//getLibrary("Thaumcraft4.0.5-API.zip")
//getLibrary("MFFS2_API.zip")
getLibrary("slick-util.jar")
processResources

30
src/main/scala/net/machinemuse/api/electricity/ElectricAdapter.scala
View file

@ -1,5 +1,7 @@
package net.machinemuse.api.electricity
import cofh.api.energy.IEnergyContainerItem
import net.machinemuse.powersuits.common.ModCompatability
import net.minecraft.item.ItemStack
object ElectricAdapter {
@ -7,7 +9,7 @@ object ElectricAdapter {
if (stack == null) return null
stack.getItem match {
case i: MuseElectricItem => new MuseElectricAdapter(stack)
// case i: IEnergyContainerItem => if (ModCompatability.isCoFHCoreLoaded) new TEElectricAdapter(stack) else null
case i: IEnergyContainerItem => if (ModCompatability.isCoFHCoreLoaded) new TEElectricAdapter(stack) else null
// case i: IElectricItem => if (ModCompatability.isIndustrialCraftLoaded) new IC2ElectricAdapter(stack) else null
case _ => null
}
@ -51,16 +53,16 @@ class MuseElectricAdapter(val stack: ItemStack) extends ElectricAdapter {
//
// def getTier = item.getTier(stack)
//}
//
//class TEElectricAdapter(val stack: ItemStack) extends ElectricAdapter {
// val item = stack.getItem.asInstanceOf[IEnergyContainerItem]
//
// def getCurrentEnergy: Double = museEnergyFromRF(item.getEnergyStored(stack))
//
// def getMaxEnergy: Double = museEnergyFromRF(item.getMaxEnergyStored(stack))
//
// def drainEnergy(requested: Double): Double = museEnergyFromRF(item.extractEnergy(stack, museEnergyToRF(requested), false))
//
// def giveEnergy(provided: Double): Double = museEnergyFromRF(item.receiveEnergy(stack, museEnergyToRF(provided), false))
//
//}
class TEElectricAdapter(val stack: ItemStack) extends ElectricAdapter {
val item = stack.getItem.asInstanceOf[IEnergyContainerItem]
import ElectricConversions._
def getCurrentEnergy: Double = museEnergyFromRF(item.getEnergyStored(stack))
def getMaxEnergy: Double = museEnergyFromRF(item.getMaxEnergyStored(stack))
def drainEnergy(requested: Double): Double = museEnergyFromRF(item.extractEnergy(stack, museEnergyToRF(requested), false))
def giveEnergy(provided: Double): Double = museEnergyFromRF(item.receiveEnergy(stack, museEnergyToRF(provided), false))
}