Update pet tier parsing

3 files changed, 17 insertions, 16 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
index 39516dc2..01c7fada 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
@@ -7,6 +7,7 @@ import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.annotations.Init;
+import de.hysky.skyblocker.skyblock.item.SkyblockItemRarity;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -137,9 +138,6 @@ public class PetCache {
 	}
 
 	public record PetInfo(String type, double exp, String tier, Optional<String> uuid, Optional<String> item, Optional<String> skin) {
-		// TODO: Combine with SkyblockItemRarity
-		private static final String[] TIER_INDEX = {"COMMON", "UNCOMMON", "RARE", "EPIC", "LEGENDARY", "MYTHIC"};
-
 		public static final Codec<PetInfo> CODEC = RecordCodecBuilder.create(instance -> instance.group(
 				Codec.STRING.fieldOf("type").forGetter(PetInfo::type),
 				Codec.DOUBLE.fieldOf("exp").forGetter(PetInfo::exp),
@@ -153,7 +151,7 @@ public class PetCache {
 		).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new);
 
 		public int tierIndex() {
-			return ArrayUtils.indexOf(TIER_INDEX, tier);
+			return SkyblockItemRarity.valueOf(tier).ordinal();
 		}
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockItemRarity.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockItemRarity.java
index 60bda976..b21b5878 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockItemRarity.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockItemRarity.java
@@ -3,17 +3,17 @@ package de.hysky.skyblocker.skyblock.item;
 import net.minecraft.util.Formatting;
 
 public enum SkyblockItemRarity {
-	ADMIN(Formatting.DARK_RED),
-	ULTIMATE(Formatting.DARK_RED),
-	VERY_SPECIAL(Formatting.RED),
-	SPECIAL(Formatting.RED),
-	DIVINE(Formatting.AQUA),
-	MYTHIC(Formatting.LIGHT_PURPLE),
-	LEGENDARY(Formatting.GOLD),
-	EPIC(Formatting.DARK_PURPLE),
-	RARE(Formatting.BLUE),
+	COMMON(Formatting.WHITE),
 	UNCOMMON(Formatting.GREEN),
-	COMMON(Formatting.WHITE);
+	RARE(Formatting.BLUE),
+	EPIC(Formatting.DARK_PURPLE),
+	LEGENDARY(Formatting.GOLD),
+	MYTHIC(Formatting.LIGHT_PURPLE),
+	DIVINE(Formatting.AQUA),
+	SPECIAL(Formatting.RED),
+	VERY_SPECIAL(Formatting.RED),
+	ULTIMATE(Formatting.DARK_RED),
+	ADMIN(Formatting.DARK_RED);
 
 	public final int color;
 	public final float r;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
index 1873111b..75e486a1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -98,8 +98,11 @@ public class QuickNavButton extends ClickableWidget {
         if (!this.temporaryToggled) {
             this.temporaryToggled = true;
             this.toggleTime = System.currentTimeMillis();
-            MessageScheduler.INSTANCE.sendMessageAfterCooldown(command);
-            // TODO : add null check with log error
+            if (command == null || command.isEmpty()) {
+                MinecraftClient.getInstance().player.sendMessage(Text.literal("Quick Nav button index " + index + " has no command"), false);
+            } else {
+                MessageScheduler.INSTANCE.sendMessageAfterCooldown(command);
+            }
             this.alpha = 0.5f;
         }
     }