Build Script Update.

FMP Fixes
Optional Interfaces for BC
Optional Interfaces for IC2
Removed UE Api on Items
Proxied Effect for C-CQuartz
This commit is contained in:
AlgorithmX2
2014-01-28 11:29:17 -06:00
parent 0f75db5e80
commit 9a64980443
16 changed files with 125 additions and 158 deletions
@@ -1,61 +1,37 @@
package appeng.items.tools.powered.powersink;
import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric;
import appeng.api.config.PowerUnits;
/*
@Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2")
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
{
*
* public UniversalElectricity(Class c, String subname) { super( c, subname ); }
*
* @Override public float recharge(ItemStack is, float energy, boolean
* doRecharge) { return (float) (energy - injectExternalPower( PowerUnits.KJ,
* is, energy, !doRecharge )); }
*
* @Override public float discharge(ItemStack is, float energy, boolean
* doDischarge) { return 0; }
*
* @Override public float getElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAECurrentPower( is ) ); }
*
* @Override public float getMaxElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) ); }
*
* @Override public void setElectricity(ItemStack is, float joules) { double
* currentPower = getAECurrentPower( is ); double targetPower =
* PowerUnits.KJ.convertTo( PowerUnits.AE, joules ); if ( targetPower >
* currentPower ) injectAEPower( is, targetPower - currentPower ); else
* extractAEPower( is, currentPower - targetPower ); }
*
* @Override public float getTransfer(ItemStack is) { return (float)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) -
* getAECurrentPower( is ) ); }
*
* @Override public float getVoltage(ItemStack itemStack) { return 120; }
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
{
}
*/
public UniversalElectricity(Class c, String subname) {
super( c, subname );
}
@Override
public float recharge(ItemStack is, float energy, boolean doRecharge)
{
return (float) (energy - injectExternalPower( PowerUnits.KJ, is, energy, !doRecharge ));
}
@Override
public float discharge(ItemStack is, float energy, boolean doDischarge)
{
return 0;
}
@Override
public float getElectricityStored(ItemStack is)
{
return (int) PowerUnits.AE.convertTo( PowerUnits.KJ, getAECurrentPower( is ) );
}
@Override
public float getMaxElectricityStored(ItemStack is)
{
return (int) PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) );
}
@Override
public void setElectricity(ItemStack is, float joules)
{
double currentPower = getAECurrentPower( is );
double targetPower = PowerUnits.KJ.convertTo( PowerUnits.AE, joules );
if ( targetPower > currentPower )
injectAEPower( is, targetPower - currentPower );
else
extractAEPower( is, currentPower - targetPower );
}
@Override
public float getTransfer(ItemStack is)
{
return (float) PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) - getAECurrentPower( is ) );
}
@Override
public float getVoltage(ItemStack itemStack)
{
return 120;
}
}