item/npc spawn refactoring