Refactor the fluid storage to use the FluidInventoryComponent. Still need to reassess impact on multiplayer.