[Finishes #72192338] support having honey goal and bee goal

When determining if you've reached the goals we compare current nectar to the nectar goal.  If you've used nectar to create honey, your current nectar will be less than the amount of nectar you've collected.  Really we want to compare total nectar collected to the nectar goal.