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

A few charging fixes

Browse source
This commit is contained in:
Aidan Brady 2013-12-12 19:46:23 -05:00
parent 9ecb7c20fd
commit 11aa04a5df
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/inventory/container/ContainerEnergyCube.java
View file

@ -68,7 +68,7 @@ public class ContainerEnergyCube extends Container
ItemStack slotStack = currentSlot.getStack();
stack = slotStack.copy();
if(slotStack.getItem() instanceof IElectricItem || slotStack.getItem() instanceof IItemElectric || slotStack.itemID == Item.redstone.itemID)
if(ChargeUtils.canBeCharged(slotStack) || ChargeUtils.canBeDischarged(slotStack))
{
if(slotStack.itemID == Item.redstone.itemID)
{

6
common/mekanism/common/item/ItemAtomicDisassembler.java
View file

@ -141,4 +141,10 @@ public class ItemAtomicDisassembler extends ItemEnergized
return 0;
}
@Override
public boolean canSend(ItemStack itemStack)
{
return false;
}
}

4
common/mekanism/common/item/ItemEnergized.java
View file

@ -152,13 +152,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, IItem
@Override
public boolean canReceive(ItemStack itemStack)
{
return true;
return getMaxEnergy(itemStack)-getEnergy(itemStack) > 0;
}
@Override
public boolean canSend(ItemStack itemStack)
{
return true;
return getEnergy(itemStack) > 0;
}
@Override

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

@ -107,6 +107,7 @@ public final class ChargeUtils
public static boolean canBeDischarged(ItemStack itemstack)
{
return (itemstack.getItem() instanceof IElectricItem && ((IElectricItem)itemstack.getItem()).canProvideEnergy(itemstack)) ||
(itemstack.getItem() instanceof IEnergizedItem && ((IEnergizedItem)itemstack.getItem()).canSend(itemstack)) ||
(itemstack.getItem() instanceof IItemElectric && ((IItemElectric)itemstack.getItem()).discharge(itemstack, 1, false) != 0) ||
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).extractEnergy(itemstack, 1, true) != 0) ||
itemstack.itemID == Item.redstone.itemID;
@ -120,6 +121,7 @@ public final class ChargeUtils
public static boolean canBeCharged(ItemStack itemstack)
{
return itemstack.getItem() instanceof IElectricItem ||
(itemstack.getItem() instanceof IEnergizedItem && ((IEnergizedItem)itemstack.getItem()).canReceive(itemstack)) ||
(itemstack.getItem() instanceof IItemElectric && ((IItemElectric)itemstack.getItem()).recharge(itemstack, 1, false) != 0) ||
(itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).receiveEnergy(itemstack, 1, true) != 0);
}