Updated: Remove need for CraftBukkit