Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules

This commit is contained in:
Aidan C. Brady committed 2014-07-10 22:28:04 -04:00
1 parent 7198704363
commit 65a8633441
29 files changed
+317 -104

No files matched your search

@@ -211,7 +211,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp
*/
public int getScaledProgress(int i)
{
return operatingTicks*i / MekanismUtils.getTicks(getSpeedMultiplier(), TICKS_REQUIRED);
return operatingTicks*i / MekanismUtils.getTicks(this, TICKS_REQUIRED);
}
/**
@@ -220,13 +220,13 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp
*/
public double getScaledProgress()
{
return ((double)operatingTicks) / ((double)MekanismUtils.getTicks(getSpeedMultiplier(), TICKS_REQUIRED));
return ((double)operatingTicks) / ((double)MekanismUtils.getTicks(this, TICKS_REQUIRED));
}
@Override
public double getMaxEnergy()
{
return MekanismUtils.getMaxEnergy(getEnergyMultiplier(), MAX_ELECTRICITY);
return MekanismUtils.getMaxEnergy(this, MAX_ELECTRICITY);
}
@Override