Add Bukkit EntityType wrappers earlier based on class. Attempt to fix #1272