fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build Script Update.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
items/tools/powered/powersink/AEBasePoweredItem.java
+1 -1
View File
@@ -1,6 +1,6 @@
package appeng.items.tools.powered.powersink;
public class AEBasePoweredItem extends UniversalElectricity
public class AEBasePoweredItem extends ThermalExpansion
{
public AEBasePoweredItem(Class c, String subname) {
items/tools/powered/powersink/IC2.java
+2
View File
@@ -4,7 +4,9 @@ import ic2.api.item.IElectricItemManager;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import appeng.api.config.PowerUnits;
import cpw.mods.fml.common.Optional.Interface;
@Interface(iface = "ic2.api.item.IElectricItemManager", modid = "IC2")
public class IC2 extends AERootPoweredItem implements IElectricItemManager
{
items/tools/powered/powersink/ThermalExpansion.java
+2
View File
@@ -3,7 +3,9 @@ package appeng.items.tools.powered.powersink;
import net.minecraft.item.ItemStack;
import appeng.api.config.PowerUnits;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.Optional.Interface;
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "ThermalExpansion")
public class ThermalExpansion extends IC2 implements IEnergyContainerItem
{
items/tools/powered/powersink/UniversalElectricity.java
+33 -57
View File
@@ -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;
}
}