Update to Bevy 0.18 (#628)

Shatur · web-flow · commit 91f4820c62d8 · 2026-01-14T00:46:56.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.38.0] - 2025-12-17
+
+### Changed
+
+- Update to Bevy 0.18.
+
 ## [0.37.2] - 2026-01-11
 
 ### Fixed
@@ -978,7 +984,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release after separation from [Project Harmonia](https://github.com/simgine/project_harmonia).
 
-[unreleased]: https://github.com/simgine/bevy_replicon/compare/v0.37.2...HEAD
+[unreleased]: https://github.com/simgine/bevy_replicon/compare/v0.38.0...HEAD
+[0.38.0]: https://github.com/simgine/bevy_replicon/compare/v0.37.2...v0.38.0
 [0.37.2]: https://github.com/simgine/bevy_replicon/compare/v0.37.1...v0.37.2
 [0.37.1]: https://github.com/simgine/bevy_replicon/compare/v0.37.0...v0.37.1
 [0.37.0]: https://github.com/simgine/bevy_replicon/compare/v0.36.1...v0.37.0
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_replicon"
-version = "0.37.2"
+version = "0.38.0"
 authors = [
   "Hennadii Chernyshchyk <genaloner@gmail.com>",
   "koe <ukoe@protonmail.com>",
@@ -28,7 +28,7 @@ all-features = true
 members = ["example_backend"]
 
 [dependencies]
-bevy = { version = "0.17", default-features = false, features = ["bevy_state"] }
+bevy = { version = "0.18", default-features = false, features = ["bevy_state"] }
 log = "0.4" # Directly depend on `log` like other `no_std` Bevy crates, since `bevy_log` currently requires `std`.
 petgraph = { version = "0.8", default-features = false, features = [
   "stable_graph",
@@ -51,7 +51,8 @@ bytes = { version = "1.10", default-features = false, features = [
 ] }
 
 [dev-dependencies]
-bevy = { version = "0.17", default-features = false, features = [
+ron = { version = "0.12", default-features = false }
+bevy = { version = "0.18", default-features = false, features = [
   "bevy_log",
   "bevy_sprite_render",
   "debug",
diff --git a/README.md b/README.md
@@ -76,6 +76,7 @@ Depending on your game, you may need additional features. We provide an API that
 
 | bevy   | bevy_replicon |
 | ------ | ------------- |
+| 0.18.0 | 0.38          |
 | 0.17.0 | 0.36-0.37     |
 | 0.16.0 | 0.33-0.35     |
 | 0.15.0 | 0.29-0.32     |
diff --git a/example_backend/Cargo.toml b/example_backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_replicon_example_backend"
-version = "0.37.0"
+version = "0.38.0"
 authors = [
   "Hennadii Chernyshchyk <genaloner@gmail.com>",
   "koe <ukoe@protonmail.com>",
@@ -21,20 +21,20 @@ license = "MIT OR Apache-2.0"
 include = ["/src", "../LICENSE*"]
 
 [dependencies]
-bevy = { version = "0.17", default-features = false, features = ["bevy_log"] }
-bevy_replicon = { path = "..", version = "0.37.0", default-features = false }
+bevy = { version = "0.18", default-features = false, features = ["bevy_log"] }
+bevy_replicon = { path = "..", version = "0.38.0", default-features = false }
 fastrand = "2.3"
 
 [dev-dependencies]
-bevy = { version = "0.17", default-features = false, features = [
+bevy = { version = "0.18", default-features = false, features = [
   "bevy_gizmos",
   "bevy_text",
-  "bevy_ui_picking_backend",
   "bevy_ui_render",
   "bevy_window",
   "default_font",
   "debug",
   "serialize",
+  "ui_picking",
   "x11",
 ] }
 clap = { version = "4.1", features = ["derive"] }
diff --git a/example_backend/examples/simple_button.rs b/example_backend/examples/simple_button.rs
@@ -200,10 +200,10 @@ struct UiRoot;
         border: UiRect::all(Val::Px(5.0)),
         justify_content: JustifyContent::Center,
         align_items: AlignItems::Center,
+        border_radius: BorderRadius::MAX,
         ..Default::default()
     },
     BorderColor::all(Color::WHITE),
-    BorderRadius::MAX,
 )]
 struct ToggleButton(bool);
 
diff --git a/src/client.rs b/src/client.rs
@@ -20,7 +20,7 @@ use crate::{
             mutate_index::MutateIndex,
             registry::{
                 ReplicationRegistry,
-                ctx::{DespawnCtx, RemoveCtx, WriteCtx},
+                ctx::{DespawnCtx, EntitySpawner, RemoveCtx, WriteCtx},
             },
             signature::SignatureMap,
             track_mutate_messages::TrackMutateMessages,
@@ -523,9 +523,9 @@ fn apply_changes(
     let data_size: usize = postcard_utils::from_buf(message)?;
 
     let world_cell = world.as_unsafe_world_cell();
-    let entities = world_cell.entities();
-    // SAFETY: split into `Entities` and `DeferredEntity`.
-    // The latter won't apply any structural changes until `flush`, and `Entities` won't be used afterward.
+    // SAFETY: split into `EntitySpawner` and `DeferredEntity`.
+    // The latter won't apply any structural changes until `flush`, and `EntitySpawner` won't be used afterward.
+    let mut spawner = EntitySpawner::new(unsafe { world_cell.world_mut() });
     let world = unsafe { world_cell.world_mut() };
 
     let mut client_entity = match params.entity_map.server_entry(server_entity) {
@@ -562,7 +562,7 @@ fn apply_changes(
             type_registry: params.type_registry,
             component_id,
             message_tick,
-            entities,
+            spawner: &mut spawner,
             ignore_mapping: false,
         };
         trace!(
@@ -653,9 +653,9 @@ fn apply_mutations(
     };
 
     let world_cell = world.as_unsafe_world_cell();
-    let entities = world_cell.entities();
-    // SAFETY: split into `Entities` and `DeferredEntity`.
-    // The latter won't apply any structural changes until `flush`, and `Entities` won't be used afterward.
+    // SAFETY: split into `EntitySpawner` and `DeferredEntity`.
+    // The latter won't apply any structural changes until `flush`, and `EntitySpawner` won't be used afterward.
+    let mut spawner = EntitySpawner::new(unsafe { world_cell.world_mut() });
     let world = unsafe { world_cell.world_mut() };
 
     let Ok(mut client_entity) = world
@@ -716,7 +716,7 @@ fn apply_mutations(
             type_registry: params.type_registry,
             component_id,
             message_tick,
-            entities,
+            spawner: &mut spawner,
             ignore_mapping: false,
         };
         trace!(
diff --git a/src/compact_entity.rs b/src/compact_entity.rs
@@ -18,7 +18,7 @@
 use core::fmt::{self, Formatter};
 
 use bevy::{
-    ecs::entity::{EntityGeneration, EntityRow},
+    ecs::entity::{EntityGeneration, EntityIndex},
     prelude::*,
 };
 use serde::{
@@ -36,7 +36,7 @@ use serde::{
 ///
 /// See also [`deserialize`] and [`postcard_utils::entity_to_extend_mut`](crate::postcard_utils::entity_to_extend_mut).
 pub fn serialize<S: Serializer>(entity: &Entity, serializer: S) -> Result<S::Ok, S::Error> {
-    let mut index = entity.index() << 1;
+    let mut index = entity.index_u32() << 1;
     let has_generation = entity.generation() != EntityGeneration::FIRST;
     index |= has_generation as u32;
 
@@ -79,9 +79,9 @@ impl<'de> Visitor<'de> for EntityVisitor {
         };
 
         // SAFETY: `index` is non-max after shift.
-        let row = unsafe { EntityRow::from_raw_u32(index >> 1).unwrap_unchecked() };
+        let row = unsafe { EntityIndex::from_raw_u32(index >> 1).unwrap_unchecked() };
         let generation = EntityGeneration::from_bits(generation);
 
-        Ok(Entity::from_row_and_generation(row, generation))
+        Ok(Entity::from_index_and_generation(row, generation))
     }
 }
diff --git a/src/postcard_utils.rs b/src/postcard_utils.rs
@@ -212,7 +212,7 @@ impl<'a, T: Buf> DeFlavor<'a> for BufFlavor<'a, T> {
 
 #[cfg(test)]
 mod tests {
-    use bevy::ecs::entity::{EntityGeneration, EntityRow};
+    use bevy::ecs::entity::{EntityGeneration, EntityIndex};
 
     use super::*;
 
@@ -229,8 +229,8 @@ mod tests {
 
     #[test]
     fn entity_with_generation() {
-        let expected_entity = Entity::from_row_and_generation(
-            EntityRow::from_raw_u32(1).unwrap(),
+        let expected_entity = Entity::from_index_and_generation(
+            EntityIndex::from_raw_u32(1).unwrap(),
             EntityGeneration::from_bits(1),
         );
         let mut buffer = Vec::new();
diff --git a/src/scene.rs b/src/scene.rs
@@ -15,7 +15,7 @@ So on deserialization you need to insert it back if you want entities to continu
 # Examples
 
 ```
-use bevy::{asset::ron, prelude::*, state::app::StatesPlugin, scene::serde::SceneDeserializer};
+use bevy::{prelude::*, state::app::StatesPlugin, scene::serde::SceneDeserializer};
 use bevy_replicon::{prelude::*, scene};
 use serde::de::DeserializeSeed;
 # let mut app = App::new();
diff --git a/src/server.rs b/src/server.rs
@@ -13,7 +13,7 @@ use core::{mem, time::Duration};
 use bevy::{
     ecs::{
         archetype::Archetypes,
-        component::{CheckChangeTicks, Tick},
+        change_detection::{CheckChangeTicks, Tick},
         entity::{Entities, EntityHash, EntityHashMap},
         intern::Interned,
         schedule::ScheduleLabel,
@@ -247,7 +247,7 @@ fn buffer_removals(
     let registry = registry.expect("registry should always exist on the server");
 
     replicated_archetypes.update(archetypes, &rules);
-    let location = entities.get(remove.entity).unwrap();
+    let location = entities.get_spawned(remove.entity).unwrap();
     let Some(archetype) = replicated_archetypes.get(location.archetype_id) else {
         // `Replicated` component is missing.
         trace!(
@@ -557,7 +557,7 @@ fn collect_removals(
                 // The client didn't see this entity.
                 continue;
             };
-            let Some(location) = entities.get(entity) else {
+            let Ok(location) = entities.get_spawned(entity) else {
                 warn!(
                     "`{entity}` was despawned after despawn processing but before sending, \
                      so the despawn will be sent on the next tick; \
diff --git a/src/server/replication_messages/mutations.rs b/src/server/replication_messages/mutations.rs
@@ -1,6 +1,6 @@
 use core::{cmp::Ordering, iter, mem, ops::Range, time::Duration};
 
-use bevy::{ecs::component::Tick, prelude::*};
+use bevy::{ecs::change_detection::Tick, prelude::*};
 use log::trace;
 use postcard::experimental::{max_size::MaxSize, serialized_size};
 
diff --git a/src/server/replication_query.rs b/src/server/replication_query.rs
@@ -1,7 +1,8 @@
 use bevy::{
     ecs::{
         archetype::ArchetypeEntity,
-        component::{ComponentId, ComponentTicks, StorageType, Tick},
+        change_detection::{ComponentTicks, Tick},
+        component::{ComponentId, StorageType},
         query::{FilteredAccess, FilteredAccessSet},
         storage::TableId,
         system::{ReadOnlySystemParam, SystemMeta, SystemParam},
diff --git a/src/shared/message/client_message.rs b/src/shared/message/client_message.rs
@@ -470,10 +470,6 @@ impl<E: EntityEvent> EntityEvent for FromClient<E> {
     fn event_target(&self) -> Entity {
         self.message.event_target()
     }
-
-    fn event_target_mut(&mut self) -> &mut Entity {
-        self.message.event_target_mut()
-    }
 }
 
 /// Default message serialization function.
diff --git a/src/shared/message/server_message.rs b/src/shared/message/server_message.rs
@@ -683,10 +683,6 @@ impl<E: EntityEvent> EntityEvent for ToClients<E> {
     fn event_target(&self) -> Entity {
         self.message.event_target()
     }
-
-    fn event_target_mut(&mut self) -> &mut Entity {
-        self.message.event_target_mut()
-    }
 }
 
 /// Type of server message sending.
diff --git a/src/shared/replication/client_ticks.rs b/src/shared/replication/client_ticks.rs
@@ -1,7 +1,7 @@
 use core::time::Duration;
 
 use bevy::{
-    ecs::{component::Tick, entity::hash_map::EntityHashMap},
+    ecs::{change_detection::Tick, entity::hash_map::EntityHashMap},
     platform::collections::HashMap,
     prelude::*,
 };
diff --git a/src/shared/replication/deferred_entity.rs b/src/shared/replication/deferred_entity.rs
@@ -63,8 +63,6 @@ impl<'w> DeferredEntity<'w> {
     /// Needed to be called after processing each entity
     /// to spawn all allocated entities from mappings.
     pub fn flush(&mut self) {
-        // SAFETY: entity location is unchanged because all changes applied after.
-        unsafe { self.entity.world_mut().flush() };
         self.changes.apply(&mut self.entity);
     }
 }
diff --git a/src/shared/replication/registry/ctx.rs b/src/shared/replication/registry/ctx.rs
@@ -1,7 +1,4 @@
-use bevy::{
-    ecs::{component::ComponentId, entity::Entities},
-    prelude::*,
-};
+use bevy::{ecs::component::ComponentId, prelude::*};
 
 use crate::{prelude::*, shared::server_entity_map::ServerEntityMap};
 
@@ -20,7 +17,7 @@ pub struct SerializeCtx<'a> {
 
 /// Replication context for writing and deserialization.
 #[non_exhaustive]
-pub struct WriteCtx<'a> {
+pub struct WriteCtx<'a, 'w> {
     /// Maps server entities to client entities and vice versa.
     pub entity_map: &'a mut ServerEntityMap,
 
@@ -34,21 +31,21 @@ pub struct WriteCtx<'a> {
     pub message_tick: RepliconTick,
 
     /// World's entities to reserve IDs on new entities inside components.
-    pub(crate) entities: &'a Entities,
+    pub(crate) spawner: &'a mut EntitySpawner<'w>,
 
     /// Disables mapping logic to avoid spawning entities for consume functions.
     pub(crate) ignore_mapping: bool,
 }
 
-impl EntityMapper for WriteCtx<'_> {
+impl EntityMapper for WriteCtx<'_, '_> {
     fn get_mapped(&mut self, server_entity: Entity) -> Entity {
         if self.ignore_mapping {
             return server_entity;
         }
 
         self.entity_map
             .server_entry(server_entity)
-            .or_insert_with(|| self.entities.reserve_entity())
+            .or_insert_with(|| self.spawner.spawn_empty())
     }
 
     fn set_mapped(&mut self, _source: Entity, _target: Entity) {
@@ -72,3 +69,18 @@ pub struct DespawnCtx {
     /// Tick for the currently processing message.
     pub message_tick: RepliconTick,
 }
+
+/// A wrapper around [`World`] for spawning empty entities.
+pub(crate) struct EntitySpawner<'a> {
+    world: &'a mut World,
+}
+
+impl<'a> EntitySpawner<'a> {
+    pub(crate) fn new(world: &'a mut World) -> Self {
+        Self { world }
+    }
+
+    fn spawn_empty(&mut self) -> Entity {
+        self.world.spawn_empty().id()
+    }
+}
diff --git a/src/shared/replication/registry/test_fns.rs b/src/shared/replication/registry/test_fns.rs
@@ -11,6 +11,7 @@ use crate::{
         replication::{
             command_markers::{CommandMarkers, EntityMarkers},
             deferred_entity::{DeferredChanges, DeferredEntity},
+            registry::ctx::EntitySpawner,
         },
         server_entity_map::ServerEntityMap,
     },
@@ -138,21 +139,21 @@ impl TestFnsEntityExt for EntityWorldMut<'_> {
                 world.resource_scope(|world, registry: Mut<ReplicationRegistry>| {
                     let type_registry = world.resource::<AppTypeRegistry>().clone();
                     let world_cell = world.as_unsafe_world_cell();
-                    let entities = world_cell.entities();
-                    // SAFETY: split into `Entities` and `DeferredEntity`.
-                    // The latter won't apply any structural changes until `flush`, and `Entities` won't be used afterward.
+                    // SAFETY: split into `EntitySpawner` and `DeferredEntity`.
+                    // The latter won't apply any structural changes until `flush`, and `EntitySpawner` won't be used afterward.
+                    let mut spawner = EntitySpawner::new(unsafe { world_cell.world_mut() });
                     let world = unsafe { world_cell.world_mut() };
 
                     let mut changes = DeferredChanges::default();
                     let mut entity = DeferredEntity::new(world.entity_mut(entity), &mut changes);
 
                     let (_, component_id, fns) = registry.get(fns_id);
                     let mut ctx = WriteCtx {
-                        entities,
                         entity_map: &mut entity_map,
                         type_registry: &type_registry,
                         component_id,
                         message_tick,
+                        spawner: &mut spawner,
                         ignore_mapping: false,
                     };
 
diff --git a/src/shared/replicon_tick.rs b/src/shared/replicon_tick.rs
diff --git a/src/test_app.rs b/src/test_app.rs
diff --git a/tests/mutations.rs b/tests/mutations.rs
