From 16637f7ebaa4f401677d7f6653a9fab8585030b6 Mon Sep 17 00:00:00 2001
From: Anon <bgteam@live.com>
Date: Thu, 11 Jun 2026 16:20:42 +0200
Subject: [PATCH] Fix custom model data decoding for 1.21.4

---
 .../Registries/StructuredComponentsRegistry1212.cs           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Registries/StructuredComponentsRegistry1212.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Registries/StructuredComponentsRegistry1212.cs
index 79c9475e..d6f519bb 100644
--- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Registries/StructuredComponentsRegistry1212.cs
+++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Registries/StructuredComponentsRegistry1212.cs
@@ -25,7 +25,10 @@ public class StructuredComponentsRegistry1212 : StructuredComponentRegistry
         RegisterComponent<CanPlaceOnComponent>(11, "minecraft:can_place_on");
         RegisterComponent<CanBreakComponent>(12, "minecraft:can_break");
         RegisterComponent<AttributeModifiersComponent>(13, "minecraft:attribute_modifiers");
-        RegisterComponent<CustomModelDataComponent1206>(14, "minecraft:custom_model_data");
+        if (dataTypes.ProtocolVersion >= Protocol18Handler.MC_1_21_4_Version)
+            RegisterComponent<CustomModelDataComponent>(14, "minecraft:custom_model_data");
+        else
+            RegisterComponent<CustomModelDataComponent1206>(14, "minecraft:custom_model_data");
         RegisterComponent<HideAdditionalTooltipComponent>(15, "minecraft:hide_additional_tooltip");
         RegisterComponent<HideTooltipComponent>(16, "minecraft:hide_tooltip");
         RegisterComponent<RepairCostComponent>(17, "minecraft:repair_cost");