Wrong calculation order of melee attacks

Before 1.21.110.20, the calculation order of melee attack is: base damage → status effect modifier → enchantment modifier → critical hit

In 1.21.110.20 and after, the order becomes to: base damage → enchantment modifier → status effect modifier → critical hit

In the words, the order of status effect modifier and enchantment modifier switches.

When a player hits a witch (26 health points) with netherite sword, enchanted with sharpness V, in strength II, without critical hit, the damage calculation should be as follows:

Before 1.21.110.20:

1（player's base damage）+ 8（netherite sword）= 9
(9 × 1.3 + 1) × 1.3 + 1 = 17.51（strength II）
17.51 + floor(1.25 × 5) = 23.51（sharpness V）

In 1.21.110.20 and after:

1（player's base damage）+ 8（netherite sword）= 9
9 + floor(1.25 × 5) = 15（sharpness V）
(15 × 1.3 + 1) × 1.3 + 1 = 27.65（strength II）

Steps to reproduce:

1. Create a creative world

2. Give yourself a netherite sword and enchant it with sharpness V

3. Give yourself strength II effect

4. Summon a witch and hit it

Observed result: Before 1.21.110.20, you cannot kill a witch in one hit. In 1.21.110.20 and after, you can.

Expected result: You shouldn’t be able to kill a witch in one hit like before 1.21.110.20.