Allow any water containers to fill up the apothecary

1.7.10 has the handy method "FluidContainerRegistry.drainFluidContainer(stack)" but I wasn't sure if you'd want to break compatibility with 1.7.2 just for that

This PR is a bit messy so feel free to just use is a suggestion =P