From a7b308aa11ad82ac6b3b74c0237e607f1d4ddf5b Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Wed, 31 Jan 2024 07:50:06 -0700
Subject: [PATCH] Upgrade to Bevy 0.13

---
 Cargo.toml                              | 184 ++++++++++++------------
 examples/animation.rs                   |   4 +-
 examples/basic.rs                       |   4 +-
 examples/frustum_cull_test.rs           |   7 +-
 examples/game_of_life.rs                |   5 +-
 examples/helpers/camera.rs              |  16 +--
 examples/hex_neighbors.rs               |  24 ++--
 examples/hex_neighbors_radius_chunks.rs |  12 +-
 examples/hexagon_column.rs              |   2 +-
 examples/hexagon_generation.rs          |   6 +-
 examples/hexagon_row.rs                 |   2 +-
 examples/mouse_to_tile.rs               |  10 +-
 examples/move_tile.rs                   |   2 +-
 src/map/mod.rs                          |   4 +-
 src/render/chunk.rs                     |   8 +-
 src/render/draw.rs                      |  54 ++++---
 src/render/pipeline.rs                  |  45 +++---
 src/render/prepare.rs                   |   4 +-
 src/tiles/storage.rs                    |   4 +-
 19 files changed, 208 insertions(+), 189 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e895314e..0377fa68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ render = []
 serde = ["dep:serde"]
 
 [dependencies]
