maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite item power distribution to support fe. should fix #1260

Browse source
This commit is contained in:
modmuss50 2017-10-03 17:02:58 +01:00
parent 81264e0fe2
commit f00214f7de
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/techreborn/items/armor/ItemLapotronPack.java
View file

@ -103,20 +103,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, IEne
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
for (int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemLithiumBatpack.distributePowerToInventory(world, player, itemStack, (int) transferLimit);
if (player.inventory.getStackInSlot(i) != ItemStack.EMPTY) {
ItemStack item = player.inventory.getStackInSlot(i);
if (item.getItem() instanceof IEnergyItemInfo) {
IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem();
if (energyItemInfo.getMaxPower(item) != PoweredItem.getEnergy(item)) {
if (PoweredItem.canUseEnergy(energyItemInfo.getMaxPower(item), itemStack)) {
PoweredItem.useEnergy(energyItemInfo.getMaxTransfer(item), itemStack);
PoweredItem.setEnergy(PoweredItem.getEnergy(item) + energyItemInfo.getMaxTransfer(item), item);
}
}
}
}
}
} }
@Override @Override

26
src/main/java/techreborn/items/armor/ItemLithiumBatpack.java
View file

@ -34,6 +34,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyInterfaceItem; import reborncore.api.power.IEnergyInterfaceItem;
@ -61,18 +63,26 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IE
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
distributePowerToInventory(world, player, itemStack, (int) transferLimit);
}
public static void distributePowerToInventory(World world, EntityPlayer player, ItemStack itemStack, int maxSend){
if(world.isRemote){
return;
}
if(!itemStack.hasCapability(CapabilityEnergy.ENERGY, null)){
return;
}
IEnergyStorage backpackPower = itemStack.getCapability(CapabilityEnergy.ENERGY, null);
for (int i = 0; i < player.inventory.getSizeInventory(); i++) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
if (player.inventory.getStackInSlot(i) != ItemStack.EMPTY) { if (player.inventory.getStackInSlot(i) != ItemStack.EMPTY) {
ItemStack item = player.inventory.getStackInSlot(i); ItemStack item = player.inventory.getStackInSlot(i);
if (item.getItem() instanceof IEnergyItemInfo) { if(!item.hasCapability(CapabilityEnergy.ENERGY, null)){
IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem(); continue;
if (energyItemInfo.getMaxPower(item) != PoweredItem.getEnergy(item)) {
if (PoweredItem.canUseEnergy(energyItemInfo.getMaxPower(item), itemStack)) {
PoweredItem.useEnergy(energyItemInfo.getMaxTransfer(item), itemStack);
PoweredItem.setEnergy(PoweredItem.getEnergy(item) + energyItemInfo.getMaxTransfer(item), item);
}
}
} }
IEnergyStorage itemPower = item.getCapability(CapabilityEnergy.ENERGY, null);
backpackPower.extractEnergy(itemPower.receiveEnergy(Math.min(backpackPower.getEnergyStored(), maxSend), false), false);
} }
} }
} }