Minor code tweaks and moved to use Runsafe Item/Entity API

- Code scopes consisting of more than one line of code should have scope brackets along with all parent scopes.
- Excess scopes removed and replaced with merged statements to the same outcome.
- Bukkit API is frowned upon, moved PlayerRightClick to use Runsafe Item/Entity API.