From 17601f5f72ba2b70eb9f264a2e543a32580b81a3 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:14:50 +0300
Subject: Fix PetLevelAdder working incorrectly in the sea creatures guide

---
 .../skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
index 88d48fbf..87d42e4f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
@@ -2,11 +2,13 @@ package de.hysky.skyblocker.skyblock.item.slottext.adders;
 
 import de.hysky.skyblocker.skyblock.item.slottext.SlotText;
 import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -22,8 +24,9 @@ public class PetLevelAdder extends SlotTextAdder {
 		ItemStack itemStack = slot.getStack();
 		if (!itemStack.isOf(Items.PLAYER_HEAD)) return List.of();
 		String level = CatacombsLevelAdder.getBracketedLevelFromName(itemStack);
-		if (!NumberUtils.isDigits(level)) return List.of();
-		if ("100".equals(level) || "200".equals(level)) return List.of();
+		if (!NumberUtils.isDigits(level) || "100".equals(level) || "200".equals(level)) return List.of();
+		NbtCompound nbt = ItemUtils.getCustomData(itemStack);
+		if (nbt.isEmpty() || !nbt.contains("id", NbtElement.STRING_TYPE) || !nbt.getString("id").equals("PET")) return List.of();
 		return List.of(SlotText.topLeft(Text.literal(level).withColor(0xFFDDC1)));
 	}
 }
-- 
cgit 


From 2dc53a460ca132ef1de46bd48c4e29b5a1b9cd44 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Thu, 4 Jul 2024 23:53:02 +0300
Subject: Change the pet detection logic to use `ItemUtils#getItemId` instead

---
 .../skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
index 87d42e4f..3049cd3f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java
@@ -5,8 +5,6 @@ import de.hysky.skyblocker.skyblock.item.slottext.SlotTextAdder;
 import de.hysky.skyblocker.utils.ItemUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -25,8 +23,7 @@ public class PetLevelAdder extends SlotTextAdder {
 		if (!itemStack.isOf(Items.PLAYER_HEAD)) return List.of();
 		String level = CatacombsLevelAdder.getBracketedLevelFromName(itemStack);
 		if (!NumberUtils.isDigits(level) || "100".equals(level) || "200".equals(level)) return List.of();
-		NbtCompound nbt = ItemUtils.getCustomData(itemStack);
-		if (nbt.isEmpty() || !nbt.contains("id", NbtElement.STRING_TYPE) || !nbt.getString("id").equals("PET")) return List.of();
+		if (!ItemUtils.getItemId(itemStack).equals("PET")) return List.of();
 		return List.of(SlotText.topLeft(Text.literal(level).withColor(0xFFDDC1)));
 	}
 }
-- 
cgit