aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2024-07-08 14:04:43 +0800
committerGitHub <noreply@github.com>2024-07-08 14:04:43 +0800
commit288151a23e1ae5461dc847ae7475adea67431efa (patch)
tree6b6b669019e165bae45064c8d8578e9c35373b43 /src/main/java/de/hysky/skyblocker/skyblock
parent7b02937debe49aa130e30a9f688e041fe12bcd9d (diff)
parenta004952c30727a2547afba6447387b2a24d4b90a (diff)
downloadSkyblocker-288151a23e1ae5461dc847ae7475adea67431efa.tar.gz
Skyblocker-288151a23e1ae5461dc847ae7475adea67431efa.tar.bz2
Skyblocker-288151a23e1ae5461dc847ae7475adea67431efa.zip
Merge pull request #817 from Emirlol/fix-pet-slot-text
Fix PetLevelAdder working incorrectly in the sea creatures guide
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/PetLevelAdder.java6
1 files changed, 3 insertions, 3 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 88d48fbf..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
@@ -2,11 +2,11 @@ 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.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 +22,8 @@ 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();
+ if (!ItemUtils.getItemId(itemStack).equals("PET")) return List.of();
return List.of(SlotText.topLeft(Text.literal(level).withColor(0xFFDDC1)));
}
}