From 9ff9bc5cbd4bc957d9d439e97f55f8d67d80d5af Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 9 Oct 2023 21:15:56 -0400
Subject: Introduce constants

---
 src/main/java/de/hysky/skyblocker/utils/ItemUtils.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
index c7718cc9..ea861a88 100644
--- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
@@ -21,6 +21,8 @@ import java.util.regex.Pattern;
 public class ItemUtils {
     private final static Pattern WHITESPACES = Pattern.compile("^\\s*$");
     public static final String EXTRA_ATTRIBUTES = "ExtraAttributes";
+    public static final String ID = "id";
+    public static final String UUID = "uuid";
 
     public static List<Text> getTooltip(ItemStack item) {
         MinecraftClient client = MinecraftClient.getInstance();
@@ -65,7 +67,7 @@ public class ItemUtils {
      * @return an optional containing the internal name of the item stack
      */
     public static Optional<String> getItemIdOptional(@NotNull ItemStack stack) {
-        return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString("id"));
+        return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString(ID));
     }
 
     /**
@@ -83,7 +85,7 @@ public class ItemUtils {
      * @return an optional containing the UUID of the item stack
      */
     public static Optional<String> getItemUuidOptional(@NotNull ItemStack stack) {
-        return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString("uuid"));
+        return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString(UUID));
     }
 
     /**
@@ -101,7 +103,7 @@ public class ItemUtils {
             return null;
         }
 
-        if (getExtraAttributesOptional(stack).filter(extraAttributes -> extraAttributes.contains("drill_fuel") || extraAttributes.getString("id").equals("PICKONIMBUS")).isEmpty()) {
+        if (getExtraAttributesOptional(stack).filter(extraAttributes -> extraAttributes.contains("drill_fuel") || extraAttributes.getString(ItemUtils.ID).equals("PICKONIMBUS")).isEmpty()) {
             return null;
         }
 
-- 
cgit