Resolve remaining v1.2 issues

[SHsuperCM]

• [x] Backport to supported versions

  • [x] 1.20.4
  • [x] 1.20.1
  • [x] 1.19.4

• [x] Fix remaining issues

  • [x] Fix enchantment glint

[SHsuperCM]

Adding fixing enchantment glint to the scope of this pr