Updated for Terraria 1.2.4