Update to Bukkit #1925; remove deprecation warnings