VillagerTradeFix modern port

Fixes villager trade abuse for Minecraft 1.20.1 Forge