add custom_name conditional for regex & backport 25w03a component select

Author: lowercasebtw

README.md

@@ -16,6 +16,9 @@ A vanilla-like implementation of Optifine's CIT, shaped how I believe it would b
 - predicate
     - fields
         - predicate: A item sub predicate [REQUIRED]
+- custom_name
+    - fields
+        - regex: The regex in string form, to test on the item's custom name
 
 #### Range Dispatch:
 
@@ -26,6 +29,7 @@ A vanilla-like implementation of Optifine's CIT, shaped how I believe it would b
 #### Select:
 
 - rarity (value of the stack rarity component)
+- "minecraft:component" (Backported from 25w03a, self-explanatory)
 
 ## Examples
 
@@ -145,4 +149,49 @@ iron_sword.json
 		}
 	}
 }
+```
+
+bone.json
+
+```json
+{
+	"model": {
+		"type": "minecraft:condition",
+		"property": "chit:custom_name",
+		"regex": "lol",
+		"on_true": {
+			"type": "minecraft:model",
+			"model": "minecraft:item/snowball"
+		},
+		"on_false": {
+			"type": "minecraft:model",
+			"model": "minecraft:item/bone"
+		}
+	}
+}
+```
+
+stick.json
+
+```json
+{
+	"model": {
+		"type": "minecraft:select",
+		"property": "minecraft:component",
+		"component": "minecraft:custom_name",
+		"cases": [
+			{
+				"when": "{\"color\":\"yellow\",\"italic\":false,\"bold\":true,\"text\":\"Hello world\"}",
+				"model": {
+					"type": "minecraft:model",
+					"model": "minecraft:item/blaze_rod"
+				}
+			}
+		],
+		"fallback": {
+			"type": "minecraft:model",
+			"model": "minecraft:item/stick"
+		}
+	}
+}
 ```

src/main/kotlin/btw/lowercase/chit/ChitClientMod.kt

@@ -4,11 +4,14 @@ import btw.lowercase.chit.property.conditional.HasEnchantmentConditional
 import btw.lowercase.chit.property.conditional.HasEnchantmentsConditional
 import btw.lowercase.chit.property.conditional.PredicateConditional
 import btw.lowercase.chit.property.numeric.EnchantmentLevelNumeric
+import btw.lowercase.chit.property.select.ComponentContents
+import btw.lowercase.chit.property.conditional.CustomNameConditional
 import btw.lowercase.chit.property.select.RaritySelect
 import net.fabricmc.api.ClientModInitializer
 import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperties
 import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties
 import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperties
+import net.minecraft.core.component.DataComponents
 import net.minecraft.resources.ResourceLocation
 
 object ChitClientMod : ClientModInitializer {
@@ -19,7 +22,23 @@ object ChitClientMod : ClientModInitializer {
         RangeSelectItemModelProperties.ID_MAPPER.put(id("enchantment_level"), EnchantmentLevelNumeric.CODEC)
 
         // Components
+        run {
+            /**
+             *
+             * NOTE:
+             * I do not own this part of this code, this code has been sourced from 25w03a and
+             * belongs to Mojang/Minecraft!
+             *
+             * I will remove this if any issues arise.
+             *
+             */
+            SelectItemModelProperties.ID_MAPPER.put(
+                ResourceLocation.withDefaultNamespace("component"),
+                ComponentContents.castType<DataComponents>()
+            )
+        }
         SelectItemModelProperties.ID_MAPPER.put(id("rarity"), RaritySelect.CODEC)
+        ConditionalItemModelProperties.ID_MAPPER.put(id("custom_name"), CustomNameConditional.CODEC)
 
         // Other
         ConditionalItemModelProperties.ID_MAPPER.put(id("predicate"), PredicateConditional.CODEC)

src/main/kotlin/btw/lowercase/chit/property/conditional/CustomNameConditional.kt

@@ -0,0 +1,40 @@
+package btw.lowercase.chit.property.conditional
+
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.client.multiplayer.ClientLevel
+import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty
+import net.minecraft.util.ExtraCodecs
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.item.ItemDisplayContext
+import net.minecraft.world.item.ItemStack
+import kotlin.text.Regex
+
+class CustomNameConditional(val regex: String) : ConditionalItemModelProperty {
+    companion object {
+        val CODEC = RecordCodecBuilder.mapCodec { instance ->
+            instance.group(
+                ExtraCodecs.NON_EMPTY_STRING.fieldOf("regex").forGetter(CustomNameConditional::regex)
+            ).apply(instance, ::CustomNameConditional)
+        }
+    }
+
+    override fun get(
+        stack: ItemStack,
+        clientLevel: ClientLevel?,
+        livingEntity: LivingEntity?,
+        layer: Int,
+        itemDisplayContext: ItemDisplayContext,
+    ): Boolean {
+        val regex = Regex.fromLiteral(regex)
+        return if (stack.customName != null) {
+            regex.matches(stack.customName!!.string)
+        } else {
+            false
+        }
+    }
+
+    override fun type(): MapCodec<out ConditionalItemModelProperty?> {
+        return CODEC
+    }
+}

src/main/kotlin/btw/lowercase/chit/property/select/ComponentContents.kt

@@ -0,0 +1,102 @@
+package btw.lowercase.chit.property.select
+
+import com.google.common.collect.HashMultiset
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
+import com.mojang.serialization.MapCodec
+import net.minecraft.client.multiplayer.ClientLevel
+import net.minecraft.client.renderer.item.SelectItemModel.SwitchCase
+import net.minecraft.client.renderer.item.SelectItemModel.UnbakedSwitch
+import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty
+import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty.Type
+import net.minecraft.core.component.DataComponentType
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.item.ItemDisplayContext
+import net.minecraft.world.item.ItemStack
+
+/**
+ *
+ * NOTE:
+ * I do not own this part of this code, this code has been sourced from 25w03a and
+ * belongs to Mojang/Minecraft!
+ *
+ * I will remove this if any issues arise.
+ *
+ */
+
+fun <T> validateCases(list: List<SwitchCase<T>>): DataResult<List<SwitchCase<T>>> {
+    if (list.isEmpty()) {
+        return DataResult.error {
+            return@error "Empty case list"
+        }
+    } else {
+        val multiset = HashMultiset.create<T>()
+        val iterator = list.iterator()
+        while (iterator.hasNext()) {
+            val switchCase = iterator.next()
+            multiset.addAll(switchCase.values())
+        }
+
+        return if (multiset.size != multiset.entrySet().size) {
+            DataResult.error {
+                val duplicates = multiset.entrySet()
+                    .filter { it.count > 1 }
+                    .joinToString(", ") { it.element.toString() }
+                "Duplicate case conditions: $duplicates"
+            }
+        } else {
+            DataResult.success(list)
+        }
+    }
+}
+
+fun <T> createCasesFieldCodec(codec: Codec<T>): MapCodec<List<SwitchCase<T>>> {
+    return SwitchCase.codec(codec).listOf().validate(::validateCases).fieldOf("cases")
+}
+
+@Suppress("UNCHECKED_CAST")
+class ComponentContents<T>(val componentType: DataComponentType<T>) : SelectItemModelProperty<T> {
+    companion object {
+        private val TYPE: Type<out ComponentContents<*>, *> = createType<Any>()
+
+        private fun <T> createType(): Type<ComponentContents<T>, T> {
+            val codec: Codec<out DataComponentType<*>> = BuiltInRegistries.DATA_COMPONENT_TYPE.byNameCodec()
+                .validate { dataComponentType ->
+                    if (dataComponentType.isTransient) {
+                        DataResult.error { "Component can't be serialized" }
+                    } else {
+                        DataResult.success(dataComponentType)
+                    }
+                }
+
+            return Type((codec as Codec<DataComponentType<T>>).dispatchMap("component", { unbakedSwitch ->
+                (unbakedSwitch.property() as ComponentContents<*>).componentType as DataComponentType<T>?
+            }, { dataComponentType ->
+                createCasesFieldCodec(dataComponentType.codecOrThrow())
+                    .xmap(
+                        { list -> UnbakedSwitch(ComponentContents(dataComponentType), list) },
+                        { UnbakedSwitch<*, *>::cases as List<SwitchCase<T>> }
+                    )
+            }))
+        }
+
+        fun <T> castType(): Type<ComponentContents<T>, T> {
+            return TYPE as Type<ComponentContents<T>, T>
+        }
+    }
+
+    override fun get(
+        stack: ItemStack,
+        clientLevel: ClientLevel?,
+        livingEntity: LivingEntity?,
+        layer: Int,
+        itemDisplayContext: ItemDisplayContext,
+    ): T? {
+        return stack.get(componentType)
+    }
+
+    override fun type(): Type<ComponentContents<T>, T> {
+        return castType()
+    }
+}