Skip to content

Commit 9b3d3e6

Browse files
committed
Fix DurabilityHUD
1 parent 897f3fd commit 9b3d3e6

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/main/java/net/wurstclient/hud/DurabilityHud.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import net.minecraft.util.ARGB;
2828
import net.minecraft.util.Mth;
2929
import net.minecraft.world.item.enchantment.Enchantment;
30-
import net.minecraft.world.item.enchantment.ItemEnchantments;
30+
import net.minecraft.world.item.enchantment.EnchantmentHelper;
3131
import net.minecraft.world.level.GameType;
3232
import net.minecraft.world.entity.EquipmentSlot;
3333
import net.minecraft.world.entity.player.Player;
@@ -431,18 +431,16 @@ private static List<Component> getEnchantmentLines(ItemStack stack)
431431
{
432432
List<Component> lines = new ArrayList<>();
433433
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());
438436
return lines;
439437
}
440438

441439
private static void appendEnchantmentLines(List<Component> out,
442-
Set<String> seen, ItemEnchantments enchantments)
440+
Set<String> seen,
441+
Iterable<Object2IntMap.Entry<Holder<Enchantment>>> enchantments)
443442
{
444-
for(Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments
445-
.entrySet())
443+
for(Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments)
446444
{
447445
Holder<Enchantment> holder = entry.getKey();
448446
int level = entry.getIntValue();

src/main/java/net/wurstclient/mixin/SelectedItemNameMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
@Mixin(Gui.class)
1919
public class SelectedItemNameMixin
2020
{
21-
@Inject(method = "renderSelectedItemName",
21+
@Inject(method = "extractSelectedItemName",
2222
at = @At("HEAD"),
2323
cancellable = true)
24-
private void onRenderSelectedItemName(GuiGraphicsExtractor context,
24+
private void onExtractSelectedItemName(GuiGraphicsExtractor context,
2525
CallbackInfo ci)
2626
{
2727
if(DurabilityHud.renderSelectedItemNameWithEnchantments(context))

0 commit comments

Comments
 (0)