NoahShomette · bas-ie · Jul 11, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_sparse_tilemap"
 description = "A Tilemap crate for the Bevy game engine with a focus on large map sizes and ECS sparse maps"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
@@ -32,7 +32,7 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
-bevy = { version = "0.15", default-features = false, features = [] }
+bevy = { version = "0.16", default-features = false, features = [] }
 bst_map_layer_derive = { version = "0.1.0" }
 # thiserror = "2.0.1"
 thiserror = "1.0.44"
@@ -42,7 +42,7 @@ lettuces = { version = "0.0.7" }
 serde = { version = "1.0.214", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.15" }
+bevy = { version = "0.16" }
 rand = { version = "0.8.5" }
 serde = "1.0.214"
 ron = "0.8.1"
diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ You should use `bevy_sparse_tilemap` if:
 
 | BST Version | Bevy Version |
 | :---------: | :----------: |
+|     0.5     |     0.16     |
 |     0.4     |     0.15     |
 |     0.3     |     0.14     |
 |     0.2     |     0.13     |

diff --git a/examples/hexagon.rs b/examples/hexagon.rs
@@ -24,7 +24,10 @@ fn main() {
             }),
             ..default()
         }))
-        .add_plugins((LogDiagnosticsPlugin::default(), FrameTimeDiagnosticsPlugin))
+        .add_plugins((
+            LogDiagnosticsPlugin::default(),
+            FrameTimeDiagnosticsPlugin::default(),
+        ))
         .add_systems(Startup, (spawn_map, spawn_tiles).chain())
         .add_systems(FixedUpdate, change_random_tile_color)
         .insert_resource(Time::<Fixed>::from_seconds(0.1))

diff --git a/examples/square.rs b/examples/square.rs
@@ -26,7 +26,10 @@ fn main() {
             }),
             ..default()
         }))
-        .add_plugins((LogDiagnosticsPlugin::default(), FrameTimeDiagnosticsPlugin))
+        .add_plugins((
+            LogDiagnosticsPlugin::default(),
+            FrameTimeDiagnosticsPlugin::default(),
+        ))
         .add_systems(Startup, (spawn_map, spawn_tiles).chain())
         .init_resource::<ColorHandles>()
         .run();

diff --git a/src/hex/map_chunk_layer.rs b/src/hex/map_chunk_layer.rs
@@ -1,8 +1,8 @@
 use crate::map::chunk::{ChunkCell, ChunkLayer, ChunkLayerType};
 use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::math::UVec2;
+use bevy::platform::collections::hash_map::HashMap;
 use bevy::prelude::{Component, Entity};
-use bevy::utils::HashMap;
 use lettuces::cell::Cell;
 use lettuces::storage::hex::HexRectangleStorage;
 use lettuces::HexOrientation;
@@ -56,7 +56,7 @@ where
 {
     fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
         for tile_entity in self.tile_entities.iter_mut() {
-            *tile_entity.1 = entity_mapper.map_entity(*tile_entity.1);
+            *tile_entity.1 = entity_mapper.get_mapped(*tile_entity.1);
         }
     }
 }

diff --git a/src/hex/map_data.rs b/src/hex/map_data.rs
@@ -1,7 +1,7 @@
 use bevy::{
     math::{vec2, UVec2},
+    platform::collections::hash_map::HashMap,
     prelude::Component,
-    utils::hashbrown::HashMap,
 };
 
 #[cfg(feature = "reflect")]
