getPickBlock (in Block) should have an EntitiyPlayer parameter.

Adding an EntityPlayer parameter to the getPickBlock() method would be quite useful, especially for providing a different block when Shift-Picked.

I'd do a PR, but can't seem to get a Forge dev environment setup...