From 52772afe85ef378e9d139777645d197d48429e06 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Tue, 13 Dec 2022 19:08:49 -0600
Subject: [PATCH] rename Component to FormattedText

also start making the metadata use bevy_ecs but bevy_ecs doesn't let you query on Bundles so it's annoying
---
 Cargo.lock                                    |     1 +
 azalea-brigadier/src/suggestion/mod.rs        |     4 +-
 .../src/suggestion/suggestions.rs             |     8 +-
 azalea-chat/src/base_component.rs             |     4 +-
 azalea-chat/src/component.rs                  |    95 +-
 azalea-chat/src/lib.rs                        |     2 +-
 azalea-chat/src/text_component.rs             |    14 +-
 azalea-chat/src/translatable_component.rs     |    18 +-
 azalea-chat/tests/integration_test.rs         |     8 +-
 azalea-client/src/chat.rs                     |     6 +-
 azalea-client/src/player.rs                   |     4 +-
 azalea-core/Cargo.toml                        |    12 +-
 azalea-core/src/particle/mod.rs               |     1 +
 .../game/clientbound_boss_event_packet.rs     |     8 +-
 .../game/clientbound_chat_preview_packet.rs   |     4 +-
 .../clientbound_command_suggestions_packet.rs |     6 +-
 .../game/clientbound_commands_packet.rs       |     2 +-
 .../game/clientbound_disconnect_packet.rs     |     4 +-
 .../game/clientbound_disguised_chat_packet.rs |     4 +-
 .../game/clientbound_map_item_data_packet.rs  |     4 +-
 .../game/clientbound_open_screen_packet.rs    |     4 +-
 .../game/clientbound_player_chat_packet.rs    |    24 +-
 .../clientbound_player_combat_kill_packet.rs  |     4 +-
 .../clientbound_player_info_update_packet.rs  |     6 +-
 .../game/clientbound_resource_pack_packet.rs  |     4 +-
 .../game/clientbound_server_data_packet.rs    |     4 +-
 .../clientbound_set_action_bar_text_packet.rs |     4 +-
 .../game/clientbound_set_objective_packet.rs  |     4 +-
 .../clientbound_set_player_team_packet.rs     |     8 +-
 .../clientbound_set_subtitle_text_packet.rs   |     4 +-
 .../game/clientbound_set_title_text_packet.rs |     4 +-
 .../game/clientbound_system_chat_packet.rs    |     4 +-
 .../game/clientbound_tab_list_packet.rs       |     6 +-
 .../clientbound_update_advancements_packet.rs |    10 +-
 .../clientbound_login_disconnect_packet.rs    |     4 +-
 .../clientbound_status_response_packet.rs     |     4 +-
 azalea-registry/src/lib.rs                    |     2 +-
 azalea-world/Cargo.toml                       |    14 +-
 azalea-world/src/entity/data.rs               |     9 +-
 azalea-world/src/entity/metadata.rs           | 21113 ++++++++--------
 codegen/lib/code/entity.py                    |   229 +-
 codegen/lib/code/utils.py                     |     4 +-
 42 files changed, 11094 insertions(+), 10584 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b78464ff..e134c286 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,6 +295,7 @@ dependencies = [
  "azalea-buf",
  "azalea-chat",
  "azalea-nbt",
+ "bevy_ecs",
  "uuid",
 ]
 
diff --git a/azalea-brigadier/src/suggestion/mod.rs b/azalea-brigadier/src/suggestion/mod.rs
index 114a4c47..ea847f58 100755
--- a/azalea-brigadier/src/suggestion/mod.rs
+++ b/azalea-brigadier/src/suggestion/mod.rs
@@ -4,7 +4,7 @@ use crate::context::StringRange;
 #[cfg(feature = "azalea-buf")]
 use azalea_buf::McBufWritable;
 #[cfg(feature = "azalea-buf")]
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 #[cfg(feature = "azalea-buf")]
 use std::io::Write;
 pub use suggestions::*;
@@ -58,7 +58,7 @@ impl<M: Clone> Suggestion<M> {
 }
 
 #[cfg(feature = "azalea-buf")]
