Fix from 1.21.1 branch and added class so custom_name data is read correctly

Author: TimmyChips

src/client/java/timmychips/modefiteitemdefinitions/comp/util/TextUtils.java

@@ -0,0 +1,22 @@
+package timmychips.modefiteitemdefinitions.comp.util;
+
+public class TextUtils {
+
+    // The strings to remove from input to get base string
+    private static final String TEXT_LITERAL = "{\"text\":\"";
+    private static final String END_LITERAL = "\"}";
+
+    /**
+     *
+     * @param text The String Minecraft text object
+     * <p>Example text String object looks like: " {"text":"Hammer of Justice"} "
+     * @return Removes and returns just the contents from the text literal
+     * <p>Example return string: " Hammer of Justice "
+     */
+    public static String fromLiteral(String text) {
+        String str = text.replace(TEXT_LITERAL, "");
+        str = str.replace(END_LITERAL, "");
+
+        return str;
+    }
+}

src/client/java/timmychips/modefiteitemdefinitions/property/resolver/selectcase/ComponentCase.java

@@ -10,6 +10,7 @@
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import timmychips.modefiteitemdefinitions.comp.ComponentType;
+import timmychips.modefiteitemdefinitions.comp.util.TextUtils;
 import timmychips.modefiteitemdefinitions.property.handler.SelectPropertyHandler;
 import timmychips.modefiteitemdefinitions.property.helper.EntityVariantHelper;
 import timmychips.modefiteitemdefinitions.property.resolver.ResolveRecursive;
@@ -58,11 +59,12 @@ public String getValue(ItemStack stack, LivingEntity entity, ModelTransformation
         String str;
 
         Object componentValue = componentType.get(stack);
-        if (componentValue instanceof Text textValue) {
-            str = textValue.getString(); // Get the string without the surrounding literal from Text component types, and with string as is
+        if (componentValue instanceof String textValue) {
+            str = TextUtils.fromLiteral(textValue); // Get string text contents
+            return str; // Return just the string for text
         }
-        else str = String.valueOf(componentValue).toLowerCase(); // Convert value to lower case string
+        else str = String.valueOf(componentValue).toLowerCase(); // Convert non-text values to lower case string
 
-        return String.valueOf(Identifier.tryParse(str)); // Return component value as string in identifier format (even for text)
+        return String.valueOf(Identifier.tryParse(str)); // Return component non-text value as string in identifier format
     }
 }

src/client/java/timmychips/modefiteitemdefinitions/property/type/codec/SelectDefinition.java

@@ -41,7 +41,12 @@ public record Definition(
                         .map(c -> new Case<String>(
                                 c.model(),
                                 c.when.stream()
-                                        .map(whenCondition -> String.valueOf(Identifier.tryParse(whenCondition)))
+                                        .map(whenCondition -> {
+                                            // Try parse the condition string into identifier format. If it's string, "null", just return the
+                                            // when condition string as is for stuff like the custom_name component
+                                            String idStr = String.valueOf(Identifier.tryParse(whenCondition));
+                                            return !idStr.equals("null") ? idStr : whenCondition;
+                                        })
                                         .collect(Collectors.toCollection(HashSet::new))
                         ))
                         .toList();