Major code cleanup, update to new version of Minecraft