From 80bdbf4299966243ae3141b10178a2cd6f061f93 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 9 Oct 2023 21:10:55 -0400
Subject: Refactor nbt parsing

---
 .../java/de/hysky/skyblocker/mixin/ItemStackMixin.java     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java')

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java
index 76073a2c..fdcbc162 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java
@@ -1,9 +1,7 @@
 package de.hysky.skyblocker.mixin;
 
 
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
@@ -13,22 +11,14 @@ import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.ItemUtils.Durability;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Text;
 
 @Mixin(ItemStack.class)
 public abstract class ItemStackMixin {
-	@Shadow
-	@Nullable
-	private NbtCompound nbt;
-
 	@ModifyReturnValue(method = "getName", at = @At("RETURN"))
 	private Text skyblocker$customItemNames(Text original) {
-		if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes"))  {
-			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
-			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
-
-			return SkyblockerConfigManager.get().general.customItemNames.getOrDefault(itemUuid, original);
+		if (Utils.isOnSkyblock())  {
+			return SkyblockerConfigManager.get().general.customItemNames.getOrDefault(ItemUtils.getItemUuid((ItemStack) (Object) this), original);
 		}
 
 		return original;
-- 
cgit