Added spear (doesn't do anything yet), marked ModBlocks and ModItems with @ObjectHolder, and a little cleanup.