Fix electric tools consuming electricity and change villager trades