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

temporary fix for "Can't charge with IC2"

Browse source
This commit is contained in:
lehjr 2015-11-13 14:06:24 -05:00
parent 26c9f2740e
commit 21f21dfc83
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,6 @@ object ElectricAdapter {
null
}
}
}
abstract class ElectricAdapter {
@ -75,4 +74,4 @@ class TEElectricAdapter(val stack: ItemStack) extends ElectricAdapter {
def giveEnergy(provided: Double): Double = museEnergyFromRF(item.receiveEnergy(stack, museEnergyToRF(provided), false))
}
}

9
src/main/scala/net/machinemuse/api/electricity/MuseElectricItem.scala
View file

@ -2,7 +2,7 @@ package net.machinemuse.api.electricity
import cofh.api.energy.IEnergyContainerItem
import cpw.mods.fml.common.Optional
import ic2.api.item.{IElectricItem, ElectricItem}
import ic2.api.item.{IElectricItemManager, ISpecialElectricItem, IElectricItem, ElectricItem}
import net.machinemuse.api.ModuleManager
import net.machinemuse.api.electricity.ElectricConversions._
import net.machinemuse.utils.{ElectricItemUtils, MuseItemUtils}
@ -13,9 +13,14 @@ import net.minecraft.item.{Item, ItemStack}
* Author: MachineMuse (Claire Semple)
* Created: 10:12 PM, 4/20/13
*/
@Optional.Interface(iface = "ic2.api.item.IElectricItemManager", modid = "IC2", striprefs = true)
@Optional.Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2", striprefs = true)
@Optional.Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore", striprefs = true)
trait MuseElectricItem extends Item
with IEnergyContainerItem
with ISpecialElectricItem
with IElectricItemManager
with IElectricItem
{
/**
@ -162,4 +167,4 @@ with IElectricItem
def getMaxEnergyStored(theItem: ItemStack) = museEnergyToRF(getMaxEnergy(theItem)).toInt
override def getMaxDamage(itemStack: ItemStack) = 0
}
}