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

added thermalexpansion's electric item api

Browse source
This commit is contained in:
MachineMuse 2013-03-04 19:09:35 -07:00
parent 1346c589fe
commit 3d482c78c6
3 changed files with 103 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.xml
View file

@ -12,7 +12,7 @@
<property name="ic2api.version" value="1.115.218-lf" />
<property name="ueapi.version" value="1.2.6.339" />
<property name="icbmapi.version" value="1.0.5.166" />
<property name="thermexapi.version" value="2.2.1" />
<property name="thermexapi.version" value="2.2.2" />
<!-- Directories -->

33
src/minecraft/net/machinemuse/powersuits/item/ItemPowerArmor.java
View file

@ -28,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraftforge.common.IArmorTextureProvider;
import net.minecraftforge.common.ISpecialArmor;
import thermalexpansion.api.core.IChargeableItem;
import universalelectricity.core.electricity.ElectricInfo;
import universalelectricity.core.implement.IItemElectric;
import cpw.mods.fml.relauncher.Side;
@ -45,7 +46,8 @@ public abstract class ItemPowerArmor extends ItemArmor
IArmorTextureProvider,
IItemElectric, // Universal Electricity
ICustomElectricItem, // Industrial Craft 2
IEMPItem // for ICBM EMP interfacing
IEMPItem, // for ICBM EMP interfacing
IChargeableItem // for Thermal Expansion
{
Config.Items itemType;
@ -413,9 +415,38 @@ public abstract class ItemPowerArmor extends ItemArmor
return 0;
}
// //////////// //
// --- ICBM --- //
// //////////// //
@Override
public void onEMP(ItemStack itemStack, Entity entity, IExplosive empExplosive) {
ElectricItemUtils.onEMP(itemStack, entity, empExplosive);
}
// ///////////////////////// //
// --- Thermal Expansion --- //
// ///////////////////////// //
@Override
public float receiveEnergy(ItemStack theItem, float energy, boolean doReceive) {
// TODO Auto-generated method stub
return 0;
}
@Override
public float transferEnergy(ItemStack theItem, float energy, boolean doTransfer) {
// TODO Auto-generated method stub
return 0;
}
@Override
public float getEnergyStored(ItemStack theItem) {
// TODO Auto-generated method stub
return 0;
}
@Override
public float getMaxEnergyStored(ItemStack theItem) {
// TODO Auto-generated method stub
return 0;
}
}

76
src/minecraft/net/machinemuse/powersuits/item/ItemPowerTool.java
View file

@ -39,6 +39,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import thermalexpansion.api.core.IChargeableItem;
import universalelectricity.core.electricity.ElectricInfo;
import universalelectricity.core.electricity.ElectricInfo.ElectricUnit;
import universalelectricity.core.electricity.ElectricityPack;
@ -61,7 +62,8 @@ public class ItemPowerTool extends ItemTool
IModularItem,
IItemElectric, // Universal Electricity
ICustomElectricItem, // Industrial Craft 2
IEMPItem // for ICBM EMP interfacing
IEMPItem, // for ICBM EMP interfacing
IChargeableItem // for Thermal Expansion
{
public static final ItemStack ironPickaxe = new ItemStack(Item.pickaxeSteel);
public static final ItemStack ironAxe = new ItemStack(Item.axeSteel);
@ -589,11 +591,6 @@ public class ItemPowerTool extends ItemTool
return MuseIcon.POWERTOOL;
}
@Override
public void onEMP(ItemStack itemStack, Entity entity, IExplosive empExplosive) {
ElectricItemUtils.onEMP(itemStack, entity, empExplosive);
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World worldObj, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
@ -615,4 +612,71 @@ public class ItemPowerTool extends ItemTool
return false;
}
// //////////// //
// --- ICBM --- //
// //////////// //
@Override
public void onEMP(ItemStack itemStack, Entity entity, IExplosive empExplosive) {
ElectricItemUtils.onEMP(itemStack, entity, empExplosive);
}
// ///////////////////////// //
// --- Thermal Expansion --- //
// ///////////////////////// //
/**
* Adds energy to an item. Returns the quantity of energy that was accepted.
* This should always return 0 if the item cannot be externally charged.
*
* @param theItem
* ItemStack to be charged.
* @param energy
* Maximum amount of energy to be sent into the item.
* @param doReceive
* If false, the charge will only be simulated.
* @return Amount of energy that was accepted by the item.
*/
public float receiveEnergy(ItemStack stack, float energy, boolean doReceive) {
double offeredJoules = energy * ModCompatability.getBCRatio();
double missingJoules = ElectricItemUtils.getMaxJoules(stack) - ElectricItemUtils.getJoules(stack);
double transferredJoules = Math.min(offeredJoules, missingJoules);
ElectricItemUtils.charge(transferredJoules, stack);
return (float) (transferredJoules / ModCompatability.getBCRatio());
}
/**
* Removes energy from an item. Returns the quantity of energy that was
* removed. This should always return 0 if the item cannot be externally
* discharged.
*
* @param theItem
* ItemStack to be discharged.
* @param energy
* Maximum amount of energy to be removed from the item.
* @param doTransfer
* If false, the discharge will only be simulated.
* @return Amount of energy that was removed from the item.
*/
public float transferEnergy(ItemStack stack, float energy, boolean doTransfer) {
double requestedJoules = energy * ModCompatability.getBCRatio();
double availableJoules = ElectricItemUtils.getJoules(stack);
double transferredJoules = Math.min(requestedJoules, availableJoules);
ElectricItemUtils.discharge(transferredJoules, stack);
return (float) (transferredJoules / ModCompatability.getBCRatio());
}
/**
* Get the amount of energy currently stored in the item.
*/
public float getEnergyStored(ItemStack stack) {
return (float) (ModCompatability.getBCRatio() * ElectricItemUtils.getJoules(stack));
}
/**
* Get the max amount of energy that can be stored in the item.
*/
public float getMaxEnergyStored(ItemStack stack) {
return (float) (ModCompatability.getBCRatio() * ElectricItemUtils.getMaxJoules(stack));
}
}