Merge pull request #491 from greatman/fix5

Fixed 2 issues with Ice. They were able to make water in the nether & cr...
Some API refactor. I may have missed some.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>