Refactored the way that energy consumation is calculated for the energy...

Refactored the way that energy consumation is calculated for the energy models. Now the consumation is calculated on every energy component for itself, since the state change is of no interest to the energy model. Makes the process easier.
Monitor logging can now be added to the respective energy components, if that is wished again (was removed from the energy model anyways!).