@@ -108,7 +108,7 @@ impl MapData for HexMapData {
     fn break_hashmap_into_chunks<TileData, MapChunk>(
         &self,
         map_layer: impl MapLayer,
-        data: &bevy::utils::HashMap<lettuces::cell::Cell, TileData>,
+        data: &HashMap<lettuces::cell::Cell, TileData>,
         map_size: UVec2,
         max_chunk_size: UVec2,
         chunk_settings: MapChunk::ChunkSettings,

diff --git a/src/map/chunk/layer_data.rs b/src/map/chunk/layer_data.rs
@@ -1,6 +1,9 @@
 use std::hash::Hash;
 
-use bevy::{ecs::entity::MapEntities, math::UVec2, prelude::Entity, utils::HashMap};
+use bevy::{
+    ecs::entity::MapEntities, math::UVec2, platform::collections::hash_map::HashMap,
+    prelude::Entity,
+};
 use lettuces::cell::Cell;
 
 use super::ChunkCell;

diff --git a/src/map/chunk/mod.rs b/src/map/chunk/mod.rs
@@ -8,8 +8,8 @@ pub use crate::map::chunk::chunk_cell::ChunkCell;
 pub use crate::map::chunk::chunk_pos::ChunkPos;
 use crate::map::MapLayer;
 use bevy::ecs::entity::{EntityMapper, MapEntities};
+use bevy::platform::collections::HashMap;
 use bevy::prelude::{Component, Entity, UVec2};
-use bevy::utils::hashbrown::HashMap;
 pub use layer_data::{ChunkLayer, ChunkLayerType};
 use lettuces::cell::Cell;
 use lettuces::storage::grid::Grid;
@@ -39,7 +39,7 @@ pub struct Chunks {
 impl MapEntities for Chunks {
     fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
         for tile_entity in self.chunk_entities.iter_mut() {
-            *tile_entity = entity_mapper.map_entity(*tile_entity);
+            *tile_entity = entity_mapper.get_mapped(*tile_entity);
         }
     }
 }
@@ -336,7 +336,7 @@ mod tests {
         map::chunk::chunk_cell::ChunkCell, map::chunk::chunk_pos::ChunkPos, map::chunk::Chunk,
     };
     use bevy::math::UVec2;
-    use bevy::utils::hashbrown::HashMap;
+    use bevy::platform::collections::hash_map::HashMap;
     use bst_map_layer_derive::MapLayer;
 
     #[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash)]

diff --git a/src/map/mod.rs b/src/map/mod.rs
@@ -16,8 +16,8 @@ mod tilemap;
 
 use bevy::{
     math::UVec2,
+    platform::collections::hash_map::HashMap,
     prelude::{Component, Entity},
-    utils::HashMap,
 };
 use chunk::{Chunk, ChunkLayer, ChunkPos};
 use lettuces::cell::Cell;

diff --git a/src/square/map_chunk_layer.rs b/src/square/map_chunk_layer.rs
@@ -1,8 +1,8 @@
 use crate::map::chunk::{ChunkCell, ChunkLayer, ChunkLayerType};
 use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::math::UVec2;
+use bevy::platform::collections::hash_map::HashMap;
 use bevy::prelude::{Component, Entity};
-use bevy::utils::HashMap;
 use lettuces::storage::grid::Grid;
 use std::hash::{Hash, Hasher};
 
@@ -51,7 +51,7 @@ where
 {
     fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
         for tile_entity in self.tile_entities.iter_mut() {
-            *tile_entity.1 = entity_mapper.map_entity(*tile_entity.1);
+            *tile_entity.1 = entity_mapper.get_mapped(*tile_entity.1);
         }
     }
 }

diff --git a/src/square/map_data.rs b/src/square/map_data.rs
@@ -1,7 +1,7 @@
 use bevy::{
     math::{vec2, UVec2},
+    platform::collections::hash_map::HashMap,
     prelude::Component,
-    utils::hashbrown::HashMap,
 };
 
 #[cfg(feature = "reflect")]
@@ -108,7 +108,7 @@ impl MapData for SquareMapData {
     fn break_hashmap_into_chunks<TileData, MapChunk>(
         &self,
         map_layer: impl MapLayer,
-        data: &bevy::utils::HashMap<lettuces::cell::Cell, TileData>,
+        data: &HashMap<lettuces::cell::Cell, TileData>,
         map_size: UVec2,
         max_chunk_size: UVec2,
         chunk_settings: MapChunk::ChunkSettings,
@@ -176,7 +176,7 @@ mod tests {
 
     use crate::tilemap_builder::tilemap_layer_builder::TilemapLayer;
     use bevy::math::UVec2;
-    use bevy::utils::HashMap;
+    use bevy::platform::collections::hash_map::HashMap;
     use bst_map_layer_derive::MapLayer;
     use lettuces::cell::Cell;
 

diff --git a/src/tilemap_builder/mod.rs b/src/tilemap_builder/mod.rs
@@ -3,8 +3,8 @@ pub mod tilemap_layer_builder;
 use crate::map::chunk::{Chunk, ChunkLayer, ChunkLayerType, Chunks};
 use crate::map::{MapData, MapLayer, Tilemap};
 use crate::tilemap_builder::tilemap_layer_builder::TilemapLayer;
-use bevy::prelude::{BuildChildren, Commands, Entity, UVec2};
-use bevy::utils::HashMap;
+use bevy::platform::collections::HashMap;
+use bevy::prelude::{Commands, Entity, UVec2};
 use std::hash::Hash;
 use std::marker::PhantomData;
 

diff --git a/src/tilemap_builder/tilemap_layer_builder.rs b/src/tilemap_builder/tilemap_layer_builder.rs
@@ -2,8 +2,8 @@
 //! and then convert those into chunks
 
 use bevy::math::UVec2;
+use bevy::platform::collections::hash_map::HashMap;
 use bevy::prelude::{Bundle, Commands, Entity};
-use bevy::utils::hashbrown::HashMap;
 use lettuces::cell::Cell;
 
 /// An enum that holds all the data for a tilemap layer. This layer is only used in the [`TilemapBuilder`](crate::tilemap_builder::TilemapBuilder)

diff --git a/src/tilemap_manager/errors.rs b/src/tilemap_manager/errors.rs
@@ -20,8 +20,8 @@ pub enum TilemapManagerError {
     TileDataDoesNotExist,
 }
 
-impl<'w> From<QueryEntityError<'w>> for TilemapManagerError {
-    fn from(_: QueryEntityError<'w>) -> Self {
+impl<'w> From<QueryEntityError> for TilemapManagerError {
+    fn from(_: QueryEntityError) -> Self {
         TilemapManagerError::ChunkEntityDoesNotExist
     }
 }
diff --git a/src/tilemap_manager/manager.rs b/src/tilemap_manager/manager.rs
@@ -4,7 +4,7 @@ use crate::tilemap_manager::TilemapManagerError;
 use crate::tilemap_manager::{LayerIndex, MapEntity};
 use bevy::ecs::system::SystemParam;
 use bevy::math::UVec2;
-use bevy::prelude::{Children, Commands, DespawnRecursiveExt, Entity, Local, Query};
+use bevy::prelude::{Children, Commands, Entity, Local, Query};
 use lettuces::cell::Cell;
 use std::hash::Hash;
 use std::ops::Deref;
@@ -267,7 +267,7 @@ where
             self.layer_index.0,
             MapChunk::into_chunk_cell(cell, &chunk.chunk_settings),
         ) {
-            self.commands.entity(entity).despawn_recursive();
+            self.commands.entity(entity).despawn();
         };
 
         Ok(())
@@ -305,8 +305,8 @@ mod tests {
     use crate::tilemap_manager::manager::TilemapManager;
     use bevy::ecs::system::{Commands, SystemState};
     use bevy::math::UVec2;
+    use bevy::platform::collections::hash_map::HashMap;
     use bevy::prelude::World;
-    use bevy::utils::hashbrown::HashMap;
     use bst_map_layer_derive::MapLayer;
     use lettuces::cell::Cell;