Fix missed diff for EntityVillager
Upstream merge and add dependency files
Introduce TradingAPI