Send correct data component checksums (#234)

* start implementing data component crc32 hashes

* start doing serde impls for checksums

* make more components hashable

* make all data components serializable

* support recursive components

* fix simdnbt dep

* update changelog

* clippy

2 files changed, 140 insertions, 140 deletions

diff --git a/azalea-inventory/src/default_components/generated.rs b/azalea-inventory/src/default_components/generated.rs
index c62a43dd..6b948ec3 100644
--- a/azalea-inventory/src/default_components/generated.rs
+++ b/azalea-inventory/src/default_components/generated.rs
@@ -20,7 +20,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::CarvedPumpkin => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -30,7 +30,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::ChainmailBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -40,7 +40,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -52,7 +52,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::ChainmailChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -62,7 +62,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -74,7 +74,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::ChainmailHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -84,7 +84,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -96,7 +96,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::ChainmailLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -106,7 +106,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -118,7 +118,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::CreeperHead => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -128,7 +128,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -138,7 +138,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -150,7 +150,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -160,7 +160,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -172,7 +172,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -182,7 +182,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -194,7 +194,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -204,7 +204,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -216,7 +216,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -226,7 +226,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -238,7 +238,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondHorseArmor => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -248,7 +248,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -260,7 +260,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -270,7 +270,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -282,7 +282,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondPickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -292,7 +292,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -304,7 +304,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -314,7 +314,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -326,7 +326,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DiamondSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -336,7 +336,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -348,7 +348,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::DragonHead => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -358,7 +358,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -368,7 +368,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -380,7 +380,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -390,7 +390,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -402,7 +402,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -412,7 +412,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -424,7 +424,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -434,7 +434,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -446,7 +446,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -456,7 +456,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -468,7 +468,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenHorseArmor => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -478,7 +478,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -490,7 +490,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -500,7 +500,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -512,7 +512,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenPickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -522,7 +522,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -534,7 +534,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -544,7 +544,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -556,7 +556,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::GoldenSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -566,7 +566,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -578,7 +578,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -588,7 +588,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -600,7 +600,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -610,7 +610,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -622,7 +622,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -632,7 +632,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -644,7 +644,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -654,7 +654,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -666,7 +666,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -676,7 +676,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -688,7 +688,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronHorseArmor => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -698,7 +698,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -710,7 +710,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -720,7 +720,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -732,7 +732,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronPickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -742,7 +742,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -754,7 +754,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -764,7 +764,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -776,7 +776,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::IronSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -786,7 +786,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -798,7 +798,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::LeatherBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -808,7 +808,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -820,7 +820,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::LeatherChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -830,7 +830,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -842,7 +842,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::LeatherHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -852,7 +852,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -864,7 +864,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::LeatherHorseArmor => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -874,7 +874,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -886,7 +886,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::LeatherLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -896,7 +896,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -908,7 +908,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::Mace => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -918,7 +918,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -930,7 +930,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -940,7 +940,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -952,7 +952,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteBoots => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -962,7 +962,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -972,7 +972,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Feet,
-                    attribute: Attribute::KnockbackResistance,
+                    kind: Attribute::KnockbackResistance,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.boots".into(),
@@ -984,7 +984,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteChestplate => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -994,7 +994,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -1004,7 +1004,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Chest,
-                    attribute: Attribute::KnockbackResistance,
+                    kind: Attribute::KnockbackResistance,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.chestplate".into(),
@@ -1016,7 +1016,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -1026,7 +1026,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -1036,7 +1036,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::KnockbackResistance,
+                    kind: Attribute::KnockbackResistance,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -1048,7 +1048,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1058,7 +1058,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1070,7 +1070,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteLeggings => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -1080,7 +1080,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -1090,7 +1090,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Legs,
-                    attribute: Attribute::KnockbackResistance,
+                    kind: Attribute::KnockbackResistance,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.leggings".into(),
@@ -1102,7 +1102,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheritePickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1112,7 +1112,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1124,7 +1124,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1134,7 +1134,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1146,7 +1146,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::NetheriteSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1156,7 +1156,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1168,7 +1168,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::PiglinHead => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -1178,7 +1178,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::PlayerHead => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -1188,7 +1188,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::SkeletonSkull => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -1198,7 +1198,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::StoneAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1208,7 +1208,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1220,7 +1220,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::StoneHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1230,7 +1230,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1242,7 +1242,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::StonePickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1252,7 +1252,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1264,7 +1264,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::StoneShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1274,7 +1274,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1286,7 +1286,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::StoneSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1296,7 +1296,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1308,7 +1308,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::Trident => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1318,7 +1318,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1330,7 +1330,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::TurtleHelmet => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -1340,7 +1340,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Head,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.helmet".into(),
@@ -1352,7 +1352,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WitherSkeletonSkull => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -1362,7 +1362,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WolfArmor => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::Armor,
+                    kind: Attribute::Armor,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -1372,7 +1372,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Body,
-                    attribute: Attribute::ArmorToughness,
+                    kind: Attribute::ArmorToughness,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:armor.body".into(),
@@ -1384,7 +1384,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WoodenAxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1394,7 +1394,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1406,7 +1406,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WoodenHoe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1416,7 +1416,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1428,7 +1428,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WoodenPickaxe => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1438,7 +1438,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1450,7 +1450,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WoodenShovel => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1460,7 +1460,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1472,7 +1472,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::WoodenSword => vec![
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackDamage,
+                    kind: Attribute::AttackDamage,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_damage".into(),
@@ -1482,7 +1482,7 @@ impl DefaultableComponent for AttributeModifiers {
                 },
                 AttributeModifiersEntry {
                     slot: EquipmentSlotGroup::Mainhand,
-                    attribute: Attribute::AttackSpeed,
+                    kind: Attribute::AttackSpeed,
                     display: AttributeModifierDisplay::Default,
                     modifier: AttributeModifier {
                         id: "minecraft:base_attack_speed".into(),
@@ -1494,7 +1494,7 @@ impl DefaultableComponent for AttributeModifiers {
             Item::ZombieHead => vec![AttributeModifiersEntry {
                 display: AttributeModifierDisplay::Hidden,
                 slot: EquipmentSlotGroup::Head,
-                attribute: Attribute::WaypointTransmitRange,
+                kind: Attribute::WaypointTransmitRange,
                 modifier: AttributeModifier {
                     id: "minecraft:waypoint_transmit_range_hide".into(),
                     amount: -1.0,
@@ -3691,7 +3691,7 @@ impl DefaultableComponent for EnchantmentGlintOverride {
 impl DefaultableComponent for PotDecorations {
     fn default_for_item(item: Item) -> Option<Self> {
         let value = match item {
-            Item::DecoratedPot => vec![Item::Brick, Item::Brick, Item::Brick, Item::Brick],
+            Item::DecoratedPot => [Item::Brick, Item::Brick, Item::Brick, Item::Brick],
             _ => return None,
         };
         Some(PotDecorations { items: value })
diff --git a/azalea-inventory/src/default_components/mod.rs b/azalea-inventory/src/default_components/mod.rs
index e6150066..7f9ef6fb 100644
--- a/azalea-inventory/src/default_components/mod.rs
+++ b/azalea-inventory/src/default_components/mod.rs
@@ -2,15 +2,15 @@ pub mod generated;
 
 use azalea_registry::Item;
 
-use crate::components::DataComponent;
+use crate::components::DataComponentTrait;
 
 /// A [`DataComponent`] that some [`Item`]s may have a default value for.
-pub trait DefaultableComponent: DataComponent {
+pub trait DefaultableComponent: DataComponentTrait {
     fn default_for_item(item: Item) -> Option<Self>
     where
         Self: Sized;
 }
-impl<T: DataComponent> DefaultableComponent for T {
+impl<T: DataComponentTrait> DefaultableComponent for T {
     default fn default_for_item(_item: Item) -> Option<Self> {
         None
     }