Revert "Remove ElectricityPack. Also changed energy to use integers instead of floating point values."

This reverts commit 69c192b5dd4bc05b9b08ecb3d33ce7333e34fab8.
Remove ElectricityPack, without energy data type change.