diff --git a/data/pc/1.21.11/protocol.json b/data/pc/1.21.11/protocol.json
index fd42a14e1..f6c2792f1 100644
--- a/data/pc/1.21.11/protocol.json
+++ b/data/pc/1.21.11/protocol.json
@@ -447,61 +447,87 @@
                   ]
                 ],
                 "attribute_modifiers": [
-                  "container",
-                  [
-                    {
-                      "name": "attributes",
-                      "type": [
-                        "array",
+                  "array",
+                  {
+                    "countType": "varint",
+                    "type": [
+                      "container",
+                      [
                         {
-                          "countType": "varint",
+                          "name": "typeId",
+                          "type": "varint"
+                        },
+                        {
+                          "name": "name",
+                          "type": "string"
+                        },
+                        {
+                          "name": "value",
+                          "type": "f64"
+                        },
+                        {
+                          "name": "operation",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "add",
+                                "1": "multiply_base",
+                                "2": "multiply_total"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "slot",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "any",
+                                "1": "main_hand",
+                                "2": "off_hand",
+                                "3": "hand",
+                                "4": "feet",
+                                "5": "legs",
+                                "6": "chest",
+                                "7": "head",
+                                "8": "armor",
+                                "9": "body",
+                                "10": "saddle"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "display",
                           "type": [
                             "container",
                             [
                               {
-                                "name": "typeId",
-                                "type": "varint"
-                              },
-                              {
-                                "name": "name",
-                                "type": "string"
-                              },
-                              {
-                                "name": "value",
-                                "type": "f64"
-                              },
-                              {
-                                "name": "operation",
+                                "name": "type",
                                 "type": [
                                   "mapper",
                                   {
                                     "type": "varint",
                                     "mappings": {
-                                      "0": "add",
-                                      "1": "multiply_base",
-                                      "2": "multiply_total"
+                                      "0": "default",
+                                      "1": "hidden",
+                                      "2": "override"
                                     }
                                   }
                                 ]
                               },
                               {
-                                "name": "slot",
+                                "name": "component",
                                 "type": [
-                                  "mapper",
+                                  "switch",
                                   {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "any",
-                                      "1": "main_hand",
-                                      "2": "off_hand",
-                                      "3": "hand",
-                                      "4": "feet",
-                                      "5": "legs",
-                                      "6": "chest",
-                                      "7": "head",
-                                      "8": "armor",
-                                      "9": "body",
-                                      "10": "saddle"
+                                    "compareTo": "type",
+                                    "fields": {
+                                      "override": "anonymousNbt"
                                     }
                                   }
                                 ]
@@ -510,42 +536,8 @@
                           ]
                         }
                       ]
-                    },
-                    {
-                      "name": "display",
-                      "type": [
-                        "container",
-                        [
-                          {
-                            "name": "type",
-                            "type": [
-                              "mapper",
-                              {
-                                "type": "varint",
-                                "mappings": {
-                                  "0": "default",
-                                  "1": "hidden",
-                                  "2": "override"
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "name": "component",
-                            "type": [
-                              "switch",
-                              {
-                                "compareTo": "type",
-                                "fields": {
-                                  "override": "anonymousNbt"
-                                }
-                              }
-                            ]
-                          }
-                        ]
-                      ]
-                    }
-                  ]
+                    ]
+                  }
                 ],
                 "custom_model_data": [
                   "container",
diff --git a/data/pc/1.21.5/proto.yml b/data/pc/1.21.5/proto.yml
index abfe7d265..c52fccaa7 100644
--- a/data/pc/1.21.5/proto.yml
+++ b/data/pc/1.21.5/proto.yml
@@ -185,28 +185,26 @@
                level: varint
          if can_place_on or can_break:
             predicates: ItemBlockPredicate[]varint
-         if attribute_modifiers:
-            attributes: []varint
-               typeId: varint
-               name: string
-               value: f64
-               operation: varint =>
-               - add
-               - multiply_base
-               - multiply_total
-               slot: varint =>
-               - any
-               - main_hand
-               - off_hand
-               - hand
-               - feet
-               - legs
-               - chest
-               - head
-               - armor
-               - body
-               - saddle
-            showTooltip: bool
+         if attribute_modifiers: []varint
+            typeId: varint
+            name: string
+            value: f64
+            operation: varint =>
+            - add
+            - multiply_base
+            - multiply_total
+            slot: varint =>
+            - any
+            - main_hand
+            - off_hand
+            - hand
+            - feet
+            - legs
+            - chest
+            - head
+            - armor
+            - body
+            - saddle
          if custom_model_data:
             floats: f32[]varint
             flags: bool[]varint
diff --git a/data/pc/1.21.5/protocol.json b/data/pc/1.21.5/protocol.json
index 2486d3956..e77b84107 100644
--- a/data/pc/1.21.5/protocol.json
+++ b/data/pc/1.21.5/protocol.json
@@ -345,75 +345,63 @@
                   ]
                 ],
                 "attribute_modifiers": [
-                  "container",
-                  [
-                    {
-                      "name": "attributes",
-                      "type": [
-                        "array",
+                  "array",
+                  {
+                    "countType": "varint",
+                    "type": [
+                      "container",
+                      [
                         {
-                          "countType": "varint",
+                          "name": "typeId",
+                          "type": "varint"
+                        },
+                        {
+                          "name": "name",
+                          "type": "string"
+                        },
+                        {
+                          "name": "value",
+                          "type": "f64"
+                        },
+                        {
+                          "name": "operation",
                           "type": [
-                            "container",
-                            [
-                              {
-                                "name": "typeId",
-                                "type": "varint"
-                              },
-                              {
-                                "name": "name",
-                                "type": "string"
-                              },
-                              {
-                                "name": "value",
-                                "type": "f64"
-                              },
-                              {
-                                "name": "operation",
-                                "type": [
-                                  "mapper",
-                                  {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "add",
-                                      "1": "multiply_base",
-                                      "2": "multiply_total"
-                                    }
-                                  }
-                                ]
-                              },
-                              {
-                                "name": "slot",
-                                "type": [
-                                  "mapper",
-                                  {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "any",
-                                      "1": "main_hand",
-                                      "2": "off_hand",
-                                      "3": "hand",
-                                      "4": "feet",
-                                      "5": "legs",
-                                      "6": "chest",
-                                      "7": "head",
-                                      "8": "armor",
-                                      "9": "body",
-                                      "10": "saddle"
-                                    }
-                                  }
-                                ]
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "add",
+                                "1": "multiply_base",
+                                "2": "multiply_total"
                               }
-                            ]
+                            }
+                          ]
+                        },
+                        {
+                          "name": "slot",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "any",
+                                "1": "main_hand",
+                                "2": "off_hand",
+                                "3": "hand",
+                                "4": "feet",
+                                "5": "legs",
+                                "6": "chest",
+                                "7": "head",
+                                "8": "armor",
+                                "9": "body",
+                                "10": "saddle"
+                              }
+                            }
                           ]
                         }
                       ]
-                    },
-                    {
-                      "name": "showTooltip",
-                      "type": "bool"
-                    }
-                  ]
+                    ]
+                  }
                 ],
                 "custom_model_data": [
                   "container",
diff --git a/data/pc/1.21.6/proto.yml b/data/pc/1.21.6/proto.yml
index bce840d4f..3f113abea 100644
--- a/data/pc/1.21.6/proto.yml
+++ b/data/pc/1.21.6/proto.yml
@@ -185,27 +185,26 @@
                level: varint
          if can_place_on or can_break:
             predicates: ItemBlockPredicate[]varint
-         if attribute_modifiers:
-            attributes: []varint
-               typeId: varint
-               name: string
-               value: f64
-               operation: varint =>
-               - add
-               - multiply_base
-               - multiply_total
-               slot: varint =>
-               - any
-               - main_hand
-               - off_hand
-               - hand
-               - feet
-               - legs
-               - chest
-               - head
-               - armor
-               - body
-               - saddle
+         if attribute_modifiers: []varint
+            typeId: varint
+            name: string
+            value: f64
+            operation: varint =>
+            - add
+            - multiply_base
+            - multiply_total
+            slot: varint =>
+            - any
+            - main_hand
+            - off_hand
+            - hand
+            - feet
+            - legs
+            - chest
+            - head
+            - armor
+            - body
+            - saddle
             display:
                type: varint =>
                   - default
diff --git a/data/pc/1.21.6/protocol.json b/data/pc/1.21.6/protocol.json
index 28e8d6a18..0e2e622a8 100644
--- a/data/pc/1.21.6/protocol.json
+++ b/data/pc/1.21.6/protocol.json
@@ -372,61 +372,87 @@
                   ]
                 ],
                 "attribute_modifiers": [
-                  "container",
-                  [
-                    {
-                      "name": "attributes",
-                      "type": [
-                        "array",
+                  "array",
+                  {
+                    "countType": "varint",
+                    "type": [
+                      "container",
+                      [
                         {
-                          "countType": "varint",
+                          "name": "typeId",
+                          "type": "varint"
+                        },
+                        {
+                          "name": "name",
+                          "type": "string"
+                        },
+                        {
+                          "name": "value",
+                          "type": "f64"
+                        },
+                        {
+                          "name": "operation",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "add",
+                                "1": "multiply_base",
+                                "2": "multiply_total"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "slot",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "any",
+                                "1": "main_hand",
+                                "2": "off_hand",
+                                "3": "hand",
+                                "4": "feet",
+                                "5": "legs",
+                                "6": "chest",
+                                "7": "head",
+                                "8": "armor",
+                                "9": "body",
+                                "10": "saddle"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "display",
                           "type": [
                             "container",
                             [
                               {
-                                "name": "typeId",
-                                "type": "varint"
-                              },
-                              {
-                                "name": "name",
-                                "type": "string"
-                              },
-                              {
-                                "name": "value",
-                                "type": "f64"
-                              },
-                              {
-                                "name": "operation",
+                                "name": "type",
                                 "type": [
                                   "mapper",
                                   {
                                     "type": "varint",
                                     "mappings": {
-                                      "0": "add",
-                                      "1": "multiply_base",
-                                      "2": "multiply_total"
+                                      "0": "default",
+                                      "1": "hidden",
+                                      "2": "override"
                                     }
                                   }
                                 ]
                               },
                               {
-                                "name": "slot",
+                                "name": "component",
                                 "type": [
-                                  "mapper",
+                                  "switch",
                                   {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "any",
-                                      "1": "main_hand",
-                                      "2": "off_hand",
-                                      "3": "hand",
-                                      "4": "feet",
-                                      "5": "legs",
-                                      "6": "chest",
-                                      "7": "head",
-                                      "8": "armor",
-                                      "9": "body",
-                                      "10": "saddle"
+                                    "compareTo": "type",
+                                    "fields": {
+                                      "override": "anonymousNbt"
                                     }
                                   }
                                 ]
@@ -435,42 +461,8 @@
                           ]
                         }
                       ]
-                    },
-                    {
-                      "name": "display",
-                      "type": [
-                        "container",
-                        [
-                          {
-                            "name": "type",
-                            "type": [
-                              "mapper",
-                              {
-                                "type": "varint",
-                                "mappings": {
-                                  "0": "default",
-                                  "1": "hidden",
-                                  "2": "override"
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "name": "component",
-                            "type": [
-                              "switch",
-                              {
-                                "compareTo": "type",
-                                "fields": {
-                                  "override": "anonymousNbt"
-                                }
-                              }
-                            ]
-                          }
-                        ]
-                      ]
-                    }
-                  ]
+                    ]
+                  }
                 ],
                 "custom_model_data": [
                   "container",
diff --git a/data/pc/1.21.8/proto.yml b/data/pc/1.21.8/proto.yml
index 699296d6f..a79d4c45b 100644
--- a/data/pc/1.21.8/proto.yml
+++ b/data/pc/1.21.8/proto.yml
@@ -185,27 +185,26 @@
                level: varint
          if can_place_on or can_break:
             predicates: ItemBlockPredicate[]varint
-         if attribute_modifiers:
-            attributes: []varint
-               typeId: varint
-               name: string
-               value: f64
-               operation: varint =>
-               - add
-               - multiply_base
-               - multiply_total
-               slot: varint =>
-               - any
-               - main_hand
-               - off_hand
-               - hand
-               - feet
-               - legs
-               - chest
-               - head
-               - armor
-               - body
-               - saddle
+         if attribute_modifiers: []varint
+            typeId: varint
+            name: string
+            value: f64
+            operation: varint =>
+            - add
+            - multiply_base
+            - multiply_total
+            slot: varint =>
+            - any
+            - main_hand
+            - off_hand
+            - hand
+            - feet
+            - legs
+            - chest
+            - head
+            - armor
+            - body
+            - saddle
             display:
                type: varint =>
                   - default
diff --git a/data/pc/1.21.8/protocol.json b/data/pc/1.21.8/protocol.json
index 252be9248..04a1ef57c 100644
--- a/data/pc/1.21.8/protocol.json
+++ b/data/pc/1.21.8/protocol.json
@@ -372,61 +372,87 @@
                   ]
                 ],
                 "attribute_modifiers": [
-                  "container",
-                  [
-                    {
-                      "name": "attributes",
-                      "type": [
-                        "array",
+                  "array",
+                  {
+                    "countType": "varint",
+                    "type": [
+                      "container",
+                      [
                         {
-                          "countType": "varint",
+                          "name": "typeId",
+                          "type": "varint"
+                        },
+                        {
+                          "name": "name",
+                          "type": "string"
+                        },
+                        {
+                          "name": "value",
+                          "type": "f64"
+                        },
+                        {
+                          "name": "operation",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "add",
+                                "1": "multiply_base",
+                                "2": "multiply_total"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "slot",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "any",
+                                "1": "main_hand",
+                                "2": "off_hand",
+                                "3": "hand",
+                                "4": "feet",
+                                "5": "legs",
+                                "6": "chest",
+                                "7": "head",
+                                "8": "armor",
+                                "9": "body",
+                                "10": "saddle"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "display",
                           "type": [
                             "container",
                             [
                               {
-                                "name": "typeId",
-                                "type": "varint"
-                              },
-                              {
-                                "name": "name",
-                                "type": "string"
-                              },
-                              {
-                                "name": "value",
-                                "type": "f64"
-                              },
-                              {
-                                "name": "operation",
+                                "name": "type",
                                 "type": [
                                   "mapper",
                                   {
                                     "type": "varint",
                                     "mappings": {
-                                      "0": "add",
-                                      "1": "multiply_base",
-                                      "2": "multiply_total"
+                                      "0": "default",
+                                      "1": "hidden",
+                                      "2": "override"
                                     }
                                   }
                                 ]
                               },
                               {
-                                "name": "slot",
+                                "name": "component",
                                 "type": [
-                                  "mapper",
+                                  "switch",
                                   {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "any",
-                                      "1": "main_hand",
-                                      "2": "off_hand",
-                                      "3": "hand",
-                                      "4": "feet",
-                                      "5": "legs",
-                                      "6": "chest",
-                                      "7": "head",
-                                      "8": "armor",
-                                      "9": "body",
-                                      "10": "saddle"
+                                    "compareTo": "type",
+                                    "fields": {
+                                      "override": "anonymousNbt"
                                     }
                                   }
                                 ]
@@ -435,42 +461,8 @@
                           ]
                         }
                       ]
-                    },
-                    {
-                      "name": "display",
-                      "type": [
-                        "container",
-                        [
-                          {
-                            "name": "type",
-                            "type": [
-                              "mapper",
-                              {
-                                "type": "varint",
-                                "mappings": {
-                                  "0": "default",
-                                  "1": "hidden",
-                                  "2": "override"
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "name": "component",
-                            "type": [
-                              "switch",
-                              {
-                                "compareTo": "type",
-                                "fields": {
-                                  "override": "anonymousNbt"
-                                }
-                              }
-                            ]
-                          }
-                        ]
-                      ]
-                    }
-                  ]
+                    ]
+                  }
                 ],
                 "custom_model_data": [
                   "container",
diff --git a/data/pc/1.21.9/proto.yml b/data/pc/1.21.9/proto.yml
index 307b44fa4..b9a4471ff 100644
--- a/data/pc/1.21.9/proto.yml
+++ b/data/pc/1.21.9/proto.yml
@@ -190,27 +190,26 @@
                level: varint
          if can_place_on or can_break:
             predicates: ItemBlockPredicate[]varint
-         if attribute_modifiers:
-            attributes: []varint
-               typeId: varint
-               name: string
-               value: f64
-               operation: varint =>
-               - add
-               - multiply_base
-               - multiply_total
-               slot: varint =>
-               - any
-               - main_hand
-               - off_hand
-               - hand
-               - feet
-               - legs
-               - chest
-               - head
-               - armor
-               - body
-               - saddle
+         if attribute_modifiers: []varint
+            typeId: varint
+            name: string
+            value: f64
+            operation: varint =>
+            - add
+            - multiply_base
+            - multiply_total
+            slot: varint =>
+            - any
+            - main_hand
+            - off_hand
+            - hand
+            - feet
+            - legs
+            - chest
+            - head
+            - armor
+            - body
+            - saddle
             display:
                type: varint =>
                   - default
diff --git a/data/pc/1.21.9/protocol.json b/data/pc/1.21.9/protocol.json
index 53ef32fe6..07115a8f7 100644
--- a/data/pc/1.21.9/protocol.json
+++ b/data/pc/1.21.9/protocol.json
@@ -390,61 +390,87 @@
                   ]
                 ],
                 "attribute_modifiers": [
-                  "container",
-                  [
-                    {
-                      "name": "attributes",
-                      "type": [
-                        "array",
+                  "array",
+                  {
+                    "countType": "varint",
+                    "type": [
+                      "container",
+                      [
                         {
-                          "countType": "varint",
+                          "name": "typeId",
+                          "type": "varint"
+                        },
+                        {
+                          "name": "name",
+                          "type": "string"
+                        },
+                        {
+                          "name": "value",
+                          "type": "f64"
+                        },
+                        {
+                          "name": "operation",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "add",
+                                "1": "multiply_base",
+                                "2": "multiply_total"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "slot",
+                          "type": [
+                            "mapper",
+                            {
+                              "type": "varint",
+                              "mappings": {
+                                "0": "any",
+                                "1": "main_hand",
+                                "2": "off_hand",
+                                "3": "hand",
+                                "4": "feet",
+                                "5": "legs",
+                                "6": "chest",
+                                "7": "head",
+                                "8": "armor",
+                                "9": "body",
+                                "10": "saddle"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "name": "display",
                           "type": [
                             "container",
                             [
                               {
-                                "name": "typeId",
-                                "type": "varint"
-                              },
-                              {
-                                "name": "name",
-                                "type": "string"
-                              },
-                              {
-                                "name": "value",
-                                "type": "f64"
-                              },
-                              {
-                                "name": "operation",
+                                "name": "type",
                                 "type": [
                                   "mapper",
                                   {
                                     "type": "varint",
                                     "mappings": {
-                                      "0": "add",
-                                      "1": "multiply_base",
-                                      "2": "multiply_total"
+                                      "0": "default",
+                                      "1": "hidden",
+                                      "2": "override"
                                     }
                                   }
                                 ]
                               },
                               {
-                                "name": "slot",
+                                "name": "component",
                                 "type": [
-                                  "mapper",
+                                  "switch",
                                   {
-                                    "type": "varint",
-                                    "mappings": {
-                                      "0": "any",
-                                      "1": "main_hand",
-                                      "2": "off_hand",
-                                      "3": "hand",
-                                      "4": "feet",
-                                      "5": "legs",
-                                      "6": "chest",
-                                      "7": "head",
-                                      "8": "armor",
-                                      "9": "body",
-                                      "10": "saddle"
+                                    "compareTo": "type",
+                                    "fields": {
+                                      "override": "anonymousNbt"
                                     }
                                   }
                                 ]
@@ -453,42 +479,8 @@
                           ]
                         }
                       ]
-                    },
-                    {
-                      "name": "display",
-                      "type": [
-                        "container",
-                        [
-                          {
-                            "name": "type",
-                            "type": [
-                              "mapper",
-                              {
-                                "type": "varint",
-                                "mappings": {
-                                  "0": "default",
-                                  "1": "hidden",
-                                  "2": "override"
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "name": "component",
-                            "type": [
-                              "switch",
-                              {
-                                "compareTo": "type",
-                                "fields": {
-                                  "override": "anonymousNbt"
-                                }
-                              }
-                            ]
-                          }
-                        ]
-                      ]
-                    }
-                  ]
+                    ]
+                  }
                 ],
                 "custom_model_data": [
                   "container",
diff --git a/data/pc/latest/proto.yml b/data/pc/latest/proto.yml
index e0ed0a934..6b70f0aea 100644
--- a/data/pc/latest/proto.yml
+++ b/data/pc/latest/proto.yml
@@ -208,27 +208,26 @@
                level: varint
          if can_place_on or can_break:
             predicates: ItemBlockPredicate[]varint
-         if attribute_modifiers:
-            attributes: []varint
-               typeId: varint
-               name: string
-               value: f64
-               operation: varint =>
-               - add
-               - multiply_base
-               - multiply_total
-               slot: varint =>
-               - any
-               - main_hand
-               - off_hand
-               - hand
-               - feet
-               - legs
-               - chest
-               - head
-               - armor
-               - body
-               - saddle
+         if attribute_modifiers: []varint
+            typeId: varint
+            name: string
+            value: f64
+            operation: varint =>
+            - add
+            - multiply_base
+            - multiply_total
+            slot: varint =>
+            - any
+            - main_hand
+            - off_hand
+            - hand
+            - feet
+            - legs
+            - chest
+            - head
+            - armor
+            - body
+            - saddle
             display:
                type: varint =>
                   - default