we should be building against bukkit.jar, not craftbukkit.jar. We should also do our best effort to never need to build against craftbukkit.jar or use the NMS code stuff like we did before