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

update build.xml to use new forestry api and new address for thaumcraft api

Browse source
This commit is contained in:
MachineMuse 2013-08-31 05:56:40 -06:00
parent 2f1c1c0192
commit 5f6cc3c1f1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.xml
View file

@ -23,7 +23,7 @@
<property name="thermexapi.version" value="2.3.0b"/>
<property name="galacticraftapi.version" value="2"/>
<property name="mfrapi.version" value="2.5.2B2-642"/>
<property name="forestryapi.version" value="2.1.2.19"/>
<property name="forestryapi.version" value="2.3.0.1"/>
<property name="thaumcraftapi.version" value="0.0.5 for 3.0.4b"/>
<!-- Directories -->
@ -131,7 +131,7 @@
dest="${download.dir}/forestry-api-${forestryapi.version}.zip"/>
<echo message="Downloading Thaumcraft API..."/>
<get src="http://machinemuse.net/ThaumcraftApi ${thaumcraftapi.version}.zip"
<get src="http://machinemuse.minecraftforge.net/ThaumcraftApi ${thaumcraftapi.version}.zip"
dest="${download.dir}/ThaumcraftApi ${thaumcraftapi.version}.zip"/>
<echo message="Downloading MFFS API..."/>

6
src/minecraft/net/machinemuse/api/electricity/MuseElectricItem.scala
View file

@ -4,10 +4,9 @@ import net.minecraft.item.ItemStack
import net.machinemuse.utils.{ElectricItemUtils, MuseItemUtils}
import ic2.api.item.ICustomElectricItem
import universalelectricity.core.item.IItemElectric
import universalelectricity.core.electricity.ElectricityPack
import thermalexpansion.api.item.IChargeableItem
import net.machinemuse.api.electricity.ElectricConversions._
import icbm.api.explosion.{IExplosion, IEMPItem}
import icbm.api.explosion.IEMPItem
import net.minecraft.entity.Entity
import net.machinemuse.api.ModuleManager
@ -150,7 +149,7 @@ trait MuseElectricItem
def getVoltage(itemStack: ItemStack): Float = 120
def recharge(itemStack: ItemStack, energy: Float, doCharge: Boolean): Float = {
var joulesConsumed : Float = 0
var joulesConsumed: Float = 0
val energyReceiving: Double = museEnergyFromJoules(energy)
if (doCharge) {
val energyConsumed: Double = giveEnergyTo(itemStack, energyReceiving)
@ -185,6 +184,7 @@ trait MuseElectricItem
val receivedME: Double = museEnergyFromMJ(energy)
val eatenME: Double = giveEnergyTo(theItem, receivedME)
if (!doReceive) {
o
setCurrentEnergy(theItem, current)
}
museEnergyToMJ(eatenME).toFloat