Make Bukkit compile again
Make tests compile again
Implement new functionality in Bukkit