Loads more work. 275 errors.

This commit is contained in:
Aidan C. Brady committed 2014-05-29 19:01:43 +01:00
1 parent 6f69c6d7b4
commit d1c193d0dd
82 files changed
+406 -415

No files matched your search

@@ -344,18 +344,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
return false;
}
@Override
public int getChargedItemId(ItemStack itemStack)
{
return itemID;
}
@Override
public int getEmptyItemId(ItemStack itemStack)
{
return itemID;
}
@Override
public int getMaxCharge(ItemStack itemStack)
{
@@ -803,7 +791,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
@Override
public double getMaxEnergy(ItemStack itemStack)
{
return MekanismUtils.getMaxEnergy(getEnergyMultiplier(itemStack), MachineType.get(itemStack.itemID, itemStack.getItemDamage()).baseEnergy);
return MekanismUtils.getMaxEnergy(getEnergyMultiplier(itemStack), MachineType.get(Block.getBlockFromItem(itemStack.getItem()), itemStack.getItemDamage()).baseEnergy);
}
@Override