Some villager trades still unexpectedly differ from 1.21.11

The Bug:

Some villager trades still unexpectedly differ from 1.21.11.

There was no mention of these changes in the changelogs. These two affected instances were missed from the list described in MC-306854.

Affected Instances:

• Expert farmers now always sell cake for 3 emeralds instead of 1.

• Novice weaponsmiths sell the enchanted iron sword trade 12 times instead of 3.

Steps to Reproduce:

1. Summon an expert farmer and a novice weaponsmith by using the commands provided below.

   /summon minecraft:villager ~2 ~ ~ {VillagerData:{profession:"minecraft:farmer",level:4,type:"minecraft:plains"},NoAI:1b}

   /summon minecraft:villager ~-2 ~ ~ {VillagerData:{profession:"minecraft:weaponsmith",level:1,type:"minecraft:plains"},NoAI:1b}

2. Open the trades of the villagers, and if they don’t offer the specified items, run the above command(s) again until they do.

3. Observe the price of the cake and how many times you can buy an enchanted iron sword without it going out of stock.

Observed Behavior:

The said villager traders differ from 1.21.11.

Expected Behavior:

The said villager trades would be the same as they were in 1.21.11.