tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

TE item support fixes

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-16 12:56:43 -05:00
parent 0616f28950
commit 5954d51ad4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/EntityRobit.java
View file

@ -185,7 +185,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
int itemEnergy = (int)Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack));
int toTransfer = (int)Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())*Mekanism.TO_TE));
item.extractEnergy(itemStack, toTransfer, true);
item.extractEnergy(itemStack, toTransfer, false);
setEnergy(getEnergy() + (toTransfer*Mekanism.FROM_TE));
}
else if(inventory[27].itemID == Item.redstone.itemID && getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY)

2
common/mekanism/common/tileentity/TileEntityChargepad.java
View file

@ -148,7 +148,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct
int itemEnergy = (int)Math.min(Math.sqrt(item.getMaxEnergyStored(itemstack)), item.getMaxEnergyStored(itemstack) - item.getEnergyStored(itemstack));
int toTransfer = (int)Math.min(itemEnergy, (getEnergy()*Mekanism.TO_TE));
item.receiveEnergy(itemstack, toTransfer, true);
item.receiveEnergy(itemstack, toTransfer, false);
setEnergy(getEnergy() - (toTransfer*Mekanism.FROM_TE));
}
}

8
common/mekanism/common/util/ChargeUtils.java
View file

@ -49,7 +49,7 @@ public final class ChargeUtils
int itemEnergy = (int)Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack));
int toTransfer = (int)Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())*Mekanism.TO_TE));
item.extractEnergy(itemStack, toTransfer, true);
item.extractEnergy(itemStack, toTransfer, false);
storer.setEnergy(storer.getEnergy() + (toTransfer*Mekanism.FROM_TE));
}
else if(storer.inventory[slotID].itemID == Item.redstone.itemID && storer.getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= storer.getMaxEnergy())
@ -95,7 +95,7 @@ public final class ChargeUtils
int itemEnergy = (int)Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getMaxEnergyStored(itemStack) - item.getEnergyStored(itemStack));
int toTransfer = (int)Math.min(itemEnergy, (storer.getEnergy()*Mekanism.TO_TE));
item.extractEnergy(itemStack, toTransfer, true);
item.extractEnergy(itemStack, toTransfer, false);
storer.setEnergy(storer.getEnergy() - (toTransfer*Mekanism.FROM_TE));
}
}
@ -110,7 +110,7 @@ public final class ChargeUtils
{
return (itemstack.getItem() instanceof IElectricItem && ((IElectricItem)itemstack.getItem()).canProvideEnergy(itemstack)) ||
(itemstack.getItem() instanceof IItemElectric && ((IItemElectric)itemstack.getItem()).discharge(itemstack, 1, false) != 0) ||
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).extractEnergy(itemstack, 1, false) != 0) ||
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).extractEnergy(itemstack, 1, true) != 0) ||
itemstack.itemID == Item.redstone.itemID;
}
@ -123,7 +123,7 @@ public final class ChargeUtils
{
return itemstack.getItem() instanceof IElectricItem ||
(itemstack.getItem() instanceof IItemElectric && ((IItemElectric)itemstack.getItem()).recharge(itemstack, 1, false) != 0) ||
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).receiveEnergy(itemstack, 1, false) != 0);
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).receiveEnergy(itemstack, 1, true) != 0);
}
/**