aboutsummaryrefslogtreecommitdiff
path: root/azalea-world/src/entity
diff options
context:
space:
mode:
Diffstat (limited to 'azalea-world/src/entity')
-rw-r--r--azalea-world/src/entity/attributes.rs2
-rwxr-xr-xazalea-world/src/entity/data.rs2
-rwxr-xr-xazalea-world/src/entity/dimensions.rs2
-rw-r--r--azalea-world/src/entity/info.rs86
-rw-r--r--azalea-world/src/entity/metadata.rs262
-rw-r--r--azalea-world/src/entity/mod.rs6
6 files changed, 186 insertions, 174 deletions
diff --git a/azalea-world/src/entity/attributes.rs b/azalea-world/src/entity/attributes.rs
index 6b10a2b4..97b890dc 100644
--- a/azalea-world/src/entity/attributes.rs
+++ b/azalea-world/src/entity/attributes.rs
@@ -6,7 +6,7 @@ use std::{
};
use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable};
-use azalea_ecs::component::Component;
+use bevy_ecs::component::Component;
use thiserror::Error;
use uuid::{uuid, Uuid};
diff --git a/azalea-world/src/entity/data.rs b/azalea-world/src/entity/data.rs
index 346b277b..65988a19 100755
--- a/azalea-world/src/entity/data.rs
+++ b/azalea-world/src/entity/data.rs
@@ -6,7 +6,7 @@ use azalea_buf::{
};
use azalea_chat::FormattedText;
use azalea_core::{BlockPos, Direction, GlobalPos, Particle, Slot};
-use azalea_ecs::component::Component;
+use bevy_ecs::component::Component;
use derive_more::Deref;
use enum_as_inner::EnumAsInner;
use nohash_hasher::IntSet;
diff --git a/azalea-world/src/entity/dimensions.rs b/azalea-world/src/entity/dimensions.rs
index daf85432..5e716307 100755
--- a/azalea-world/src/entity/dimensions.rs
+++ b/azalea-world/src/entity/dimensions.rs
@@ -1,5 +1,5 @@
use azalea_core::{Vec3, AABB};
-use azalea_ecs::{query::Changed, system::Query};
+use bevy_ecs::{query::Changed, system::Query};
use super::{Physics, Position};
diff --git a/azalea-world/src/entity/info.rs b/azalea-world/src/entity/info.rs
index 8615ef81..19e87627 100644
--- a/azalea-world/src/entity/info.rs
+++ b/azalea-world/src/entity/info.rs
@@ -9,15 +9,14 @@ use crate::{
update_entity_by_id_index, update_uuid_index, PartialWorld, WorldContainer,
};
use azalea_core::ChunkPos;
-use azalea_ecs::{
- app::{App, CoreStage, Plugin},
+use bevy_app::{App, CoreSet, Plugin};
+use bevy_ecs::{
component::Component,
- ecs::Ecs,
- ecs::EntityMut,
entity::Entity,
query::{Added, Changed, With, Without},
- schedule::{IntoSystemDescriptor, SystemSet},
- system::{Command, Commands, Query, Res, ResMut, Resource},
+ schedule::{IntoSystemConfig, IntoSystemConfigs, SystemSet},
+ system::{Commands, EntityCommand, Query, Res, ResMut, Resource},
+ world::{EntityMut, World},
};
use derive_more::{Deref, DerefMut};
use log::{debug, warn};
@@ -32,6 +31,18 @@ use uuid::Uuid;
use super::Local;
+/// A Bevy [`SystemSet`] for various types of entity updates.
+#[derive(SystemSet, Debug, Hash, Eq, PartialEq, Clone)]
+pub enum EntityUpdateSet {
+ /// Remove ECS entities that refer to an entity that was already in the ECS
+ /// before.
+ Deduplicate,
+ /// Create search indexes for entities.
+ Index,
+ /// Remove despawned entities from search indexes.
+ Deindex,
+}
+
/// Plugin handling some basic entity functionality.
pub struct EntityPlugin;
impl Plugin for EntityPlugin {
@@ -40,30 +51,31 @@ impl Plugin for EntityPlugin {
// added to indexes during update (done by this plugin)
// modified during update
// despawned post-update (done by this plugin)
- app.add_system_set_to_stage(
- CoreStage::PreUpdate,
- SystemSet::new().with_system(remove_despawned_entities_from_indexes),
- )
- .add_system_set_to_stage(
- CoreStage::PostUpdate,
- SystemSet::new()
- .with_system(deduplicate_entities.label("deduplicate_entities"))
- .with_system(deduplicate_local_entities.label("deduplicate_entities")),
+ app.add_system(
+ remove_despawned_entities_from_indexes
+ .in_base_set(CoreSet::PreUpdate)
+ .in_set(EntityUpdateSet::Deindex),
)
- .add_system_set(
- SystemSet::new()
- .with_system(update_entity_chunk_positions)
- .with_system(update_uuid_index.label("update_indexes"))
- .with_system(update_entity_by_id_index.label("update_indexes")),
+ .add_systems(
+ (deduplicate_entities, deduplicate_local_entities)
+ .in_base_set(CoreSet::PostUpdate)
+ .in_set(EntityUpdateSet::Deduplicate),
)
- .add_system_set(
- SystemSet::new()
- .with_system(add_updates_received.label("add_updates_received"))
- .with_system(debug_new_entity)
- .with_system(debug_detect_updates_received_on_local_entities)
- .with_system(add_dead)
- .with_system(update_bounding_box),
+ .add_systems(
+ (
+ update_entity_chunk_positions,
+ update_uuid_index,
+ update_entity_by_id_index,
+ )
+ .in_set(EntityUpdateSet::Index),
)
+ .add_systems((
+ add_updates_received,
+ debug_new_entity,
+ debug_detect_updates_received_on_local_entities,
+ add_dead,
+ update_bounding_box,
+ ))
.init_resource::<EntityInfos>();
}
}
@@ -134,26 +146,24 @@ impl PartialEntityInfos {
/// other clients within render distance will get too. You usually don't need
/// this when the change isn't relative either.
pub struct RelativeEntityUpdate {
- pub entity: Entity,
pub partial_world: Arc<RwLock<PartialWorld>>,
// a function that takes the entity and updates it
pub update: Box<dyn FnOnce(&mut EntityMut) + Send + Sync>,
}
-impl Command for RelativeEntityUpdate {
- fn write(self, world: &mut Ecs) {
+impl EntityCommand for RelativeEntityUpdate {
+ fn write(self, entity: Entity, world: &mut World) {
let partial_entity_infos = &mut self.partial_world.write().entity_infos;
- let mut entity = world.entity_mut(self.entity);
+ let mut entity_mut = world.entity_mut(entity);
- if Some(self.entity) == partial_entity_infos.owner_entity {
+ if Some(entity) == partial_entity_infos.owner_entity {
// if the entity owns this partial world, it's always allowed to update itself
- (self.update)(&mut entity);
+ (self.update)(&mut entity_mut);
return;
};
- let entity_id = *entity.get::<MinecraftEntityId>().unwrap();
-
- let Some(updates_received) = entity.get_mut::<UpdatesReceived>() else {
+ let entity_id = *entity_mut.get::<MinecraftEntityId>().unwrap();
+ let Some(updates_received) = entity_mut.get_mut::<UpdatesReceived>() else {
// a client tried to update another client, which isn't allowed
return;
};
@@ -170,9 +180,9 @@ impl Command for RelativeEntityUpdate {
.updates_received
.insert(entity_id, new_updates_received);
- **entity.get_mut::<UpdatesReceived>().unwrap() = new_updates_received;
+ **entity_mut.get_mut::<UpdatesReceived>().unwrap() = new_updates_received;
- let mut entity = world.entity_mut(self.entity);
+ let mut entity = world.entity_mut(entity);
(self.update)(&mut entity);
}
}
diff --git a/azalea-world/src/entity/metadata.rs b/azalea-world/src/entity/metadata.rs
index 8960b045..0a0bddc8 100644
--- a/azalea-world/src/entity/metadata.rs
+++ b/azalea-world/src/entity/metadata.rs
@@ -7,7 +7,7 @@ use super::{EntityDataItem, EntityDataValue, OptionalUnsignedInt, Pose, Rotation
use azalea_block::BlockState;
use azalea_chat::FormattedText;
use azalea_core::{BlockPos, Direction, Particle, Slot};
-use azalea_ecs::{bundle::Bundle, component::Component};
+use bevy_ecs::{bundle::Bundle, component::Component};
use derive_more::{Deref, DerefMut};
use thiserror::Error;
use uuid::Uuid;
@@ -79,7 +79,7 @@ pub struct CanDuplicate(pub bool);
pub struct Allay;
impl Allay {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -160,7 +160,7 @@ pub struct Waiting(pub bool);
pub struct AreaEffectCloud;
impl AreaEffectCloud {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -245,7 +245,7 @@ pub struct RightLegPose(pub Rotations);
pub struct ArmorStand;
impl ArmorStand {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -356,7 +356,7 @@ pub struct ArrowEffectColor(pub i32);
pub struct Arrow;
impl Arrow {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -431,7 +431,7 @@ pub struct AxolotlFromBucket(pub bool);
pub struct Axolotl;
impl Axolotl {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -520,7 +520,7 @@ pub struct Resting(pub bool);
pub struct Bat;
impl Bat {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -596,7 +596,7 @@ pub struct BeeRemainingAngerTime(pub i32);
pub struct Bee;
impl Bee {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -687,7 +687,7 @@ pub struct Charged(pub bool);
pub struct Blaze;
impl Blaze {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -775,7 +775,7 @@ pub struct BubbleTime(pub i32);
pub struct Boat;
impl Boat {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -871,7 +871,7 @@ pub struct LastPoseChangeTick(pub i64);
pub struct Camel;
impl Camel {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -990,7 +990,7 @@ pub struct CatCollarColor(pub i32);
pub struct Cat;
impl Cat {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1090,7 +1090,7 @@ pub struct Climbing(pub bool);
pub struct CaveSpider;
impl CaveSpider {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1162,7 +1162,7 @@ impl Default for CaveSpiderMetadataBundle {
pub struct ChestBoat;
impl ChestBoat {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1229,7 +1229,7 @@ pub struct CustomDisplay(pub bool);
pub struct ChestMinecart;
impl ChestMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1283,7 +1283,7 @@ impl Default for ChestMinecartMetadataBundle {
pub struct Chicken;
impl Chicken {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1357,7 +1357,7 @@ pub struct CodFromBucket(pub bool);
pub struct Cod;
impl Cod {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1431,7 +1431,7 @@ pub struct LastOutput(pub FormattedText);
pub struct CommandBlockMinecart;
impl CommandBlockMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1495,7 +1495,7 @@ impl Default for CommandBlockMinecartMetadataBundle {
pub struct Cow;
impl Cow {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1573,7 +1573,7 @@ pub struct IsIgnited(pub bool);
pub struct Creeper;
impl Creeper {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1662,7 +1662,7 @@ pub struct MoistnessLevel(pub i32);
pub struct Dolphin;
impl Dolphin {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1756,7 +1756,7 @@ pub struct DonkeyChest(pub bool);
pub struct Donkey;
impl Donkey {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1856,7 +1856,7 @@ impl Default for DonkeyMetadataBundle {
pub struct DragonFireball;
impl DragonFireball {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1907,7 +1907,7 @@ pub struct DrownedConversion(pub bool);
pub struct Drowned;
impl Drowned {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -1983,7 +1983,7 @@ pub struct EggItemStack(pub Slot);
pub struct Egg;
impl Egg {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2037,7 +2037,7 @@ pub struct AttackTarget(pub i32);
pub struct ElderGuardian;
impl ElderGuardian {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2114,7 +2114,7 @@ pub struct ShowBottom(pub bool);
pub struct EndCrystal;
impl EndCrystal {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2171,7 +2171,7 @@ pub struct Phase(pub i32);
pub struct EnderDragon;
impl EnderDragon {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2240,7 +2240,7 @@ pub struct EnderPearlItemStack(pub Slot);
pub struct EnderPearl;
impl EnderPearl {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2296,7 +2296,7 @@ pub struct StaredAt(pub bool);
pub struct Enderman;
impl Enderman {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2379,7 +2379,7 @@ impl Default for EndermanMetadataBundle {
pub struct Endermite;
impl Endermite {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2451,7 +2451,7 @@ pub struct EvokerSpellCasting(pub u8);
pub struct Evoker;
impl Evoker {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2529,7 +2529,7 @@ impl Default for EvokerMetadataBundle {
pub struct EvokerFangs;
impl EvokerFangs {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2576,7 +2576,7 @@ pub struct ExperienceBottleItemStack(pub Slot);
pub struct ExperienceBottle;
impl ExperienceBottle {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2626,7 +2626,7 @@ impl Default for ExperienceBottleMetadataBundle {
pub struct ExperienceOrb;
impl ExperienceOrb {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2673,7 +2673,7 @@ pub struct EyeOfEnderItemStack(pub Slot);
pub struct EyeOfEnder;
impl EyeOfEnder {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2725,7 +2725,7 @@ pub struct StartPos(pub BlockPos);
pub struct FallingBlock;
impl FallingBlock {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2777,7 +2777,7 @@ pub struct FireballItemStack(pub Slot);
pub struct Fireball;
impl Fireball {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2833,7 +2833,7 @@ pub struct ShotAtAngle(pub bool);
pub struct FireworkRocket;
impl FireworkRocket {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2897,7 +2897,7 @@ pub struct Biting(pub bool);
pub struct FishingBobber;
impl FishingBobber {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -2970,7 +2970,7 @@ pub struct TrustedId1(pub Option<Uuid>);
pub struct Fox;
impl Fox {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3082,7 +3082,7 @@ pub struct TongueTarget(pub OptionalUnsignedInt);
pub struct Frog;
impl Frog {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3166,7 +3166,7 @@ pub struct Fuel(pub bool);
pub struct FurnaceMinecart;
impl FurnaceMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3227,7 +3227,7 @@ pub struct IsCharging(pub bool);
pub struct Ghast;
impl Ghast {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3294,7 +3294,7 @@ impl Default for GhastMetadataBundle {
pub struct Giant;
impl Giant {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3366,7 +3366,7 @@ pub struct Rotation(pub i32);
pub struct GlowItemFrame;
impl GlowItemFrame {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3418,7 +3418,7 @@ pub struct DarkTicksRemaining(pub i32);
pub struct GlowSquid;
impl GlowSquid {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3497,7 +3497,7 @@ pub struct HasRightHorn(pub bool);
pub struct Goat;
impl Goat {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3584,7 +3584,7 @@ impl Default for GoatMetadataBundle {
pub struct Guardian;
impl Guardian {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3664,7 +3664,7 @@ pub struct HoglinImmuneToZombification(pub bool);
pub struct Hoglin;
impl Hoglin {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3741,7 +3741,7 @@ impl Default for HoglinMetadataBundle {
pub struct HopperMinecart;
impl HopperMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3809,7 +3809,7 @@ pub struct HorseTypeVariant(pub i32);
pub struct Horse;
impl Horse {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3909,7 +3909,7 @@ impl Default for HorseMetadataBundle {
pub struct Husk;
impl Husk {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -3987,7 +3987,7 @@ pub struct IllusionerSpellCasting(pub u8);
pub struct Illusioner;
impl Illusioner {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4067,7 +4067,7 @@ pub struct PlayerCreated(pub bool);
pub struct IronGolem;
impl IronGolem {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4140,7 +4140,7 @@ pub struct ItemItem(pub Slot);
pub struct Item;
impl Item {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4190,7 +4190,7 @@ impl Default for ItemMetadataBundle {
pub struct ItemFrame;
impl ItemFrame {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4245,7 +4245,7 @@ impl Default for ItemFrameMetadataBundle {
pub struct LeashKnot;
impl LeashKnot {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4290,7 +4290,7 @@ impl Default for LeashKnotMetadataBundle {
pub struct LightningBolt;
impl LightningBolt {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4355,7 +4355,7 @@ pub struct LlamaVariant(pub i32);
pub struct Llama;
impl Llama {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4470,7 +4470,7 @@ impl Default for LlamaMetadataBundle {
pub struct LlamaSpit;
impl LlamaSpit {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4517,7 +4517,7 @@ pub struct SlimeSize(pub i32);
pub struct MagmaCube;
impl MagmaCube {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4583,7 +4583,7 @@ impl Default for MagmaCubeMetadataBundle {
pub struct Marker;
impl Marker {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4628,7 +4628,7 @@ impl Default for MarkerMetadataBundle {
pub struct Minecart;
impl Minecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4684,7 +4684,7 @@ pub struct MooshroomKind(pub String);
pub struct Mooshroom;
impl Mooshroom {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4778,7 +4778,7 @@ pub struct MuleChest(pub bool);
pub struct Mule;
impl Mule {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4880,7 +4880,7 @@ pub struct Trusting(pub bool);
pub struct Ocelot;
impl Ocelot {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -4959,7 +4959,7 @@ pub struct PaintingVariant(pub azalea_registry::PaintingVariant);
pub struct Painting;
impl Painting {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5027,7 +5027,7 @@ pub struct PandaFlags(pub u8);
pub struct Panda;
impl Panda {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5141,7 +5141,7 @@ pub struct ParrotVariant(pub i32);
pub struct Parrot;
impl Parrot {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5226,7 +5226,7 @@ pub struct PhantomSize(pub i32);
pub struct Phantom;
impl Phantom {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5297,7 +5297,7 @@ pub struct PigBoostTime(pub i32);
pub struct Pig;
impl Pig {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5387,7 +5387,7 @@ pub struct IsDancing(pub bool);
pub struct Piglin;
impl Piglin {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5477,7 +5477,7 @@ pub struct PiglinBruteImmuneToZombification(pub bool);
pub struct PiglinBrute;
impl PiglinBrute {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5554,7 +5554,7 @@ pub struct PillagerIsChargingCrossbow(pub bool);
pub struct Pillager;
impl Pillager {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5644,7 +5644,7 @@ pub struct ShoulderRight(pub azalea_nbt::Tag);
pub struct Player;
impl Player {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5732,7 +5732,7 @@ pub struct PolarBearStanding(pub bool);
pub struct PolarBear;
impl PolarBear {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5811,7 +5811,7 @@ pub struct PotionItemStack(pub Slot);
pub struct Potion;
impl Potion {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5865,7 +5865,7 @@ pub struct PuffState(pub i32);
pub struct Pufferfish;
impl Pufferfish {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -5942,7 +5942,7 @@ pub struct RabbitKind(pub i32);
pub struct Rabbit;
impl Rabbit {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6021,7 +6021,7 @@ pub struct RavagerIsCelebrating(pub bool);
pub struct Ravager;
impl Ravager {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6096,7 +6096,7 @@ pub struct SalmonFromBucket(pub bool);
pub struct Salmon;
impl Salmon {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6168,7 +6168,7 @@ pub struct Sheared(pub bool);
pub struct Sheep;
impl Sheep {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6252,7 +6252,7 @@ pub struct ShulkerColor(pub u8);
pub struct Shulker;
impl Shulker {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6332,7 +6332,7 @@ impl Default for ShulkerMetadataBundle {
pub struct ShulkerBullet;
impl ShulkerBullet {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6377,7 +6377,7 @@ impl Default for ShulkerBulletMetadataBundle {
pub struct Silverfish;
impl Silverfish {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6447,7 +6447,7 @@ pub struct StrayConversion(pub bool);
pub struct Skeleton;
impl Skeleton {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6532,7 +6532,7 @@ pub struct SkeletonHorseOwnerUuid(pub Option<Uuid>);
pub struct SkeletonHorse;
impl SkeletonHorse {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6627,7 +6627,7 @@ impl Default for SkeletonHorseMetadataBundle {
pub struct Slime;
impl Slime {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6696,7 +6696,7 @@ pub struct SmallFireballItemStack(pub Slot);
pub struct SmallFireball;
impl SmallFireball {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6748,7 +6748,7 @@ pub struct HasPumpkin(pub bool);
pub struct SnowGolem;
impl SnowGolem {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6821,7 +6821,7 @@ pub struct SnowballItemStack(pub Slot);
pub struct Snowball;
impl Snowball {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6871,7 +6871,7 @@ impl Default for SnowballMetadataBundle {
pub struct SpawnerMinecart;
impl SpawnerMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6933,7 +6933,7 @@ pub struct SpectralArrowPierceLevel(pub u8);
pub struct SpectralArrow;
impl SpectralArrow {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -6995,7 +6995,7 @@ impl Default for SpectralArrowMetadataBundle {
pub struct Spider;
impl Spider {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7069,7 +7069,7 @@ impl Default for SpiderMetadataBundle {
pub struct Squid;
impl Squid {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7134,7 +7134,7 @@ impl Default for SquidMetadataBundle {
pub struct Stray;
impl Stray {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7208,7 +7208,7 @@ pub struct StriderSaddle(pub bool);
pub struct Strider;
impl Strider {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7297,7 +7297,7 @@ pub struct TadpoleFromBucket(pub bool);
pub struct Tadpole;
impl Tadpole {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7369,7 +7369,7 @@ pub struct Fuse(pub i32);
pub struct Tnt;
impl Tnt {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7419,7 +7419,7 @@ impl Default for TntMetadataBundle {
pub struct TntMinecart;
impl TntMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7473,7 +7473,7 @@ impl Default for TntMinecartMetadataBundle {
pub struct TraderLlama;
impl TraderLlama {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7570,7 +7570,7 @@ pub struct Foil(pub bool);
pub struct Trident;
impl Trident {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7646,7 +7646,7 @@ pub struct TropicalFishTypeVariant(pub i32);
pub struct TropicalFish;
impl TropicalFish {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7733,7 +7733,7 @@ pub struct Travelling(pub bool);
pub struct Turtle;
impl Turtle {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7837,7 +7837,7 @@ pub struct VexFlags(pub u8);
pub struct Vex;
impl Vex {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7914,7 +7914,7 @@ pub struct VillagerVillagerData(pub VillagerData);
pub struct Villager;
impl Villager {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -7999,7 +7999,7 @@ pub struct VindicatorIsCelebrating(pub bool);
pub struct Vindicator;
impl Vindicator {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8074,7 +8074,7 @@ pub struct WanderingTraderUnhappyCounter(pub i32);
pub struct WanderingTrader;
impl WanderingTrader {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8150,7 +8150,7 @@ pub struct ClientAngerLevel(pub i32);
pub struct Warden;
impl Warden {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8227,7 +8227,7 @@ pub struct WitchUsingItem(pub bool);
pub struct Witch;
impl Witch {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8313,7 +8313,7 @@ pub struct Inv(pub i32);
pub struct Wither;
impl Wither {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8401,7 +8401,7 @@ impl Default for WitherMetadataBundle {
pub struct WitherSkeleton;
impl WitherSkeleton {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8471,7 +8471,7 @@ pub struct Dangerous(pub bool);
pub struct WitherSkull;
impl WitherSkull {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8527,7 +8527,7 @@ pub struct WolfRemainingAngerTime(pub i32);
pub struct Wolf;
impl Wolf {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8622,7 +8622,7 @@ pub struct ZoglinBaby(pub bool);
pub struct Zoglin;
impl Zoglin {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8695,7 +8695,7 @@ impl Default for ZoglinMetadataBundle {
pub struct Zombie;
impl Zombie {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8790,7 +8790,7 @@ pub struct ZombieHorseOwnerUuid(pub Option<Uuid>);
pub struct ZombieHorse;
impl ZombieHorse {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8889,7 +8889,7 @@ pub struct ZombieVillagerVillagerData(pub VillagerData);
pub struct ZombieVillager;
impl ZombieVillager {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -8977,7 +8977,7 @@ impl Default for ZombieVillagerMetadataBundle {
pub struct ZombifiedPiglin;
impl ZombifiedPiglin {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9051,7 +9051,7 @@ impl Default for ZombifiedPiglinMetadataBundle {
pub struct AbstractAgeable;
impl AbstractAgeable {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9121,7 +9121,7 @@ impl Default for AbstractAgeableMetadataBundle {
pub struct AbstractAnimal;
impl AbstractAnimal {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9190,7 +9190,7 @@ impl Default for AbstractAnimalMetadataBundle {
pub struct AbstractCreature;
impl AbstractCreature {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9252,7 +9252,7 @@ impl Default for AbstractCreatureMetadataBundle {
pub struct AbstractEntity;
impl AbstractEntity {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9337,7 +9337,7 @@ impl Default for AbstractEntityMetadataBundle {
pub struct AbstractInsentient;
impl AbstractInsentient {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9405,7 +9405,7 @@ impl Default for AbstractInsentientMetadataBundle {
pub struct AbstractLiving;
impl AbstractLiving {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9489,7 +9489,7 @@ impl Default for AbstractLivingMetadataBundle {
pub struct AbstractMinecart;
impl AbstractMinecart {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9564,7 +9564,7 @@ impl Default for AbstractMinecartMetadataBundle {
pub struct AbstractMonster;
impl AbstractMonster {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9629,7 +9629,7 @@ impl Default for AbstractMonsterMetadataBundle {
pub struct AbstractTameable;
impl AbstractTameable {
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
d: EntityDataItem,
) -> Result<(), UpdateMetadataError> {
match d.index {
@@ -9712,7 +9712,7 @@ impl Default for AbstractTameableMetadataBundle {
}
pub fn apply_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
entity_kind: azalea_registry::EntityKind,
items: Vec<EntityDataItem>,
) -> Result<(), UpdateMetadataError> {
@@ -10317,7 +10317,7 @@ pub fn apply_metadata(
}
pub fn apply_default_metadata(
- entity: &mut azalea_ecs::system::EntityCommands,
+ entity: &mut bevy_ecs::system::EntityCommands,
kind: azalea_registry::EntityKind,
) {
match kind {
diff --git a/azalea-world/src/entity/mod.rs b/azalea-world/src/entity/mod.rs
index 9b1191fb..6f77f1be 100644
--- a/azalea-world/src/entity/mod.rs
+++ b/azalea-world/src/entity/mod.rs
@@ -12,7 +12,7 @@ use self::{attributes::AttributeInstance, metadata::Health};
pub use attributes::Attributes;
use azalea_block::BlockState;
use azalea_core::{BlockPos, ChunkPos, ResourceLocation, Vec3, AABB};
-use azalea_ecs::{
+use bevy_ecs::{
bundle::Bundle,
component::Component,
entity::Entity,
@@ -22,7 +22,9 @@ use azalea_ecs::{
pub use data::*;
use derive_more::{Deref, DerefMut};
pub use dimensions::{update_bounding_box, EntityDimensions};
-pub use info::{EntityInfos, EntityPlugin, LoadedBy, PartialEntityInfos, RelativeEntityUpdate};
+pub use info::{
+ EntityInfos, EntityPlugin, EntityUpdateSet, LoadedBy, PartialEntityInfos, RelativeEntityUpdate,
+};
use std::fmt::Debug;
use uuid::Uuid;
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-16 22:48:17 +0000