Removed a single unneeded null check

I am proud of myself
Fixes to compile on 1.6.1
Move textures to /assets as required by ResourcePack system.
Fix mappings for MCP 8.03.