-impl McBufWritable for Suggestion<Component> {
+impl McBufWritable for Suggestion<FormattedText> {
     fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
         self.text.write_into(buf)?;
         self.tooltip.write_into(buf)?;
diff --git a/azalea-brigadier/src/suggestion/suggestions.rs b/azalea-brigadier/src/suggestion/suggestions.rs
index 06ef9661..2a8b5e9e 100755
--- a/azalea-brigadier/src/suggestion/suggestions.rs
+++ b/azalea-brigadier/src/suggestion/suggestions.rs
@@ -5,7 +5,7 @@ use azalea_buf::{
     BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
 };
 #[cfg(feature = "azalea-buf")]
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 #[cfg(feature = "azalea-buf")]
 use std::io::{Cursor, Write};
 use std::{collections::HashSet, hash::Hash};
@@ -68,12 +68,12 @@ impl<M> Default for Suggestions<M> {
 }
 
 #[cfg(feature = "azalea-buf")]
-impl McBufReadable for Suggestions<Component> {
+impl McBufReadable for Suggestions<FormattedText> {
     fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
         #[derive(McBuf)]
         struct StandaloneSuggestion {
             pub text: String,
-            pub tooltip: Option<Component>,
+            pub tooltip: Option<FormattedText>,
         }
 
         let start = u32::var_read_from(buf)? as usize;
@@ -97,7 +97,7 @@ impl McBufReadable for Suggestions<Component> {
 }
 
 #[cfg(feature = "azalea-buf")]
-impl McBufWritable for Suggestions<Component> {
+impl McBufWritable for Suggestions<FormattedText> {
     fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
         (self.range.start() as u32).var_write_into(buf)?;
         (self.range.length() as u32).var_write_into(buf)?;
diff --git a/azalea-chat/src/base_component.rs b/azalea-chat/src/base_component.rs
index ab4f5e5d..43b35aef 100755
--- a/azalea-chat/src/base_component.rs
+++ b/azalea-chat/src/base_component.rs
@@ -1,11 +1,11 @@
-use crate::{style::Style, Component};
+use crate::{style::Style, FormattedText};
 use serde::Serialize;
 
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct BaseComponent {
     // implements mutablecomponent
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub siblings: Vec<Component>,
+    pub siblings: Vec<FormattedText>,
     #[serde(flatten)]
     pub style: Style,
 }
diff --git a/azalea-chat/src/component.rs b/azalea-chat/src/component.rs
index d889f3ef..61c948ce 100755
--- a/azalea-chat/src/component.rs
+++ b/azalea-chat/src/component.rs
@@ -16,7 +16,7 @@ use std::{
 /// A chat component, basically anything you can see in chat.
 #[derive(Clone, Debug, PartialEq, Serialize)]
 #[serde(untagged)]
-pub enum Component {
+pub enum FormattedText {
     Text(TextComponent),
     Translatable(TranslatableComponent),
 }
@@ -27,7 +27,7 @@ pub static DEFAULT_STYLE: Lazy<Style> = Lazy::new(|| Style {
 });
 
 /// A chat component
-impl Component {
+impl FormattedText {
     pub fn get_base_mut(&mut self) -> &mut BaseComponent {
         match self {
             Self::Text(c) => &mut c.base,
@@ -43,14 +43,16 @@ impl Component {
     }
 
     /// Add a component as a sibling of this one
-    fn append(&mut self, sibling: Component) {
+    fn append(&mut self, sibling: FormattedText) {
         self.get_base_mut().siblings.push(sibling);
     }
 
     /// Get the "separator" component from the json
-    fn parse_separator(json: &serde_json::Value) -> Result<Option<Component>, serde_json::Error> {
+    fn parse_separator(
+        json: &serde_json::Value,
+    ) -> Result<Option<FormattedText>, serde_json::Error> {
         if json.get("separator").is_some() {
-            return Ok(Some(Component::deserialize(
+            return Ok(Some(FormattedText::deserialize(
                 json.get("separator").unwrap(),
             )?));
         }
@@ -61,16 +63,17 @@ impl Component {
     /// [ANSI string](https://en.wikipedia.org/wiki/ANSI_escape_code), so you
     /// can print it to your terminal and get styling.
     ///
-    /// This is technically a shortcut for [`Component::to_ansi_custom_style`]
-    /// with a default [`Style`] colored white.
+    /// This is technically a shortcut for
+    /// [`FormattedText::to_ansi_custom_style`] with a default [`Style`]
+    /// colored white.
     ///
     /// # Examples
     ///
     /// ```rust
-    /// use azalea_chat::Component;
+    /// use azalea_chat::FormattedText;
     /// use serde::de::Deserialize;
     ///
-    /// let component = Component::deserialize(&serde_json::json!({
+    /// let component = FormattedText::deserialize(&serde_json::json!({
     ///    "text": "Hello, world!",
     ///    "color": "red",
     /// })).unwrap();
@@ -85,7 +88,7 @@ impl Component {
     /// Convert this component into an
     /// [ANSI string](https://en.wikipedia.org/wiki/ANSI_escape_code).
     ///
-    /// This is the same as [`Component::to_ansi`], but you can specify a
+    /// This is the same as [`FormattedText::to_ansi`], but you can specify a
     /// default [`Style`] to use.
     pub fn to_ansi_custom_style(&self, default_style: &Style) -> String {
         // this contains the final string will all the ansi escape codes
@@ -116,12 +119,12 @@ impl Component {
     }
 }
 
-impl IntoIterator for Component {
+impl IntoIterator for FormattedText {
     /// Recursively call the function for every component in this component
     fn into_iter(self) -> Self::IntoIter {
         let base = self.get_base();
         let siblings = base.siblings.clone();
-        let mut v: Vec<Component> = Vec::with_capacity(siblings.len() + 1);
+        let mut v: Vec<FormattedText> = Vec::with_capacity(siblings.len() + 1);
         v.push(self);
         for sibling in siblings {
             v.extend(sibling.into_iter());
@@ -130,11 +133,11 @@ impl IntoIterator for Component {
         v.into_iter()
     }
 
-    type Item = Component;
+    type Item = FormattedText;
     type IntoIter = std::vec::IntoIter<Self::Item>;
 }
 
-impl<'de> Deserialize<'de> for Component {
+impl<'de> Deserialize<'de> for FormattedText {
     fn deserialize<D>(de: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
@@ -142,11 +145,11 @@ impl<'de> Deserialize<'de> for Component {
         let json: serde_json::Value = serde::Deserialize::deserialize(de)?;
 
         // we create a component that we might add siblings to
-        let mut component: Component;
+        let mut component: FormattedText;
 
         // if it's primitive, make it a text component
         if !json.is_array() && !json.is_object() {
-            return Ok(Component::Text(TextComponent::new(
+            return Ok(FormattedText::Text(TextComponent::new(
                 json.as_str().unwrap_or("").to_string(),
             )));
         }
@@ -154,7 +157,7 @@ impl<'de> Deserialize<'de> for Component {
         else if json.is_object() {
             if let Some(text) = json.get("text") {
                 let text = text.as_str().unwrap_or("").to_string();
-                component = Component::Text(TextComponent::new(text));
+                component = FormattedText::Text(TextComponent::new(text));
             } else if let Some(translate) = json.get("translate") {
                 let translate = translate
                     .as_str()
@@ -169,8 +172,8 @@ impl<'de> Deserialize<'de> for Component {
                         // if it's a string component with no styling and no siblings, just add a
                         // string to with_array otherwise add the component
                         // to the array
-                        let c = Component::deserialize(item).map_err(de::Error::custom)?;
-                        if let Component::Text(text_component) = c {
+                        let c = FormattedText::deserialize(item).map_err(de::Error::custom)?;
+                        if let FormattedText::Text(text_component) = c {
                             if text_component.base.siblings.is_empty()
                                 && text_component.base.style.is_empty()
                             {
@@ -178,16 +181,19 @@ impl<'de> Deserialize<'de> for Component {
                                 continue;
                             }
                         }
-                        with_array.push(StringOrComponent::Component(
-                            Component::deserialize(item).map_err(de::Error::custom)?,
+                        with_array.push(StringOrComponent::FormattedText(
+                            FormattedText::deserialize(item).map_err(de::Error::custom)?,
                         ));
                     }
-                    component =
-                        Component::Translatable(TranslatableComponent::new(translate, with_array));
+                    component = FormattedText::Translatable(TranslatableComponent::new(
+                        translate, with_array,
+                    ));
                 } else {
                     // if it doesn't have a "with", just have the with_array be empty
-                    component =
-                        Component::Translatable(TranslatableComponent::new(translate, Vec::new()));
+                    component = FormattedText::Translatable(TranslatableComponent::new(
+                        translate,
+                        Vec::new(),
+                    ));
                 }
             } else if let Some(score) = json.get("score") {
                 // object = GsonHelper.getAsJsonObject(jsonObject, "score");
@@ -213,10 +219,11 @@ impl<'de> Deserialize<'de> for Component {
                     nbt
                 } else {
                     return Err(de::Error::custom(
-                        format!("Don't know how to turn {json} into a Component").as_str(),
+                        format!("Don't know how to turn {json} into a FormattedText").as_str(),
                     ));
                 };
-                let _separator = Component::parse_separator(&json).map_err(de::Error::custom)?;
+                let _separator =
+                    FormattedText::parse_separator(&json).map_err(de::Error::custom)?;
 
                 let _interpret = match json.get("interpret") {
                     Some(v) => v.as_bool().ok_or(Some(false)).unwrap(),
@@ -237,7 +244,7 @@ impl<'de> Deserialize<'de> for Component {
                 }
                 for extra_component in extra {
                     let sibling =
-                        Component::deserialize(extra_component).map_err(de::Error::custom)?;
+                        FormattedText::deserialize(extra_component).map_err(de::Error::custom)?;
                     component.append(sibling);
                 }
             }
@@ -250,33 +257,35 @@ impl<'de> Deserialize<'de> for Component {
         // ok so it's not an object, if it's an array deserialize every item
         else if !json.is_array() {
             return Err(de::Error::custom(
-                format!("Don't know how to turn {json} into a Component").as_str(),
+                format!("Don't know how to turn {json} into a FormattedText").as_str(),
             ));
         }
         let json_array = json.as_array().unwrap();
         // the first item in the array is the one that we're gonna return, the others
         // are siblings
-        let mut component = Component::deserialize(&json_array[0]).map_err(de::Error::custom)?;
+        let mut component =
+            FormattedText::deserialize(&json_array[0]).map_err(de::Error::custom)?;
         for i in 1..json_array.len() {
             component.append(
-                Component::deserialize(json_array.get(i).unwrap()).map_err(de::Error::custom)?,
+                FormattedText::deserialize(json_array.get(i).unwrap())
+                    .map_err(de::Error::custom)?,
             );
         }
         Ok(component)
     }
 }
 
-impl McBufReadable for Component {
+impl McBufReadable for FormattedText {
     fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
         let string = String::read_from(buf)?;
-        debug!("Component string: {}", string);
+        debug!("FormattedText string: {}", string);
         let json: serde_json::Value = serde_json::from_str(string.as_str())?;
-        let component = Component::deserialize(json)?;
+        let component = FormattedText::deserialize(json)?;
         Ok(component)
     }
 }
 
-impl McBufWritable for Component {
+impl McBufWritable for FormattedText {
     fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
         let json = serde_json::to_string(self).unwrap();
         json.write_into(buf)?;
@@ -284,31 +293,31 @@ impl McBufWritable for Component {
     }
 }
 
-impl From<String> for Component {
+impl From<String> for FormattedText {
     fn from(s: String) -> Self {
-        Component::Text(TextComponent {
+        FormattedText::Text(TextComponent {
             text: s,
             base: BaseComponent::default(),
         })
     }
 }
-impl From<&str> for Component {
+impl From<&str> for FormattedText {
     fn from(s: &str) -> Self {
         Self::from(s.to_string())
     }
 }
 
-impl Display for Component {
+impl Display for FormattedText {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Component::Text(c) => c.fmt(f),
-            Component::Translatable(c) => c.fmt(f),
+            FormattedText::Text(c) => c.fmt(f),
+            FormattedText::Translatable(c) => c.fmt(f),
         }
     }
 }
 
-impl Default for Component {
+impl Default for FormattedText {
     fn default() -> Self {
-        Component::Text(TextComponent::default())
+        FormattedText::Text(TextComponent::default())
     }
 }
diff --git a/azalea-chat/src/lib.rs b/azalea-chat/src/lib.rs
index fd26ee4f..e2ef5657 100755
--- a/azalea-chat/src/lib.rs
+++ b/azalea-chat/src/lib.rs
@@ -7,4 +7,4 @@ pub mod style;
 pub mod text_component;
 pub mod translatable_component;
 
-pub use component::Component;
+pub use component::FormattedText;
diff --git a/azalea-chat/src/text_component.rs b/azalea-chat/src/text_component.rs
index 44bcbcf1..df770473 100755
--- a/azalea-chat/src/text_component.rs
+++ b/azalea-chat/src/text_component.rs
@@ -1,4 +1,4 @@
-use crate::{base_component::BaseComponent, style::ChatFormatting, Component};
+use crate::{base_component::BaseComponent, style::ChatFormatting, FormattedText};
 use serde::{ser::SerializeMap, Serialize, Serializer, __private::ser::FlatMapSerializer};
 use std::fmt::Display;
 
@@ -26,7 +26,7 @@ impl Serialize for TextComponent {
 
 const LEGACY_FORMATTING_CODE_SYMBOL: char = '§';
 
-/// Convert a legacy color code string into a Component
+/// Convert a legacy color code string into a FormattedText
 /// Technically in Minecraft this is done when displaying the text, but AFAIK
 /// it's the same as just doing it in TextComponent
 pub fn legacy_color_code_to_text_component(legacy_color_code: &str) -> TextComponent {
@@ -98,18 +98,18 @@ impl TextComponent {
         }
     }
 
-    fn get(self) -> Component {
-        Component::Text(self)
+    fn get(self) -> FormattedText {
+        FormattedText::Text(self)
     }
 }
 
 impl Display for TextComponent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         // this contains the final string will all the ansi escape codes
-        for component in Component::Text(self.clone()).into_iter() {
+        for component in FormattedText::Text(self.clone()).into_iter() {
             let component_text = match &component {
-                Component::Text(c) => c.text.to_string(),
-                Component::Translatable(c) => c.read()?.to_string(),
+                FormattedText::Text(c) => c.text.to_string(),
+                FormattedText::Translatable(c) => c.read()?.to_string(),
             };
 
             f.write_str(&component_text)?;
diff --git a/azalea-chat/src/translatable_component.rs b/azalea-chat/src/translatable_component.rs
index 7819d5ff..5072ad1e 100755
--- a/azalea-chat/src/translatable_component.rs
+++ b/azalea-chat/src/translatable_component.rs
@@ -1,7 +1,7 @@
 use std::fmt::{self, Display, Formatter};
 
 use crate::{
-    base_component::BaseComponent, style::Style, text_component::TextComponent, Component,
+    base_component::BaseComponent, style::Style, text_component::TextComponent, FormattedText,
 };
 use serde::{ser::SerializeMap, Serialize, Serializer, __private::ser::FlatMapSerializer};
 
@@ -9,7 +9,7 @@ use serde::{ser::SerializeMap, Serialize, Serializer, __private::ser::FlatMapSer
 #[serde(untagged)]
 pub enum StringOrComponent {
     String(String),
-    Component(Component),
+    FormattedText(FormattedText),
 }
 
 /// A message whose content depends on the client's language.
@@ -42,7 +42,7 @@ impl TranslatableComponent {
         }
     }
 
-    /// Convert the key and args to a Component.
+    /// Convert the key and args to a FormattedText.
     pub fn read(&self) -> Result<TextComponent, fmt::Error> {
         let template = azalea_language::get(&self.key).unwrap_or(&self.key);
         // decode the % things
@@ -122,7 +122,7 @@ impl TranslatableComponent {
 
         Ok(TextComponent {
             base: BaseComponent {
-                siblings: components.into_iter().map(Component::Text).collect(),
+                siblings: components.into_iter().map(FormattedText::Text).collect(),
                 style: Style::default(),
             },
             text: "".to_string(),
@@ -133,10 +133,10 @@ impl TranslatableComponent {
 impl Display for TranslatableComponent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         // this contains the final string will all the ansi escape codes
-        for component in Component::Translatable(self.clone()).into_iter() {
+        for component in FormattedText::Translatable(self.clone()).into_iter() {
             let component_text = match &component {
-                Component::Text(c) => c.text.to_string(),
-                Component::Translatable(c) => c.read()?.to_string(),
+                FormattedText::Text(c) => c.text.to_string(),
+                FormattedText::Translatable(c) => c.read()?.to_string(),
             };
 
             f.write_str(&component_text)?;
@@ -150,7 +150,7 @@ impl Display for StringOrComponent {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), fmt::Error> {
         match self {
             StringOrComponent::String(s) => write!(f, "{s}"),
-            StringOrComponent::Component(c) => write!(f, "{c}"),
+            StringOrComponent::FormattedText(c) => write!(f, "{c}"),
         }
     }
 }
@@ -159,7 +159,7 @@ impl From<StringOrComponent> for TextComponent {
     fn from(soc: StringOrComponent) -> Self {
         match soc {
             StringOrComponent::String(s) => TextComponent::new(s),
-            StringOrComponent::Component(c) => TextComponent::new(c.to_string()),
+            StringOrComponent::FormattedText(c) => TextComponent::new(c.to_string()),
         }
     }
 }
diff --git a/azalea-chat/tests/integration_test.rs b/azalea-chat/tests/integration_test.rs
index 35fab8d3..122df538 100755
--- a/azalea-chat/tests/integration_test.rs
+++ b/azalea-chat/tests/integration_test.rs
@@ -1,6 +1,6 @@
 use azalea_chat::{
     style::{Ansi, ChatFormatting, TextColor},
-    Component,
+    FormattedText,
 };
 use serde::Deserialize;
 use serde_json::Value;
@@ -15,7 +15,7 @@ fn basic_ansi_test() {
 }"#,
     )
     .unwrap();
-    let component = Component::deserialize(&j).unwrap();
+    let component = FormattedText::deserialize(&j).unwrap();
     assert_eq!(
         component.to_ansi(),
         "\u{1b}[1m\u{1b}[38;2;255;85;85mhello\u{1b}[m"
@@ -51,7 +51,7 @@ fn complex_ansi_test() {
 ]"##,
     )
     .unwrap();
-    let component = Component::deserialize(&j).unwrap();
+    let component = FormattedText::deserialize(&j).unwrap();
     assert_eq!(
         component.to_ansi(),
         format!(
@@ -70,6 +70,6 @@ fn complex_ansi_test() {
 #[test]
 fn component_from_string() {
     let j: Value = serde_json::from_str("\"foo\"").unwrap();
-    let component = Component::deserialize(&j).unwrap();
+    let component = FormattedText::deserialize(&j).unwrap();
     assert_eq!(component.to_ansi(), "foo");
 }
diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index fa88daf7..72ab9fe0 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -1,7 +1,7 @@
 //! Implementations of chat-related features.
 
 use crate::Client;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol::packets::game::{
     clientbound_player_chat_packet::ClientboundPlayerChatPacket,
     clientbound_system_chat_packet::ClientboundSystemChatPacket,
@@ -29,7 +29,7 @@ macro_rules! regex {
 
 impl ChatPacket {
     /// Get the message shown in chat for this packet.
-    pub fn message(&self) -> Component {
+    pub fn message(&self) -> FormattedText {
         match self {
             ChatPacket::System(p) => p.content.clone(),
             ChatPacket::Player(p) => p.message(),
@@ -83,7 +83,7 @@ impl ChatPacket {
     /// convenience function for testing.
     pub fn new(message: &str) -> Self {
         ChatPacket::System(Arc::new(ClientboundSystemChatPacket {
-            content: Component::from(message),
+            content: FormattedText::from(message),
             overlay: false,
         }))
     }
diff --git a/azalea-client/src/player.rs b/azalea-client/src/player.rs
index 83b064f8..22537ac5 100755
--- a/azalea-client/src/player.rs
+++ b/azalea-client/src/player.rs
@@ -1,5 +1,5 @@
 use azalea_auth::game_profile::GameProfile;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::GameType;
 use azalea_world::PartialWorld;
 use uuid::Uuid;
@@ -13,5 +13,5 @@ pub struct PlayerInfo {
     pub gamemode: GameType,
     pub latency: i32,
     /// The player's display name in the tab list.
-    pub display_name: Option<Component>,
+    pub display_name: Option<FormattedText>,
 }
diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml
index 9addac59..e102594d 100755
--- a/azalea-core/Cargo.toml
+++ b/azalea-core/Cargo.toml
@@ -3,13 +3,17 @@ description = "Miscellaneous things in Azalea."
 edition = "2021"
 license = "MIT"
 name = "azalea-core"
-version = "0.5.0"
 repository = "https://github.com/mat-1/azalea/tree/main/azalea-core"
+version = "0.5.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-azalea-buf = {path = "../azalea-buf", version = "^0.5.0" }
-azalea-chat = {path = "../azalea-chat", version = "^0.5.0" }
-azalea-nbt = {path = "../azalea-nbt", version = "^0.5.0" }
+azalea-buf = {path = "../azalea-buf", version = "^0.5.0"}
+azalea-chat = {path = "../azalea-chat", version = "^0.5.0"}
+azalea-nbt = {path = "../azalea-nbt", version = "^0.5.0"}
+bevy_ecs = {version = "0.9.1", default-features = false, optional = true}
 uuid = "^1.1.2"
+
+[features]
+bevy_ecs = ["dep:bevy_ecs"]
diff --git a/azalea-core/src/particle/mod.rs b/azalea-core/src/particle/mod.rs
index 44c7c2f5..8dc9f8c6 100755
--- a/azalea-core/src/particle/mod.rs
+++ b/azalea-core/src/particle/mod.rs
@@ -1,6 +1,7 @@
 use crate::{BlockPos, Slot};
 use azalea_buf::McBuf;
 
+#[cfg_attr(feature = "bevy_ecs", derive(bevy_ecs::component::Component))]
 #[derive(Debug, Clone, McBuf, Default)]
 pub struct Particle {
     #[var]
diff --git a/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs b/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs
index 59378d3e..80da9c4d 100755
--- a/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs
@@ -1,7 +1,7 @@
 use azalea_buf::{
     BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
 };
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::io::Cursor;
 use std::io::Write;
@@ -18,7 +18,7 @@ pub enum Operation {
     Add(AddOperation),
     Remove,
     UpdateProgress(f32),
-    UpdateName(Component),
+    UpdateName(FormattedText),
     UpdateStyle(Style),
     UpdateProperties(Properties),
 }
@@ -30,7 +30,7 @@ impl McBufReadable for Operation {
             0 => Operation::Add(AddOperation::read_from(buf)?),
             1 => Operation::Remove,
             2 => Operation::UpdateProgress(f32::read_from(buf)?),
-            3 => Operation::UpdateName(Component::read_from(buf)?),
+            3 => Operation::UpdateName(FormattedText::read_from(buf)?),
             4 => Operation::UpdateStyle(Style::read_from(buf)?),
             5 => Operation::UpdateProperties(Properties::read_from(buf)?),
             _ => {
@@ -75,7 +75,7 @@ impl McBufWritable for Operation {
 
 #[derive(Clone, Debug, McBuf)]
 pub struct AddOperation {
-    name: Component,
+    name: FormattedText,
     progress: f32,
     style: Style,
     properties: Properties,
diff --git a/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs
index 5a72ae33..40f28259 100755
--- a/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs
@@ -1,9 +1,9 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundChatPreviewPacket {
     pub query_id: i32,
-    pub preview: Option<Component>,
+    pub preview: Option<FormattedText>,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_command_suggestions_packet.rs b/azalea-protocol/src/packets/game/clientbound_command_suggestions_packet.rs
index 652ce78a..88c6f29e 100755
--- a/azalea-protocol/src/packets/game/clientbound_command_suggestions_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_command_suggestions_packet.rs
@@ -1,13 +1,13 @@
 use azalea_brigadier::suggestion::Suggestions;
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundCommandSuggestionsPacket {
     #[var]
     pub id: u32,
-    pub suggestions: Suggestions<Component>,
+    pub suggestions: Suggestions<FormattedText>,
 }
 
 #[cfg(test)]
@@ -24,7 +24,7 @@ mod tests {
             suggestions: vec![Suggestion {
                 text: "foo".to_string(),
                 range: StringRange::new(1, 4),
-                tooltip: Some(Component::from("bar".to_string())),
+                tooltip: Some(FormattedText::from("bar".to_string())),
             }],
         };
         let mut buf = Vec::new();
diff --git a/azalea-protocol/src/packets/game/clientbound_commands_packet.rs b/azalea-protocol/src/packets/game/clientbound_commands_packet.rs
index 39e807cf..b2a258d1 100755
--- a/azalea-protocol/src/packets/game/clientbound_commands_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_commands_packet.rs
@@ -99,7 +99,7 @@ pub enum BrigadierParser {
     ItemStack,
     ItemPredicate,
     Color,
-    Component,
+    FormattedText,
     Message,
     NbtCompoundTag,
     NbtTag,
diff --git a/azalea-protocol/src/packets/game/clientbound_disconnect_packet.rs b/azalea-protocol/src/packets/game/clientbound_disconnect_packet.rs
index ecff0278..f8771c37 100755
--- a/azalea-protocol/src/packets/game/clientbound_disconnect_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_disconnect_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundDisconnectPacket {
-    pub reason: Component,
+    pub reason: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_disguised_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_disguised_chat_packet.rs
index 701284a0..9aa9fd6f 100644
--- a/azalea-protocol/src/packets/game/clientbound_disguised_chat_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_disguised_chat_packet.rs
@@ -1,10 +1,10 @@
 use super::clientbound_player_chat_packet::ChatTypeBound;
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundDisguisedChatPacket {
-    pub message: Component,
+    pub message: FormattedText,
     pub chat_type: ChatTypeBound,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_map_item_data_packet.rs b/azalea-protocol/src/packets/game/clientbound_map_item_data_packet.rs
index 94593e3e..f7819b6e 100755
--- a/azalea-protocol/src/packets/game/clientbound_map_item_data_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_map_item_data_packet.rs
@@ -1,6 +1,6 @@
 use azalea_buf::{BufReadError, McBuf};
 use azalea_buf::{McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable};
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::io::{Cursor, Write};
 
@@ -76,7 +76,7 @@ pub struct MapDecoration {
     /// Minecraft does & 15 on this value, azalea-protocol doesn't. I don't
     /// think it matters.
     pub rot: i8,
-    pub name: Option<Component>,
+    pub name: Option<FormattedText>,
 }
 
 #[derive(Debug, Clone)]
diff --git a/azalea-protocol/src/packets/game/clientbound_open_screen_packet.rs b/azalea-protocol/src/packets/game/clientbound_open_screen_packet.rs
index f127f587..9b8b02a1 100755
--- a/azalea-protocol/src/packets/game/clientbound_open_screen_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_open_screen_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
@@ -7,5 +7,5 @@ pub struct ClientboundOpenScreenPacket {
     #[var]
     pub container_id: u32,
     pub menu_type: azalea_registry::Menu,
-    pub title: Component,
+    pub title: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
index a735c907..2ccf5d07 100644
--- a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
@@ -3,7 +3,7 @@ use azalea_buf::{
 };
 use azalea_chat::{
     translatable_component::{StringOrComponent, TranslatableComponent},
-    Component,
+    FormattedText,
 };
 use azalea_core::BitSet;
 use azalea_crypto::MessageSignature;
@@ -18,7 +18,7 @@ pub struct ClientboundPlayerChatPacket {
     pub index: u32,
     pub signature: Option<MessageSignature>,
     pub body: PackedSignedMessageBody,
-    pub unsigned_content: Option<Component>,
+    pub unsigned_content: Option<FormattedText>,
     pub filter_mask: FilterMask,
     pub chat_type: ChatTypeBound,
 }
@@ -66,8 +66,8 @@ pub enum ChatType {
 #[derive(Clone, Debug, McBuf, PartialEq)]
 pub struct ChatTypeBound {
     pub chat_type: ChatType,
-    pub name: Component,
-    pub target_name: Option<Component>,
+    pub name: FormattedText,
+    pub target_name: Option<FormattedText>,
 }
 
 // must be in Client
@@ -87,17 +87,17 @@ pub struct MessageSignatureCache {
 // {} }
 
 impl ClientboundPlayerChatPacket {
-    /// Returns the content of the message. If you want to get the Component
+    /// Returns the content of the message. If you want to get the FormattedText
     /// for the whole message including the sender part, use
     /// [`ClientboundPlayerChatPacket::message`].
-    pub fn content(&self) -> Component {
+    pub fn content(&self) -> FormattedText {
         self.unsigned_content
             .clone()
-            .unwrap_or_else(|| Component::from(self.body.content.clone()))
+            .unwrap_or_else(|| FormattedText::from(self.body.content.clone()))
     }
 
     /// Get the full message, including the sender part.
-    pub fn message(&self) -> Component {
+    pub fn message(&self) -> FormattedText {
         let sender = self.chat_type.name.clone();
         let content = self.content();
         let target = self.chat_type.target_name.clone();
@@ -105,16 +105,16 @@ impl ClientboundPlayerChatPacket {
         let translation_key = self.chat_type.chat_type.chat_translation_key();
 
         let mut args = vec![
-            StringOrComponent::Component(sender),
-            StringOrComponent::Component(content),
+            StringOrComponent::FormattedText(sender),
+            StringOrComponent::FormattedText(content),
         ];
         if let Some(target) = target {
-            args.push(StringOrComponent::Component(target));
+            args.push(StringOrComponent::FormattedText(target));
         }
 
         let component = TranslatableComponent::new(translation_key.to_string(), args);
 
-        Component::Translatable(component)
+        FormattedText::Translatable(component)
     }
 }
 
diff --git a/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
index fa547af1..eae96f65 100755
--- a/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 /// Used to send a respawn screen.
@@ -8,5 +8,5 @@ pub struct ClientboundPlayerCombatKillPacket {
     #[var]
     pub player_id: u32,
     pub killer_id: u32,
-    pub message: Component,
+    pub message: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs
index a3a3b45d..e96a4026 100644
--- a/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs
@@ -2,7 +2,7 @@ use azalea_auth::game_profile::{GameProfile, ProfilePropertyValue};
 use azalea_buf::{
     BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
 };
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::{BitSet, GameType};
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::{
@@ -25,7 +25,7 @@ pub struct PlayerInfoEntry {
     pub listed: bool,
     pub latency: i32,
     pub game_mode: GameType,
-    pub display_name: Option<Component>,
+    pub display_name: Option<FormattedText>,
     pub chat_session: Option<RemoteChatSessionData>,
 }
 
@@ -53,7 +53,7 @@ pub struct UpdateLatencyAction {
 }
 #[derive(Clone, Debug, McBuf)]
 pub struct UpdateDisplayNameAction {
-    pub display_name: Option<Component>,
+    pub display_name: Option<FormattedText>,
 }
 
 impl McBufReadable for ClientboundPlayerInfoUpdatePacket {
diff --git a/azalea-protocol/src/packets/game/clientbound_resource_pack_packet.rs b/azalea-protocol/src/packets/game/clientbound_resource_pack_packet.rs
index 73ade728..a545ff31 100755
--- a/azalea-protocol/src/packets/game/clientbound_resource_pack_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_resource_pack_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
@@ -7,5 +7,5 @@ pub struct ClientboundResourcePackPacket {
     pub url: String,
     pub hash: String,
     pub required: bool,
-    pub prompt: Option<Component>,
+    pub prompt: Option<FormattedText>,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs
index 16841e3a..4b2bf055 100755
--- a/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs
@@ -1,10 +1,10 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundServerDataPacket {
-    pub motd: Option<Component>,
+    pub motd: Option<FormattedText>,
     pub icon_base64: Option<String>,
     pub enforces_secure_chat: bool,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_set_action_bar_text_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_action_bar_text_packet.rs
index e279e33c..60b80fe9 100755
--- a/azalea-protocol/src/packets/game/clientbound_set_action_bar_text_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_action_bar_text_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundSetActionBarTextPacket {
-    pub text: Component,
+    pub text: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_set_objective_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_objective_packet.rs
index ad75a1c3..f5ae6c5b 100755
--- a/azalea-protocol/src/packets/game/clientbound_set_objective_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_objective_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable};
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::io::{Cursor, Write};
 
@@ -48,7 +48,7 @@ impl McBufWritable for Method {
 
 #[derive(McBuf, Clone, Debug)]
 pub struct DisplayInfo {
-    pub display_name: Component,
+    pub display_name: FormattedText,
     pub render_type: RenderType,
 }
 
diff --git a/azalea-protocol/src/packets/game/clientbound_set_player_team_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_player_team_packet.rs
index 2550a98c..d16c8e02 100755
--- a/azalea-protocol/src/packets/game/clientbound_set_player_team_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_player_team_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable};
-use azalea_chat::{style::ChatFormatting, Component};
+use azalea_chat::{style::ChatFormatting, FormattedText};
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::io::{Cursor, Write};
 
@@ -61,13 +61,13 @@ impl McBufWritable for Method {
 
 #[derive(McBuf, Clone, Debug)]
 pub struct Parameters {
-    pub display_name: Component,
+    pub display_name: FormattedText,
     pub options: u8,
     pub nametag_visibility: String,
     pub collision_rule: String,
     pub color: ChatFormatting,
-    pub player_prefix: Component,
-    pub player_suffix: Component,
+    pub player_prefix: FormattedText,
+    pub player_suffix: FormattedText,
 }
 
 type PlayerList = Vec<String>;
diff --git a/azalea-protocol/src/packets/game/clientbound_set_subtitle_text_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_subtitle_text_packet.rs
index b7d1e7a4..9b25ac05 100755
--- a/azalea-protocol/src/packets/game/clientbound_set_subtitle_text_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_subtitle_text_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundSetSubtitleTextPacket {
-    pub text: Component,
+    pub text: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_set_title_text_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_title_text_packet.rs
index a9185e1a..fb00a4e5 100755
--- a/azalea-protocol/src/packets/game/clientbound_set_title_text_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_title_text_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundSetTitleTextPacket {
-    pub text: Component,
+    pub text: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs
index 9fe03fb2..8a5823a0 100755
--- a/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs
@@ -1,9 +1,9 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket, PartialEq)]
 pub struct ClientboundSystemChatPacket {
-    pub content: Component,
+    pub content: FormattedText,
     pub overlay: bool,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_tab_list_packet.rs b/azalea-protocol/src/packets/game/clientbound_tab_list_packet.rs
index 94f23241..47dd1ab2 100755
--- a/azalea-protocol/src/packets/game/clientbound_tab_list_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_tab_list_packet.rs
@@ -1,9 +1,9 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundGamePacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundTabListPacket {
-    pub header: Component,
-    pub footer: Component,
+    pub header: FormattedText,
+    pub footer: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs
index b18193d0..7a350a06 100755
--- a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::{ResourceLocation, Slot};
 use azalea_protocol_macros::ClientboundGamePacket;
 use std::collections::HashMap;
@@ -25,8 +25,8 @@ pub struct Advancement {
 
 #[derive(Clone, Debug)]
 pub struct DisplayInfo {
-    pub title: Component,
-    pub description: Component,
+    pub title: FormattedText,
+    pub description: FormattedText,
     pub icon: Slot,
     pub frame: FrameType,
     pub show_toast: bool,
@@ -132,9 +132,9 @@ pub struct CriterionProgress {
 //                 Advancement {
 //                     parent_id: None,
 //                     display: Some(DisplayInfo {
-//                         title: Component::from("title".to_string()),
+//                         title: FormattedText::from("title".to_string()),
 //                         description:
-// Component::from("description".to_string()),                         icon:
+// FormattedText::from("description".to_string()),                         icon:
 // Slot::Empty,                         frame: FrameType::Task,
 //                         show_toast: true,
 //                         hidden: false,
diff --git a/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs b/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
index 983dc31b..31cd370d 100755
--- a/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundLoginPacket;
 
 #[derive(Clone, Debug, McBuf, ClientboundLoginPacket)]
 pub struct ClientboundLoginDisconnectPacket {
-    pub reason: Component,
+    pub reason: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
index efa6080c..40452c87 100755
--- a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
+++ b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::{BufReadError, McBufReadable, McBufWritable};
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundStatusPacket;
 use serde::{Deserialize, Serialize};
 use serde_json::{value::Serializer, Value};
@@ -28,7 +28,7 @@ pub struct Players {
 // the entire packet is just json, which is why it has deserialize
 #[derive(Clone, Debug, Serialize, Deserialize, ClientboundStatusPacket)]
 pub struct ClientboundStatusResponsePacket {
-    pub description: Component,
+    pub description: FormattedText,
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub favicon: Option<String>,
diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs
index 9ae75de5..1583c7e7 100755
--- a/azalea-registry/src/lib.rs
+++ b/azalea-registry/src/lib.rs
@@ -1205,7 +1205,7 @@ registry!(CommandArgumentKind, {
     ItemStack => "minecraft:item_stack",
     ItemPredicate => "minecraft:item_predicate",
     Color => "minecraft:color",
-    Component => "minecraft:component",
+    FormattedText => "minecraft:component",
     Message => "minecraft:message",
     NbtCompoundTag => "minecraft:nbt_compound_tag",
     NbtTag => "minecraft:nbt_tag",
diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml
index fa6907eb..b36dff43 100644
--- a/azalea-world/Cargo.toml
+++ b/azalea-world/Cargo.toml
@@ -9,13 +9,13 @@ version = "0.5.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-azalea-block = { path = "../azalea-block", default-features = false, version = "^0.5.0" }
-azalea-buf = { path = "../azalea-buf", version = "^0.5.0" }
-azalea-chat = { path = "../azalea-chat", version = "^0.5.0" }
-azalea-core = { path = "../azalea-core", version = "^0.5.0" }
-azalea-nbt = { path = "../azalea-nbt", version = "^0.5.0" }
-azalea-registry = { path = "../azalea-registry", version = "^0.5.0" }
-bevy_ecs = { version = "0.9.1", default-features = false }
+azalea-block = {path = "../azalea-block", default-features = false, version = "^0.5.0"}
+azalea-buf = {path = "../azalea-buf", version = "^0.5.0"}
+azalea-chat = {path = "../azalea-chat", version = "^0.5.0"}
+azalea-core = {path = "../azalea-core", version = "^0.5.0", features = ["bevy_ecs"]}
+azalea-nbt = {path = "../azalea-nbt", version = "^0.5.0"}
+azalea-registry = {path = "../azalea-registry", version = "^0.5.0"}
+bevy_ecs = {version = "0.9.1", default-features = false}
 enum-as-inner = "0.5.1"
 log = "0.4.17"
 nohash-hasher = "0.2.0"
diff --git a/azalea-world/src/entity/data.rs b/azalea-world/src/entity/data.rs
index baebd210..7368dd69 100755
--- a/azalea-world/src/entity/data.rs
+++ b/azalea-world/src/entity/data.rs
@@ -1,8 +1,9 @@
 use azalea_block::BlockState;
 use azalea_buf::{BufReadError, McBufVarReadable, McBufVarWritable};
 use azalea_buf::{McBuf, McBufReadable, McBufWritable};
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::{BlockPos, Direction, GlobalPos, Particle, Slot};
+use bevy_ecs::component::Component;
 use enum_as_inner::EnumAsInner;
 use nohash_hasher::IntSet;
 use std::io::{Cursor, Write};
@@ -52,8 +53,8 @@ pub enum EntityDataValue {
     Long(i64),
     Float(f32),
     String(String),
-    Component(Component),
-    OptionalComponent(Option<Component>),
+    FormattedText(FormattedText),
+    OptionalComponent(Option<FormattedText>),
     ItemStack(Slot),
     Boolean(bool),
     Rotations(Rotations),
@@ -105,7 +106,7 @@ pub struct Rotations {
     pub z: f32,
 }
 
-#[derive(Clone, Debug, Copy, McBuf, Default)]
+#[derive(Clone, Debug, Copy, McBuf, Default, Component)]
 pub enum Pose {
     #[default]
     Standing = 0,
diff --git a/azalea-world/src/entity/metadata.rs b/azalea-world/src/entity/metadata.rs
index 244911da..41ca54a2 100644
--- a/azalea-world/src/entity/metadata.rs
+++ b/azalea-world/src/entity/metadata.rs
@@ -6,9 +6,9 @@ use super::{
     EntityDataValue, EntityMetadataItems, OptionalUnsignedInt, Pose, Rotations, VillagerData,
 };
 use azalea_block::BlockState;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::{BlockPos, Direction, Particle, Slot};
-use hecs::{BuiltEntity, EntityBuilder, Query};
+use bevy_ecs::{bundle::Bundle, component::Component};
 use thiserror::Error;
 use uuid::Uuid;
 
@@ -23,717 +23,745 @@ impl From<EntityDataValue> for UpdateMetadataError {
     }
 }
 
+#[derive(Component)]
 pub struct OnFire(pub bool);
+#[derive(Component)]
 pub struct ShiftKeyDown(pub bool);
+#[derive(Component)]
 pub struct Sprinting(pub bool);
+#[derive(Component)]
 pub struct Swimming(pub bool);
+#[derive(Component)]
 pub struct CurrentlyGlowing(pub bool);
+#[derive(Component)]
 pub struct Invisible(pub bool);
+#[derive(Component)]
 pub struct FallFlying(pub bool);
+#[derive(Component)]
 pub struct AirSupply(pub i32);
-pub struct CustomName(pub Option<Component>);
+#[derive(Component)]
+pub struct CustomName(pub Option<FormattedText>);
+#[derive(Component)]
 pub struct CustomNameVisible(pub bool);
+#[derive(Component)]
 pub struct Silent(pub bool);
+#[derive(Component)]
 pub struct NoGravity(pub bool);
+#[derive(Component)]
 pub struct TicksFrozen(pub i32);
+#[derive(Component)]
 pub struct AutoSpinAttack(pub bool);
+#[derive(Component)]
 pub struct AbstractLivingUsingItem(pub bool);
+#[derive(Component)]
 pub struct Health(pub f32);
+#[derive(Component)]
 pub struct AbstractLivingEffectColor(pub i32);
+#[derive(Component)]
 pub struct EffectAmbience(pub bool);
+#[derive(Component)]
 pub struct ArrowCount(pub i32);
+#[derive(Component)]
 pub struct StingerCount(pub i32);
+#[derive(Component)]
 pub struct SleepingPos(pub Option<BlockPos>);
+#[derive(Component)]
 pub struct NoAi(pub bool);
+#[derive(Component)]
 pub struct LeftHanded(pub bool);
+#[derive(Component)]
 pub struct Aggressive(pub bool);
+#[derive(Component)]
 pub struct Dancing(pub bool);
+#[derive(Component)]
 pub struct CanDuplicate(pub bool);
+#[derive(Component)]
 pub struct Allay;
-impl Allay {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Dancing(false))
-            .add(CanDuplicate(true))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct AllayQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    dancing: &'a mut Dancing,
-    can_duplicate: &'a mut CanDuplicate,
+#[derive(Bundle)]
+struct AllayBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    dancing: Dancing,
+    can_duplicate: CanDuplicate,
 }
-impl AllayQuery<'_> {
+impl AllayBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.dancing = Dancing(d.value.into_boolean()?),
-                17 => *self.can_duplicate = CanDuplicate(d.value.into_boolean()?),
+                16 => self.dancing = Dancing(d.value.into_boolean()?),
+                17 => self.can_duplicate = CanDuplicate(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for AllayBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            dancing: Dancing(false),
+            can_duplicate: CanDuplicate(true),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Radius(pub f32);
+#[derive(Component)]
 pub struct AreaEffectCloudColor(pub i32);
+#[derive(Component)]
 pub struct Waiting(pub bool);
+#[derive(Component)]
 pub struct AreaEffectCloud;
-impl AreaEffectCloud {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(Radius(3.0))
-            .add(AreaEffectCloudColor(0))
-            .add(Waiting(false))
-            .add(Particle::default())
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct AreaEffectCloudQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    radius: &'a mut Radius,
-    area_effect_cloud_color: &'a mut AreaEffectCloudColor,
-    waiting: &'a mut Waiting,
-    particle: &'a mut Particle,
+#[derive(Bundle)]
+struct AreaEffectCloudBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    radius: Radius,
+    area_effect_cloud_color: AreaEffectCloudColor,
+    waiting: Waiting,
+    particle: Particle,
 }
-impl AreaEffectCloudQuery<'_> {
+impl AreaEffectCloudBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.radius = Radius(d.value.into_float()?),
-                9 => *self.area_effect_cloud_color = AreaEffectCloudColor(d.value.into_int()?),
-                10 => *self.waiting = Waiting(d.value.into_boolean()?),
-                11 => *self.particle = d.value.into_particle()?,
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.radius = Radius(d.value.into_float()?),
+                9 => self.area_effect_cloud_color = AreaEffectCloudColor(d.value.into_int()?),
+                10 => self.waiting = Waiting(d.value.into_boolean()?),
+                11 => self.particle = d.value.into_particle()?,
             }
         }
         Ok(())
     }
 }
 
+impl Default for AreaEffectCloudBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            radius: Radius(3.0),
+            area_effect_cloud_color: AreaEffectCloudColor(0),
+            waiting: Waiting(false),
+            particle: Particle::default(),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Small(pub bool);
+#[derive(Component)]
 pub struct ShowArms(pub bool);
+#[derive(Component)]
 pub struct NoBasePlate(pub bool);
+#[derive(Component)]
 pub struct ArmorStandMarker(pub bool);
+#[derive(Component)]
 pub struct HeadPose(pub Rotations);
+#[derive(Component)]
 pub struct BodyPose(pub Rotations);
+#[derive(Component)]
 pub struct LeftArmPose(pub Rotations);
+#[derive(Component)]
 pub struct RightArmPose(pub Rotations);
+#[derive(Component)]
 pub struct LeftLegPose(pub Rotations);
+#[derive(Component)]
 pub struct RightLegPose(pub Rotations);
+#[derive(Component)]
 pub struct ArmorStand;
-impl ArmorStand {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(Small(false))
-            .add(ShowArms(false))
-            .add(NoBasePlate(false))
-            .add(ArmorStandMarker(false))
-            .add(HeadPose(Default::default()))
-            .add(BodyPose(Default::default()))
-            .add(LeftArmPose(Default::default()))
-            .add(RightArmPose(Default::default()))
-            .add(LeftLegPose(Default::default()))
-            .add(RightLegPose(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ArmorStandQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    small: &'a mut Small,
-    show_arms: &'a mut ShowArms,
-    no_base_plate: &'a mut NoBasePlate,
-    armor_stand_marker: &'a mut ArmorStandMarker,
-    head_pose: &'a mut HeadPose,
-    body_pose: &'a mut BodyPose,
-    left_arm_pose: &'a mut LeftArmPose,
-    right_arm_pose: &'a mut RightArmPose,
-    left_leg_pose: &'a mut LeftLegPose,
-    right_leg_pose: &'a mut RightLegPose,
+#[derive(Bundle)]
+struct ArmorStandBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    small: Small,
+    show_arms: ShowArms,
+    no_base_plate: NoBasePlate,
+    armor_stand_marker: ArmorStandMarker,
+    head_pose: HeadPose,
+    body_pose: BodyPose,
+    left_arm_pose: LeftArmPose,
+    right_arm_pose: RightArmPose,
+    left_leg_pose: LeftLegPose,
+    right_leg_pose: RightLegPose,
 }
-impl ArmorStandQuery<'_> {
+impl ArmorStandBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.small = Small(bitfield & 0x1 != 0);
-                    *self.show_arms = ShowArms(bitfield & 0x4 != 0);
-                    *self.no_base_plate = NoBasePlate(bitfield & 0x8 != 0);
-                    *self.armor_stand_marker = ArmorStandMarker(bitfield & 0x10 != 0);
+                    self.small = Small(bitfield & 0x1 != 0);
+                    self.show_arms = ShowArms(bitfield & 0x4 != 0);
+                    self.no_base_plate = NoBasePlate(bitfield & 0x8 != 0);
+                    self.armor_stand_marker = ArmorStandMarker(bitfield & 0x10 != 0);
                 }
-                16 => *self.head_pose = HeadPose(d.value.into_rotations()?),
-                17 => *self.body_pose = BodyPose(d.value.into_rotations()?),
-                18 => *self.left_arm_pose = LeftArmPose(d.value.into_rotations()?),
-                19 => *self.right_arm_pose = RightArmPose(d.value.into_rotations()?),
-                20 => *self.left_leg_pose = LeftLegPose(d.value.into_rotations()?),
-                21 => *self.right_leg_pose = RightLegPose(d.value.into_rotations()?),
+                16 => self.head_pose = HeadPose(d.value.into_rotations()?),
+                17 => self.body_pose = BodyPose(d.value.into_rotations()?),
+                18 => self.left_arm_pose = LeftArmPose(d.value.into_rotations()?),
+                19 => self.right_arm_pose = RightArmPose(d.value.into_rotations()?),
+                20 => self.left_leg_pose = LeftLegPose(d.value.into_rotations()?),
+                21 => self.right_leg_pose = RightLegPose(d.value.into_rotations()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ArmorStandBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            small: Small(false),
+            show_arms: ShowArms(false),
+            no_base_plate: NoBasePlate(false),
+            armor_stand_marker: ArmorStandMarker(false),
+            head_pose: HeadPose(Default::default()),
+            body_pose: BodyPose(Default::default()),
+            left_arm_pose: LeftArmPose(Default::default()),
+            right_arm_pose: RightArmPose(Default::default()),
+            left_leg_pose: LeftLegPose(Default::default()),
+            right_leg_pose: RightLegPose(Default::default()),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ArrowCritArrow(pub bool);
+#[derive(Component)]
 pub struct ArrowShotFromCrossbow(pub bool);
+#[derive(Component)]
 pub struct ArrowNoPhysics(pub bool);
+#[derive(Component)]
 pub struct ArrowPierceLevel(pub u8);
+#[derive(Component)]
 pub struct ArrowEffectColor(pub i32);
+#[derive(Component)]
 pub struct Arrow;
-impl Arrow {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(ArrowCritArrow(false))
-            .add(ArrowShotFromCrossbow(false))
-            .add(ArrowNoPhysics(false))
-            .add(ArrowPierceLevel(0))
-            .add(ArrowEffectColor(-1))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ArrowQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    arrow_crit_arrow: &'a mut ArrowCritArrow,
-    arrow_shot_from_crossbow: &'a mut ArrowShotFromCrossbow,
-    arrow_no_physics: &'a mut ArrowNoPhysics,
-    arrow_pierce_level: &'a mut ArrowPierceLevel,
-    arrow_effect_color: &'a mut ArrowEffectColor,
+#[derive(Bundle)]
+struct ArrowBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    arrow_crit_arrow: ArrowCritArrow,
+    arrow_shot_from_crossbow: ArrowShotFromCrossbow,
+    arrow_no_physics: ArrowNoPhysics,
+    arrow_pierce_level: ArrowPierceLevel,
+    arrow_effect_color: ArrowEffectColor,
 }
-impl ArrowQuery<'_> {
+impl ArrowBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.arrow_crit_arrow = ArrowCritArrow(bitfield & 0x1 != 0);
-                    *self.arrow_shot_from_crossbow = ArrowShotFromCrossbow(bitfield & 0x4 != 0);
-                    *self.arrow_no_physics = ArrowNoPhysics(bitfield & 0x2 != 0);
+                    self.arrow_crit_arrow = ArrowCritArrow(bitfield & 0x1 != 0);
+                    self.arrow_shot_from_crossbow = ArrowShotFromCrossbow(bitfield & 0x4 != 0);
+                    self.arrow_no_physics = ArrowNoPhysics(bitfield & 0x2 != 0);
                 }
-                9 => *self.arrow_pierce_level = ArrowPierceLevel(d.value.into_byte()?),
-                10 => *self.arrow_effect_color = ArrowEffectColor(d.value.into_int()?),
+                9 => self.arrow_pierce_level = ArrowPierceLevel(d.value.into_byte()?),
+                10 => self.arrow_effect_color = ArrowEffectColor(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ArrowBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            arrow_crit_arrow: ArrowCritArrow(false),
+            arrow_shot_from_crossbow: ArrowShotFromCrossbow(false),
+            arrow_no_physics: ArrowNoPhysics(false),
+            arrow_pierce_level: ArrowPierceLevel(0),
+            arrow_effect_color: ArrowEffectColor(-1),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct AbstractAgeableBaby(pub bool);
+#[derive(Component)]
 pub struct AxolotlVariant(pub i32);
+#[derive(Component)]
 pub struct PlayingDead(pub bool);
+#[derive(Component)]
 pub struct AxolotlFromBucket(pub bool);
+#[derive(Component)]
 pub struct Axolotl;
-impl Axolotl {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(AxolotlVariant(0))
-            .add(PlayingDead(false))
-            .add(AxolotlFromBucket(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct AxolotlQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    axolotl_variant: &'a mut AxolotlVariant,
-    playing_dead: &'a mut PlayingDead,
-    axolotl_from_bucket: &'a mut AxolotlFromBucket,
+#[derive(Bundle)]
+struct AxolotlBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    axolotl_variant: AxolotlVariant,
+    playing_dead: PlayingDead,
+    axolotl_from_bucket: AxolotlFromBucket,
 }
-impl AxolotlQuery<'_> {
+impl AxolotlBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.axolotl_variant = AxolotlVariant(d.value.into_int()?),
-                18 => *self.playing_dead = PlayingDead(d.value.into_boolean()?),
-                19 => *self.axolotl_from_bucket = AxolotlFromBucket(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.axolotl_variant = AxolotlVariant(d.value.into_int()?),
+                18 => self.playing_dead = PlayingDead(d.value.into_boolean()?),
+                19 => self.axolotl_from_bucket = AxolotlFromBucket(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for AxolotlBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            axolotl_variant: AxolotlVariant(0),
+            playing_dead: PlayingDead(false),
+            axolotl_from_bucket: AxolotlFromBucket(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Resting(pub bool);
+#[derive(Component)]
 pub struct Bat;
-impl Bat {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Resting(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct BatQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    resting: &'a mut Resting,
+#[derive(Bundle)]
+struct BatBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    resting: Resting,
 }
-impl BatQuery<'_> {
+impl BatBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.resting = Resting(bitfield & 0x1 != 0);
+                    self.resting = Resting(bitfield & 0x1 != 0);
                 }
             }
         }
@@ -741,254 +769,263 @@ impl BatQuery<'_> {
     }
 }
 
+impl Default for BatBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            resting: Resting(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct HasNectar(pub bool);
+#[derive(Component)]
 pub struct HasStung(pub bool);
+#[derive(Component)]
 pub struct BeeRolling(pub bool);
+#[derive(Component)]
 pub struct BeeRemainingAngerTime(pub i32);
+#[derive(Component)]
 pub struct Bee;
-impl Bee {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(HasNectar(false))
-            .add(HasStung(false))
-            .add(BeeRolling(false))
-            .add(BeeRemainingAngerTime(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct BeeQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    has_nectar: &'a mut HasNectar,
-    has_stung: &'a mut HasStung,
-    bee_rolling: &'a mut BeeRolling,
-    bee_remaining_anger_time: &'a mut BeeRemainingAngerTime,
+#[derive(Bundle)]
+struct BeeBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    has_nectar: HasNectar,
+    has_stung: HasStung,
+    bee_rolling: BeeRolling,
+    bee_remaining_anger_time: BeeRemainingAngerTime,
 }
-impl BeeQuery<'_> {
+impl BeeBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.has_nectar = HasNectar(bitfield & 0x8 != 0);
-                    *self.has_stung = HasStung(bitfield & 0x4 != 0);
-                    *self.bee_rolling = BeeRolling(bitfield & 0x2 != 0);
+                    self.has_nectar = HasNectar(bitfield & 0x8 != 0);
+                    self.has_stung = HasStung(bitfield & 0x4 != 0);
+                    self.bee_rolling = BeeRolling(bitfield & 0x2 != 0);
                 }
-                18 => *self.bee_remaining_anger_time = BeeRemainingAngerTime(d.value.into_int()?),
+                18 => self.bee_remaining_anger_time = BeeRemainingAngerTime(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for BeeBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            has_nectar: HasNectar(false),
+            has_stung: HasStung(false),
+            bee_rolling: BeeRolling(false),
+            bee_remaining_anger_time: BeeRemainingAngerTime(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Charged(pub bool);
+#[derive(Component)]
 pub struct Blaze;
-impl Blaze {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Charged(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct BlazeQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    charged: &'a mut Charged,
+#[derive(Bundle)]
+struct BlazeBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    charged: Charged,
 }
-impl BlazeQuery<'_> {
+impl BlazeBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.charged = Charged(bitfield & 0x1 != 0);
+                    self.charged = Charged(bitfield & 0x1 != 0);
                 }
             }
         }
@@ -996,516 +1033,547 @@ impl BlazeQuery<'_> {
     }
 }
 
+impl Default for BlazeBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            charged: Charged(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct BoatHurt(pub i32);
+#[derive(Component)]
 pub struct BoatHurtdir(pub i32);
+#[derive(Component)]
 pub struct BoatDamage(pub f32);
+#[derive(Component)]
 pub struct BoatKind(pub i32);
+#[derive(Component)]
 pub struct PaddleLeft(pub bool);
+#[derive(Component)]
 pub struct PaddleRight(pub bool);
+#[derive(Component)]
 pub struct BubbleTime(pub i32);
+#[derive(Component)]
 pub struct Boat;
-impl Boat {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(BoatHurt(0))
-            .add(BoatHurtdir(1))
-            .add(BoatDamage(0.0))
-            .add(BoatKind(Default::default()))
-            .add(PaddleLeft(false))
-            .add(PaddleRight(false))
-            .add(BubbleTime(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct BoatQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    boat_hurt: &'a mut BoatHurt,
-    boat_hurtdir: &'a mut BoatHurtdir,
-    boat_damage: &'a mut BoatDamage,
-    boat_kind: &'a mut BoatKind,
-    paddle_left: &'a mut PaddleLeft,
-    paddle_right: &'a mut PaddleRight,
-    bubble_time: &'a mut BubbleTime,
+#[derive(Bundle)]
+struct BoatBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    boat_hurt: BoatHurt,
+    boat_hurtdir: BoatHurtdir,
+    boat_damage: BoatDamage,
+    boat_kind: BoatKind,
+    paddle_left: PaddleLeft,
+    paddle_right: PaddleRight,
+    bubble_time: BubbleTime,
 }
-impl BoatQuery<'_> {
+impl BoatBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.boat_hurt = BoatHurt(d.value.into_int()?),
-                9 => *self.boat_hurtdir = BoatHurtdir(d.value.into_int()?),
-                10 => *self.boat_damage = BoatDamage(d.value.into_float()?),
-                11 => *self.boat_kind = BoatKind(d.value.into_int()?),
-                12 => *self.paddle_left = PaddleLeft(d.value.into_boolean()?),
-                13 => *self.paddle_right = PaddleRight(d.value.into_boolean()?),
-                14 => *self.bubble_time = BubbleTime(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.boat_hurt = BoatHurt(d.value.into_int()?),
+                9 => self.boat_hurtdir = BoatHurtdir(d.value.into_int()?),
+                10 => self.boat_damage = BoatDamage(d.value.into_float()?),
+                11 => self.boat_kind = BoatKind(d.value.into_int()?),
+                12 => self.paddle_left = PaddleLeft(d.value.into_boolean()?),
+                13 => self.paddle_right = PaddleRight(d.value.into_boolean()?),
+                14 => self.bubble_time = BubbleTime(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for BoatBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            boat_hurt: BoatHurt(0),
+            boat_hurtdir: BoatHurtdir(1),
+            boat_damage: BoatDamage(0.0),
+            boat_kind: BoatKind(Default::default()),
+            paddle_left: PaddleLeft(false),
+            paddle_right: PaddleRight(false),
+            bubble_time: BubbleTime(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct CamelTamed(pub bool);
+#[derive(Component)]
 pub struct CamelEating(pub bool);
+#[derive(Component)]
 pub struct CamelStanding(pub bool);
+#[derive(Component)]
 pub struct CamelBred(pub bool);
+#[derive(Component)]
 pub struct CamelSaddled(pub bool);
+#[derive(Component)]
 pub struct CamelOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
 pub struct Dash(pub bool);
+#[derive(Component)]
 pub struct LastPoseChangeTick(pub i64);
+#[derive(Component)]
 pub struct Camel;
-impl Camel {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(CamelTamed(false))
-            .add(CamelEating(false))
-            .add(CamelStanding(false))
-            .add(CamelBred(false))
-            .add(CamelSaddled(false))
-            .add(CamelOwnerUuid(None))
-            .add(Dash(false))
-            .add(LastPoseChangeTick(-52))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CamelQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    camel_tamed: &'a mut CamelTamed,
-    camel_eating: &'a mut CamelEating,
-    camel_standing: &'a mut CamelStanding,
-    camel_bred: &'a mut CamelBred,
-    camel_saddled: &'a mut CamelSaddled,
-    camel_owner_uuid: &'a mut CamelOwnerUuid,
-    dash: &'a mut Dash,
-    last_pose_change_tick: &'a mut LastPoseChangeTick,
+#[derive(Bundle)]
+struct CamelBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    camel_tamed: CamelTamed,
+    camel_eating: CamelEating,
+    camel_standing: CamelStanding,
+    camel_bred: CamelBred,
+    camel_saddled: CamelSaddled,
+    camel_owner_uuid: CamelOwnerUuid,
+    dash: Dash,
+    last_pose_change_tick: LastPoseChangeTick,
 }
-impl CamelQuery<'_> {
+impl CamelBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.camel_tamed = CamelTamed(bitfield & 0x2 != 0);
-                    *self.camel_eating = CamelEating(bitfield & 0x10 != 0);
-                    *self.camel_standing = CamelStanding(bitfield & 0x20 != 0);
-                    *self.camel_bred = CamelBred(bitfield & 0x8 != 0);
-                    *self.camel_saddled = CamelSaddled(bitfield & 0x4 != 0);
+                    self.camel_tamed = CamelTamed(bitfield & 0x2 != 0);
+                    self.camel_eating = CamelEating(bitfield & 0x10 != 0);
+                    self.camel_standing = CamelStanding(bitfield & 0x20 != 0);
+                    self.camel_bred = CamelBred(bitfield & 0x8 != 0);
+                    self.camel_saddled = CamelSaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.camel_owner_uuid = CamelOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.dash = Dash(d.value.into_boolean()?),
-                20 => *self.last_pose_change_tick = LastPoseChangeTick(d.value.into_long()?),
+                18 => self.camel_owner_uuid = CamelOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.dash = Dash(d.value.into_boolean()?),
+                20 => self.last_pose_change_tick = LastPoseChangeTick(d.value.into_long()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for CamelBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            camel_tamed: CamelTamed(false),
+            camel_eating: CamelEating(false),
+            camel_standing: CamelStanding(false),
+            camel_bred: CamelBred(false),
+            camel_saddled: CamelSaddled(false),
+            camel_owner_uuid: CamelOwnerUuid(None),
+            dash: Dash(false),
+            last_pose_change_tick: LastPoseChangeTick(-52),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Tame(pub bool);
+#[derive(Component)]
 pub struct InSittingPose(pub bool);
+#[derive(Component)]
 pub struct Owneruuid(pub Option<Uuid>);
+#[derive(Component)]
 pub struct CatVariant(pub azalea_registry::CatVariant);
+#[derive(Component)]
 pub struct IsLying(pub bool);
+#[derive(Component)]
 pub struct RelaxStateOne(pub bool);
+#[derive(Component)]
 pub struct CatCollarColor(pub i32);
+#[derive(Component)]
 pub struct Cat;
-impl Cat {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(Tame(false))
-            .add(InSittingPose(false))
-            .add(Owneruuid(None))
-            .add(CatVariant(azalea_registry::CatVariant::Tabby))
-            .add(IsLying(false))
-            .add(RelaxStateOne(false))
-            .add(CatCollarColor(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CatQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    tame: &'a mut Tame,
-    in_sitting_pose: &'a mut InSittingPose,
-    owneruuid: &'a mut Owneruuid,
-    cat_variant: &'a mut CatVariant,
-    is_lying: &'a mut IsLying,
-    relax_state_one: &'a mut RelaxStateOne,
-    cat_collar_color: &'a mut CatCollarColor,
+#[derive(Bundle)]
+struct CatBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    tame: Tame,
+    in_sitting_pose: InSittingPose,
+    owneruuid: Owneruuid,
+    cat_variant: CatVariant,
+    is_lying: IsLying,
+    relax_state_one: RelaxStateOne,
+    cat_collar_color: CatCollarColor,
 }
-impl CatQuery<'_> {
+impl CatBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.tame = Tame(bitfield & 0x4 != 0);
-                    *self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
+                    self.tame = Tame(bitfield & 0x4 != 0);
+                    self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
                 }
-                18 => *self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
-                19 => *self.cat_variant = CatVariant(d.value.into_cat_variant()?),
-                20 => *self.is_lying = IsLying(d.value.into_boolean()?),
-                21 => *self.relax_state_one = RelaxStateOne(d.value.into_boolean()?),
-                22 => *self.cat_collar_color = CatCollarColor(d.value.into_int()?),
+                18 => self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
+                19 => self.cat_variant = CatVariant(d.value.into_cat_variant()?),
+                20 => self.is_lying = IsLying(d.value.into_boolean()?),
+                21 => self.relax_state_one = RelaxStateOne(d.value.into_boolean()?),
+                22 => self.cat_collar_color = CatCollarColor(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct Climbing(pub bool);
-pub struct CaveSpider;
-impl CaveSpider {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Climbing(false))
-            .build()
+impl Default for CatBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            tame: Tame(false),
+            in_sitting_pose: InSittingPose(false),
+            owneruuid: Owneruuid(None),
+            cat_variant: CatVariant(azalea_registry::CatVariant::Tabby),
+            is_lying: IsLying(false),
+            relax_state_one: RelaxStateOne(false),
+            cat_collar_color: CatCollarColor(Default::default()),
+        }
     }
 }
 
-#[derive(Query)]
-struct CaveSpiderQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    climbing: &'a mut Climbing,
+#[derive(Component)]
+pub struct Climbing(pub bool);
+#[derive(Component)]
+pub struct CaveSpider;
+
+#[derive(Bundle)]
+struct CaveSpiderBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    climbing: Climbing,
 }
-impl CaveSpiderQuery<'_> {
+impl CaveSpiderBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.climbing = Climbing(bitfield & 0x1 != 0);
+                    self.climbing = Climbing(bitfield & 0x1 != 0);
                 }
             }
         }
@@ -1513,1934 +1581,2002 @@ impl CaveSpiderQuery<'_> {
     }
 }
 
+impl Default for CaveSpiderBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            climbing: Climbing(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ChestBoat;
-impl ChestBoat {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(BoatHurt(0))
-            .add(BoatHurtdir(1))
-            .add(BoatDamage(0.0))
-            .add(BoatKind(Default::default()))
-            .add(PaddleLeft(false))
-            .add(PaddleRight(false))
-            .add(BubbleTime(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ChestBoatQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    boat_hurt: &'a mut BoatHurt,
-    boat_hurtdir: &'a mut BoatHurtdir,
-    boat_damage: &'a mut BoatDamage,
-    boat_kind: &'a mut BoatKind,
-    paddle_left: &'a mut PaddleLeft,
-    paddle_right: &'a mut PaddleRight,
-    bubble_time: &'a mut BubbleTime,
+#[derive(Bundle)]
+struct ChestBoatBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    boat_hurt: BoatHurt,
+    boat_hurtdir: BoatHurtdir,
+    boat_damage: BoatDamage,
+    boat_kind: BoatKind,
+    paddle_left: PaddleLeft,
+    paddle_right: PaddleRight,
+    bubble_time: BubbleTime,
 }
-impl ChestBoatQuery<'_> {
+impl ChestBoatBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.boat_hurt = BoatHurt(d.value.into_int()?),
-                9 => *self.boat_hurtdir = BoatHurtdir(d.value.into_int()?),
-                10 => *self.boat_damage = BoatDamage(d.value.into_float()?),
-                11 => *self.boat_kind = BoatKind(d.value.into_int()?),
-                12 => *self.paddle_left = PaddleLeft(d.value.into_boolean()?),
-                13 => *self.paddle_right = PaddleRight(d.value.into_boolean()?),
-                14 => *self.bubble_time = BubbleTime(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.boat_hurt = BoatHurt(d.value.into_int()?),
+                9 => self.boat_hurtdir = BoatHurtdir(d.value.into_int()?),
+                10 => self.boat_damage = BoatDamage(d.value.into_float()?),
+                11 => self.boat_kind = BoatKind(d.value.into_int()?),
+                12 => self.paddle_left = PaddleLeft(d.value.into_boolean()?),
+                13 => self.paddle_right = PaddleRight(d.value.into_boolean()?),
+                14 => self.bubble_time = BubbleTime(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ChestBoatBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            boat_hurt: BoatHurt(0),
+            boat_hurtdir: BoatHurtdir(1),
+            boat_damage: BoatDamage(0.0),
+            boat_kind: BoatKind(Default::default()),
+            paddle_left: PaddleLeft(false),
+            paddle_right: PaddleRight(false),
+            bubble_time: BubbleTime(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct AbstractMinecartHurt(pub i32);
+#[derive(Component)]
 pub struct AbstractMinecartHurtdir(pub i32);
+#[derive(Component)]
 pub struct AbstractMinecartDamage(pub f32);
+#[derive(Component)]
 pub struct DisplayBlock(pub i32);
+#[derive(Component)]
 pub struct DisplayOffset(pub i32);
+#[derive(Component)]
 pub struct CustomDisplay(pub bool);
+#[derive(Component)]
 pub struct ChestMinecart;
-impl ChestMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ChestMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
+#[derive(Bundle)]
+struct ChestMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
 }
-impl ChestMinecartQuery<'_> {
+impl ChestMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ChestMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Chicken;
-impl Chicken {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ChickenQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
+#[derive(Bundle)]
+struct ChickenBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
 }
-impl ChickenQuery<'_> {
+impl ChickenBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ChickenBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct CodFromBucket(pub bool);
+#[derive(Component)]
 pub struct Cod;
-impl Cod {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(CodFromBucket(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CodQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    cod_from_bucket: &'a mut CodFromBucket,
+#[derive(Bundle)]
+struct CodBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    cod_from_bucket: CodFromBucket,
 }
-impl CodQuery<'_> {
+impl CodBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.cod_from_bucket = CodFromBucket(d.value.into_boolean()?),
+                16 => self.cod_from_bucket = CodFromBucket(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for CodBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            cod_from_bucket: CodFromBucket(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct CommandName(pub String);
-pub struct LastOutput(pub Component);
+#[derive(Component)]
+pub struct LastOutput(pub FormattedText);
+#[derive(Component)]
 pub struct CommandBlockMinecart;
-impl CommandBlockMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .add(CommandName("".to_string()))
-            .add(LastOutput(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CommandBlockMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
-    command_name: &'a mut CommandName,
-    last_output: &'a mut LastOutput,
+#[derive(Bundle)]
+struct CommandBlockMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
+    command_name: CommandName,
+    last_output: LastOutput,
 }
-impl CommandBlockMinecartQuery<'_> {
+impl CommandBlockMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
-                14 => *self.command_name = CommandName(d.value.into_string()?),
-                15 => *self.last_output = LastOutput(d.value.into_component()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                14 => self.command_name = CommandName(d.value.into_string()?),
+                15 => self.last_output = LastOutput(d.value.into_formatted_text()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for CommandBlockMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+            command_name: CommandName("".to_string()),
+            last_output: LastOutput(Default::default()),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Cow;
-impl Cow {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CowQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
+#[derive(Bundle)]
+struct CowBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
 }
-impl CowQuery<'_> {
+impl CowBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for CowBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct SwellDir(pub i32);
+#[derive(Component)]
 pub struct IsPowered(pub bool);
+#[derive(Component)]
 pub struct IsIgnited(pub bool);
+#[derive(Component)]
 pub struct Creeper;
-impl Creeper {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(SwellDir(-1))
-            .add(IsPowered(false))
-            .add(IsIgnited(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct CreeperQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    swell_dir: &'a mut SwellDir,
-    is_powered: &'a mut IsPowered,
-    is_ignited: &'a mut IsIgnited,
+#[derive(Bundle)]
+struct CreeperBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    swell_dir: SwellDir,
+    is_powered: IsPowered,
+    is_ignited: IsIgnited,
 }
-impl CreeperQuery<'_> {
+impl CreeperBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.swell_dir = SwellDir(d.value.into_int()?),
-                17 => *self.is_powered = IsPowered(d.value.into_boolean()?),
-                18 => *self.is_ignited = IsIgnited(d.value.into_boolean()?),
+                16 => self.swell_dir = SwellDir(d.value.into_int()?),
+                17 => self.is_powered = IsPowered(d.value.into_boolean()?),
+                18 => self.is_ignited = IsIgnited(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for CreeperBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            swell_dir: SwellDir(-1),
+            is_powered: IsPowered(false),
+            is_ignited: IsIgnited(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct TreasurePos(pub BlockPos);
+#[derive(Component)]
 pub struct GotFish(pub bool);
+#[derive(Component)]
 pub struct MoistnessLevel(pub i32);
+#[derive(Component)]
 pub struct Dolphin;
-impl Dolphin {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(TreasurePos(BlockPos::new(0, 0, 0)))
-            .add(GotFish(false))
-            .add(MoistnessLevel(2400))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct DolphinQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    treasure_pos: &'a mut TreasurePos,
-    got_fish: &'a mut GotFish,
-    moistness_level: &'a mut MoistnessLevel,
+#[derive(Bundle)]
+struct DolphinBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    treasure_pos: TreasurePos,
+    got_fish: GotFish,
+    moistness_level: MoistnessLevel,
 }
-impl DolphinQuery<'_> {
+impl DolphinBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.treasure_pos = TreasurePos(d.value.into_block_pos()?),
-                17 => *self.got_fish = GotFish(d.value.into_boolean()?),
-                18 => *self.moistness_level = MoistnessLevel(d.value.into_int()?),
+                16 => self.treasure_pos = TreasurePos(d.value.into_block_pos()?),
+                17 => self.got_fish = GotFish(d.value.into_boolean()?),
+                18 => self.moistness_level = MoistnessLevel(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct DonkeyTamed(pub bool);
-pub struct DonkeyEating(pub bool);
-pub struct DonkeyStanding(pub bool);
-pub struct DonkeyBred(pub bool);
-pub struct DonkeySaddled(pub bool);
-pub struct DonkeyOwnerUuid(pub Option<Uuid>);
-pub struct DonkeyChest(pub bool);
-pub struct Donkey;
-impl Donkey {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(DonkeyTamed(false))
-            .add(DonkeyEating(false))
-            .add(DonkeyStanding(false))
-            .add(DonkeyBred(false))
-            .add(DonkeySaddled(false))
-            .add(DonkeyOwnerUuid(None))
-            .add(DonkeyChest(false))
-            .build()
+impl Default for DolphinBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            treasure_pos: TreasurePos(BlockPos::new(0, 0, 0)),
+            got_fish: GotFish(false),
+            moistness_level: MoistnessLevel(2400),
+        }
     }
 }
 
-#[derive(Query)]
-struct DonkeyQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    donkey_tamed: &'a mut DonkeyTamed,
-    donkey_eating: &'a mut DonkeyEating,
-    donkey_standing: &'a mut DonkeyStanding,
-    donkey_bred: &'a mut DonkeyBred,
-    donkey_saddled: &'a mut DonkeySaddled,
-    donkey_owner_uuid: &'a mut DonkeyOwnerUuid,
-    donkey_chest: &'a mut DonkeyChest,
+#[derive(Component)]
+pub struct DonkeyTamed(pub bool);
+#[derive(Component)]
+pub struct DonkeyEating(pub bool);
+#[derive(Component)]
+pub struct DonkeyStanding(pub bool);
+#[derive(Component)]
+pub struct DonkeyBred(pub bool);
+#[derive(Component)]
+pub struct DonkeySaddled(pub bool);
+#[derive(Component)]
+pub struct DonkeyOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
+pub struct DonkeyChest(pub bool);
+#[derive(Component)]
+pub struct Donkey;
+
+#[derive(Bundle)]
+struct DonkeyBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    donkey_tamed: DonkeyTamed,
+    donkey_eating: DonkeyEating,
+    donkey_standing: DonkeyStanding,
+    donkey_bred: DonkeyBred,
+    donkey_saddled: DonkeySaddled,
+    donkey_owner_uuid: DonkeyOwnerUuid,
+    donkey_chest: DonkeyChest,
 }
-impl DonkeyQuery<'_> {
+impl DonkeyBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.donkey_tamed = DonkeyTamed(bitfield & 0x2 != 0);
-                    *self.donkey_eating = DonkeyEating(bitfield & 0x10 != 0);
-                    *self.donkey_standing = DonkeyStanding(bitfield & 0x20 != 0);
-                    *self.donkey_bred = DonkeyBred(bitfield & 0x8 != 0);
-                    *self.donkey_saddled = DonkeySaddled(bitfield & 0x4 != 0);
+                    self.donkey_tamed = DonkeyTamed(bitfield & 0x2 != 0);
+                    self.donkey_eating = DonkeyEating(bitfield & 0x10 != 0);
+                    self.donkey_standing = DonkeyStanding(bitfield & 0x20 != 0);
+                    self.donkey_bred = DonkeyBred(bitfield & 0x8 != 0);
+                    self.donkey_saddled = DonkeySaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.donkey_owner_uuid = DonkeyOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.donkey_chest = DonkeyChest(d.value.into_boolean()?),
+                18 => self.donkey_owner_uuid = DonkeyOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.donkey_chest = DonkeyChest(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for DonkeyBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            donkey_tamed: DonkeyTamed(false),
+            donkey_eating: DonkeyEating(false),
+            donkey_standing: DonkeyStanding(false),
+            donkey_bred: DonkeyBred(false),
+            donkey_saddled: DonkeySaddled(false),
+            donkey_owner_uuid: DonkeyOwnerUuid(None),
+            donkey_chest: DonkeyChest(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct DragonFireball;
-impl DragonFireball {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct DragonFireballQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct DragonFireballBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl DragonFireballQuery<'_> {
+impl DragonFireballBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for DragonFireballBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ZombieBaby(pub bool);
+#[derive(Component)]
 pub struct SpecialType(pub i32);
+#[derive(Component)]
 pub struct DrownedConversion(pub bool);
+#[derive(Component)]
 pub struct Drowned;
-impl Drowned {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZombieBaby(false))
-            .add(SpecialType(0))
-            .add(DrownedConversion(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct DrownedQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zombie_baby: &'a mut ZombieBaby,
-    special_type: &'a mut SpecialType,
-    drowned_conversion: &'a mut DrownedConversion,
+#[derive(Bundle)]
+struct DrownedBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zombie_baby: ZombieBaby,
+    special_type: SpecialType,
+    drowned_conversion: DrownedConversion,
 }
-impl DrownedQuery<'_> {
+impl DrownedBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
-                17 => *self.special_type = SpecialType(d.value.into_int()?),
-                18 => *self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
+                16 => self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
+                17 => self.special_type = SpecialType(d.value.into_int()?),
+                18 => self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for DrownedBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zombie_baby: ZombieBaby(false),
+            special_type: SpecialType(0),
+            drowned_conversion: DrownedConversion(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct EggItemStack(pub Slot);
+#[derive(Component)]
 pub struct Egg;
-impl Egg {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(EggItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EggQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    egg_item_stack: &'a mut EggItemStack,
+#[derive(Bundle)]
+struct EggBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    egg_item_stack: EggItemStack,
 }
-impl EggQuery<'_> {
+impl EggBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.egg_item_stack = EggItemStack(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.egg_item_stack = EggItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EggBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            egg_item_stack: EggItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Moving(pub bool);
+#[derive(Component)]
 pub struct AttackTarget(pub i32);
+#[derive(Component)]
 pub struct ElderGuardian;
-impl ElderGuardian {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Moving(false))
-            .add(AttackTarget(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ElderGuardianQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    moving: &'a mut Moving,
-    attack_target: &'a mut AttackTarget,
+#[derive(Bundle)]
+struct ElderGuardianBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    moving: Moving,
+    attack_target: AttackTarget,
 }
-impl ElderGuardianQuery<'_> {
+impl ElderGuardianBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.moving = Moving(d.value.into_boolean()?),
-                17 => *self.attack_target = AttackTarget(d.value.into_int()?),
+                16 => self.moving = Moving(d.value.into_boolean()?),
+                17 => self.attack_target = AttackTarget(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ElderGuardianBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            moving: Moving(false),
+            attack_target: AttackTarget(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct BeamTarget(pub Option<BlockPos>);
+#[derive(Component)]
 pub struct ShowBottom(pub bool);
+#[derive(Component)]
 pub struct EndCrystal;
-impl EndCrystal {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(BeamTarget(None))
-            .add(ShowBottom(true))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EndCrystalQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    beam_target: &'a mut BeamTarget,
-    show_bottom: &'a mut ShowBottom,
+#[derive(Bundle)]
+struct EndCrystalBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    beam_target: BeamTarget,
+    show_bottom: ShowBottom,
 }
-impl EndCrystalQuery<'_> {
+impl EndCrystalBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.beam_target = BeamTarget(d.value.into_optional_block_pos()?),
-                9 => *self.show_bottom = ShowBottom(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.beam_target = BeamTarget(d.value.into_optional_block_pos()?),
+                9 => self.show_bottom = ShowBottom(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EndCrystalBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            beam_target: BeamTarget(None),
+            show_bottom: ShowBottom(true),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Phase(pub i32);
+#[derive(Component)]
 pub struct EnderDragon;
-impl EnderDragon {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Phase(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EnderDragonQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    phase: &'a mut Phase,
+#[derive(Bundle)]
+struct EnderDragonBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    phase: Phase,
 }
-impl EnderDragonQuery<'_> {
+impl EnderDragonBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.phase = Phase(d.value.into_int()?),
+                16 => self.phase = Phase(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EnderDragonBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            phase: Phase(Default::default()),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct EnderPearlItemStack(pub Slot);
+#[derive(Component)]
 pub struct EnderPearl;
-impl EnderPearl {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(EnderPearlItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EnderPearlQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    ender_pearl_item_stack: &'a mut EnderPearlItemStack,
+#[derive(Bundle)]
+struct EnderPearlBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    ender_pearl_item_stack: EnderPearlItemStack,
 }
-impl EnderPearlQuery<'_> {
+impl EnderPearlBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.ender_pearl_item_stack = EnderPearlItemStack(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.ender_pearl_item_stack = EnderPearlItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EnderPearlBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            ender_pearl_item_stack: EnderPearlItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct CarryState(pub BlockState);
+#[derive(Component)]
 pub struct Creepy(pub bool);
+#[derive(Component)]
 pub struct StaredAt(pub bool);
+#[derive(Component)]
 pub struct Enderman;
-impl Enderman {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(CarryState(BlockState::Air))
-            .add(Creepy(false))
-            .add(StaredAt(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EndermanQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    carry_state: &'a mut CarryState,
-    creepy: &'a mut Creepy,
-    stared_at: &'a mut StaredAt,
+#[derive(Bundle)]
+struct EndermanBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    carry_state: CarryState,
+    creepy: Creepy,
+    stared_at: StaredAt,
 }
-impl EndermanQuery<'_> {
+impl EndermanBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.carry_state = CarryState(d.value.into_block_state()?),
-                17 => *self.creepy = Creepy(d.value.into_boolean()?),
-                18 => *self.stared_at = StaredAt(d.value.into_boolean()?),
+                16 => self.carry_state = CarryState(d.value.into_block_state()?),
+                17 => self.creepy = Creepy(d.value.into_boolean()?),
+                18 => self.stared_at = StaredAt(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EndermanBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            carry_state: CarryState(BlockState::Air),
+            creepy: Creepy(false),
+            stared_at: StaredAt(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Endermite;
-impl Endermite {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EndermiteQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct EndermiteBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl EndermiteQuery<'_> {
+impl EndermiteBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -3448,268 +3584,287 @@ impl EndermiteQuery<'_> {
     }
 }
 
+impl Default for EndermiteBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct EvokerIsCelebrating(pub bool);
+#[derive(Component)]
 pub struct EvokerSpellCasting(pub u8);
+#[derive(Component)]
 pub struct Evoker;
-impl Evoker {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(EvokerIsCelebrating(false))
-            .add(EvokerSpellCasting(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EvokerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    evoker_is_celebrating: &'a mut EvokerIsCelebrating,
-    evoker_spell_casting: &'a mut EvokerSpellCasting,
+#[derive(Bundle)]
+struct EvokerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    evoker_is_celebrating: EvokerIsCelebrating,
+    evoker_spell_casting: EvokerSpellCasting,
 }
-impl EvokerQuery<'_> {
+impl EvokerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.evoker_is_celebrating = EvokerIsCelebrating(d.value.into_boolean()?),
-                17 => *self.evoker_spell_casting = EvokerSpellCasting(d.value.into_byte()?),
+                16 => self.evoker_is_celebrating = EvokerIsCelebrating(d.value.into_boolean()?),
+                17 => self.evoker_spell_casting = EvokerSpellCasting(d.value.into_byte()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EvokerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            evoker_is_celebrating: EvokerIsCelebrating(false),
+            evoker_spell_casting: EvokerSpellCasting(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct EvokerFangs;
-impl EvokerFangs {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EvokerFangsQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct EvokerFangsBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl EvokerFangsQuery<'_> {
+impl EvokerFangsBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct ExperienceBottleItemStack(pub Slot);
-pub struct ExperienceBottle;
-impl ExperienceBottle {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(ExperienceBottleItemStack(Slot::Empty))
-            .build()
+impl Default for EvokerFangsBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct ExperienceBottleQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    experience_bottle_item_stack: &'a mut ExperienceBottleItemStack,
+#[derive(Component)]
+pub struct ExperienceBottleItemStack(pub Slot);
+#[derive(Component)]
+pub struct ExperienceBottle;
+
+#[derive(Bundle)]
+struct ExperienceBottleBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    experience_bottle_item_stack: ExperienceBottleItemStack,
 }
-impl ExperienceBottleQuery<'_> {
+impl ExperienceBottleBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
-                    *self.experience_bottle_item_stack =
+                    self.experience_bottle_item_stack =
                         ExperienceBottleItemStack(d.value.into_item_stack()?)
                 }
             }
@@ -3718,1066 +3873,1095 @@ impl ExperienceBottleQuery<'_> {
     }
 }
 
+impl Default for ExperienceBottleBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            experience_bottle_item_stack: ExperienceBottleItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ExperienceOrb;
-impl ExperienceOrb {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ExperienceOrbQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct ExperienceOrbBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl ExperienceOrbQuery<'_> {
+impl ExperienceOrbBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ExperienceOrbBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct EyeOfEnderItemStack(pub Slot);
+#[derive(Component)]
 pub struct EyeOfEnder;
-impl EyeOfEnder {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(EyeOfEnderItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct EyeOfEnderQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    eye_of_ender_item_stack: &'a mut EyeOfEnderItemStack,
+#[derive(Bundle)]
+struct EyeOfEnderBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    eye_of_ender_item_stack: EyeOfEnderItemStack,
 }
-impl EyeOfEnderQuery<'_> {
+impl EyeOfEnderBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
-                }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => {
-                    *self.eye_of_ender_item_stack = EyeOfEnderItemStack(d.value.into_item_stack()?)
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.eye_of_ender_item_stack = EyeOfEnderItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for EyeOfEnderBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            eye_of_ender_item_stack: EyeOfEnderItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct StartPos(pub BlockPos);
+#[derive(Component)]
 pub struct FallingBlock;
-impl FallingBlock {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(StartPos(BlockPos::new(0, 0, 0)))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct FallingBlockQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    start_pos: &'a mut StartPos,
+#[derive(Bundle)]
+struct FallingBlockBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    start_pos: StartPos,
 }
-impl FallingBlockQuery<'_> {
+impl FallingBlockBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.start_pos = StartPos(d.value.into_block_pos()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.start_pos = StartPos(d.value.into_block_pos()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for FallingBlockBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            start_pos: StartPos(BlockPos::new(0, 0, 0)),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct FireballItemStack(pub Slot);
+#[derive(Component)]
 pub struct Fireball;
-impl Fireball {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(FireballItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct FireballQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    fireball_item_stack: &'a mut FireballItemStack,
+#[derive(Bundle)]
+struct FireballBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    fireball_item_stack: FireballItemStack,
 }
-impl FireballQuery<'_> {
+impl FireballBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.fireball_item_stack = FireballItemStack(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.fireball_item_stack = FireballItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct FireworksItem(pub Slot);
-pub struct AttachedToTarget(pub OptionalUnsignedInt);
-pub struct ShotAtAngle(pub bool);
-pub struct FireworkRocket;
-impl FireworkRocket {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(FireworksItem(Slot::Empty))
-            .add(AttachedToTarget(OptionalUnsignedInt(None)))
-            .add(ShotAtAngle(false))
-            .build()
+impl Default for FireballBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            fireball_item_stack: FireballItemStack(Slot::Empty),
+        }
     }
 }
 
-#[derive(Query)]
-struct FireworkRocketQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    fireworks_item: &'a mut FireworksItem,
-    attached_to_target: &'a mut AttachedToTarget,
-    shot_at_angle: &'a mut ShotAtAngle,
+#[derive(Component)]
+pub struct FireworksItem(pub Slot);
+#[derive(Component)]
+pub struct AttachedToTarget(pub OptionalUnsignedInt);
+#[derive(Component)]
+pub struct ShotAtAngle(pub bool);
+#[derive(Component)]
+pub struct FireworkRocket;
+
+#[derive(Bundle)]
+struct FireworkRocketBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    fireworks_item: FireworksItem,
+    attached_to_target: AttachedToTarget,
+    shot_at_angle: ShotAtAngle,
 }
-impl FireworkRocketQuery<'_> {
+impl FireworkRocketBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.fireworks_item = FireworksItem(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.fireworks_item = FireworksItem(d.value.into_item_stack()?),
                 9 => {
-                    *self.attached_to_target =
+                    self.attached_to_target =
                         AttachedToTarget(d.value.into_optional_unsigned_int()?)
                 }
-                10 => *self.shot_at_angle = ShotAtAngle(d.value.into_boolean()?),
+                10 => self.shot_at_angle = ShotAtAngle(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for FireworkRocketBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            fireworks_item: FireworksItem(Slot::Empty),
+            attached_to_target: AttachedToTarget(OptionalUnsignedInt(None)),
+            shot_at_angle: ShotAtAngle(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct HookedEntity(pub i32);
+#[derive(Component)]
 pub struct Biting(pub bool);
+#[derive(Component)]
 pub struct FishingBobber;
-impl FishingBobber {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(HookedEntity(0))
-            .add(Biting(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct FishingBobberQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    hooked_entity: &'a mut HookedEntity,
-    biting: &'a mut Biting,
+#[derive(Bundle)]
+struct FishingBobberBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    hooked_entity: HookedEntity,
+    biting: Biting,
 }
-impl FishingBobberQuery<'_> {
+impl FishingBobberBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.hooked_entity = HookedEntity(d.value.into_int()?),
-                9 => *self.biting = Biting(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.hooked_entity = HookedEntity(d.value.into_int()?),
+                9 => self.biting = Biting(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct FoxKind(pub i32);
-pub struct FoxSitting(pub bool);
-pub struct Faceplanted(pub bool);
-pub struct Sleeping(pub bool);
-pub struct Pouncing(pub bool);
-pub struct Crouching(pub bool);
-pub struct FoxInterested(pub bool);
-pub struct TrustedId0(pub Option<Uuid>);
-pub struct TrustedId1(pub Option<Uuid>);
-pub struct Fox;
-impl Fox {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(FoxKind(0))
-            .add(FoxSitting(false))
-            .add(Faceplanted(false))
-            .add(Sleeping(false))
-            .add(Pouncing(false))
-            .add(Crouching(false))
-            .add(FoxInterested(false))
-            .add(TrustedId0(None))
-            .add(TrustedId1(None))
-            .build()
+impl Default for FishingBobberBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            hooked_entity: HookedEntity(0),
+            biting: Biting(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct FoxQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    fox_kind: &'a mut FoxKind,
-    fox_sitting: &'a mut FoxSitting,
-    faceplanted: &'a mut Faceplanted,
-    sleeping: &'a mut Sleeping,
-    pouncing: &'a mut Pouncing,
-    crouching: &'a mut Crouching,
-    fox_interested: &'a mut FoxInterested,
-    trusted_id_0: &'a mut TrustedId0,
-    trusted_id_1: &'a mut TrustedId1,
+#[derive(Component)]
+pub struct FoxKind(pub i32);
+#[derive(Component)]
+pub struct FoxSitting(pub bool);
+#[derive(Component)]
+pub struct Faceplanted(pub bool);
+#[derive(Component)]
+pub struct Sleeping(pub bool);
+#[derive(Component)]
+pub struct Pouncing(pub bool);
+#[derive(Component)]
+pub struct Crouching(pub bool);
+#[derive(Component)]
+pub struct FoxInterested(pub bool);
+#[derive(Component)]
+pub struct TrustedId0(pub Option<Uuid>);
+#[derive(Component)]
+pub struct TrustedId1(pub Option<Uuid>);
+#[derive(Component)]
+pub struct Fox;
+
+#[derive(Bundle)]
+struct FoxBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    fox_kind: FoxKind,
+    fox_sitting: FoxSitting,
+    faceplanted: Faceplanted,
+    sleeping: Sleeping,
+    pouncing: Pouncing,
+    crouching: Crouching,
+    fox_interested: FoxInterested,
+    trusted_id_0: TrustedId0,
+    trusted_id_1: TrustedId1,
 }
-impl FoxQuery<'_> {
+impl FoxBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.fox_kind = FoxKind(d.value.into_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.fox_kind = FoxKind(d.value.into_int()?),
                 18 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.fox_sitting = FoxSitting(bitfield & 0x1 != 0);
-                    *self.faceplanted = Faceplanted(bitfield & 0x40 != 0);
-                    *self.sleeping = Sleeping(bitfield & 0x20 != 0);
-                    *self.pouncing = Pouncing(bitfield & 0x10 != 0);
-                    *self.crouching = Crouching(bitfield & 0x4 != 0);
-                    *self.fox_interested = FoxInterested(bitfield & 0x8 != 0);
+                    self.fox_sitting = FoxSitting(bitfield & 0x1 != 0);
+                    self.faceplanted = Faceplanted(bitfield & 0x40 != 0);
+                    self.sleeping = Sleeping(bitfield & 0x20 != 0);
+                    self.pouncing = Pouncing(bitfield & 0x10 != 0);
+                    self.crouching = Crouching(bitfield & 0x4 != 0);
+                    self.fox_interested = FoxInterested(bitfield & 0x8 != 0);
                 }
-                19 => *self.trusted_id_0 = TrustedId0(d.value.into_optional_uuid()?),
-                20 => *self.trusted_id_1 = TrustedId1(d.value.into_optional_uuid()?),
+                19 => self.trusted_id_0 = TrustedId0(d.value.into_optional_uuid()?),
+                20 => self.trusted_id_1 = TrustedId1(d.value.into_optional_uuid()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for FoxBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            fox_kind: FoxKind(0),
+            fox_sitting: FoxSitting(false),
+            faceplanted: Faceplanted(false),
+            sleeping: Sleeping(false),
+            pouncing: Pouncing(false),
+            crouching: Crouching(false),
+            fox_interested: FoxInterested(false),
+            trusted_id_0: TrustedId0(None),
+            trusted_id_1: TrustedId1(None),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct FrogVariant(pub azalea_registry::FrogVariant);
+#[derive(Component)]
 pub struct TongueTarget(pub OptionalUnsignedInt);
+#[derive(Component)]
 pub struct Frog;
-impl Frog {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(FrogVariant(azalea_registry::FrogVariant::Temperate))
-            .add(TongueTarget(OptionalUnsignedInt(None)))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct FrogQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    frog_variant: &'a mut FrogVariant,
-    tongue_target: &'a mut TongueTarget,
+#[derive(Bundle)]
+struct FrogBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    frog_variant: FrogVariant,
+    tongue_target: TongueTarget,
 }
-impl FrogQuery<'_> {
+impl FrogBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.frog_variant = FrogVariant(d.value.into_frog_variant()?),
-                18 => *self.tongue_target = TongueTarget(d.value.into_optional_unsigned_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.frog_variant = FrogVariant(d.value.into_frog_variant()?),
+                18 => self.tongue_target = TongueTarget(d.value.into_optional_unsigned_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for FrogBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            frog_variant: FrogVariant(azalea_registry::FrogVariant::Temperate),
+            tongue_target: TongueTarget(OptionalUnsignedInt(None)),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Fuel(pub bool);
+#[derive(Component)]
 pub struct FurnaceMinecart;
-impl FurnaceMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .add(Fuel(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct FurnaceMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
-    fuel: &'a mut Fuel,
+#[derive(Bundle)]
+struct FurnaceMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
+    fuel: Fuel,
 }
-impl FurnaceMinecartQuery<'_> {
+impl FurnaceMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
-                14 => *self.fuel = Fuel(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                14 => self.fuel = Fuel(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for FurnaceMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+            fuel: Fuel(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct IsCharging(pub bool);
+#[derive(Component)]
 pub struct Ghast;
-impl Ghast {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(IsCharging(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GhastQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    is_charging: &'a mut IsCharging,
+#[derive(Bundle)]
+struct GhastBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    is_charging: IsCharging,
 }
-impl GhastQuery<'_> {
+impl GhastBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.is_charging = IsCharging(d.value.into_boolean()?),
+                16 => self.is_charging = IsCharging(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for GhastBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            is_charging: IsCharging(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Giant;
-impl Giant {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GiantQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct GiantBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl GiantQuery<'_> {
+impl GiantBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -4785,564 +4969,579 @@ impl GiantQuery<'_> {
     }
 }
 
+impl Default for GiantBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ItemFrameItem(pub Slot);
+#[derive(Component)]
 pub struct Rotation(pub i32);
+#[derive(Component)]
 pub struct GlowItemFrame;
-impl GlowItemFrame {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(ItemFrameItem(Slot::Empty))
-            .add(Rotation(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GlowItemFrameQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    item_frame_item: &'a mut ItemFrameItem,
-    rotation: &'a mut Rotation,
+#[derive(Bundle)]
+struct GlowItemFrameBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    item_frame_item: ItemFrameItem,
+    rotation: Rotation,
 }
-impl GlowItemFrameQuery<'_> {
+impl GlowItemFrameBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.item_frame_item = ItemFrameItem(d.value.into_item_stack()?),
-                9 => *self.rotation = Rotation(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.item_frame_item = ItemFrameItem(d.value.into_item_stack()?),
+                9 => self.rotation = Rotation(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for GlowItemFrameBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            item_frame_item: ItemFrameItem(Slot::Empty),
+            rotation: Rotation(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct DarkTicksRemaining(pub i32);
+#[derive(Component)]
 pub struct GlowSquid;
-impl GlowSquid {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(DarkTicksRemaining(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GlowSquidQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    dark_ticks_remaining: &'a mut DarkTicksRemaining,
+#[derive(Bundle)]
+struct GlowSquidBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    dark_ticks_remaining: DarkTicksRemaining,
 }
-impl GlowSquidQuery<'_> {
+impl GlowSquidBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.dark_ticks_remaining = DarkTicksRemaining(d.value.into_int()?),
+                16 => self.dark_ticks_remaining = DarkTicksRemaining(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for GlowSquidBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            dark_ticks_remaining: DarkTicksRemaining(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct IsScreamingGoat(pub bool);
+#[derive(Component)]
 pub struct HasLeftHorn(pub bool);
+#[derive(Component)]
 pub struct HasRightHorn(pub bool);
+#[derive(Component)]
 pub struct Goat;
-impl Goat {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(IsScreamingGoat(false))
-            .add(HasLeftHorn(true))
-            .add(HasRightHorn(true))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GoatQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    is_screaming_goat: &'a mut IsScreamingGoat,
-    has_left_horn: &'a mut HasLeftHorn,
-    has_right_horn: &'a mut HasRightHorn,
+#[derive(Bundle)]
+struct GoatBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    is_screaming_goat: IsScreamingGoat,
+    has_left_horn: HasLeftHorn,
+    has_right_horn: HasRightHorn,
 }
-impl GoatQuery<'_> {
+impl GoatBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.is_screaming_goat = IsScreamingGoat(d.value.into_boolean()?),
-                18 => *self.has_left_horn = HasLeftHorn(d.value.into_boolean()?),
-                19 => *self.has_right_horn = HasRightHorn(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.is_screaming_goat = IsScreamingGoat(d.value.into_boolean()?),
+                18 => self.has_left_horn = HasLeftHorn(d.value.into_boolean()?),
+                19 => self.has_right_horn = HasRightHorn(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for GoatBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            is_screaming_goat: IsScreamingGoat(false),
+            has_left_horn: HasLeftHorn(true),
+            has_right_horn: HasRightHorn(true),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Guardian;
-impl Guardian {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Moving(false))
-            .add(AttackTarget(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct GuardianQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    moving: &'a mut Moving,
-    attack_target: &'a mut AttackTarget,
+#[derive(Bundle)]
+struct GuardianBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    moving: Moving,
+    attack_target: AttackTarget,
 }
-impl GuardianQuery<'_> {
+impl GuardianBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.moving = Moving(d.value.into_boolean()?),
-                17 => *self.attack_target = AttackTarget(d.value.into_int()?),
+                16 => self.moving = Moving(d.value.into_boolean()?),
+                17 => self.attack_target = AttackTarget(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct HoglinImmuneToZombification(pub bool);
-pub struct Hoglin;
-impl Hoglin {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(HoglinImmuneToZombification(false))
-            .build()
+impl Default for GuardianBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            moving: Moving(false),
+            attack_target: AttackTarget(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct HoglinQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    hoglin_immune_to_zombification: &'a mut HoglinImmuneToZombification,
+#[derive(Component)]
+pub struct HoglinImmuneToZombification(pub bool);
+#[derive(Component)]
+pub struct Hoglin;
+
+#[derive(Bundle)]
+struct HoglinBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    hoglin_immune_to_zombification: HoglinImmuneToZombification,
 }
-impl HoglinQuery<'_> {
+impl HoglinBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
-                    *self.hoglin_immune_to_zombification =
+                    self.hoglin_immune_to_zombification =
                         HoglinImmuneToZombification(d.value.into_boolean()?)
                 }
             }
@@ -5351,603 +5550,622 @@ impl HoglinQuery<'_> {
     }
 }
 
-pub struct HopperMinecart;
-impl HopperMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .build()
+impl Default for HoglinBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            hoglin_immune_to_zombification: HoglinImmuneToZombification(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct HopperMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
+#[derive(Component)]
+pub struct HopperMinecart;
+
+#[derive(Bundle)]
+struct HopperMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
 }
-impl HopperMinecartQuery<'_> {
+impl HopperMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct HorseTamed(pub bool);
-pub struct HorseEating(pub bool);
-pub struct HorseStanding(pub bool);
-pub struct HorseBred(pub bool);
-pub struct HorseSaddled(pub bool);
-pub struct HorseOwnerUuid(pub Option<Uuid>);
-pub struct HorseTypeVariant(pub i32);
-pub struct Horse;
-impl Horse {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(HorseTamed(false))
-            .add(HorseEating(false))
-            .add(HorseStanding(false))
-            .add(HorseBred(false))
-            .add(HorseSaddled(false))
-            .add(HorseOwnerUuid(None))
-            .add(HorseTypeVariant(0))
-            .build()
+impl Default for HopperMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct HorseQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    horse_tamed: &'a mut HorseTamed,
-    horse_eating: &'a mut HorseEating,
-    horse_standing: &'a mut HorseStanding,
-    horse_bred: &'a mut HorseBred,
-    horse_saddled: &'a mut HorseSaddled,
-    horse_owner_uuid: &'a mut HorseOwnerUuid,
-    horse_type_variant: &'a mut HorseTypeVariant,
+#[derive(Component)]
+pub struct HorseTamed(pub bool);
+#[derive(Component)]
+pub struct HorseEating(pub bool);
+#[derive(Component)]
+pub struct HorseStanding(pub bool);
+#[derive(Component)]
+pub struct HorseBred(pub bool);
+#[derive(Component)]
+pub struct HorseSaddled(pub bool);
+#[derive(Component)]
+pub struct HorseOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
+pub struct HorseTypeVariant(pub i32);
+#[derive(Component)]
+pub struct Horse;
+
+#[derive(Bundle)]
+struct HorseBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    horse_tamed: HorseTamed,
+    horse_eating: HorseEating,
+    horse_standing: HorseStanding,
+    horse_bred: HorseBred,
+    horse_saddled: HorseSaddled,
+    horse_owner_uuid: HorseOwnerUuid,
+    horse_type_variant: HorseTypeVariant,
 }
-impl HorseQuery<'_> {
+impl HorseBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.horse_tamed = HorseTamed(bitfield & 0x2 != 0);
-                    *self.horse_eating = HorseEating(bitfield & 0x10 != 0);
-                    *self.horse_standing = HorseStanding(bitfield & 0x20 != 0);
-                    *self.horse_bred = HorseBred(bitfield & 0x8 != 0);
-                    *self.horse_saddled = HorseSaddled(bitfield & 0x4 != 0);
+                    self.horse_tamed = HorseTamed(bitfield & 0x2 != 0);
+                    self.horse_eating = HorseEating(bitfield & 0x10 != 0);
+                    self.horse_standing = HorseStanding(bitfield & 0x20 != 0);
+                    self.horse_bred = HorseBred(bitfield & 0x8 != 0);
+                    self.horse_saddled = HorseSaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.horse_owner_uuid = HorseOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.horse_type_variant = HorseTypeVariant(d.value.into_int()?),
+                18 => self.horse_owner_uuid = HorseOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.horse_type_variant = HorseTypeVariant(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for HorseBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            horse_tamed: HorseTamed(false),
+            horse_eating: HorseEating(false),
+            horse_standing: HorseStanding(false),
+            horse_bred: HorseBred(false),
+            horse_saddled: HorseSaddled(false),
+            horse_owner_uuid: HorseOwnerUuid(None),
+            horse_type_variant: HorseTypeVariant(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Husk;
-impl Husk {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZombieBaby(false))
-            .add(SpecialType(0))
-            .add(DrownedConversion(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct HuskQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zombie_baby: &'a mut ZombieBaby,
-    special_type: &'a mut SpecialType,
-    drowned_conversion: &'a mut DrownedConversion,
+#[derive(Bundle)]
+struct HuskBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zombie_baby: ZombieBaby,
+    special_type: SpecialType,
+    drowned_conversion: DrownedConversion,
 }
-impl HuskQuery<'_> {
+impl HuskBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
-                17 => *self.special_type = SpecialType(d.value.into_int()?),
-                18 => *self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
+                16 => self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
+                17 => self.special_type = SpecialType(d.value.into_int()?),
+                18 => self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct IllusionerIsCelebrating(pub bool);
-pub struct IllusionerSpellCasting(pub u8);
-pub struct Illusioner;
-impl Illusioner {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(IllusionerIsCelebrating(false))
-            .add(IllusionerSpellCasting(0))
-            .build()
+impl Default for HuskBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zombie_baby: ZombieBaby(false),
+            special_type: SpecialType(0),
+            drowned_conversion: DrownedConversion(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct IllusionerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    illusioner_is_celebrating: &'a mut IllusionerIsCelebrating,
-    illusioner_spell_casting: &'a mut IllusionerSpellCasting,
+#[derive(Component)]
+pub struct IllusionerIsCelebrating(pub bool);
+#[derive(Component)]
+pub struct IllusionerSpellCasting(pub u8);
+#[derive(Component)]
+pub struct Illusioner;
+
+#[derive(Bundle)]
+struct IllusionerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    illusioner_is_celebrating: IllusionerIsCelebrating,
+    illusioner_spell_casting: IllusionerSpellCasting,
 }
-impl IllusionerQuery<'_> {
+impl IllusionerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
-                    *self.illusioner_is_celebrating =
+                    self.illusioner_is_celebrating =
                         IllusionerIsCelebrating(d.value.into_boolean()?)
                 }
-                17 => *self.illusioner_spell_casting = IllusionerSpellCasting(d.value.into_byte()?),
+                17 => self.illusioner_spell_casting = IllusionerSpellCasting(d.value.into_byte()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct PlayerCreated(pub bool);
-pub struct IronGolem;
-impl IronGolem {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PlayerCreated(false))
-            .build()
+impl Default for IllusionerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            illusioner_is_celebrating: IllusionerIsCelebrating(false),
+            illusioner_spell_casting: IllusionerSpellCasting(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct IronGolemQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    player_created: &'a mut PlayerCreated,
+#[derive(Component)]
+pub struct PlayerCreated(pub bool);
+#[derive(Component)]
+pub struct IronGolem;
+
+#[derive(Bundle)]
+struct IronGolemBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    player_created: PlayerCreated,
 }
-impl IronGolemQuery<'_> {
+impl IronGolemBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.player_created = PlayerCreated(bitfield & 0x1 != 0);
+                    self.player_created = PlayerCreated(bitfield & 0x1 != 0);
                 }
             }
         }
@@ -5955,2046 +6173,2122 @@ impl IronGolemQuery<'_> {
     }
 }
 
+impl Default for IronGolemBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            player_created: PlayerCreated(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ItemItem(pub Slot);
+#[derive(Component)]
 pub struct Item;
-impl Item {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(ItemItem(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ItemQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    item_item: &'a mut ItemItem,
+#[derive(Bundle)]
+struct ItemBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    item_item: ItemItem,
 }
-impl ItemQuery<'_> {
+impl ItemBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.item_item = ItemItem(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.item_item = ItemItem(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ItemBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            item_item: ItemItem(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ItemFrame;
-impl ItemFrame {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(ItemFrameItem(Slot::Empty))
-            .add(Rotation(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ItemFrameQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    item_frame_item: &'a mut ItemFrameItem,
-    rotation: &'a mut Rotation,
+#[derive(Bundle)]
+struct ItemFrameBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    item_frame_item: ItemFrameItem,
+    rotation: Rotation,
 }
-impl ItemFrameQuery<'_> {
+impl ItemFrameBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.item_frame_item = ItemFrameItem(d.value.into_item_stack()?),
-                9 => *self.rotation = Rotation(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.item_frame_item = ItemFrameItem(d.value.into_item_stack()?),
+                9 => self.rotation = Rotation(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ItemFrameBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            item_frame_item: ItemFrameItem(Slot::Empty),
+            rotation: Rotation(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct LeashKnot;
-impl LeashKnot {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct LeashKnotQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct LeashKnotBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl LeashKnotQuery<'_> {
+impl LeashKnotBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for LeashKnotBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct LightningBolt;
-impl LightningBolt {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct LightningBoltQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct LightningBoltBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl LightningBoltQuery<'_> {
+impl LightningBoltBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for LightningBoltBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct LlamaTamed(pub bool);
+#[derive(Component)]
 pub struct LlamaEating(pub bool);
+#[derive(Component)]
 pub struct LlamaStanding(pub bool);
+#[derive(Component)]
 pub struct LlamaBred(pub bool);
+#[derive(Component)]
 pub struct LlamaSaddled(pub bool);
+#[derive(Component)]
 pub struct LlamaOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
 pub struct LlamaChest(pub bool);
+#[derive(Component)]
 pub struct Strength(pub i32);
+#[derive(Component)]
 pub struct Swag(pub i32);
+#[derive(Component)]
 pub struct LlamaVariant(pub i32);
+#[derive(Component)]
 pub struct Llama;
-impl Llama {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(LlamaTamed(false))
-            .add(LlamaEating(false))
-            .add(LlamaStanding(false))
-            .add(LlamaBred(false))
-            .add(LlamaSaddled(false))
-            .add(LlamaOwnerUuid(None))
-            .add(LlamaChest(false))
-            .add(Strength(0))
-            .add(Swag(-1))
-            .add(LlamaVariant(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct LlamaQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    llama_tamed: &'a mut LlamaTamed,
-    llama_eating: &'a mut LlamaEating,
-    llama_standing: &'a mut LlamaStanding,
-    llama_bred: &'a mut LlamaBred,
-    llama_saddled: &'a mut LlamaSaddled,
-    llama_owner_uuid: &'a mut LlamaOwnerUuid,
-    llama_chest: &'a mut LlamaChest,
-    strength: &'a mut Strength,
-    swag: &'a mut Swag,
-    llama_variant: &'a mut LlamaVariant,
+#[derive(Bundle)]
+struct LlamaBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    llama_tamed: LlamaTamed,
+    llama_eating: LlamaEating,
+    llama_standing: LlamaStanding,
+    llama_bred: LlamaBred,
+    llama_saddled: LlamaSaddled,
+    llama_owner_uuid: LlamaOwnerUuid,
+    llama_chest: LlamaChest,
+    strength: Strength,
+    swag: Swag,
+    llama_variant: LlamaVariant,
 }
-impl LlamaQuery<'_> {
+impl LlamaBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.llama_tamed = LlamaTamed(bitfield & 0x2 != 0);
-                    *self.llama_eating = LlamaEating(bitfield & 0x10 != 0);
-                    *self.llama_standing = LlamaStanding(bitfield & 0x20 != 0);
-                    *self.llama_bred = LlamaBred(bitfield & 0x8 != 0);
-                    *self.llama_saddled = LlamaSaddled(bitfield & 0x4 != 0);
+                    self.llama_tamed = LlamaTamed(bitfield & 0x2 != 0);
+                    self.llama_eating = LlamaEating(bitfield & 0x10 != 0);
+                    self.llama_standing = LlamaStanding(bitfield & 0x20 != 0);
+                    self.llama_bred = LlamaBred(bitfield & 0x8 != 0);
+                    self.llama_saddled = LlamaSaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.llama_owner_uuid = LlamaOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.llama_chest = LlamaChest(d.value.into_boolean()?),
-                20 => *self.strength = Strength(d.value.into_int()?),
-                21 => *self.swag = Swag(d.value.into_int()?),
-                22 => *self.llama_variant = LlamaVariant(d.value.into_int()?),
+                18 => self.llama_owner_uuid = LlamaOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.llama_chest = LlamaChest(d.value.into_boolean()?),
+                20 => self.strength = Strength(d.value.into_int()?),
+                21 => self.swag = Swag(d.value.into_int()?),
+                22 => self.llama_variant = LlamaVariant(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for LlamaBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            llama_tamed: LlamaTamed(false),
+            llama_eating: LlamaEating(false),
+            llama_standing: LlamaStanding(false),
+            llama_bred: LlamaBred(false),
+            llama_saddled: LlamaSaddled(false),
+            llama_owner_uuid: LlamaOwnerUuid(None),
+            llama_chest: LlamaChest(false),
+            strength: Strength(0),
+            swag: Swag(-1),
+            llama_variant: LlamaVariant(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct LlamaSpit;
-impl LlamaSpit {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct LlamaSpitQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct LlamaSpitBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl LlamaSpitQuery<'_> {
+impl LlamaSpitBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for LlamaSpitBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct SlimeSize(pub i32);
+#[derive(Component)]
 pub struct MagmaCube;
-impl MagmaCube {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(SlimeSize(1))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct MagmaCubeQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    slime_size: &'a mut SlimeSize,
+#[derive(Bundle)]
+struct MagmaCubeBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    slime_size: SlimeSize,
 }
-impl MagmaCubeQuery<'_> {
+impl MagmaCubeBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.slime_size = SlimeSize(d.value.into_int()?),
+                16 => self.slime_size = SlimeSize(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for MagmaCubeBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            slime_size: SlimeSize(1),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Marker;
-impl Marker {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct MarkerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct MarkerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl MarkerQuery<'_> {
+impl MarkerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for MarkerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Minecart;
-impl Minecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct MinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
+#[derive(Bundle)]
+struct MinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
 }
-impl MinecartQuery<'_> {
+impl MinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for MinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct MooshroomKind(pub String);
+#[derive(Component)]
 pub struct Mooshroom;
-impl Mooshroom {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(MooshroomKind(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct MooshroomQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    mooshroom_kind: &'a mut MooshroomKind,
+#[derive(Bundle)]
+struct MooshroomBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    mooshroom_kind: MooshroomKind,
 }
-impl MooshroomQuery<'_> {
+impl MooshroomBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.mooshroom_kind = MooshroomKind(d.value.into_string()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.mooshroom_kind = MooshroomKind(d.value.into_string()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct MuleTamed(pub bool);
-pub struct MuleEating(pub bool);
-pub struct MuleStanding(pub bool);
-pub struct MuleBred(pub bool);
-pub struct MuleSaddled(pub bool);
-pub struct MuleOwnerUuid(pub Option<Uuid>);
-pub struct MuleChest(pub bool);
-pub struct Mule;
-impl Mule {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(MuleTamed(false))
-            .add(MuleEating(false))
-            .add(MuleStanding(false))
-            .add(MuleBred(false))
-            .add(MuleSaddled(false))
-            .add(MuleOwnerUuid(None))
-            .add(MuleChest(false))
-            .build()
+impl Default for MooshroomBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            mooshroom_kind: MooshroomKind(Default::default()),
+        }
     }
 }
 
-#[derive(Query)]
-struct MuleQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    mule_tamed: &'a mut MuleTamed,
-    mule_eating: &'a mut MuleEating,
-    mule_standing: &'a mut MuleStanding,
-    mule_bred: &'a mut MuleBred,
-    mule_saddled: &'a mut MuleSaddled,
-    mule_owner_uuid: &'a mut MuleOwnerUuid,
-    mule_chest: &'a mut MuleChest,
+#[derive(Component)]
+pub struct MuleTamed(pub bool);
+#[derive(Component)]
+pub struct MuleEating(pub bool);
+#[derive(Component)]
+pub struct MuleStanding(pub bool);
+#[derive(Component)]
+pub struct MuleBred(pub bool);
+#[derive(Component)]
+pub struct MuleSaddled(pub bool);
+#[derive(Component)]
+pub struct MuleOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
+pub struct MuleChest(pub bool);
+#[derive(Component)]
+pub struct Mule;
+
+#[derive(Bundle)]
+struct MuleBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    mule_tamed: MuleTamed,
+    mule_eating: MuleEating,
+    mule_standing: MuleStanding,
+    mule_bred: MuleBred,
+    mule_saddled: MuleSaddled,
+    mule_owner_uuid: MuleOwnerUuid,
+    mule_chest: MuleChest,
 }
-impl MuleQuery<'_> {
+impl MuleBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.mule_tamed = MuleTamed(bitfield & 0x2 != 0);
-                    *self.mule_eating = MuleEating(bitfield & 0x10 != 0);
-                    *self.mule_standing = MuleStanding(bitfield & 0x20 != 0);
-                    *self.mule_bred = MuleBred(bitfield & 0x8 != 0);
-                    *self.mule_saddled = MuleSaddled(bitfield & 0x4 != 0);
+                    self.mule_tamed = MuleTamed(bitfield & 0x2 != 0);
+                    self.mule_eating = MuleEating(bitfield & 0x10 != 0);
+                    self.mule_standing = MuleStanding(bitfield & 0x20 != 0);
+                    self.mule_bred = MuleBred(bitfield & 0x8 != 0);
+                    self.mule_saddled = MuleSaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.mule_owner_uuid = MuleOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.mule_chest = MuleChest(d.value.into_boolean()?),
+                18 => self.mule_owner_uuid = MuleOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.mule_chest = MuleChest(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for MuleBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            mule_tamed: MuleTamed(false),
+            mule_eating: MuleEating(false),
+            mule_standing: MuleStanding(false),
+            mule_bred: MuleBred(false),
+            mule_saddled: MuleSaddled(false),
+            mule_owner_uuid: MuleOwnerUuid(None),
+            mule_chest: MuleChest(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Trusting(pub bool);
+#[derive(Component)]
 pub struct Ocelot;
-impl Ocelot {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(Trusting(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct OcelotQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    trusting: &'a mut Trusting,
+#[derive(Bundle)]
+struct OcelotBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    trusting: Trusting,
 }
-impl OcelotQuery<'_> {
+impl OcelotBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.trusting = Trusting(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.trusting = Trusting(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for OcelotBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            trusting: Trusting(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PaintingVariant(pub azalea_registry::PaintingVariant);
+#[derive(Component)]
 pub struct Painting;
-impl Painting {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(PaintingVariant(azalea_registry::PaintingVariant::Kebab))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PaintingQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    painting_variant: &'a mut PaintingVariant,
+#[derive(Bundle)]
+struct PaintingBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    painting_variant: PaintingVariant,
 }
-impl PaintingQuery<'_> {
+impl PaintingBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.painting_variant = PaintingVariant(d.value.into_painting_variant()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.painting_variant = PaintingVariant(d.value.into_painting_variant()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct PandaUnhappyCounter(pub i32);
-pub struct SneezeCounter(pub i32);
-pub struct EatCounter(pub i32);
-pub struct Sneezing(pub bool);
-pub struct PandaSitting(pub bool);
-pub struct OnBack(pub bool);
-pub struct PandaRolling(pub bool);
-pub struct HiddenGene(pub u8);
-pub struct PandaFlags(pub u8);
-pub struct Panda;
-impl Panda {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(PandaUnhappyCounter(0))
-            .add(SneezeCounter(0))
-            .add(EatCounter(0))
-            .add(Sneezing(false))
-            .add(PandaSitting(false))
-            .add(OnBack(false))
-            .add(PandaRolling(false))
-            .add(HiddenGene(0))
-            .add(PandaFlags(0))
-            .build()
+impl Default for PaintingBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            painting_variant: PaintingVariant(azalea_registry::PaintingVariant::Kebab),
+        }
     }
 }
 
-#[derive(Query)]
-struct PandaQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    panda_unhappy_counter: &'a mut PandaUnhappyCounter,
-    sneeze_counter: &'a mut SneezeCounter,
-    eat_counter: &'a mut EatCounter,
-    sneezing: &'a mut Sneezing,
-    panda_sitting: &'a mut PandaSitting,
-    on_back: &'a mut OnBack,
-    panda_rolling: &'a mut PandaRolling,
-    hidden_gene: &'a mut HiddenGene,
-    panda_flags: &'a mut PandaFlags,
+#[derive(Component)]
+pub struct PandaUnhappyCounter(pub i32);
+#[derive(Component)]
+pub struct SneezeCounter(pub i32);
+#[derive(Component)]
+pub struct EatCounter(pub i32);
+#[derive(Component)]
+pub struct Sneezing(pub bool);
+#[derive(Component)]
+pub struct PandaSitting(pub bool);
+#[derive(Component)]
+pub struct OnBack(pub bool);
+#[derive(Component)]
+pub struct PandaRolling(pub bool);
+#[derive(Component)]
+pub struct HiddenGene(pub u8);
+#[derive(Component)]
+pub struct PandaFlags(pub u8);
+#[derive(Component)]
+pub struct Panda;
+
+#[derive(Bundle)]
+struct PandaBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    panda_unhappy_counter: PandaUnhappyCounter,
+    sneeze_counter: SneezeCounter,
+    eat_counter: EatCounter,
+    sneezing: Sneezing,
+    panda_sitting: PandaSitting,
+    on_back: OnBack,
+    panda_rolling: PandaRolling,
+    hidden_gene: HiddenGene,
+    panda_flags: PandaFlags,
 }
-impl PandaQuery<'_> {
+impl PandaBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.panda_unhappy_counter = PandaUnhappyCounter(d.value.into_int()?),
-                18 => *self.sneeze_counter = SneezeCounter(d.value.into_int()?),
-                19 => *self.eat_counter = EatCounter(d.value.into_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.panda_unhappy_counter = PandaUnhappyCounter(d.value.into_int()?),
+                18 => self.sneeze_counter = SneezeCounter(d.value.into_int()?),
+                19 => self.eat_counter = EatCounter(d.value.into_int()?),
                 20 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.sneezing = Sneezing(bitfield & 0x2 != 0);
-                    *self.panda_sitting = PandaSitting(bitfield & 0x8 != 0);
-                    *self.on_back = OnBack(bitfield & 0x10 != 0);
-                    *self.panda_rolling = PandaRolling(bitfield & 0x4 != 0);
+                    self.sneezing = Sneezing(bitfield & 0x2 != 0);
+                    self.panda_sitting = PandaSitting(bitfield & 0x8 != 0);
+                    self.on_back = OnBack(bitfield & 0x10 != 0);
+                    self.panda_rolling = PandaRolling(bitfield & 0x4 != 0);
                 }
-                21 => *self.hidden_gene = HiddenGene(d.value.into_byte()?),
-                22 => *self.panda_flags = PandaFlags(d.value.into_byte()?),
+                21 => self.hidden_gene = HiddenGene(d.value.into_byte()?),
+                22 => self.panda_flags = PandaFlags(d.value.into_byte()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct ParrotVariant(pub i32);
-pub struct Parrot;
-impl Parrot {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(Tame(false))
-            .add(InSittingPose(false))
-            .add(Owneruuid(None))
-            .add(ParrotVariant(0))
-            .build()
+impl Default for PandaBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            panda_unhappy_counter: PandaUnhappyCounter(0),
+            sneeze_counter: SneezeCounter(0),
+            eat_counter: EatCounter(0),
+            sneezing: Sneezing(false),
+            panda_sitting: PandaSitting(false),
+            on_back: OnBack(false),
+            panda_rolling: PandaRolling(false),
+            hidden_gene: HiddenGene(0),
+            panda_flags: PandaFlags(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct ParrotQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    tame: &'a mut Tame,
-    in_sitting_pose: &'a mut InSittingPose,
-    owneruuid: &'a mut Owneruuid,
-    parrot_variant: &'a mut ParrotVariant,
+#[derive(Component)]
+pub struct ParrotVariant(pub i32);
+#[derive(Component)]
+pub struct Parrot;
+
+#[derive(Bundle)]
+struct ParrotBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    tame: Tame,
+    in_sitting_pose: InSittingPose,
+    owneruuid: Owneruuid,
+    parrot_variant: ParrotVariant,
 }
-impl ParrotQuery<'_> {
+impl ParrotBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.tame = Tame(bitfield & 0x4 != 0);
-                    *self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
+                    self.tame = Tame(bitfield & 0x4 != 0);
+                    self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
                 }
-                18 => *self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
-                19 => *self.parrot_variant = ParrotVariant(d.value.into_int()?),
+                18 => self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
+                19 => self.parrot_variant = ParrotVariant(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ParrotBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            tame: Tame(false),
+            in_sitting_pose: InSittingPose(false),
+            owneruuid: Owneruuid(None),
+            parrot_variant: ParrotVariant(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PhantomSize(pub i32);
+#[derive(Component)]
 pub struct Phantom;
-impl Phantom {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PhantomSize(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PhantomQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    phantom_size: &'a mut PhantomSize,
+#[derive(Bundle)]
+struct PhantomBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    phantom_size: PhantomSize,
 }
-impl PhantomQuery<'_> {
+impl PhantomBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.phantom_size = PhantomSize(d.value.into_int()?),
+                16 => self.phantom_size = PhantomSize(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for PhantomBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            phantom_size: PhantomSize(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PigSaddle(pub bool);
+#[derive(Component)]
 pub struct PigBoostTime(pub i32);
+#[derive(Component)]
 pub struct Pig;
-impl Pig {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(PigSaddle(false))
-            .add(PigBoostTime(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PigQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    pig_saddle: &'a mut PigSaddle,
-    pig_boost_time: &'a mut PigBoostTime,
+#[derive(Bundle)]
+struct PigBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    pig_saddle: PigSaddle,
+    pig_boost_time: PigBoostTime,
 }
-impl PigQuery<'_> {
+impl PigBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.pig_saddle = PigSaddle(d.value.into_boolean()?),
-                18 => *self.pig_boost_time = PigBoostTime(d.value.into_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.pig_saddle = PigSaddle(d.value.into_boolean()?),
+                18 => self.pig_boost_time = PigBoostTime(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct PiglinImmuneToZombification(pub bool);
-pub struct PiglinBaby(pub bool);
-pub struct PiglinIsChargingCrossbow(pub bool);
-pub struct IsDancing(pub bool);
-pub struct Piglin;
-impl Piglin {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PiglinImmuneToZombification(false))
-            .add(PiglinBaby(false))
-            .add(PiglinIsChargingCrossbow(false))
-            .add(IsDancing(false))
-            .build()
+impl Default for PigBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            pig_saddle: PigSaddle(false),
+            pig_boost_time: PigBoostTime(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct PiglinQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    piglin_immune_to_zombification: &'a mut PiglinImmuneToZombification,
-    piglin_baby: &'a mut PiglinBaby,
-    piglin_is_charging_crossbow: &'a mut PiglinIsChargingCrossbow,
-    is_dancing: &'a mut IsDancing,
+#[derive(Component)]
+pub struct PiglinImmuneToZombification(pub bool);
+#[derive(Component)]
+pub struct PiglinBaby(pub bool);
+#[derive(Component)]
+pub struct PiglinIsChargingCrossbow(pub bool);
+#[derive(Component)]
+pub struct IsDancing(pub bool);
+#[derive(Component)]
+pub struct Piglin;
+
+#[derive(Bundle)]
+struct PiglinBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    piglin_immune_to_zombification: PiglinImmuneToZombification,
+    piglin_baby: PiglinBaby,
+    piglin_is_charging_crossbow: PiglinIsChargingCrossbow,
+    is_dancing: IsDancing,
 }
-impl PiglinQuery<'_> {
+impl PiglinBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
-                    *self.piglin_immune_to_zombification =
+                    self.piglin_immune_to_zombification =
                         PiglinImmuneToZombification(d.value.into_boolean()?)
                 }
-                17 => *self.piglin_baby = PiglinBaby(d.value.into_boolean()?),
+                17 => self.piglin_baby = PiglinBaby(d.value.into_boolean()?),
                 18 => {
-                    *self.piglin_is_charging_crossbow =
+                    self.piglin_is_charging_crossbow =
                         PiglinIsChargingCrossbow(d.value.into_boolean()?)
                 }
-                19 => *self.is_dancing = IsDancing(d.value.into_boolean()?),
+                19 => self.is_dancing = IsDancing(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct PiglinBruteImmuneToZombification(pub bool);
-pub struct PiglinBrute;
-impl PiglinBrute {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PiglinBruteImmuneToZombification(false))
-            .build()
+impl Default for PiglinBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            piglin_immune_to_zombification: PiglinImmuneToZombification(false),
+            piglin_baby: PiglinBaby(false),
+            piglin_is_charging_crossbow: PiglinIsChargingCrossbow(false),
+            is_dancing: IsDancing(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct PiglinBruteQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    piglin_brute_immune_to_zombification: &'a mut PiglinBruteImmuneToZombification,
+#[derive(Component)]
+pub struct PiglinBruteImmuneToZombification(pub bool);
+#[derive(Component)]
+pub struct PiglinBrute;
+
+#[derive(Bundle)]
+struct PiglinBruteBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    piglin_brute_immune_to_zombification: PiglinBruteImmuneToZombification,
 }
-impl PiglinBruteQuery<'_> {
+impl PiglinBruteBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
-                    *self.piglin_brute_immune_to_zombification =
+                    self.piglin_brute_immune_to_zombification =
                         PiglinBruteImmuneToZombification(d.value.into_boolean()?)
                 }
             }
@@ -8003,124 +8297,125 @@ impl PiglinBruteQuery<'_> {
     }
 }
 
-pub struct PillagerIsCelebrating(pub bool);
-pub struct PillagerIsChargingCrossbow(pub bool);
-pub struct Pillager;
-impl Pillager {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PillagerIsCelebrating(false))
-            .add(PillagerIsChargingCrossbow(false))
-            .build()
+impl Default for PiglinBruteBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            piglin_brute_immune_to_zombification: PiglinBruteImmuneToZombification(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct PillagerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    pillager_is_celebrating: &'a mut PillagerIsCelebrating,
-    pillager_is_charging_crossbow: &'a mut PillagerIsChargingCrossbow,
+#[derive(Component)]
+pub struct PillagerIsCelebrating(pub bool);
+#[derive(Component)]
+pub struct PillagerIsChargingCrossbow(pub bool);
+#[derive(Component)]
+pub struct Pillager;
+
+#[derive(Bundle)]
+struct PillagerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    pillager_is_celebrating: PillagerIsCelebrating,
+    pillager_is_charging_crossbow: PillagerIsChargingCrossbow,
 }
-impl PillagerQuery<'_> {
+impl PillagerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
-                }
-                16 => {
-                    *self.pillager_is_celebrating = PillagerIsCelebrating(d.value.into_boolean()?)
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
+                16 => self.pillager_is_celebrating = PillagerIsCelebrating(d.value.into_boolean()?),
                 17 => {
-                    *self.pillager_is_charging_crossbow =
+                    self.pillager_is_charging_crossbow =
                         PillagerIsChargingCrossbow(d.value.into_boolean()?)
                 }
             }
@@ -8129,919 +8424,949 @@ impl PillagerQuery<'_> {
     }
 }
 
+impl Default for PillagerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            pillager_is_celebrating: PillagerIsCelebrating(false),
+            pillager_is_charging_crossbow: PillagerIsChargingCrossbow(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PlayerAbsorption(pub f32);
+#[derive(Component)]
 pub struct Score(pub i32);
+#[derive(Component)]
 pub struct PlayerModeCustomisation(pub u8);
+#[derive(Component)]
 pub struct PlayerMainHand(pub u8);
+#[derive(Component)]
 pub struct ShoulderLeft(pub azalea_nbt::Tag);
+#[derive(Component)]
 pub struct ShoulderRight(pub azalea_nbt::Tag);
+#[derive(Component)]
 pub struct Player;
-impl Player {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(PlayerAbsorption(0.0))
-            .add(Score(0))
-            .add(PlayerModeCustomisation(0))
-            .add(PlayerMainHand(1))
-            .add(ShoulderLeft(azalea_nbt::Tag::Compound(Default::default())))
-            .add(ShoulderRight(azalea_nbt::Tag::Compound(Default::default())))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PlayerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    player_absorption: &'a mut PlayerAbsorption,
-    score: &'a mut Score,
-    player_mode_customisation: &'a mut PlayerModeCustomisation,
-    player_main_hand: &'a mut PlayerMainHand,
-    shoulder_left: &'a mut ShoulderLeft,
-    shoulder_right: &'a mut ShoulderRight,
+#[derive(Bundle)]
+struct PlayerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    player_absorption: PlayerAbsorption,
+    score: Score,
+    player_mode_customisation: PlayerModeCustomisation,
+    player_main_hand: PlayerMainHand,
+    shoulder_left: ShoulderLeft,
+    shoulder_right: ShoulderRight,
 }
-impl PlayerQuery<'_> {
+impl PlayerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
-                15 => *self.player_absorption = PlayerAbsorption(d.value.into_float()?),
-                16 => *self.score = Score(d.value.into_int()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                15 => self.player_absorption = PlayerAbsorption(d.value.into_float()?),
+                16 => self.score = Score(d.value.into_int()?),
                 17 => {
-                    *self.player_mode_customisation = PlayerModeCustomisation(d.value.into_byte()?)
+                    self.player_mode_customisation = PlayerModeCustomisation(d.value.into_byte()?)
                 }
-                18 => *self.player_main_hand = PlayerMainHand(d.value.into_byte()?),
-                19 => *self.shoulder_left = ShoulderLeft(d.value.into_compound_tag()?),
-                20 => *self.shoulder_right = ShoulderRight(d.value.into_compound_tag()?),
+                18 => self.player_main_hand = PlayerMainHand(d.value.into_byte()?),
+                19 => self.shoulder_left = ShoulderLeft(d.value.into_compound_tag()?),
+                20 => self.shoulder_right = ShoulderRight(d.value.into_compound_tag()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for PlayerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            player_absorption: PlayerAbsorption(0.0),
+            score: Score(0),
+            player_mode_customisation: PlayerModeCustomisation(0),
+            player_main_hand: PlayerMainHand(1),
+            shoulder_left: ShoulderLeft(azalea_nbt::Tag::Compound(Default::default())),
+            shoulder_right: ShoulderRight(azalea_nbt::Tag::Compound(Default::default())),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PolarBearStanding(pub bool);
+#[derive(Component)]
 pub struct PolarBear;
-impl PolarBear {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(PolarBearStanding(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PolarBearQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    polar_bear_standing: &'a mut PolarBearStanding,
+#[derive(Bundle)]
+struct PolarBearBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    polar_bear_standing: PolarBearStanding,
 }
-impl PolarBearQuery<'_> {
+impl PolarBearBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.polar_bear_standing = PolarBearStanding(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.polar_bear_standing = PolarBearStanding(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for PolarBearBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            polar_bear_standing: PolarBearStanding(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PotionItemStack(pub Slot);
+#[derive(Component)]
 pub struct Potion;
-impl Potion {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(PotionItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PotionQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    potion_item_stack: &'a mut PotionItemStack,
+#[derive(Bundle)]
+struct PotionBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    potion_item_stack: PotionItemStack,
 }
-impl PotionQuery<'_> {
+impl PotionBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.potion_item_stack = PotionItemStack(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.potion_item_stack = PotionItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for PotionBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            potion_item_stack: PotionItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct PufferfishFromBucket(pub bool);
+#[derive(Component)]
 pub struct PuffState(pub i32);
+#[derive(Component)]
 pub struct Pufferfish;
-impl Pufferfish {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(PufferfishFromBucket(false))
-            .add(PuffState(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct PufferfishQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    pufferfish_from_bucket: &'a mut PufferfishFromBucket,
-    puff_state: &'a mut PuffState,
+#[derive(Bundle)]
+struct PufferfishBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    pufferfish_from_bucket: PufferfishFromBucket,
+    puff_state: PuffState,
 }
-impl PufferfishQuery<'_> {
+impl PufferfishBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.pufferfish_from_bucket = PufferfishFromBucket(d.value.into_boolean()?),
-                17 => *self.puff_state = PuffState(d.value.into_int()?),
+                16 => self.pufferfish_from_bucket = PufferfishFromBucket(d.value.into_boolean()?),
+                17 => self.puff_state = PuffState(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for PufferfishBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            pufferfish_from_bucket: PufferfishFromBucket(false),
+            puff_state: PuffState(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct RabbitKind(pub i32);
+#[derive(Component)]
 pub struct Rabbit;
-impl Rabbit {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(RabbitKind(Default::default()))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct RabbitQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    rabbit_kind: &'a mut RabbitKind,
+#[derive(Bundle)]
+struct RabbitBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    rabbit_kind: RabbitKind,
 }
-impl RabbitQuery<'_> {
+impl RabbitBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.rabbit_kind = RabbitKind(d.value.into_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.rabbit_kind = RabbitKind(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for RabbitBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            rabbit_kind: RabbitKind(Default::default()),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct RavagerIsCelebrating(pub bool);
+#[derive(Component)]
 pub struct Ravager;
-impl Ravager {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(RavagerIsCelebrating(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct RavagerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    ravager_is_celebrating: &'a mut RavagerIsCelebrating,
+#[derive(Bundle)]
+struct RavagerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    ravager_is_celebrating: RavagerIsCelebrating,
 }
-impl RavagerQuery<'_> {
+impl RavagerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.ravager_is_celebrating = RavagerIsCelebrating(d.value.into_boolean()?),
+                16 => self.ravager_is_celebrating = RavagerIsCelebrating(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for RavagerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            ravager_is_celebrating: RavagerIsCelebrating(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct SalmonFromBucket(pub bool);
+#[derive(Component)]
 pub struct Salmon;
-impl Salmon {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(SalmonFromBucket(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SalmonQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    salmon_from_bucket: &'a mut SalmonFromBucket,
+#[derive(Bundle)]
+struct SalmonBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    salmon_from_bucket: SalmonFromBucket,
 }
-impl SalmonQuery<'_> {
+impl SalmonBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.salmon_from_bucket = SalmonFromBucket(d.value.into_boolean()?),
+                16 => self.salmon_from_bucket = SalmonFromBucket(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for SalmonBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            salmon_from_bucket: SalmonFromBucket(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Sheared(pub bool);
+#[derive(Component)]
 pub struct Sheep;
-impl Sheep {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(Sheared(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SheepQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    sheared: &'a mut Sheared,
+#[derive(Bundle)]
+struct SheepBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    sheared: Sheared,
 }
-impl SheepQuery<'_> {
+impl SheepBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.sheared = Sheared(bitfield & 0x10 != 0);
+                    self.sheared = Sheared(bitfield & 0x10 != 0);
                 }
             }
         }
@@ -9049,308 +9374,319 @@ impl SheepQuery<'_> {
     }
 }
 
+impl Default for SheepBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            sheared: Sheared(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct AttachFace(pub Direction);
+#[derive(Component)]
 pub struct Peek(pub u8);
+#[derive(Component)]
 pub struct ShulkerColor(pub u8);
+#[derive(Component)]
 pub struct Shulker;
-impl Shulker {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AttachFace(Default::default()))
-            .add(Peek(0))
-            .add(ShulkerColor(16))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ShulkerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    attach_face: &'a mut AttachFace,
-    peek: &'a mut Peek,
-    shulker_color: &'a mut ShulkerColor,
+#[derive(Bundle)]
+struct ShulkerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    attach_face: AttachFace,
+    peek: Peek,
+    shulker_color: ShulkerColor,
 }
-impl ShulkerQuery<'_> {
+impl ShulkerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.attach_face = AttachFace(d.value.into_direction()?),
-                17 => *self.peek = Peek(d.value.into_byte()?),
-                18 => *self.shulker_color = ShulkerColor(d.value.into_byte()?),
+                16 => self.attach_face = AttachFace(d.value.into_direction()?),
+                17 => self.peek = Peek(d.value.into_byte()?),
+                18 => self.shulker_color = ShulkerColor(d.value.into_byte()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ShulkerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            attach_face: AttachFace(Default::default()),
+            peek: Peek(0),
+            shulker_color: ShulkerColor(16),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ShulkerBullet;
-impl ShulkerBullet {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ShulkerBulletQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
+#[derive(Bundle)]
+struct ShulkerBulletBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
 }
-impl ShulkerBulletQuery<'_> {
+impl ShulkerBulletBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ShulkerBulletBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Silverfish;
-impl Silverfish {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SilverfishQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct SilverfishBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl SilverfishQuery<'_> {
+impl SilverfishBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -9358,261 +9694,265 @@ impl SilverfishQuery<'_> {
     }
 }
 
+impl Default for SilverfishBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct StrayConversion(pub bool);
+#[derive(Component)]
 pub struct Skeleton;
-impl Skeleton {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(StrayConversion(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SkeletonQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    stray_conversion: &'a mut StrayConversion,
+#[derive(Bundle)]
+struct SkeletonBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    stray_conversion: StrayConversion,
 }
-impl SkeletonQuery<'_> {
+impl SkeletonBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.stray_conversion = StrayConversion(d.value.into_boolean()?),
+                16 => self.stray_conversion = StrayConversion(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct SkeletonHorseTamed(pub bool);
-pub struct SkeletonHorseEating(pub bool);
-pub struct SkeletonHorseStanding(pub bool);
-pub struct SkeletonHorseBred(pub bool);
-pub struct SkeletonHorseSaddled(pub bool);
-pub struct SkeletonHorseOwnerUuid(pub Option<Uuid>);
-pub struct SkeletonHorse;
-impl SkeletonHorse {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(SkeletonHorseTamed(false))
-            .add(SkeletonHorseEating(false))
-            .add(SkeletonHorseStanding(false))
-            .add(SkeletonHorseBred(false))
-            .add(SkeletonHorseSaddled(false))
-            .add(SkeletonHorseOwnerUuid(None))
-            .build()
+impl Default for SkeletonBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            stray_conversion: StrayConversion(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct SkeletonHorseQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    skeleton_horse_tamed: &'a mut SkeletonHorseTamed,
-    skeleton_horse_eating: &'a mut SkeletonHorseEating,
-    skeleton_horse_standing: &'a mut SkeletonHorseStanding,
-    skeleton_horse_bred: &'a mut SkeletonHorseBred,
-    skeleton_horse_saddled: &'a mut SkeletonHorseSaddled,
-    skeleton_horse_owner_uuid: &'a mut SkeletonHorseOwnerUuid,
+#[derive(Component)]
+pub struct SkeletonHorseTamed(pub bool);
+#[derive(Component)]
+pub struct SkeletonHorseEating(pub bool);
+#[derive(Component)]
+pub struct SkeletonHorseStanding(pub bool);
+#[derive(Component)]
+pub struct SkeletonHorseBred(pub bool);
+#[derive(Component)]
+pub struct SkeletonHorseSaddled(pub bool);
+#[derive(Component)]
+pub struct SkeletonHorseOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
+pub struct SkeletonHorse;
+
+#[derive(Bundle)]
+struct SkeletonHorseBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    skeleton_horse_tamed: SkeletonHorseTamed,
+    skeleton_horse_eating: SkeletonHorseEating,
+    skeleton_horse_standing: SkeletonHorseStanding,
+    skeleton_horse_bred: SkeletonHorseBred,
+    skeleton_horse_saddled: SkeletonHorseSaddled,
+    skeleton_horse_owner_uuid: SkeletonHorseOwnerUuid,
 }
-impl SkeletonHorseQuery<'_> {
+impl SkeletonHorseBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.skeleton_horse_tamed = SkeletonHorseTamed(bitfield & 0x2 != 0);
-                    *self.skeleton_horse_eating = SkeletonHorseEating(bitfield & 0x10 != 0);
-                    *self.skeleton_horse_standing = SkeletonHorseStanding(bitfield & 0x20 != 0);
-                    *self.skeleton_horse_bred = SkeletonHorseBred(bitfield & 0x8 != 0);
-                    *self.skeleton_horse_saddled = SkeletonHorseSaddled(bitfield & 0x4 != 0);
+                    self.skeleton_horse_tamed = SkeletonHorseTamed(bitfield & 0x2 != 0);
+                    self.skeleton_horse_eating = SkeletonHorseEating(bitfield & 0x10 != 0);
+                    self.skeleton_horse_standing = SkeletonHorseStanding(bitfield & 0x20 != 0);
+                    self.skeleton_horse_bred = SkeletonHorseBred(bitfield & 0x8 != 0);
+                    self.skeleton_horse_saddled = SkeletonHorseSaddled(bitfield & 0x4 != 0);
                 }
                 18 => {
-                    *self.skeleton_horse_owner_uuid =
+                    self.skeleton_horse_owner_uuid =
                         SkeletonHorseOwnerUuid(d.value.into_optional_uuid()?)
                 }
             }
@@ -9621,192 +9961,214 @@ impl SkeletonHorseQuery<'_> {
     }
 }
 
-pub struct Slime;
-impl Slime {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(SlimeSize(1))
-            .build()
+impl Default for SkeletonHorseBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            skeleton_horse_tamed: SkeletonHorseTamed(false),
+            skeleton_horse_eating: SkeletonHorseEating(false),
+            skeleton_horse_standing: SkeletonHorseStanding(false),
+            skeleton_horse_bred: SkeletonHorseBred(false),
+            skeleton_horse_saddled: SkeletonHorseSaddled(false),
+            skeleton_horse_owner_uuid: SkeletonHorseOwnerUuid(None),
+        }
     }
 }
 
-#[derive(Query)]
-struct SlimeQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    slime_size: &'a mut SlimeSize,
+#[derive(Component)]
+pub struct Slime;
+
+#[derive(Bundle)]
+struct SlimeBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    slime_size: SlimeSize,
 }
-impl SlimeQuery<'_> {
+impl SlimeBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.slime_size = SlimeSize(d.value.into_int()?),
+                16 => self.slime_size = SlimeSize(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct SmallFireballItemStack(pub Slot);
-pub struct SmallFireball;
-impl SmallFireball {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(SmallFireballItemStack(Slot::Empty))
-            .build()
+impl Default for SlimeBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            slime_size: SlimeSize(1),
+        }
     }
 }
 
-#[derive(Query)]
-struct SmallFireballQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    small_fireball_item_stack: &'a mut SmallFireballItemStack,
+#[derive(Component)]
+pub struct SmallFireballItemStack(pub Slot);
+#[derive(Component)]
+pub struct SmallFireball;
+
+#[derive(Bundle)]
+struct SmallFireballBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    small_fireball_item_stack: SmallFireballItemStack,
 }
-impl SmallFireballQuery<'_> {
+impl SmallFireballBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
-                    *self.small_fireball_item_stack =
+                    self.small_fireball_item_stack =
                         SmallFireballItemStack(d.value.into_item_stack()?)
                 }
             }
@@ -9815,119 +10177,111 @@ impl SmallFireballQuery<'_> {
     }
 }
 
-pub struct HasPumpkin(pub bool);
-pub struct SnowGolem;
-impl SnowGolem {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(HasPumpkin(true))
-            .build()
+impl Default for SmallFireballBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            small_fireball_item_stack: SmallFireballItemStack(Slot::Empty),
+        }
     }
 }
 
-#[derive(Query)]
-struct SnowGolemQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    has_pumpkin: &'a mut HasPumpkin,
+#[derive(Component)]
+pub struct HasPumpkin(pub bool);
+#[derive(Component)]
+pub struct SnowGolem;
+
+#[derive(Bundle)]
+struct SnowGolemBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    has_pumpkin: HasPumpkin,
 }
-impl SnowGolemQuery<'_> {
+impl SnowGolemBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.has_pumpkin = HasPumpkin(bitfield & 0x10 != 0);
+                    self.has_pumpkin = HasPumpkin(bitfield & 0x10 != 0);
                 }
             }
         }
@@ -9935,258 +10289,275 @@ impl SnowGolemQuery<'_> {
     }
 }
 
+impl Default for SnowGolemBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            has_pumpkin: HasPumpkin(true),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct SnowballItemStack(pub Slot);
+#[derive(Component)]
 pub struct Snowball;
-impl Snowball {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(SnowballItemStack(Slot::Empty))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SnowballQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    snowball_item_stack: &'a mut SnowballItemStack,
+#[derive(Bundle)]
+struct SnowballBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    snowball_item_stack: SnowballItemStack,
 }
-impl SnowballQuery<'_> {
+impl SnowballBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.snowball_item_stack = SnowballItemStack(d.value.into_item_stack()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.snowball_item_stack = SnowballItemStack(d.value.into_item_stack()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for SnowballBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            snowball_item_stack: SnowballItemStack(Slot::Empty),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct SpawnerMinecart;
-impl SpawnerMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SpawnerMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
+#[derive(Bundle)]
+struct SpawnerMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
 }
-impl SpawnerMinecartQuery<'_> {
+impl SpawnerMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct SpectralArrowCritArrow(pub bool);
-pub struct SpectralArrowShotFromCrossbow(pub bool);
-pub struct SpectralArrowNoPhysics(pub bool);
-pub struct SpectralArrowPierceLevel(pub u8);
-pub struct SpectralArrow;
-impl SpectralArrow {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(SpectralArrowCritArrow(false))
-            .add(SpectralArrowShotFromCrossbow(false))
-            .add(SpectralArrowNoPhysics(false))
-            .add(SpectralArrowPierceLevel(0))
-            .build()
+impl Default for SpawnerMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct SpectralArrowQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    spectral_arrow_crit_arrow: &'a mut SpectralArrowCritArrow,
-    spectral_arrow_shot_from_crossbow: &'a mut SpectralArrowShotFromCrossbow,
-    spectral_arrow_no_physics: &'a mut SpectralArrowNoPhysics,
-    spectral_arrow_pierce_level: &'a mut SpectralArrowPierceLevel,
+#[derive(Component)]
+pub struct SpectralArrowCritArrow(pub bool);
+#[derive(Component)]
+pub struct SpectralArrowShotFromCrossbow(pub bool);
+#[derive(Component)]
+pub struct SpectralArrowNoPhysics(pub bool);
+#[derive(Component)]
+pub struct SpectralArrowPierceLevel(pub u8);
+#[derive(Component)]
+pub struct SpectralArrow;
+
+#[derive(Bundle)]
+struct SpectralArrowBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    spectral_arrow_crit_arrow: SpectralArrowCritArrow,
+    spectral_arrow_shot_from_crossbow: SpectralArrowShotFromCrossbow,
+    spectral_arrow_no_physics: SpectralArrowNoPhysics,
+    spectral_arrow_pierce_level: SpectralArrowPierceLevel,
 }
-impl SpectralArrowQuery<'_> {
+impl SpectralArrowBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.spectral_arrow_crit_arrow = SpectralArrowCritArrow(bitfield & 0x1 != 0);
-                    *self.spectral_arrow_shot_from_crossbow =
+                    self.spectral_arrow_crit_arrow = SpectralArrowCritArrow(bitfield & 0x1 != 0);
+                    self.spectral_arrow_shot_from_crossbow =
                         SpectralArrowShotFromCrossbow(bitfield & 0x4 != 0);
-                    *self.spectral_arrow_no_physics = SpectralArrowNoPhysics(bitfield & 0x2 != 0);
+                    self.spectral_arrow_no_physics = SpectralArrowNoPhysics(bitfield & 0x2 != 0);
                 }
                 9 => {
-                    *self.spectral_arrow_pierce_level =
+                    self.spectral_arrow_pierce_level =
                         SpectralArrowPierceLevel(d.value.into_byte()?)
                 }
             }
@@ -10195,118 +10566,112 @@ impl SpectralArrowQuery<'_> {
     }
 }
 
+impl Default for SpectralArrowBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            spectral_arrow_crit_arrow: SpectralArrowCritArrow(false),
+            spectral_arrow_shot_from_crossbow: SpectralArrowShotFromCrossbow(false),
+            spectral_arrow_no_physics: SpectralArrowNoPhysics(false),
+            spectral_arrow_pierce_level: SpectralArrowPierceLevel(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Spider;
-impl Spider {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(Climbing(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SpiderQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    climbing: &'a mut Climbing,
+#[derive(Bundle)]
+struct SpiderBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    climbing: Climbing,
 }
-impl SpiderQuery<'_> {
+impl SpiderBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.climbing = Climbing(bitfield & 0x1 != 0);
+                    self.climbing = Climbing(bitfield & 0x1 != 0);
                 }
             }
         }
@@ -10314,112 +10679,115 @@ impl SpiderQuery<'_> {
     }
 }
 
+impl Default for SpiderBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            climbing: Climbing(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Squid;
-impl Squid {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct SquidQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct SquidBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl SquidQuery<'_> {
+impl SquidBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -10427,112 +10795,114 @@ impl SquidQuery<'_> {
     }
 }
 
+impl Default for SquidBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Stray;
-impl Stray {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct StrayQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct StrayBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl StrayQuery<'_> {
+impl StrayBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -10540,783 +10910,805 @@ impl StrayQuery<'_> {
     }
 }
 
+impl Default for StrayBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct StriderBoostTime(pub i32);
+#[derive(Component)]
 pub struct Suffocating(pub bool);
+#[derive(Component)]
 pub struct StriderSaddle(pub bool);
+#[derive(Component)]
 pub struct Strider;
-impl Strider {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(StriderBoostTime(0))
-            .add(Suffocating(false))
-            .add(StriderSaddle(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct StriderQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    strider_boost_time: &'a mut StriderBoostTime,
-    suffocating: &'a mut Suffocating,
-    strider_saddle: &'a mut StriderSaddle,
+#[derive(Bundle)]
+struct StriderBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    strider_boost_time: StriderBoostTime,
+    suffocating: Suffocating,
+    strider_saddle: StriderSaddle,
 }
-impl StriderQuery<'_> {
+impl StriderBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.strider_boost_time = StriderBoostTime(d.value.into_int()?),
-                18 => *self.suffocating = Suffocating(d.value.into_boolean()?),
-                19 => *self.strider_saddle = StriderSaddle(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.strider_boost_time = StriderBoostTime(d.value.into_int()?),
+                18 => self.suffocating = Suffocating(d.value.into_boolean()?),
+                19 => self.strider_saddle = StriderSaddle(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for StriderBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            strider_boost_time: StriderBoostTime(0),
+            suffocating: Suffocating(false),
+            strider_saddle: StriderSaddle(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct TadpoleFromBucket(pub bool);
+#[derive(Component)]
 pub struct Tadpole;
-impl Tadpole {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(TadpoleFromBucket(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct TadpoleQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    tadpole_from_bucket: &'a mut TadpoleFromBucket,
+#[derive(Bundle)]
+struct TadpoleBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    tadpole_from_bucket: TadpoleFromBucket,
 }
-impl TadpoleQuery<'_> {
+impl TadpoleBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.tadpole_from_bucket = TadpoleFromBucket(d.value.into_boolean()?),
+                16 => self.tadpole_from_bucket = TadpoleFromBucket(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for TadpoleBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            tadpole_from_bucket: TadpoleFromBucket(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Fuse(pub i32);
+#[derive(Component)]
 pub struct Tnt;
-impl Tnt {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(Fuse(80))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct TntQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    fuse: &'a mut Fuse,
+#[derive(Bundle)]
+struct TntBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    fuse: Fuse,
 }
-impl TntQuery<'_> {
+impl TntBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.fuse = Fuse(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.fuse = Fuse(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for TntBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            fuse: Fuse(80),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct TntMinecart;
-impl TntMinecart {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AbstractMinecartHurt(0))
-            .add(AbstractMinecartHurtdir(1))
-            .add(AbstractMinecartDamage(0.0))
-            .add(DisplayBlock(Default::default()))
-            .add(DisplayOffset(6))
-            .add(CustomDisplay(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct TntMinecartQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    abstract_minecart_hurt: &'a mut AbstractMinecartHurt,
-    abstract_minecart_hurtdir: &'a mut AbstractMinecartHurtdir,
-    abstract_minecart_damage: &'a mut AbstractMinecartDamage,
-    display_block: &'a mut DisplayBlock,
-    display_offset: &'a mut DisplayOffset,
-    custom_display: &'a mut CustomDisplay,
+#[derive(Bundle)]
+struct TntMinecartBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    abstract_minecart_hurt: AbstractMinecartHurt,
+    abstract_minecart_hurtdir: AbstractMinecartHurtdir,
+    abstract_minecart_damage: AbstractMinecartDamage,
+    display_block: DisplayBlock,
+    display_offset: DisplayOffset,
+    custom_display: CustomDisplay,
 }
-impl TntMinecartQuery<'_> {
+impl TntMinecartBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
-                9 => *self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
-                10 => {
-                    *self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?)
-                }
-                11 => *self.display_block = DisplayBlock(d.value.into_int()?),
-                12 => *self.display_offset = DisplayOffset(d.value.into_int()?),
-                13 => *self.custom_display = CustomDisplay(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.abstract_minecart_hurt = AbstractMinecartHurt(d.value.into_int()?),
+                9 => self.abstract_minecart_hurtdir = AbstractMinecartHurtdir(d.value.into_int()?),
+                10 => self.abstract_minecart_damage = AbstractMinecartDamage(d.value.into_float()?),
+                11 => self.display_block = DisplayBlock(d.value.into_int()?),
+                12 => self.display_offset = DisplayOffset(d.value.into_int()?),
+                13 => self.custom_display = CustomDisplay(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct TraderLlama;
-impl TraderLlama {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(LlamaTamed(false))
-            .add(LlamaEating(false))
-            .add(LlamaStanding(false))
-            .add(LlamaBred(false))
-            .add(LlamaSaddled(false))
-            .add(LlamaOwnerUuid(None))
-            .add(LlamaChest(false))
-            .add(Strength(0))
-            .add(Swag(-1))
-            .add(LlamaVariant(0))
-            .build()
+impl Default for TntMinecartBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            abstract_minecart_hurt: AbstractMinecartHurt(0),
+            abstract_minecart_hurtdir: AbstractMinecartHurtdir(1),
+            abstract_minecart_damage: AbstractMinecartDamage(0.0),
+            display_block: DisplayBlock(Default::default()),
+            display_offset: DisplayOffset(6),
+            custom_display: CustomDisplay(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct TraderLlamaQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    llama_tamed: &'a mut LlamaTamed,
-    llama_eating: &'a mut LlamaEating,
-    llama_standing: &'a mut LlamaStanding,
-    llama_bred: &'a mut LlamaBred,
-    llama_saddled: &'a mut LlamaSaddled,
-    llama_owner_uuid: &'a mut LlamaOwnerUuid,
-    llama_chest: &'a mut LlamaChest,
-    strength: &'a mut Strength,
-    swag: &'a mut Swag,
-    llama_variant: &'a mut LlamaVariant,
+#[derive(Component)]
+pub struct TraderLlama;
+
+#[derive(Bundle)]
+struct TraderLlamaBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    llama_tamed: LlamaTamed,
+    llama_eating: LlamaEating,
+    llama_standing: LlamaStanding,
+    llama_bred: LlamaBred,
+    llama_saddled: LlamaSaddled,
+    llama_owner_uuid: LlamaOwnerUuid,
+    llama_chest: LlamaChest,
+    strength: Strength,
+    swag: Swag,
+    llama_variant: LlamaVariant,
 }
-impl TraderLlamaQuery<'_> {
+impl TraderLlamaBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.llama_tamed = LlamaTamed(bitfield & 0x2 != 0);
-                    *self.llama_eating = LlamaEating(bitfield & 0x10 != 0);
-                    *self.llama_standing = LlamaStanding(bitfield & 0x20 != 0);
-                    *self.llama_bred = LlamaBred(bitfield & 0x8 != 0);
-                    *self.llama_saddled = LlamaSaddled(bitfield & 0x4 != 0);
+                    self.llama_tamed = LlamaTamed(bitfield & 0x2 != 0);
+                    self.llama_eating = LlamaEating(bitfield & 0x10 != 0);
+                    self.llama_standing = LlamaStanding(bitfield & 0x20 != 0);
+                    self.llama_bred = LlamaBred(bitfield & 0x8 != 0);
+                    self.llama_saddled = LlamaSaddled(bitfield & 0x4 != 0);
                 }
-                18 => *self.llama_owner_uuid = LlamaOwnerUuid(d.value.into_optional_uuid()?),
-                19 => *self.llama_chest = LlamaChest(d.value.into_boolean()?),
-                20 => *self.strength = Strength(d.value.into_int()?),
-                21 => *self.swag = Swag(d.value.into_int()?),
-                22 => *self.llama_variant = LlamaVariant(d.value.into_int()?),
+                18 => self.llama_owner_uuid = LlamaOwnerUuid(d.value.into_optional_uuid()?),
+                19 => self.llama_chest = LlamaChest(d.value.into_boolean()?),
+                20 => self.strength = Strength(d.value.into_int()?),
+                21 => self.swag = Swag(d.value.into_int()?),
+                22 => self.llama_variant = LlamaVariant(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for TraderLlamaBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            llama_tamed: LlamaTamed(false),
+            llama_eating: LlamaEating(false),
+            llama_standing: LlamaStanding(false),
+            llama_bred: LlamaBred(false),
+            llama_saddled: LlamaSaddled(false),
+            llama_owner_uuid: LlamaOwnerUuid(None),
+            llama_chest: LlamaChest(false),
+            strength: Strength(0),
+            swag: Swag(-1),
+            llama_variant: LlamaVariant(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct TridentCritArrow(pub bool);
+#[derive(Component)]
 pub struct TridentShotFromCrossbow(pub bool);
+#[derive(Component)]
 pub struct TridentNoPhysics(pub bool);
+#[derive(Component)]
 pub struct TridentPierceLevel(pub u8);
+#[derive(Component)]
 pub struct Loyalty(pub u8);
+#[derive(Component)]
 pub struct Foil(pub bool);
+#[derive(Component)]
 pub struct Trident;
-impl Trident {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(TridentCritArrow(false))
-            .add(TridentShotFromCrossbow(false))
-            .add(TridentNoPhysics(false))
-            .add(TridentPierceLevel(0))
-            .add(Loyalty(0))
-            .add(Foil(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct TridentQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    trident_crit_arrow: &'a mut TridentCritArrow,
-    trident_shot_from_crossbow: &'a mut TridentShotFromCrossbow,
-    trident_no_physics: &'a mut TridentNoPhysics,
-    trident_pierce_level: &'a mut TridentPierceLevel,
-    loyalty: &'a mut Loyalty,
-    foil: &'a mut Foil,
+#[derive(Bundle)]
+struct TridentBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    trident_crit_arrow: TridentCritArrow,
+    trident_shot_from_crossbow: TridentShotFromCrossbow,
+    trident_no_physics: TridentNoPhysics,
+    trident_pierce_level: TridentPierceLevel,
+    loyalty: Loyalty,
+    foil: Foil,
 }
-impl TridentQuery<'_> {
+impl TridentBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.trident_crit_arrow = TridentCritArrow(bitfield & 0x1 != 0);
-                    *self.trident_shot_from_crossbow = TridentShotFromCrossbow(bitfield & 0x4 != 0);
-                    *self.trident_no_physics = TridentNoPhysics(bitfield & 0x2 != 0);
+                    self.trident_crit_arrow = TridentCritArrow(bitfield & 0x1 != 0);
+                    self.trident_shot_from_crossbow = TridentShotFromCrossbow(bitfield & 0x4 != 0);
+                    self.trident_no_physics = TridentNoPhysics(bitfield & 0x2 != 0);
                 }
-                9 => *self.trident_pierce_level = TridentPierceLevel(d.value.into_byte()?),
-                10 => *self.loyalty = Loyalty(d.value.into_byte()?),
-                11 => *self.foil = Foil(d.value.into_boolean()?),
+                9 => self.trident_pierce_level = TridentPierceLevel(d.value.into_byte()?),
+                10 => self.loyalty = Loyalty(d.value.into_byte()?),
+                11 => self.foil = Foil(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct TropicalFishFromBucket(pub bool);
-pub struct TropicalFishTypeVariant(pub i32);
-pub struct TropicalFish;
-impl TropicalFish {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(TropicalFishFromBucket(false))
-            .add(TropicalFishTypeVariant(0))
-            .build()
+impl Default for TridentBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            trident_crit_arrow: TridentCritArrow(false),
+            trident_shot_from_crossbow: TridentShotFromCrossbow(false),
+            trident_no_physics: TridentNoPhysics(false),
+            trident_pierce_level: TridentPierceLevel(0),
+            loyalty: Loyalty(0),
+            foil: Foil(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct TropicalFishQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    tropical_fish_from_bucket: &'a mut TropicalFishFromBucket,
-    tropical_fish_type_variant: &'a mut TropicalFishTypeVariant,
+#[derive(Component)]
+pub struct TropicalFishFromBucket(pub bool);
+#[derive(Component)]
+pub struct TropicalFishTypeVariant(pub i32);
+#[derive(Component)]
+pub struct TropicalFish;
+
+#[derive(Bundle)]
+struct TropicalFishBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    tropical_fish_from_bucket: TropicalFishFromBucket,
+    tropical_fish_type_variant: TropicalFishTypeVariant,
 }
-impl TropicalFishQuery<'_> {
+impl TropicalFishBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
-                    *self.tropical_fish_from_bucket =
-                        TropicalFishFromBucket(d.value.into_boolean()?)
+                    self.tropical_fish_from_bucket = TropicalFishFromBucket(d.value.into_boolean()?)
                 }
                 17 => {
-                    *self.tropical_fish_type_variant = TropicalFishTypeVariant(d.value.into_int()?)
+                    self.tropical_fish_type_variant = TropicalFishTypeVariant(d.value.into_int()?)
                 }
             }
         }
@@ -11324,386 +11716,396 @@ impl TropicalFishQuery<'_> {
     }
 }
 
+impl Default for TropicalFishBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            tropical_fish_from_bucket: TropicalFishFromBucket(false),
+            tropical_fish_type_variant: TropicalFishTypeVariant(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct HomePos(pub BlockPos);
+#[derive(Component)]
 pub struct HasEgg(pub bool);
+#[derive(Component)]
 pub struct LayingEgg(pub bool);
+#[derive(Component)]
 pub struct TravelPos(pub BlockPos);
+#[derive(Component)]
 pub struct GoingHome(pub bool);
+#[derive(Component)]
 pub struct Travelling(pub bool);
+#[derive(Component)]
 pub struct Turtle;
-impl Turtle {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(HomePos(BlockPos::new(0, 0, 0)))
-            .add(HasEgg(false))
-            .add(LayingEgg(false))
-            .add(TravelPos(BlockPos::new(0, 0, 0)))
-            .add(GoingHome(false))
-            .add(Travelling(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct TurtleQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    home_pos: &'a mut HomePos,
-    has_egg: &'a mut HasEgg,
-    laying_egg: &'a mut LayingEgg,
-    travel_pos: &'a mut TravelPos,
-    going_home: &'a mut GoingHome,
-    travelling: &'a mut Travelling,
+#[derive(Bundle)]
+struct TurtleBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    home_pos: HomePos,
+    has_egg: HasEgg,
+    laying_egg: LayingEgg,
+    travel_pos: TravelPos,
+    going_home: GoingHome,
+    travelling: Travelling,
 }
-impl TurtleQuery<'_> {
+impl TurtleBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.home_pos = HomePos(d.value.into_block_pos()?),
-                18 => *self.has_egg = HasEgg(d.value.into_boolean()?),
-                19 => *self.laying_egg = LayingEgg(d.value.into_boolean()?),
-                20 => *self.travel_pos = TravelPos(d.value.into_block_pos()?),
-                21 => *self.going_home = GoingHome(d.value.into_boolean()?),
-                22 => *self.travelling = Travelling(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.home_pos = HomePos(d.value.into_block_pos()?),
+                18 => self.has_egg = HasEgg(d.value.into_boolean()?),
+                19 => self.laying_egg = LayingEgg(d.value.into_boolean()?),
+                20 => self.travel_pos = TravelPos(d.value.into_block_pos()?),
+                21 => self.going_home = GoingHome(d.value.into_boolean()?),
+                22 => self.travelling = Travelling(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for TurtleBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            home_pos: HomePos(BlockPos::new(0, 0, 0)),
+            has_egg: HasEgg(false),
+            laying_egg: LayingEgg(false),
+            travel_pos: TravelPos(BlockPos::new(0, 0, 0)),
+            going_home: GoingHome(false),
+            travelling: Travelling(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct VexFlags(pub u8);
+#[derive(Component)]
 pub struct Vex;
-impl Vex {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(VexFlags(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct VexQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    vex_flags: &'a mut VexFlags,
+#[derive(Bundle)]
+struct VexBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    vex_flags: VexFlags,
 }
-impl VexQuery<'_> {
+impl VexBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.vex_flags = VexFlags(d.value.into_byte()?),
+                16 => self.vex_flags = VexFlags(d.value.into_byte()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct VillagerUnhappyCounter(pub i32);
-pub struct VillagerVillagerData(pub VillagerData);
-pub struct Villager;
-impl Villager {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(VillagerUnhappyCounter(0))
-            .add(VillagerVillagerData(VillagerData {
-                kind: azalea_registry::VillagerType::Plains,
-                profession: azalea_registry::VillagerProfession::None,
-                level: 0,
-            }))
-            .build()
+impl Default for VexBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            vex_flags: VexFlags(0),
+        }
     }
 }
 
-#[derive(Query)]
-struct VillagerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    villager_unhappy_counter: &'a mut VillagerUnhappyCounter,
-    villager_villager_data: &'a mut VillagerVillagerData,
+#[derive(Component)]
+pub struct VillagerUnhappyCounter(pub i32);
+#[derive(Component)]
+pub struct VillagerVillagerData(pub VillagerData);
+#[derive(Component)]
+pub struct Villager;
+
+#[derive(Bundle)]
+struct VillagerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    villager_unhappy_counter: VillagerUnhappyCounter,
+    villager_villager_data: VillagerVillagerData,
 }
-impl VillagerQuery<'_> {
+impl VillagerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
-                17 => *self.villager_unhappy_counter = VillagerUnhappyCounter(d.value.into_int()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                17 => self.villager_unhappy_counter = VillagerUnhappyCounter(d.value.into_int()?),
                 18 => {
-                    *self.villager_villager_data =
+                    self.villager_villager_data =
                         VillagerVillagerData(d.value.into_villager_data()?)
                 }
             }
@@ -11712,118 +12114,127 @@ impl VillagerQuery<'_> {
     }
 }
 
-pub struct VindicatorIsCelebrating(pub bool);
-pub struct Vindicator;
-impl Vindicator {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(VindicatorIsCelebrating(false))
-            .build()
+impl Default for VillagerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            villager_unhappy_counter: VillagerUnhappyCounter(0),
+            villager_villager_data: VillagerVillagerData(VillagerData {
+                kind: azalea_registry::VillagerKind::Plains,
+                profession: azalea_registry::VillagerProfession::None,
+                level: 0,
+            }),
+        }
     }
 }
 
-#[derive(Query)]
-struct VindicatorQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    vindicator_is_celebrating: &'a mut VindicatorIsCelebrating,
+#[derive(Component)]
+pub struct VindicatorIsCelebrating(pub bool);
+#[derive(Component)]
+pub struct Vindicator;
+
+#[derive(Bundle)]
+struct VindicatorBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    vindicator_is_celebrating: VindicatorIsCelebrating,
 }
-impl VindicatorQuery<'_> {
+impl VindicatorBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
                 16 => {
-                    *self.vindicator_is_celebrating =
+                    self.vindicator_is_celebrating =
                         VindicatorIsCelebrating(d.value.into_boolean()?)
                 }
             }
@@ -11832,121 +12243,123 @@ impl VindicatorQuery<'_> {
     }
 }
 
-pub struct WanderingTraderUnhappyCounter(pub i32);
-pub struct WanderingTrader;
-impl WanderingTrader {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(WanderingTraderUnhappyCounter(0))
-            .build()
+impl Default for VindicatorBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            vindicator_is_celebrating: VindicatorIsCelebrating(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct WanderingTraderQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    wandering_trader_unhappy_counter: &'a mut WanderingTraderUnhappyCounter,
+#[derive(Component)]
+pub struct WanderingTraderUnhappyCounter(pub i32);
+#[derive(Component)]
+pub struct WanderingTrader;
+
+#[derive(Bundle)]
+struct WanderingTraderBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    wandering_trader_unhappy_counter: WanderingTraderUnhappyCounter,
 }
-impl WanderingTraderQuery<'_> {
+impl WanderingTraderBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
-                    *self.wandering_trader_unhappy_counter =
+                    self.wandering_trader_unhappy_counter =
                         WanderingTraderUnhappyCounter(d.value.into_int()?)
                 }
             }
@@ -11955,479 +12368,496 @@ impl WanderingTraderQuery<'_> {
     }
 }
 
+impl Default for WanderingTraderBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            wandering_trader_unhappy_counter: WanderingTraderUnhappyCounter(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ClientAngerLevel(pub i32);
+#[derive(Component)]
 pub struct Warden;
-impl Warden {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ClientAngerLevel(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WardenQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    client_anger_level: &'a mut ClientAngerLevel,
+#[derive(Bundle)]
+struct WardenBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    client_anger_level: ClientAngerLevel,
 }
-impl WardenQuery<'_> {
+impl WardenBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.client_anger_level = ClientAngerLevel(d.value.into_int()?),
+                16 => self.client_anger_level = ClientAngerLevel(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for WardenBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            client_anger_level: ClientAngerLevel(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct WitchIsCelebrating(pub bool);
+#[derive(Component)]
 pub struct WitchUsingItem(pub bool);
+#[derive(Component)]
 pub struct Witch;
-impl Witch {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(WitchIsCelebrating(false))
-            .add(WitchUsingItem(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WitchQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    witch_is_celebrating: &'a mut WitchIsCelebrating,
-    witch_using_item: &'a mut WitchUsingItem,
+#[derive(Bundle)]
+struct WitchBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    witch_is_celebrating: WitchIsCelebrating,
+    witch_using_item: WitchUsingItem,
 }
-impl WitchQuery<'_> {
+impl WitchBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.witch_is_celebrating = WitchIsCelebrating(d.value.into_boolean()?),
-                17 => *self.witch_using_item = WitchUsingItem(d.value.into_boolean()?),
+                16 => self.witch_is_celebrating = WitchIsCelebrating(d.value.into_boolean()?),
+                17 => self.witch_using_item = WitchUsingItem(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for WitchBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            witch_is_celebrating: WitchIsCelebrating(false),
+            witch_using_item: WitchUsingItem(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct TargetA(pub i32);
+#[derive(Component)]
 pub struct TargetB(pub i32);
+#[derive(Component)]
 pub struct TargetC(pub i32);
+#[derive(Component)]
 pub struct Inv(pub i32);
+#[derive(Component)]
 pub struct Wither;
-impl Wither {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(TargetA(0))
-            .add(TargetB(0))
-            .add(TargetC(0))
-            .add(Inv(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WitherQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    target_a: &'a mut TargetA,
-    target_b: &'a mut TargetB,
-    target_c: &'a mut TargetC,
-    inv: &'a mut Inv,
+#[derive(Bundle)]
+struct WitherBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    target_a: TargetA,
+    target_b: TargetB,
+    target_c: TargetC,
+    inv: Inv,
 }
-impl WitherQuery<'_> {
+impl WitherBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.target_a = TargetA(d.value.into_int()?),
-                17 => *self.target_b = TargetB(d.value.into_int()?),
-                18 => *self.target_c = TargetC(d.value.into_int()?),
-                19 => *self.inv = Inv(d.value.into_int()?),
+                16 => self.target_a = TargetA(d.value.into_int()?),
+                17 => self.target_b = TargetB(d.value.into_int()?),
+                18 => self.target_c = TargetC(d.value.into_int()?),
+                19 => self.inv = Inv(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for WitherBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            target_a: TargetA(0),
+            target_b: TargetB(0),
+            target_c: TargetC(0),
+            inv: Inv(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct WitherSkeleton;
-impl WitherSkeleton {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WitherSkeletonQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
+#[derive(Bundle)]
+struct WitherSkeletonBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
 }
-impl WitherSkeletonQuery<'_> {
+impl WitherSkeletonBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
             }
         }
@@ -12435,598 +12865,612 @@ impl WitherSkeletonQuery<'_> {
     }
 }
 
+impl Default for WitherSkeletonBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Dangerous(pub bool);
+#[derive(Component)]
 pub struct WitherSkull;
-impl WitherSkull {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(Dangerous(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WitherSkullQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    dangerous: &'a mut Dangerous,
+#[derive(Bundle)]
+struct WitherSkullBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    dangerous: Dangerous,
 }
-impl WitherSkullQuery<'_> {
+impl WitherSkullBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
-                8 => *self.dangerous = Dangerous(d.value.into_boolean()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                8 => self.dangerous = Dangerous(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for WitherSkullBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            dangerous: Dangerous(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct WolfInterested(pub bool);
+#[derive(Component)]
 pub struct WolfCollarColor(pub i32);
+#[derive(Component)]
 pub struct WolfRemainingAngerTime(pub i32);
+#[derive(Component)]
 pub struct Wolf;
-impl Wolf {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(Tame(false))
-            .add(InSittingPose(false))
-            .add(Owneruuid(None))
-            .add(WolfInterested(false))
-            .add(WolfCollarColor(Default::default()))
-            .add(WolfRemainingAngerTime(0))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct WolfQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    tame: &'a mut Tame,
-    in_sitting_pose: &'a mut InSittingPose,
-    owneruuid: &'a mut Owneruuid,
-    wolf_interested: &'a mut WolfInterested,
-    wolf_collar_color: &'a mut WolfCollarColor,
-    wolf_remaining_anger_time: &'a mut WolfRemainingAngerTime,
+#[derive(Bundle)]
+struct WolfBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    tame: Tame,
+    in_sitting_pose: InSittingPose,
+    owneruuid: Owneruuid,
+    wolf_interested: WolfInterested,
+    wolf_collar_color: WolfCollarColor,
+    wolf_remaining_anger_time: WolfRemainingAngerTime,
 }
-impl WolfQuery<'_> {
+impl WolfBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.tame = Tame(bitfield & 0x4 != 0);
-                    *self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
+                    self.tame = Tame(bitfield & 0x4 != 0);
+                    self.in_sitting_pose = InSittingPose(bitfield & 0x1 != 0);
                 }
-                18 => *self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
-                19 => *self.wolf_interested = WolfInterested(d.value.into_boolean()?),
-                20 => *self.wolf_collar_color = WolfCollarColor(d.value.into_int()?),
-                21 => *self.wolf_remaining_anger_time = WolfRemainingAngerTime(d.value.into_int()?),
+                18 => self.owneruuid = Owneruuid(d.value.into_optional_uuid()?),
+                19 => self.wolf_interested = WolfInterested(d.value.into_boolean()?),
+                20 => self.wolf_collar_color = WolfCollarColor(d.value.into_int()?),
+                21 => self.wolf_remaining_anger_time = WolfRemainingAngerTime(d.value.into_int()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for WolfBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            tame: Tame(false),
+            in_sitting_pose: InSittingPose(false),
+            owneruuid: Owneruuid(None),
+            wolf_interested: WolfInterested(false),
+            wolf_collar_color: WolfCollarColor(Default::default()),
+            wolf_remaining_anger_time: WolfRemainingAngerTime(0),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct ZoglinBaby(pub bool);
+#[derive(Component)]
 pub struct Zoglin;
-impl Zoglin {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZoglinBaby(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ZoglinQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zoglin_baby: &'a mut ZoglinBaby,
+#[derive(Bundle)]
+struct ZoglinBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zoglin_baby: ZoglinBaby,
 }
-impl ZoglinQuery<'_> {
+impl ZoglinBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zoglin_baby = ZoglinBaby(d.value.into_boolean()?),
+                16 => self.zoglin_baby = ZoglinBaby(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ZoglinBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zoglin_baby: ZoglinBaby(false),
+        }
+    }
+}
+
+#[derive(Component)]
 pub struct Zombie;
-impl Zombie {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZombieBaby(false))
-            .add(SpecialType(0))
-            .add(DrownedConversion(false))
-            .build()
-    }
-}
 
-#[derive(Query)]
-struct ZombieQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zombie_baby: &'a mut ZombieBaby,
-    special_type: &'a mut SpecialType,
-    drowned_conversion: &'a mut DrownedConversion,
+#[derive(Bundle)]
+struct ZombieBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zombie_baby: ZombieBaby,
+    special_type: SpecialType,
+    drowned_conversion: DrownedConversion,
 }
-impl ZombieQuery<'_> {
+impl ZombieBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
-                17 => *self.special_type = SpecialType(d.value.into_int()?),
-                18 => *self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
+                16 => self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
+                17 => self.special_type = SpecialType(d.value.into_int()?),
+                18 => self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
-pub struct ZombieHorseTamed(pub bool);
-pub struct ZombieHorseEating(pub bool);
-pub struct ZombieHorseStanding(pub bool);
-pub struct ZombieHorseBred(pub bool);
-pub struct ZombieHorseSaddled(pub bool);
-pub struct ZombieHorseOwnerUuid(pub Option<Uuid>);
-pub struct ZombieHorse;
-impl ZombieHorse {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(AbstractAgeableBaby(false))
-            .add(ZombieHorseTamed(false))
-            .add(ZombieHorseEating(false))
-            .add(ZombieHorseStanding(false))
-            .add(ZombieHorseBred(false))
-            .add(ZombieHorseSaddled(false))
-            .add(ZombieHorseOwnerUuid(None))
-            .build()
+impl Default for ZombieBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zombie_baby: ZombieBaby(false),
+            special_type: SpecialType(0),
+            drowned_conversion: DrownedConversion(false),
+        }
     }
 }
 
-#[derive(Query)]
-struct ZombieHorseQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    abstract_ageable_baby: &'a mut AbstractAgeableBaby,
-    zombie_horse_tamed: &'a mut ZombieHorseTamed,
-    zombie_horse_eating: &'a mut ZombieHorseEating,
-    zombie_horse_standing: &'a mut ZombieHorseStanding,
-    zombie_horse_bred: &'a mut ZombieHorseBred,
-    zombie_horse_saddled: &'a mut ZombieHorseSaddled,
-    zombie_horse_owner_uuid: &'a mut ZombieHorseOwnerUuid,
+#[derive(Component)]
+pub struct ZombieHorseTamed(pub bool);
+#[derive(Component)]
+pub struct ZombieHorseEating(pub bool);
+#[derive(Component)]
+pub struct ZombieHorseStanding(pub bool);
+#[derive(Component)]
+pub struct ZombieHorseBred(pub bool);
+#[derive(Component)]
+pub struct ZombieHorseSaddled(pub bool);
+#[derive(Component)]
+pub struct ZombieHorseOwnerUuid(pub Option<Uuid>);
+#[derive(Component)]
+pub struct ZombieHorse;
+
+#[derive(Bundle)]
+struct ZombieHorseBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    abstract_ageable_baby: AbstractAgeableBaby,
+    zombie_horse_tamed: ZombieHorseTamed,
+    zombie_horse_eating: ZombieHorseEating,
+    zombie_horse_standing: ZombieHorseStanding,
+    zombie_horse_bred: ZombieHorseBred,
+    zombie_horse_saddled: ZombieHorseSaddled,
+    zombie_horse_owner_uuid: ZombieHorseOwnerUuid,
 }
-impl ZombieHorseQuery<'_> {
+impl ZombieHorseBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
+                16 => self.abstract_ageable_baby = AbstractAgeableBaby(d.value.into_boolean()?),
                 17 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.zombie_horse_tamed = ZombieHorseTamed(bitfield & 0x2 != 0);
-                    *self.zombie_horse_eating = ZombieHorseEating(bitfield & 0x10 != 0);
-                    *self.zombie_horse_standing = ZombieHorseStanding(bitfield & 0x20 != 0);
-                    *self.zombie_horse_bred = ZombieHorseBred(bitfield & 0x8 != 0);
-                    *self.zombie_horse_saddled = ZombieHorseSaddled(bitfield & 0x4 != 0);
+                    self.zombie_horse_tamed = ZombieHorseTamed(bitfield & 0x2 != 0);
+                    self.zombie_horse_eating = ZombieHorseEating(bitfield & 0x10 != 0);
+                    self.zombie_horse_standing = ZombieHorseStanding(bitfield & 0x20 != 0);
+                    self.zombie_horse_bred = ZombieHorseBred(bitfield & 0x8 != 0);
+                    self.zombie_horse_saddled = ZombieHorseSaddled(bitfield & 0x4 != 0);
                 }
                 18 => {
-                    *self.zombie_horse_owner_uuid =
+                    self.zombie_horse_owner_uuid =
                         ZombieHorseOwnerUuid(d.value.into_optional_uuid()?)
                 }
             }
@@ -13035,135 +13479,137 @@ impl ZombieHorseQuery<'_> {
     }
 }
 
-pub struct Converting(pub bool);
-pub struct ZombieVillagerVillagerData(pub VillagerData);
-pub struct ZombieVillager;
-impl ZombieVillager {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZombieBaby(false))
-            .add(SpecialType(0))
-            .add(DrownedConversion(false))
-            .add(Converting(false))
-            .add(ZombieVillagerVillagerData(VillagerData {
-                kind: azalea_registry::VillagerType::Plains,
-                profession: azalea_registry::VillagerProfession::None,
-                level: 0,
-            }))
-            .build()
+impl Default for ZombieHorseBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            abstract_ageable_baby: AbstractAgeableBaby(false),
+            zombie_horse_tamed: ZombieHorseTamed(false),
+            zombie_horse_eating: ZombieHorseEating(false),
+            zombie_horse_standing: ZombieHorseStanding(false),
+            zombie_horse_bred: ZombieHorseBred(false),
+            zombie_horse_saddled: ZombieHorseSaddled(false),
+            zombie_horse_owner_uuid: ZombieHorseOwnerUuid(None),
+        }
     }
 }
 
-#[derive(Query)]
-struct ZombieVillagerQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zombie_baby: &'a mut ZombieBaby,
-    special_type: &'a mut SpecialType,
-    drowned_conversion: &'a mut DrownedConversion,
-    converting: &'a mut Converting,
-    zombie_villager_villager_data: &'a mut ZombieVillagerVillagerData,
+#[derive(Component)]
+pub struct Converting(pub bool);
+#[derive(Component)]
+pub struct ZombieVillagerVillagerData(pub VillagerData);
+#[derive(Component)]
+pub struct ZombieVillager;
+
+#[derive(Bundle)]
+struct ZombieVillagerBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zombie_baby: ZombieBaby,
+    special_type: SpecialType,
+    drowned_conversion: DrownedConversion,
+    converting: Converting,
+    zombie_villager_villager_data: ZombieVillagerVillagerData,
 }
-impl ZombieVillagerQuery<'_> {
+impl ZombieVillagerBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
-                17 => *self.special_type = SpecialType(d.value.into_int()?),
-                18 => *self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
-                19 => *self.converting = Converting(d.value.into_boolean()?),
+                16 => self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
+                17 => self.special_type = SpecialType(d.value.into_int()?),
+                18 => self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
+                19 => self.converting = Converting(d.value.into_boolean()?),
                 20 => {
-                    *self.zombie_villager_villager_data =
+                    self.zombie_villager_villager_data =
                         ZombieVillagerVillagerData(d.value.into_villager_data()?)
                 }
             }
@@ -13172,607 +13618,650 @@ impl ZombieVillagerQuery<'_> {
     }
 }
 
-pub struct ZombifiedPiglin;
-impl ZombifiedPiglin {
-    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {
-        builder
-            .add(OnFire(false))
-            .add(ShiftKeyDown(false))
-            .add(Sprinting(false))
-            .add(Swimming(false))
-            .add(CurrentlyGlowing(false))
-            .add(Invisible(false))
-            .add(FallFlying(false))
-            .add(AirSupply(Default::default()))
-            .add(CustomName(None))
-            .add(CustomNameVisible(false))
-            .add(Silent(false))
-            .add(NoGravity(false))
-            .add(Pose::default())
-            .add(TicksFrozen(0))
-            .add(AutoSpinAttack(false))
-            .add(AbstractLivingUsingItem(false))
-            .add(Health(1.0))
-            .add(AbstractLivingEffectColor(0))
-            .add(EffectAmbience(false))
-            .add(ArrowCount(0))
-            .add(StingerCount(0))
-            .add(SleepingPos(None))
-            .add(NoAi(false))
-            .add(LeftHanded(false))
-            .add(Aggressive(false))
-            .add(ZombieBaby(false))
-            .add(SpecialType(0))
-            .add(DrownedConversion(false))
-            .build()
+impl Default for ZombieVillagerBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zombie_baby: ZombieBaby(false),
+            special_type: SpecialType(0),
+            drowned_conversion: DrownedConversion(false),
+            converting: Converting(false),
+            zombie_villager_villager_data: ZombieVillagerVillagerData(VillagerData {
+                kind: azalea_registry::VillagerKind::Plains,
+                profession: azalea_registry::VillagerProfession::None,
+                level: 0,
+            }),
+        }
     }
 }
 
-#[derive(Query)]
-struct ZombifiedPiglinQuery<'a> {
-    on_fire: &'a mut OnFire,
-    shift_key_down: &'a mut ShiftKeyDown,
-    sprinting: &'a mut Sprinting,
-    swimming: &'a mut Swimming,
-    currently_glowing: &'a mut CurrentlyGlowing,
-    invisible: &'a mut Invisible,
-    fall_flying: &'a mut FallFlying,
-    air_supply: &'a mut AirSupply,
-    custom_name: &'a mut CustomName,
-    custom_name_visible: &'a mut CustomNameVisible,
-    silent: &'a mut Silent,
-    no_gravity: &'a mut NoGravity,
-    pose: &'a mut Pose,
-    ticks_frozen: &'a mut TicksFrozen,
-    auto_spin_attack: &'a mut AutoSpinAttack,
-    abstract_living_using_item: &'a mut AbstractLivingUsingItem,
-    health: &'a mut Health,
-    abstract_living_effect_color: &'a mut AbstractLivingEffectColor,
-    effect_ambience: &'a mut EffectAmbience,
-    arrow_count: &'a mut ArrowCount,
-    stinger_count: &'a mut StingerCount,
-    sleeping_pos: &'a mut SleepingPos,
-    no_ai: &'a mut NoAi,
-    left_handed: &'a mut LeftHanded,
-    aggressive: &'a mut Aggressive,
-    zombie_baby: &'a mut ZombieBaby,
-    special_type: &'a mut SpecialType,
-    drowned_conversion: &'a mut DrownedConversion,
+#[derive(Component)]
+pub struct ZombifiedPiglin;
+
+#[derive(Bundle)]
+struct ZombifiedPiglinBundle {
+    on_fire: OnFire,
+    shift_key_down: ShiftKeyDown,
+    sprinting: Sprinting,
+    swimming: Swimming,
+    currently_glowing: CurrentlyGlowing,
+    invisible: Invisible,
+    fall_flying: FallFlying,
+    air_supply: AirSupply,
+    custom_name: CustomName,
+    custom_name_visible: CustomNameVisible,
+    silent: Silent,
+    no_gravity: NoGravity,
+    pose: Pose,
+    ticks_frozen: TicksFrozen,
+    auto_spin_attack: AutoSpinAttack,
+    abstract_living_using_item: AbstractLivingUsingItem,
+    health: Health,
+    abstract_living_effect_color: AbstractLivingEffectColor,
+    effect_ambience: EffectAmbience,
+    arrow_count: ArrowCount,
+    stinger_count: StingerCount,
+    sleeping_pos: SleepingPos,
+    no_ai: NoAi,
+    left_handed: LeftHanded,
+    aggressive: Aggressive,
+    zombie_baby: ZombieBaby,
+    special_type: SpecialType,
+    drowned_conversion: DrownedConversion,
 }
-impl ZombifiedPiglinQuery<'_> {
+impl ZombifiedPiglinBundle {
     pub fn update_metadata(
         &mut self,
-        world: hecs::World,
-        entity: hecs::Entity,
+        ecs: bevy_ecs::world::World,
+        entity: bevy_ecs::world::EntityMut,
         data: EntityMetadataItems,
     ) -> Result<(), UpdateMetadataError> {
         for d in data.0 {
             match d.index {
                 0 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.on_fire = OnFire(bitfield & 0x1 != 0);
-                    *self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
-                    *self.sprinting = Sprinting(bitfield & 0x8 != 0);
-                    *self.swimming = Swimming(bitfield & 0x10 != 0);
-                    *self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
-                    *self.invisible = Invisible(bitfield & 0x20 != 0);
-                    *self.fall_flying = FallFlying(bitfield & 0x80 != 0);
+                    self.on_fire = OnFire(bitfield & 0x1 != 0);
+                    self.shift_key_down = ShiftKeyDown(bitfield & 0x2 != 0);
+                    self.sprinting = Sprinting(bitfield & 0x8 != 0);
+                    self.swimming = Swimming(bitfield & 0x10 != 0);
+                    self.currently_glowing = CurrentlyGlowing(bitfield & 0x40 != 0);
+                    self.invisible = Invisible(bitfield & 0x20 != 0);
+                    self.fall_flying = FallFlying(bitfield & 0x80 != 0);
                 }
-                1 => *self.air_supply = AirSupply(d.value.into_int()?),
-                2 => *self.custom_name = CustomName(d.value.into_optional_component()?),
-                3 => *self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
-                4 => *self.silent = Silent(d.value.into_boolean()?),
-                5 => *self.no_gravity = NoGravity(d.value.into_boolean()?),
-                6 => *self.pose = d.value.into_pose()?,
-                7 => *self.ticks_frozen = TicksFrozen(d.value.into_int()?),
+                1 => self.air_supply = AirSupply(d.value.into_int()?),
+                2 => self.custom_name = CustomName(d.value.into_optional_component()?),
+                3 => self.custom_name_visible = CustomNameVisible(d.value.into_boolean()?),
+                4 => self.silent = Silent(d.value.into_boolean()?),
+                5 => self.no_gravity = NoGravity(d.value.into_boolean()?),
+                6 => self.pose = d.value.into_pose()?,
+                7 => self.ticks_frozen = TicksFrozen(d.value.into_int()?),
                 8 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
-                    *self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
+                    self.auto_spin_attack = AutoSpinAttack(bitfield & 0x4 != 0);
+                    self.abstract_living_using_item = AbstractLivingUsingItem(bitfield & 0x1 != 0);
                 }
-                9 => *self.health = Health(d.value.into_float()?),
+                9 => self.health = Health(d.value.into_float()?),
                 10 => {
-                    *self.abstract_living_effect_color =
+                    self.abstract_living_effect_color =
                         AbstractLivingEffectColor(d.value.into_int()?)
                 }
-                11 => *self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
-                12 => *self.arrow_count = ArrowCount(d.value.into_int()?),
-                13 => *self.stinger_count = StingerCount(d.value.into_int()?),
-                14 => *self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
+                11 => self.effect_ambience = EffectAmbience(d.value.into_boolean()?),
+                12 => self.arrow_count = ArrowCount(d.value.into_int()?),
+                13 => self.stinger_count = StingerCount(d.value.into_int()?),
+                14 => self.sleeping_pos = SleepingPos(d.value.into_optional_block_pos()?),
                 15 => {
                     let bitfield = d.value.into_byte()?;
-                    *self.no_ai = NoAi(bitfield & 0x1 != 0);
-                    *self.left_handed = LeftHanded(bitfield & 0x2 != 0);
-                    *self.aggressive = Aggressive(bitfield & 0x4 != 0);
+                    self.no_ai = NoAi(bitfield & 0x1 != 0);
+                    self.left_handed = LeftHanded(bitfield & 0x2 != 0);
+                    self.aggressive = Aggressive(bitfield & 0x4 != 0);
                 }
-                16 => *self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
-                17 => *self.special_type = SpecialType(d.value.into_int()?),
-                18 => *self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
+                16 => self.zombie_baby = ZombieBaby(d.value.into_boolean()?),
+                17 => self.special_type = SpecialType(d.value.into_int()?),
+                18 => self.drowned_conversion = DrownedConversion(d.value.into_boolean()?),
             }
         }
         Ok(())
     }
 }
 
+impl Default for ZombifiedPiglinBundle {
+    fn default() -> Self {
+        Self {
+            on_fire: OnFire(false),
+            shift_key_down: ShiftKeyDown(false),
+            sprinting: Sprinting(false),
+            swimming: Swimming(false),
+            currently_glowing: CurrentlyGlowing(false),
+            invisible: Invisible(false),
+            fall_flying: FallFlying(false),
+            air_supply: AirSupply(Default::default()),
+            custom_name: CustomName(None),
+            custom_name_visible: CustomNameVisible(false),
+            silent: Silent(false),
+            no_gravity: NoGravity(false),
+            pose: Pose::default(),
+            ticks_frozen: TicksFrozen(0),
+            auto_spin_attack: AutoSpinAttack(false),
+            abstract_living_using_item: AbstractLivingUsingItem(false),
+            health: Health(1.0),
+            abstract_living_effect_color: AbstractLivingEffectColor(0),
+            effect_ambience: EffectAmbience(false),
+            arrow_count: ArrowCount(0),
+            stinger_count: StingerCount(0),
+            sleeping_pos: SleepingPos(None),
+            no_ai: NoAi(false),
+            left_handed: LeftHanded(false),
+            aggressive: Aggressive(false),
+            zombie_baby: ZombieBaby(false),
+            special_type: SpecialType(0),
+            drowned_conversion: DrownedConversion(false),
+        }
+    }
+}
+
 fn update_metadata(
-    world: hecs::World,
-    entity: hecs::Entity,
+    ecs: bevy_ecs::world::World,
+    entity: bevy_ecs::world::EntityMut,
     data: EntityMetadataItems,
 ) -> Result<(), UpdateMetadataError> {
-    if let Ok(e) = world.query_one_mut::<AllayQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<AllayBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<AreaEffectCloudQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<AreaEffectCloudBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ArmorStandQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ArmorStandBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ArrowQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ArrowBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<AxolotlQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<AxolotlBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<BatQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<BatBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<BeeQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<BeeBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<BlazeQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<BlazeBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<BoatQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<BoatBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CamelQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CamelBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CatQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CatBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CaveSpiderQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CaveSpiderBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ChestBoatQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ChestBoatBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ChestMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ChestMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ChickenQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ChickenBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CodQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CodBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CommandBlockMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CommandBlockMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CowQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CowBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<CreeperQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<CreeperBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<DolphinQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<DolphinBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<DonkeyQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<DonkeyBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<DragonFireballQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<DragonFireballBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<DrownedQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<DrownedBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EggQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EggBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ElderGuardianQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ElderGuardianBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EndCrystalQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EndCrystalBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EnderDragonQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EnderDragonBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EnderPearlQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EnderPearlBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EndermanQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EndermanBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EndermiteQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EndermiteBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EvokerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EvokerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EvokerFangsQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EvokerFangsBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ExperienceBottleQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ExperienceBottleBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ExperienceOrbQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ExperienceOrbBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<EyeOfEnderQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<EyeOfEnderBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FallingBlockQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FallingBlockBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FireballQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FireballBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FireworkRocketQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FireworkRocketBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FishingBobberQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FishingBobberBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FoxQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FoxBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FrogQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FrogBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<FurnaceMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<FurnaceMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GhastQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GhastBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GiantQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GiantBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GlowItemFrameQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GlowItemFrameBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GlowSquidQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GlowSquidBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GoatQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GoatBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<GuardianQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<GuardianBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<HoglinQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<HoglinBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<HopperMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<HopperMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<HorseQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<HorseBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<HuskQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<HuskBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<IllusionerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<IllusionerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<IronGolemQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<IronGolemBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ItemQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ItemBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ItemFrameQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ItemFrameBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<LeashKnotQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<LeashKnotBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<LightningBoltQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<LightningBoltBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<LlamaQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<LlamaBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<LlamaSpitQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<LlamaSpitBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<MagmaCubeQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<MagmaCubeBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<MarkerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<MarkerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<MinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<MinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<MooshroomQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<MooshroomBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<MuleQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<MuleBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<OcelotQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<OcelotBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PaintingQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PaintingBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PandaQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PandaBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ParrotQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ParrotBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PhantomQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PhantomBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PigQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PigBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PiglinQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PiglinBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PiglinBruteQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PiglinBruteBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PillagerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PillagerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PlayerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PlayerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PolarBearQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PolarBearBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PotionQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PotionBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<PufferfishQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<PufferfishBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<RabbitQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<RabbitBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<RavagerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<RavagerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SalmonQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SalmonBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SheepQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SheepBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ShulkerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ShulkerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ShulkerBulletQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ShulkerBulletBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SilverfishQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SilverfishBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SkeletonQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SkeletonBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SkeletonHorseQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SkeletonHorseBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SlimeQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SlimeBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SmallFireballQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SmallFireballBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SnowGolemQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SnowGolemBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SnowballQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SnowballBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SpawnerMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SpawnerMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SpectralArrowQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SpectralArrowBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SpiderQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SpiderBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<SquidQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<SquidBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<StrayQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<StrayBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<StriderQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<StriderBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TadpoleQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TadpoleBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TntQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TntBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TntMinecartQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TntMinecartBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TraderLlamaQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TraderLlamaBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TridentQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TridentBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TropicalFishQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TropicalFishBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<TurtleQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<TurtleBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<VexQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<VexBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<VillagerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<VillagerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<VindicatorQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<VindicatorBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WanderingTraderQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WanderingTraderBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WardenQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WardenBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WitchQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WitchBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WitherQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WitherBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WitherSkeletonQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WitherSkeletonBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WitherSkullQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WitherSkullBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<WolfQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<WolfBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ZoglinQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ZoglinBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ZombieQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ZombieBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ZombieHorseQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ZombieHorseBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ZombieVillagerQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ZombieVillagerBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
-    if let Ok(e) = world.query_one_mut::<ZombifiedPiglinQuery>(entity) {
-        e.update_metadata(world, entity, data)?;
+    if let Ok(e) = world.query_one_mut::<ZombifiedPiglinBundle>(entity) {
+        e.update_metadata(ecs, entity, data)?;
         return Ok(());
     }
     Ok(())
diff --git a/codegen/lib/code/entity.py b/codegen/lib/code/entity.py
index a1060468..e50e9c33 100644
--- a/codegen/lib/code/entity.py
+++ b/codegen/lib/code/entity.py
@@ -15,8 +15,8 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
         {'name': 'Long', 'type': 'i64'},
         {'name': 'Float', 'type': 'f32'},
         {'name': 'String', 'type': 'String'},
-        {'name': 'Component', 'type': 'Component'},
-        {'name': 'OptionalComponent', 'type': 'Option<Component>'},
+        {'name': 'Component', 'type': 'FormattedText'},
+        {'name': 'OptionalComponent', 'type': 'Option<FormattedText>'},
         {'name': 'ItemStack', 'type': 'Slot'},
         {'name': 'Boolean', 'type': 'bool'},
         {'name': 'Rotations', 'type': 'Rotations'},
@@ -45,9 +45,9 @@ use super::{
     EntityDataValue, EntityMetadataItems, OptionalUnsignedInt, Pose, Rotations, VillagerData,
 };
 use azalea_block::BlockState;
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
 use azalea_core::{BlockPos, Direction, Particle, Slot};
-use hecs::{Query, EntityBuilder, BuiltEntity};
+use bevy_ecs::{bundle::Bundle, component::Component};
 use thiserror::Error;
 use uuid::Uuid;
 
@@ -160,33 +160,124 @@ impl From<EntityDataValue> for UpdateMetadataError {
                 metadata_type_data = metadata_types[type_id]
                 rust_type = metadata_type_data['type']
 
+                code.append(f'#[derive(Component)]')
                 code.append(f'pub struct {struct_name}(pub {rust_type});')
             else:
                 # if it's a bitfield just make a struct for each bit
                 for mask, name in name_or_bitfield.items():
                     name = maybe_rename_field(name, index)
                     struct_name = upper_first_letter(to_camel_case(name))
+                    code.append(f'#[derive(Component)]')
                     code.append(f'pub struct {struct_name}(pub bool);')
 
         # add the entity struct and Query struct
         is_actually_entity = not entity_id.startswith('~')
         if is_actually_entity:
             struct_name: str = upper_first_letter(to_camel_case(entity_id))
+            code.append(f'#[derive(Component)]')
             code.append(f'pub struct {struct_name};')
 
-            # impl Allay {
-            #     pub fn default(builder: &mut EntityBuilder) {
-            #         builder
-            #             .add(OnFire(false))
-            #             .add(ShiftKeyDown(false))
-            #             .add(Sprinting(false))
-            #             .add(Swimming(false));
+            # #[derive(Bundle)]
+            # struct AllayBundle {
+            #     health: Health,
+            #     ...
+            #     dancing: Dancing,
+            #     can_duplicate: CanDuplicate,
+            # }
+            bundle_struct_name = f'{struct_name}Bundle'
+            code.append(f'')
+            code.append(f'#[derive(Bundle)]')
+            code.append(f'struct {bundle_struct_name} {{')
+            for index, name_or_bitfield in enumerate(all_field_names_or_bitfields):
+                if isinstance(name_or_bitfield, str):
+                    name_or_bitfield = maybe_rename_field(
+                        name_or_bitfield, index)
+                    struct_name = upper_first_letter(
+                        to_camel_case(name_or_bitfield))
+                    code.append(
+                        f'    {name_or_bitfield}: {struct_name},')
+                else:
+                    for mask, name in name_or_bitfield.items():
+                        name = maybe_rename_field(name, index)
+
+                        struct_name = upper_first_letter(to_camel_case(name))
+                        code.append(f'    {name}: {struct_name},')
+            code.append('}')
+
+            # impl AllayBundle {
+            #     pub fn update_metadata(
+            #         &mut self,
+            #         ecs: bevy_ecs::world::World,
+            #         entity: bevy_ecs::world::EntityMut,
+            #         data: EntityMetadataItems,
+            #     ) -> Result<(), UpdateMetadataError> {
+            #         for d in data.0 {
+            #             match d.index {
+            #                 0 => self.health = Health(d.value.into_float()?),
+            #                 1 => self.dancing = Dancing(d.value.into_boolean()?),
+            #                 2 => self.can_duplicate = CanDuplicate(d.value.into_boolean()?),
+            #             }
+            #         }
+            #         Ok(())
             #     }
             # }
-            code.append(f'impl {struct_name} {{')
+            code.append(f'impl {bundle_struct_name} {{')
             code.append(
-                '    pub fn default(builder: &mut EntityBuilder) -> BuiltEntity {')
-            code.append('        builder')
+                f'    pub fn update_metadata(&mut self, ecs: bevy_ecs::world::World, entity: bevy_ecs::world::EntityMut, data: EntityMetadataItems) -> Result<(), UpdateMetadataError> {{')
+            code.append(f'        for d in data.0 {{')
+            code.append(f'            match d.index {{')
+            for index, name_or_bitfield in enumerate(all_field_names_or_bitfields):
+                if isinstance(name_or_bitfield, str):
+                    name_or_bitfield = maybe_rename_field(
+                        name_or_bitfield, index)
+
+                    struct_name = upper_first_letter(
+                        to_camel_case(name_or_bitfield))
+                    if name_or_bitfield in single_use_imported_types:
+                        struct_name = ''
+
+                    type_id = next(filter(lambda i: i['index'] == index, entity_metadatas))[
+                        'type_id']
+                    metadata_type_data = metadata_types[type_id]
+                    rust_type = metadata_type_data['type']
+                    type_name = metadata_type_data['name']
+
+                    type_name_field = to_snake_case(type_name)
+                    read_field_code = f'{struct_name}(d.value.into_{type_name_field}()?)' if struct_name else f'd.value.into_{type_name_field}()?'
+                    code.append(
+                        f'                {index} => self.{name_or_bitfield} = {read_field_code},')
+                else:
+                    code.append(f'                {index} => {{')
+                    code.append(
+                        f'let bitfield = d.value.into_byte()?;')
+                    for mask, name in name_or_bitfield.items():
+                        name = maybe_rename_field(name, index)
+                        struct_name = upper_first_letter(to_camel_case(name))
+
+                        code.append(
+                            f'self.{name} = {struct_name}(bitfield & {mask} != 0);')
+                    code.append('                },')
+            code.append('            }')
+            code.append('        }')
+            code.append('        Ok(())')
+            code.append('    }')
+            code.append('}')
+            code.append('')
+
+            # impl Default for AllayBundle {
+            #     fn default() -> Self {
+            #         Self {
+            #             on_fire: OnFire(false),
+            #             shift_key_down: ShiftKeyDown(false),
+            #             sprinting: Sprinting(false),
+            #             swimming: Swimming(false)
+            #        }
+            #     }
+            # }
+            code.append(f'impl Default for {bundle_struct_name} {{')
+            code.append(
+                '    fn default() -> Self {')
+            code.append('        Self {')
             for index, name_or_bitfield in enumerate(all_field_names_or_bitfields):
                 default = next(filter(lambda i: i['index'] == index, entity_metadatas)).get(
                     'default', 'Default::default()')
@@ -212,7 +303,7 @@ impl From<EntityDataValue> for UpdateMetadataError {
                         elif type_name == 'FrogVariant':
                             default = 'azalea_registry::FrogVariant::Temperate'
                         elif type_name == 'VillagerData':
-                            default = 'VillagerData { kind: azalea_registry::VillagerType::Plains, profession: azalea_registry::VillagerProfession::None, level: 0 }'
+                            default = 'VillagerData { kind: azalea_registry::VillagerKind::Plains, profession: azalea_registry::VillagerProfession::None, level: 0 }'
                         else:
                             default = f'{type_name}::default()' if name in single_use_imported_types else 'Default::default()'
                     else:
@@ -238,10 +329,10 @@ impl From<EntityDataValue> for UpdateMetadataError {
                         elif type_name == 'CompoundTag':
                             default = f'azalea_nbt::Tag::Compound({default})' if default != 'Empty' else 'azalea_nbt::Tag::Compound(Default::default())'
                     if name in single_use_imported_types:
-                        code.append(f'            .add({default})')
+                        code.append(f'            {name}: {default},')
                     else:
                         code.append(
-                            f'            .add({upper_first_letter(to_camel_case(name))}({default}))')
+                            f'            {name}: {upper_first_letter(to_camel_case(name))}({default}),')
                 else:
                     # if it's a bitfield, we'll have to extract the default for
                     # each bool from each bit in the default
@@ -251,94 +342,8 @@ impl From<EntityDataValue> for UpdateMetadataError {
                         bit_default = 'true' if (
                             default & mask != 0) else 'false'
                         code.append(
-                            f'            .add({upper_first_letter(to_camel_case(name))}({bit_default}))')
-            code.append(f'            .build()')
-            code.append('    }')
-            code.append('}')
-
-            # #[derive(Query)]
-            # struct AllayQuery<'a> {
-            #     health: &'a mut Health,
-            #     ...
-            #     dancing: &'a mut Dancing,
-            #     can_duplicate: &'a mut CanDuplicate,
-            # }
-            query_struct_name = f'{struct_name}Query'
-            code.append(f'')
-            code.append(f'#[derive(Query)]')
-            code.append(f'struct {query_struct_name}<\'a> {{')
-            for index, name_or_bitfield in enumerate(all_field_names_or_bitfields):
-                if isinstance(name_or_bitfield, str):
-                    name_or_bitfield = maybe_rename_field(
-                        name_or_bitfield, index)
-                    struct_name = upper_first_letter(
-                        to_camel_case(name_or_bitfield))
-                    code.append(
-                        f'    {name_or_bitfield}: &\'a mut {struct_name},')
-                else:
-                    for mask, name in name_or_bitfield.items():
-                        name = maybe_rename_field(name, index)
-
-                        struct_name = upper_first_letter(to_camel_case(name))
-                        code.append(f'    {name}: &\'a mut {struct_name},')
-            code.append('}')
-
-            # impl AllayQuery<'_> {
-            #     pub fn update_metadata(
-            #         &mut self,
-            #         world: hecs::World,
-            #         entity: hecs::Entity,
-            #         data: EntityMetadataItems,
-            #     ) -> Result<(), UpdateMetadataError> {
-            #         for d in data.0 {
-            #             match d.index {
-            #                 0 => *self.health = Health(d.value.into_float()?),
-            #                 1 => *self.dancing = Dancing(d.value.into_boolean()?),
-            #                 2 => *self.can_duplicate = CanDuplicate(d.value.into_boolean()?),
-            #             }
-            #         }
-            #         Ok(())
-            #     }
-            # }
-            code.append(f'impl {query_struct_name}<\'_> {{')
-            code.append(
-                f'    pub fn update_metadata(&mut self, world: hecs::World, entity: hecs::Entity, data: EntityMetadataItems) -> Result<(), UpdateMetadataError> {{')
-            code.append(f'        for d in data.0 {{')
-            code.append(f'            match d.index {{')
-            for index, name_or_bitfield in enumerate(all_field_names_or_bitfields):
-                if isinstance(name_or_bitfield, str):
-                    name_or_bitfield = maybe_rename_field(
-                        name_or_bitfield, index)
-
-                    struct_name = upper_first_letter(
-                        to_camel_case(name_or_bitfield))
-                    if name_or_bitfield in single_use_imported_types:
-                        struct_name = ''
-
-                    type_id = next(filter(lambda i: i['index'] == index, entity_metadatas))[
-                        'type_id']
-                    metadata_type_data = metadata_types[type_id]
-                    rust_type = metadata_type_data['type']
-                    type_name = metadata_type_data['name']
-
-                    type_name_field = to_snake_case(type_name)
-                    read_field_code = f'{struct_name}(d.value.into_{type_name_field}()?)' if struct_name else f'd.value.into_{type_name_field}()?'
-                    code.append(
-                        f'                {index} => *self.{name_or_bitfield} = {read_field_code},')
-                else:
-                    code.append(f'                {index} => {{')
-                    code.append(
-                        f'let bitfield = d.value.into_byte()?;')
-                    for mask, name in name_or_bitfield.items():
-                        name = maybe_rename_field(name, index)
-                        struct_name = upper_first_letter(to_camel_case(name))
-
-                        code.append(
-                            f'*self.{name} = {struct_name}(bitfield & {mask} != 0);')
-                    code.append('                },')
-            code.append('            }')
+                            f'            {name}: {upper_first_letter(to_camel_case(name))}({bit_default}),')
             code.append('        }')
-            code.append('        Ok(())')
             code.append('    }')
             code.append('}')
             code.append('')
@@ -349,29 +354,29 @@ impl From<EntityDataValue> for UpdateMetadataError {
 
     # and now make the main update_metadata
     # fn update_metadata(
-    #     world: hecs::World,
-    #     entity: hecs::Entity,
+    #     ecs: bevy_ecs::world::World,
+    #     entity: bevy_ecs::world::EntityMut,
     #     data: EntityMetadataItems,
     # ) -> Result<(), UpdateMetadataError> {
-    #     if let Ok(e) = world.query_one_mut::<AllayQuery>(entity) {
-    #         e.update_metadata(world, entity, data)?;
+    #     if let Ok(e) = world.query_one_mut::<AllayBundle>(entity) {
+    #         e.update_metadata(ecs, entity, data)?;
     #         return Ok(());
     #     }
 
     #     Ok(())
     # }
     code.append(
-        f'fn update_metadata(world: hecs::World, entity: hecs::Entity, data: EntityMetadataItems) -> Result<(), UpdateMetadataError> {{')
+        f'fn update_metadata(ecs: bevy_ecs::world::World, entity: bevy_ecs::world::EntityMut, data: EntityMetadataItems) -> Result<(), UpdateMetadataError> {{')
     for entity_id in burger_entity_data:
         if entity_id.startswith('~'):
             # not actually an entiry
             continue
         struct_name: str = upper_first_letter(to_camel_case(entity_id))
-        query_struct_name = f'{struct_name}Query'
+        bundle_struct_name = f'{struct_name}Bundle'
         code.append(
-            f'    if let Ok(e) = world.query_one_mut::<{query_struct_name}>(entity) {{')
+            f'    if let Ok(e) = ecs.query_one_mut::<{bundle_struct_name}>(entity) {{')
         code.append(
-            f'        e.update_metadata(world, entity, data)?;')
+            f'        e.update_metadata(ecs, entity, data)?;')
         code.append(f'        return Ok(());')
         code.append('    }')
     code.append('    Ok(())')
diff --git a/codegen/lib/code/utils.py b/codegen/lib/code/utils.py
index 5550cdb2..fe4aca7f 100755
--- a/codegen/lib/code/utils.py
+++ b/codegen/lib/code/utils.py
@@ -44,8 +44,8 @@ def burger_type_to_rust_type(burger_type, field_name: Optional[str] = None, inst
         field_type_rs = 'String'
 
     elif burger_type == 'chatcomponent':
-        field_type_rs = 'Component'
-        uses.add('azalea_chat::Component')
+        field_type_rs = 'FormattedText'
+        uses.add('azalea_chat::FormattedText')
     elif burger_type == 'identifier':
         field_type_rs = 'ResourceLocation'
         uses.add('azalea_core::ResourceLocation')