Hopefully fixed use of FluidUtils.

Refactored fluids and potions, fixed use of FluidUtils, hopefully.