Applying Mandrake's diamond block fix to the 1.6.4 branch
Fix compilation failure

Fix failure of compilation caused by referring to an inaccessible local variable.
Resolve compilation issue

Actually resolve the compilation issue instead of just wallpapering over it.
Add import for ChatComponentText
Whoops...ChatComponentText isn't a 1.6.4 thing.