diff options
| author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-07-04 23:53:02 +0300 |
|---|---|---|
| committer | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-07-04 23:53:15 +0300 |
| commit | 2dc53a460ca132ef1de46bd48c4e29b5a1b9cd44 (patch) | |
| tree | 533f69cb5a370fe2108f2ac61cd52d8e4f435790 /src/main/java/de/hysky | |
| parent | 90ce041b5c266a4093c9b5929de06369d179534f (diff) | |
| download | Skyblocker-2dc53a460ca132ef1de46bd48c4e29b5a1b9cd44.tar.gz Skyblocker-2dc53a460ca132ef1de46bd48c4e29b5a1b9cd44.tar.bz2 Skyblocker-2dc53a460ca132ef1de46bd48c4e29b5a1b9cd44.zip | |
Change the pet detection logic to use `ItemUtils#getItemId` instead
Diffstat (limited to 'src/main/java/de/hysky')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java | 5 |
1 files changed, 1 insertions, 4 deletions
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))); } } |