Fixing bunch of inventory stuff, implementing VillagerInventory