Refactored energy API to play nicely with new changes

This commit is contained in:
aidancbrady committed 2017-03-31 16:50:11 -04:00
1 parent b4c5cf73a9
commit cf6a04a65d
19 files changed
+161 -289

No files matched your search

@@ -295,47 +295,14 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
public double getEnergy()
{
if(getInv() == null)
{
return 0;
}
return getInv().getEnergy();
}
@Override
public void setEnergy(double energy)
{
if(getInv() == null)
{
return;
}
getInv().setEnergy(energy);
}
@Override
public double getMaxEnergy()
{
if(getInv() == null)
{
return 0;
}
return getInv().getMaxEnergy();
}
@Override
public double transferEnergyToAcceptor(EnumFacing side, double amount)
public double acceptEnergy(EnumFacing side, double amount, boolean simulate)
{
if(getInv() == null || !canReceiveEnergy(side))
{
return 0;
}
return getInv().transferEnergyToAcceptor(side, amount);
return getInv().acceptEnergy(side, amount, simulate);
}
@Override