Checkstyle additions and matching style fix.
Show entity held item and equipment to players (fixes #164).
Added query support (closes #377).
fix merge