-bevy = { version = "0.12", default-features = false, features = [
+bevy = { version = "0.13", default-features = false, features = [
     "bevy_core_pipeline",
     "bevy_render",
     "bevy_asset",
@@ -35,7 +35,7 @@ tiled = { version = "0.11.0", default-features = false }
 thiserror = { version = "1.0" }
 
 [dev-dependencies.bevy]
-version = "0.12"
+version = "0.13"
 default-features = false
 features = [
     "bevy_core_pipeline",
@@ -47,11 +47,11 @@ features = [
     "bevy_text",
     "bevy_sprite",
     #"file_watcher",
-    "multi-threaded"
+    "multi-threaded",
 ]
 
 [target.'cfg(unix)'.dev-dependencies.bevy]
-version = "0.12"
+version = "0.13"
 default-features = false
 features = [
     "bevy_core_pipeline",
@@ -63,123 +63,123 @@ features = [
     "x11",
     "bevy_text",
     "bevy_sprite",
-    "multi-threaded"
+    "multi-threaded",
 ]
 
 
 [[example]]
-name="3d_iso"
-path="examples/3d_iso.rs"
-required-features=["render"]
+name = "3d_iso"
+path = "examples/3d_iso.rs"
+required-features = ["render"]
 [[example]]
-name="accessing_tiles"
-path="examples/accessing_tiles.rs"
-required-features=["render"]
+name = "accessing_tiles"
+path = "examples/accessing_tiles.rs"
+required-features = ["render"]
 [[example]]
-name="animation"
-path="examples/animation.rs"
-required-features=["render"]
+name = "animation"
+path = "examples/animation.rs"
+required-features = ["render"]
 [[example]]
-name="basic"
-path="examples/basic.rs"
-required-features=["render"]
+name = "basic"
+path = "examples/basic.rs"
+required-features = ["render"]
 [[example]]
-name="bench"
-path="examples/bench.rs"
-required-features=["render"]
+name = "bench"
+path = "examples/bench.rs"
+required-features = ["render"]
 [[example]]
-name="chunking"
-path="examples/chunking.rs"
-required-features=["render"]
+name = "chunking"
+path = "examples/chunking.rs"
+required-features = ["render"]
 [[example]]
-name="colors"
-path="examples/colors.rs"
-required-features=["render"]
+name = "colors"
+path = "examples/colors.rs"
+required-features = ["render"]
 [[example]]
-name="custom_shader"
-path="examples/custom_shader.rs"
-required-features=["render"]
+name = "custom_shader"
+path = "examples/custom_shader.rs"
+required-features = ["render"]
 [[example]]
-name="frustum_cull_test"
-path="examples/frustum_cull_test.rs"
-required-features=["render"]
+name = "frustum_cull_test"
+path = "examples/frustum_cull_test.rs"
+required-features = ["render"]
 [[example]]
-name="game_of_life"
-path="examples/game_of_life.rs"
-required-features=["render"]
+name = "game_of_life"
+path = "examples/game_of_life.rs"
+required-features = ["render"]
 [[example]]
-name="hex_neighbors_radius_chunks"
-path="examples/hex_neighbors_radius_chunks.rs"
-required-features=["render"]
+name = "hex_neighbors_radius_chunks"
+path = "examples/hex_neighbors_radius_chunks.rs"
+required-features = ["render"]
 [[example]]
-name="hex_neighbors"
-path="examples/hex_neighbors.rs"
-required-features=["render"]
+name = "hex_neighbors"
+path = "examples/hex_neighbors.rs"
+required-features = ["render"]
 [[example]]
-name="hexagon_column"
-path="examples/hexagon_column.rs"
-required-features=["render"]
+name = "hexagon_column"
+path = "examples/hexagon_column.rs"
+required-features = ["render"]
 [[example]]
-name="hexagon_generation"
-path="examples/hexagon_generation.rs"
-required-features=["render"]
+name = "hexagon_generation"
+path = "examples/hexagon_generation.rs"
+required-features = ["render"]
 [[example]]
-name="hexagon_row"
-path="examples/hexagon_row.rs"
-required-features=["render"]
+name = "hexagon_row"
+path = "examples/hexagon_row.rs"
+required-features = ["render"]
 [[example]]
-name="iso_diamond"
-path="examples/iso_diamond.rs"
-required-features=["render"]
+name = "iso_diamond"
+path = "examples/iso_diamond.rs"
+required-features = ["render"]
 [[example]]
-name="iso_staggered"
-path="examples/iso_staggered.rs"
-required-features=["render"]
+name = "iso_staggered"
+path = "examples/iso_staggered.rs"
+required-features = ["render"]
 [[example]]
-name="layers"
-path="examples/layers.rs"
-required-features=["render"]
+name = "layers"
+path = "examples/layers.rs"
+required-features = ["render"]
 [[example]]
-name="ldtk"
-path="examples/ldtk.rs"
-required-features=["render"]
+name = "ldtk"
+path = "examples/ldtk.rs"
+required-features = ["render"]
 [[example]]
-name="mouse_to_tile"
-path="examples/mouse_to_tile.rs"
-required-features=["render"]
+name = "mouse_to_tile"
+path = "examples/mouse_to_tile.rs"
+required-features = ["render"]
 [[example]]
-name="move_tile"
-path="examples/move_tile.rs"
-required-features=["render"]
+name = "move_tile"
+path = "examples/move_tile.rs"
+required-features = ["render"]
 [[example]]
-name="random_map"
-path="examples/random_map.rs"
-required-features=["render"]
+name = "random_map"
+path = "examples/random_map.rs"
+required-features = ["render"]
 [[example]]
-name="remove_tiles"
-path="examples/remove_tiles.rs"
-required-features=["render"]
+name = "remove_tiles"
+path = "examples/remove_tiles.rs"
+required-features = ["render"]
 [[example]]
-name="spacing"
-path="examples/spacing.rs"
-required-features=["render"]
+name = "spacing"
+path = "examples/spacing.rs"
+required-features = ["render"]
 [[example]]
-name="texture_container"
-path="examples/texture_container.rs"
-required-features=["render"]
+name = "texture_container"
+path = "examples/texture_container.rs"
+required-features = ["render"]
 [[example]]
-name="texture_vec"
-path="examples/texture_vec.rs"
-required-features=["render"]
+name = "texture_vec"
+path = "examples/texture_vec.rs"
+required-features = ["render"]
 [[example]]
-name="tiled_rotated"
-path="examples/tiled_rotated.rs"
-required-features=["render"]
+name = "tiled_rotated"
+path = "examples/tiled_rotated.rs"
+required-features = ["render"]
 [[example]]
-name="tiled"
-path="examples/tiled.rs"
-required-features=["render"]
+name = "tiled"
+path = "examples/tiled.rs"
+required-features = ["render"]
 [[example]]
-name="visibility"
-path="examples/visibility.rs"
-required-features=["render"]
+name = "visibility"
+path = "examples/visibility.rs"
+required-features = ["render"]
diff --git a/examples/animation.rs b/examples/animation.rs
index 5f340c9d..59ff5c20 100644
--- a/examples/animation.rs
+++ b/examples/animation.rs
@@ -150,8 +150,8 @@ fn main() {
         .run();
 }
 
-fn pause_animation(mut query: Query<&mut AnimatedTile>, keys: Res<Input<KeyCode>>) {
-    if keys.just_pressed(KeyCode::P) {
+fn pause_animation(mut query: Query<&mut AnimatedTile>, keys: Res<ButtonInput<KeyCode>>) {
+    if keys.just_pressed(KeyCode::KeyP) {
         for mut anim in &mut query {
             anim.speed = if anim.speed == 0.0 { 1.0 } else { 0.0 }
         }
diff --git a/examples/basic.rs b/examples/basic.rs
index 7c1c83bd..b9a2868e 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -74,7 +74,7 @@ fn startup(
 
 fn swap_texture_or_hide(
     asset_server: Res<AssetServer>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<(&mut TilemapTexture, &mut Visibility)>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Space) {
@@ -88,7 +88,7 @@ fn swap_texture_or_hide(
             }
         }
     }
-    if keyboard_input.just_pressed(KeyCode::H) {
+    if keyboard_input.just_pressed(KeyCode::KeyH) {
         for (_, mut visibility) in &mut query {
             *visibility = match *visibility {
                 Visibility::Inherited | Visibility::Visible => Visibility::Hidden,
diff --git a/examples/frustum_cull_test.rs b/examples/frustum_cull_test.rs
index 48d29f88..ee15f082 100644
--- a/examples/frustum_cull_test.rs
+++ b/examples/frustum_cull_test.rs
@@ -127,7 +127,7 @@ fn spawn_map_type_label(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
 
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
@@ -140,7 +140,7 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2dBundle {
                     text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_alignment(text_alignment),
+                        .with_justify(text_justify),
                     transform,
                     ..default()
                 },
@@ -159,7 +159,7 @@ fn swap_map_type(
         &mut TilemapTexture,
         &mut TilemapTileSize,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
     tile_handle_square: Res<TileHandleSquare>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
@@ -240,6 +240,7 @@ fn main() {
                     level: Level::ERROR,
                     // except for bevy_ecs_tilemap
                     filter: "bevy_ecs_tilemap=trace".into(),
+                    ..default()
                 }),
         )
         .add_plugins(TilemapPlugin)
diff --git a/examples/game_of_life.rs b/examples/game_of_life.rs
index 70ff515a..6b11cacc 100644
--- a/examples/game_of_life.rs
+++ b/examples/game_of_life.rs
@@ -67,9 +67,8 @@ fn update(
                     .entities(tile_storage)
                     .iter()
                     .filter(|neighbor| {
-                        let tile_component =
-                            tile_query.get_component::<TileVisible>(**neighbor).unwrap();
-                        tile_component.0
+                        let (_, _, tile_visible) = tile_query.get(**neighbor).unwrap();
+                        tile_visible.0
                     })
                     .count();
 
diff --git a/examples/helpers/camera.rs b/examples/helpers/camera.rs
index a6068e4c..e6155f5c 100644
--- a/examples/helpers/camera.rs
+++ b/examples/helpers/camera.rs
@@ -1,36 +1,36 @@
-use bevy::{input::Input, math::Vec3, prelude::*, render::camera::Camera};
+use bevy::{input::ButtonInput, math::Vec3, prelude::*, render::camera::Camera};
 
 // A simple camera system for moving and zooming the camera.
 #[allow(dead_code)]
 pub fn movement(
     time: Res<Time>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
 ) {
     for (mut transform, mut ortho) in query.iter_mut() {
         let mut direction = Vec3::ZERO;
 
-        if keyboard_input.pressed(KeyCode::A) {
+        if keyboard_input.pressed(KeyCode::KeyA) {
             direction -= Vec3::new(1.0, 0.0, 0.0);
         }
 
-        if keyboard_input.pressed(KeyCode::D) {
+        if keyboard_input.pressed(KeyCode::KeyD) {
             direction += Vec3::new(1.0, 0.0, 0.0);
         }
 
-        if keyboard_input.pressed(KeyCode::W) {
+        if keyboard_input.pressed(KeyCode::KeyW) {
             direction += Vec3::new(0.0, 1.0, 0.0);
         }
 
-        if keyboard_input.pressed(KeyCode::S) {
+        if keyboard_input.pressed(KeyCode::KeyS) {
             direction -= Vec3::new(0.0, 1.0, 0.0);
         }
 
-        if keyboard_input.pressed(KeyCode::Z) {
+        if keyboard_input.pressed(KeyCode::KeyZ) {
             ortho.scale += 0.1;
         }
 
-        if keyboard_input.pressed(KeyCode::X) {
+        if keyboard_input.pressed(KeyCode::KeyX) {
             ortho.scale -= 0.1;
         }
 
diff --git a/examples/hex_neighbors.rs b/examples/hex_neighbors.rs
index 6288d316..c3c8ccb5 100644
--- a/examples/hex_neighbors.rs
+++ b/examples/hex_neighbors.rs
@@ -98,7 +98,7 @@ fn spawn_tile_labels(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -111,7 +111,7 @@ fn spawn_tile_labels(
                         format!("{}, {}", tile_pos.x, tile_pos.y),
                         text_style.clone(),
                     )
-                    .with_alignment(text_alignment),
+                    .with_justify(text_justify),
                     transform,
                     ..default()
                 })
@@ -138,7 +138,7 @@ fn spawn_map_type_label(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
 
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
@@ -151,7 +151,7 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2dBundle {
                     text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_alignment(text_alignment),
+                        .with_justify(text_justify),
                     transform,
                     ..default()
                 },
@@ -172,7 +172,7 @@ fn swap_map_type(
         &mut TilemapTexture,
         &mut TilemapTileSize,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     tile_label_q: Query<
         (&TileLabel, &TilePos),
         (With<TileLabel>, Without<MapTypeLabel>, Without<TilemapType>),
@@ -333,7 +333,7 @@ struct NeighborHighlight;
 fn highlight_neighbor_label(
     mut commands: Commands,
     tilemap_query: Query<(&TilemapType, &TilemapSize, &TileStorage)>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     highlighted_tiles_q: Query<Entity, With<NeighborHighlight>>,
     hovered_tiles_q: Query<&TilePos, With<Hovered>>,
     tile_label_q: Query<&TileLabel>,
@@ -379,17 +379,17 @@ fn highlight_neighbor_label(
                 }
             }
 
-            let selected_hex_direction = if keyboard_input.pressed(KeyCode::Key0) {
+            let selected_hex_direction = if keyboard_input.pressed(KeyCode::Digit0) {
                 Some(HexDirection::Zero)
-            } else if keyboard_input.pressed(KeyCode::Key1) {
+            } else if keyboard_input.pressed(KeyCode::Digit1) {
                 Some(HexDirection::One)
-            } else if keyboard_input.pressed(KeyCode::Key2) {
+            } else if keyboard_input.pressed(KeyCode::Digit2) {
                 Some(HexDirection::Two)
-            } else if keyboard_input.pressed(KeyCode::Key3) {
+            } else if keyboard_input.pressed(KeyCode::Digit3) {
                 Some(HexDirection::Three)
-            } else if keyboard_input.pressed(KeyCode::Key4) {
+            } else if keyboard_input.pressed(KeyCode::Digit4) {
                 Some(HexDirection::Four)
-            } else if keyboard_input.pressed(KeyCode::Key5) {
+            } else if keyboard_input.pressed(KeyCode::Digit5) {
                 Some(HexDirection::Five)
             } else {
                 None
diff --git a/examples/hex_neighbors_radius_chunks.rs b/examples/hex_neighbors_radius_chunks.rs
index 628dbb9f..96dd4579 100644
--- a/examples/hex_neighbors_radius_chunks.rs
+++ b/examples/hex_neighbors_radius_chunks.rs
@@ -250,7 +250,7 @@ fn swap_map_type(
         &TileStorage,
         &ChunkPos,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     tile_label_q: Query<(Entity, &TileLabel, &TilePos), Without<TilemapType>>,
     mut transform_q: Query<(&mut Transform, &mut Text), Without<TilemapType>>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
@@ -332,7 +332,7 @@ fn spawn_tile_labels(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -347,7 +347,7 @@ fn spawn_tile_labels(
                         format!("{}, {}", hex_pos.x, hex_pos.y),
                         text_style.clone(),
                     )
-                    .with_alignment(text_alignment),
+                    .with_justify(text_justify),
                     transform,
                     ..default()
                 })
@@ -448,10 +448,10 @@ impl Default for HighlightRadius {
     }
 }
 
-fn update_radius(mut radius: ResMut<HighlightRadius>, keyboard_input: Res<Input<KeyCode>>) {
-    if keyboard_input.just_pressed(KeyCode::Up) {
+fn update_radius(mut radius: ResMut<HighlightRadius>, keyboard_input: Res<ButtonInput<KeyCode>>) {
+    if keyboard_input.just_pressed(KeyCode::ArrowUp) {
         radius.0 = std::cmp::min(MAX_RADIUS, radius.0 + 1);
-    } else if keyboard_input.just_pressed(KeyCode::Down) {
+    } else if keyboard_input.just_pressed(KeyCode::ArrowDown) {
         radius.0 = std::cmp::max(1, radius.0 - 1);
     }
 }
diff --git a/examples/hexagon_column.rs b/examples/hexagon_column.rs
index d0dbed03..597f83e2 100644
--- a/examples/hexagon_column.rs
+++ b/examples/hexagon_column.rs
@@ -93,7 +93,7 @@ fn swap_mesh_type(
         &TilemapGridSize,
         &mut TilemapType,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Space) {
         for (mut transform, map_size, grid_size, mut map_type) in query.iter_mut() {
diff --git a/examples/hexagon_generation.rs b/examples/hexagon_generation.rs
index 4800cf98..d575fde8 100644
--- a/examples/hexagon_generation.rs
+++ b/examples/hexagon_generation.rs
@@ -109,7 +109,7 @@ fn spawn_map_type_label(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
 
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
@@ -122,7 +122,7 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2dBundle {
                     text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_alignment(text_alignment),
+                        .with_justify(text_justify),
                     transform,
                     ..default()
                 },
@@ -146,7 +146,7 @@ fn swap_map_type(
         &mut TilemapTileSize,
         &mut TileStorage,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
     tile_handle_hex_col: Res<TileHandleHexCol>,
diff --git a/examples/hexagon_row.rs b/examples/hexagon_row.rs
index 067ad384..e99cd66e 100644
--- a/examples/hexagon_row.rs
+++ b/examples/hexagon_row.rs
@@ -92,7 +92,7 @@ fn swap_mesh_type(
         &TilemapGridSize,
         &mut TilemapType,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Space) {
         for (mut transform, map_size, grid_size, mut map_type) in query.iter_mut() {
diff --git a/examples/mouse_to_tile.rs b/examples/mouse_to_tile.rs
index 2a0bf550..ac432501 100644
--- a/examples/mouse_to_tile.rs
+++ b/examples/mouse_to_tile.rs
@@ -122,7 +122,7 @@ fn spawn_tile_labels(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -135,7 +135,7 @@ fn spawn_tile_labels(
                         format!("{}, {}", tile_pos.x, tile_pos.y),
                         text_style.clone(),
                     )
-                    .with_alignment(text_alignment),
+                    .with_justify(text_justify),
                     transform,
                     ..default()
                 })
@@ -162,7 +162,7 @@ fn spawn_map_type_label(
         font_size: 20.0,
         color: Color::BLACK,
     };
-    let text_alignment = TextAlignment::Center;
+    let text_alignment = JustifyText::Center;
 
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
@@ -175,7 +175,7 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2dBundle {
                     text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_alignment(text_alignment),
+                        .with_justify(text_alignment),
                     transform,
                     ..default()
                 },
@@ -196,7 +196,7 @@ fn swap_map_type(
         &mut TilemapTexture,
         &mut TilemapTileSize,
     )>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     tile_label_q: Query<
         (&TileLabel, &TilePos),
         (With<TileLabel>, Without<MapTypeLabel>, Without<TilemapType>),
diff --git a/examples/move_tile.rs b/examples/move_tile.rs
index 68f5bfff..d88e2933 100644
--- a/examples/move_tile.rs
+++ b/examples/move_tile.rs
@@ -42,7 +42,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
     });
 }
 
-fn swap_pos(keyboard_input: Res<Input<KeyCode>>, mut query: Query<&mut TilePos>) {
+fn swap_pos(keyboard_input: Res<ButtonInput<KeyCode>>, mut query: Query<&mut TilePos>) {
     if keyboard_input.just_pressed(KeyCode::Space) {
         for mut pos in query.iter_mut() {
             if pos.x == 0 {
diff --git a/src/map/mod.rs b/src/map/mod.rs
index 3115fa1d..d0bbb5a5 100644
--- a/src/map/mod.rs
+++ b/src/map/mod.rs
@@ -47,8 +47,8 @@ impl Default for TilemapRenderSettings {
 pub struct TilemapId(pub Entity);
 
 impl MapEntities for TilemapId {
-    fn map_entities(&mut self, entity_mapper: &mut EntityMapper) {
-        self.0 = entity_mapper.get_or_reserve(self.0);
+    fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
+        self.0 = entity_mapper.map_entity(self.0);
     }
 }
 
diff --git a/src/render/chunk.rs b/src/render/chunk.rs
index a7b021b3..e8f86d1f 100644
--- a/src/render/chunk.rs
+++ b/src/render/chunk.rs
@@ -3,6 +3,7 @@ use std::hash::{Hash, Hasher};
 use bevy::math::Mat4;
 use bevy::prelude::{InheritedVisibility, Resource, Transform};
 use bevy::render::primitives::Aabb;
+use bevy::render::render_asset::RenderAssetUsages;
 use bevy::{
     math::{UVec2, UVec3, UVec4, Vec2, Vec3Swizzles, Vec4, Vec4Swizzles},
     prelude::{Component, Entity, GlobalTransform, Mesh, Vec3},
@@ -260,7 +261,10 @@ impl RenderChunk2d {
             global_transform,
             transform,
             transform_matrix,
-            mesh: Mesh::new(bevy::render::render_resource::PrimitiveTopology::TriangleList),
+            mesh: Mesh::new(
+                bevy::render::render_resource::PrimitiveTopology::TriangleList,
+                RenderAssetUsages::default(),
+            ),
             spacing,
             texture_size,
             texture,
@@ -416,7 +420,7 @@ impl RenderChunk2d {
                 crate::render::ATTRIBUTE_COLOR,
                 VertexAttributeValues::Float32x4(colors),
             );
-            self.mesh.set_indices(Some(Indices::U32(indices)));
+            self.mesh.insert_indices(Indices::U32(indices));
 
             let vertex_buffer_data = self.mesh.get_vertex_buffer_data();
             let vertex_buffer = device.create_buffer_with_data(&BufferInitDescriptor {
diff --git a/src/render/draw.rs b/src/render/draw.rs
index 0fccb06f..26c8f7ec 100644
--- a/src/render/draw.rs
+++ b/src/render/draw.rs
@@ -30,13 +30,13 @@ use super::{
 pub struct SetMeshViewBindGroup<const I: usize>;
 impl<const I: usize> RenderCommand<Transparent2d> for SetMeshViewBindGroup<I> {
     type Param = ();
-    type ViewWorldQuery = (Read<ViewUniformOffset>, Read<TilemapViewBindGroup>);
-    type ItemWorldQuery = ();
+    type ViewQuery = (Read<ViewUniformOffset>, Read<TilemapViewBindGroup>);
+    type ItemQuery = ();
     #[inline]
     fn render<'w>(
         _item: &Transparent2d,
         (view_uniform, pbr_view_bind_group): (&'w ViewUniformOffset, &'w TilemapViewBindGroup),
-        _entity: (),
+        _entity: Option<()>,
         _param: (),
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
@@ -49,8 +49,8 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetMeshViewBindGroup<I> {
 pub struct SetTransformBindGroup<const I: usize>;
 impl<const I: usize> RenderCommand<Transparent2d> for SetTransformBindGroup<I> {
     type Param = SRes<TransformBindGroup>;
-    type ViewWorldQuery = ();
-    type ItemWorldQuery = (
+    type ViewQuery = ();
+    type ItemQuery = (
         Read<DynamicUniformIndex<MeshUniform>>,
         Read<DynamicUniformIndex<TilemapUniformData>>,
     );
@@ -58,13 +58,17 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetTransformBindGroup<I> {
     fn render<'w>(
         _item: &Transparent2d,
         _view: (),
-        (transform_index, tilemap_index): (
+        uniform_indices: Option<(
             &'w DynamicUniformIndex<MeshUniform>,
             &'w DynamicUniformIndex<TilemapUniformData>,
-        ),
+        )>,
         transform_bind_group: SystemParamItem<'w, '_, Self::Param>,
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
+        let Some((transform_index, tilemap_index)) = uniform_indices else {
+            return RenderCommandResult::Failure;
+        };
+
         pass.set_bind_group(
             I,
             &transform_bind_group.into_inner().value,
@@ -78,16 +82,20 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetTransformBindGroup<I> {
 pub struct SetTextureBindGroup<const I: usize>;
 impl<const I: usize> RenderCommand<Transparent2d> for SetTextureBindGroup<I> {
     type Param = SRes<ImageBindGroups>;
-    type ViewWorldQuery = ();
-    type ItemWorldQuery = Read<TilemapTexture>;
+    type ViewQuery = ();
+    type ItemQuery = Read<TilemapTexture>;
     #[inline]
     fn render<'w>(
         _item: &Transparent2d,
         _view: (),
-        texture: &'w TilemapTexture,
+        texture: Option<&'w TilemapTexture>,
         image_bind_groups: SystemParamItem<'w, '_, Self::Param>,
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
+        let Some(texture) = texture else {
+            return RenderCommandResult::Failure;
+        };
+
         let bind_group = image_bind_groups.into_inner().values.get(texture).unwrap();
         pass.set_bind_group(I, bind_group, &[]);
 
@@ -98,13 +106,13 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetTextureBindGroup<I> {
 pub struct SetItemPipeline;
 impl RenderCommand<Transparent2d> for SetItemPipeline {
     type Param = SRes<PipelineCache>;
-    type ViewWorldQuery = ();
-    type ItemWorldQuery = ();
+    type ViewQuery = ();
+    type ItemQuery = ();
     #[inline]
     fn render<'w>(
         item: &Transparent2d,
         _view: (),
-        _entity: (),
+        _entity: Option<()>,
         pipeline_cache: SystemParamItem<'w, '_, Self::Param>,
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
@@ -142,16 +150,20 @@ impl<M: MaterialTilemap, const I: usize> RenderCommand<Transparent2d>
     for SetMaterialBindGroup<M, I>
 {
     type Param = (SRes<RenderMaterialsTilemap<M>>, SQuery<&'static Handle<M>>);
-    type ViewWorldQuery = ();
-    type ItemWorldQuery = Read<TilemapId>;
+    type ViewQuery = ();
+    type ItemQuery = Read<TilemapId>;
     #[inline]
     fn render<'w>(
         _item: &Transparent2d,
         _view: (),
-        id: &'w TilemapId,
+        id: Option<&'w TilemapId>,
         (material_bind_groups, material_handles): SystemParamItem<'w, '_, Self::Param>,
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
+        let Some(id) = id else {
+            return RenderCommandResult::Failure;
+        };
+
         if let Ok(material_handle) = material_handles.get(id.0) {
             let bind_group = material_bind_groups
                 .into_inner()
@@ -167,16 +179,20 @@ impl<M: MaterialTilemap, const I: usize> RenderCommand<Transparent2d>
 pub struct DrawMesh;
 impl RenderCommand<Transparent2d> for DrawMesh {
     type Param = SRes<RenderChunk2dStorage>;
-    type ViewWorldQuery = ();
-    type ItemWorldQuery = (Read<ChunkId>, Read<TilemapId>);
+    type ViewQuery = ();
+    type ItemQuery = (Read<ChunkId>, Read<TilemapId>);
     #[inline]
     fn render<'w>(
         _item: &Transparent2d,
         _view: (),
-        (chunk_id, tilemap_id): (&'w ChunkId, &'w TilemapId),
+        ids: Option<(&'w ChunkId, &'w TilemapId)>,
         chunk_storage: SystemParamItem<'w, '_, Self::Param>,
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
+        let Some((chunk_id, tilemap_id)) = ids else {
+            return RenderCommandResult::Failure;
+        };
+
         if let Some(chunk) = chunk_storage.into_inner().get(&UVec4::new(
             chunk_id.0.x,
             chunk_id.0.y,
diff --git a/src/render/pipeline.rs b/src/render/pipeline.rs
index 8beb2c27..facc8e07 100644
--- a/src/render/pipeline.rs
+++ b/src/render/pipeline.rs
@@ -3,13 +3,12 @@ use bevy::{
     render::{
         globals::GlobalsUniform,
         render_resource::{
-            BindGroupLayout, BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType,
-            BlendComponent, BlendFactor, BlendOperation, BlendState, BufferBindingType,
-            ColorTargetState, ColorWrites, Face, FragmentState, FrontFace, MultisampleState,
-            PolygonMode, PrimitiveState, PrimitiveTopology, RenderPipelineDescriptor,
-            SamplerBindingType, ShaderStages, ShaderType, SpecializedRenderPipeline, TextureFormat,
-            TextureSampleType, TextureViewDimension, VertexBufferLayout, VertexFormat, VertexState,
-            VertexStepMode,
+            BindGroupLayout, BindGroupLayoutEntry, BindingType, BlendComponent, BlendFactor,
+            BlendOperation, BlendState, BufferBindingType, ColorTargetState, ColorWrites, Face,
+            FragmentState, FrontFace, MultisampleState, PolygonMode, PrimitiveState,
+            PrimitiveTopology, RenderPipelineDescriptor, SamplerBindingType, ShaderStages,
+            ShaderType, SpecializedRenderPipeline, TextureFormat, TextureSampleType,
+            TextureViewDimension, VertexBufferLayout, VertexFormat, VertexState, VertexStepMode,
         },
         renderer::RenderDevice,
         texture::BevyDefault,
@@ -36,8 +35,9 @@ impl FromWorld for TilemapPipeline {
         let world = world.cell();
         let render_device = world.get_resource::<RenderDevice>().unwrap();
 
-        let view_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[
+        let view_layout = render_device.create_bind_group_layout(
+            "tilemap_view_layout",
+            &[
                 // View
                 BindGroupLayoutEntry {
                     binding: 0,
@@ -60,11 +60,11 @@ impl FromWorld for TilemapPipeline {
                     count: None,
                 },
             ],
-            label: Some("tilemap_view_layout"),
-        });
+        );
 
-        let mesh_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[
+        let mesh_layout = render_device.create_bind_group_layout(
+            "tilemap_mesh_layout",
+            &[
                 BindGroupLayoutEntry {
                     binding: 0,
                     visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
@@ -88,12 +88,12 @@ impl FromWorld for TilemapPipeline {
                     count: None,
                 },
             ],
-            label: Some("tilemap_mesh_layout"),
-        });
+        );
 
         #[cfg(not(feature = "atlas"))]
-        let material_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[
+        let material_layout = render_device.create_bind_group_layout(
+            "tilemap_material_layout",
+            &[
                 BindGroupLayoutEntry {
                     binding: 0,
                     visibility: ShaderStages::FRAGMENT,
@@ -111,12 +111,12 @@ impl FromWorld for TilemapPipeline {
                     count: None,
                 },
             ],
-            label: Some("tilemap_material_layout"),
-        });
+        );
 
         #[cfg(feature = "atlas")]
-        let material_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
-            entries: &[
+        let material_layout = render_device.create_bind_group_layout(
+            "tilemap_material_layout",
+            &[
                 BindGroupLayoutEntry {
                     binding: 0,
                     visibility: ShaderStages::FRAGMENT,
@@ -134,8 +134,7 @@ impl FromWorld for TilemapPipeline {
                     count: None,
                 },
             ],
-            label: Some("tilemap_material_layout"),
-        });
+        );
 
         TilemapPipeline {
             view_layout,
diff --git a/src/render/prepare.rs b/src/render/prepare.rs
index 875d5c34..24b307e8 100644
--- a/src/render/prepare.rs
+++ b/src/render/prepare.rs
@@ -200,13 +200,13 @@ pub(crate) fn prepare(
             chunk.get_map_type(),
             TilemapId(Entity::from_bits(chunk.tilemap_id)),
             DynamicUniformIndex::<MeshUniform> {
-                index: mesh_uniforms.0.push(MeshUniform {
+                index: mesh_uniforms.0.push(&MeshUniform {
                     transform: chunk.get_transform_matrix(),
                 }),
                 marker: PhantomData,
             },
             DynamicUniformIndex::<TilemapUniformData> {
-                index: tilemap_uniforms.0.push(chunk_uniform),
+                index: tilemap_uniforms.0.push(&chunk_uniform),
                 marker: PhantomData,
             },
         ));
diff --git a/src/tiles/storage.rs b/src/tiles/storage.rs
index 0cb520a6..60fabff0 100644
--- a/src/tiles/storage.rs
+++ b/src/tiles/storage.rs
@@ -20,9 +20,9 @@ pub struct TileStorage {
 }
 
 impl MapEntities for TileStorage {
-    fn map_entities(&mut self, entity_mapper: &mut EntityMapper) {
+    fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
         for entity in self.tiles.iter_mut().flatten() {
-            *entity = entity_mapper.get_or_reserve(*entity);
+            *entity = entity_mapper.map_entity(*entity);
         }
     }
 }