|
27 | 27 | import net.minecraft.util.ARGB; |
28 | 28 | import net.minecraft.util.Mth; |
29 | 29 | import net.minecraft.world.item.enchantment.Enchantment; |
30 | | -import net.minecraft.world.item.enchantment.ItemEnchantments; |
| 30 | +import net.minecraft.world.item.enchantment.EnchantmentHelper; |
31 | 31 | import net.minecraft.world.level.GameType; |
32 | 32 | import net.minecraft.world.entity.EquipmentSlot; |
33 | 33 | import net.minecraft.world.entity.player.Player; |
@@ -431,18 +431,16 @@ private static List<Component> getEnchantmentLines(ItemStack stack) |
431 | 431 | { |
432 | 432 | List<Component> lines = new ArrayList<>(); |
433 | 433 | LinkedHashSet<String> seen = new LinkedHashSet<>(); |
434 | | - appendEnchantmentLines(lines, seen, stack |
435 | | - .getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)); |
436 | | - appendEnchantmentLines(lines, seen, stack.getOrDefault( |
437 | | - DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY)); |
| 434 | + appendEnchantmentLines(lines, seen, |
| 435 | + EnchantmentHelper.getEnchantmentsForCrafting(stack).entrySet()); |
438 | 436 | return lines; |
439 | 437 | } |
440 | 438 |
|
441 | 439 | private static void appendEnchantmentLines(List<Component> out, |
442 | | - Set<String> seen, ItemEnchantments enchantments) |
| 440 | + Set<String> seen, |
| 441 | + Iterable<Object2IntMap.Entry<Holder<Enchantment>>> enchantments) |
443 | 442 | { |
444 | | - for(Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments |
445 | | - .entrySet()) |
| 443 | + for(Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments) |
446 | 444 | { |
447 | 445 | Holder<Enchantment> holder = entry.getKey(); |
448 | 446 | int level = entry.getIntValue(); |
|
0 commit comments