From c694281e88cdc8cc68bb78f3181186e113f1b953 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Sun, 8 Dec 2024 20:42:14 +0200
Subject: [PATCH 1/8] refactor: use private plugins

---
 Cargo.lock               | 789 +++++++++++++++++++++++++--------------
 src/dev_tools/mod.rs     |  32 +-
 src/dev_tools/plugin.rs  |  36 --
 src/lib.rs               |   6 +-
 src/maze/mod.rs          |  15 +-
 src/maze/resources.rs    |   3 +-
 src/player/components.rs |   5 +
 src/player/mod.rs        |   9 +
 src/player/systems.rs    |  21 ++
 9 files changed, 598 insertions(+), 318 deletions(-)
 delete mode 100644 src/dev_tools/plugin.rs
 create mode 100644 src/player/components.rs
 create mode 100644 src/player/mod.rs
 create mode 100644 src/player/systems.rs

diff --git a/Cargo.lock b/Cargo.lock
index efeb7cc..fed8ef6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.28"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -78,10 +78,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
@@ -108,18 +108,19 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alsa"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
+checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
  "bitflags 2.6.0",
+ "cfg-if",
  "libc",
 ]
 
@@ -204,15 +205,15 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -264,9 +265,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -317,9 +318,9 @@ checksum = "467163b50876d3a4a44da5f4dbd417537e522fc059ede8d518d57941cfb3d745"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "base64"
@@ -927,7 +928,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "toml_edit 0.22.20",
+ "toml_edit",
 ]
 
 [[package]]
@@ -939,7 +940,7 @@ dependencies = [
  "bevy_reflect",
  "derive_more",
  "glam",
- "itertools 0.13.0",
+ "itertools",
  "rand",
  "rand_distr",
  "serde",
@@ -1387,26 +1388,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.69.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
-dependencies = [
- "bitflags 2.6.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.70.1"
@@ -1416,7 +1397,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.13.0",
+ "itertools",
  "log",
  "prettyplease",
  "proc-macro2",
@@ -1474,9 +1455,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.3"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1530,9 +1511,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1553,9 +1534,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "calloop"
@@ -1585,12 +1566,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -1713,9 +1695,9 @@ dependencies = [
 
 [[package]]
 name = "const_panic"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
+checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81"
 
 [[package]]
 name = "const_soft_float"
@@ -1725,9 +1707,9 @@ checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "constgebra"
@@ -1801,11 +1783,11 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
+checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
 dependencies = [
- "bindgen 0.69.4",
+ "bindgen",
 ]
 
 [[package]]
@@ -1958,6 +1940,17 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "disqualified"
 version = "1.0.0"
@@ -2103,12 +2096,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2119,9 +2112,9 @@ checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "euclid"
-version = "0.22.10"
+version = "0.22.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
 dependencies = [
  "num-traits",
 ]
@@ -2145,9 +2138,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
  "event-listener 5.3.1",
  "pin-project-lite",
@@ -2155,15 +2148,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
@@ -2179,14 +2172,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2203,9 +2196,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.0.31"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2302,30 +2295,30 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2604,7 +2597,7 @@ dependencies = [
  "hexx",
  "rand",
  "rand_chacha",
- "thiserror 2.0.5",
+ "thiserror 2.0.6",
 ]
 
 [[package]]
@@ -2628,20 +2621,149 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2661,12 +2783,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -2725,15 +2847,6 @@ dependencies = [
  "mach2",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -2745,9 +2858,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jni"
@@ -2848,12 +2961,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lewton"
 version = "0.10.2"
@@ -2873,9 +2980,9 @@ checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -2889,13 +2996,13 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
-version = "0.0.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.8",
 ]
 
 [[package]]
@@ -2914,6 +3021,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "litrs"
 version = "0.4.1"
@@ -2974,7 +3087,7 @@ dependencies = [
  "hexx",
  "log",
  "rand",
- "thiserror 2.0.5",
+ "thiserror 2.0.6",
  "tracing",
 ]
 
@@ -2986,9 +3099,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -3016,11 +3129,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
  "simd-adler32",
 ]
 
@@ -3071,7 +3184,7 @@ dependencies = [
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "rustc-hash",
  "thiserror 1.0.69",
  "tracing",
@@ -3529,9 +3642,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
 dependencies = [
  "libredox",
 ]
@@ -3544,18 +3657,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
 dependencies = [
- "ttf-parser 0.24.0",
+ "ttf-parser 0.25.1",
 ]
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -3575,7 +3688,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.8",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -3606,18 +3719,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3626,15 +3739,15 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "piper"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -3643,15 +3756,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.13"
+version = "0.17.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3662,9 +3775,9 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.2"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
@@ -3672,7 +3785,7 @@ dependencies = [
  "pin-project-lite",
  "rustix",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3711,51 +3824,51 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
 
 [[package]]
 name = "quick-xml"
-version = "0.34.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "radsort"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
+checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
 [[package]]
 name = "rand"
@@ -3862,23 +3975,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -3892,13 +4005,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -3909,9 +4022,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "renderdoc-sys"
@@ -3956,15 +4069,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3986,11 +4099,10 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
+checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
 dependencies = [
- "byteorder",
  "twox-hash",
 ]
 
@@ -4048,18 +4160,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4068,9 +4180,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -4176,6 +4288,12 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "stackfuture"
 version = "0.3.0"
@@ -4196,9 +4314,9 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
+checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
 
 [[package]]
 name = "swash"
@@ -4213,15 +4331,26 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "sys-locale"
 version = "0.3.2"
@@ -4241,7 +4370,7 @@ dependencies = [
  "libc",
  "memchr",
  "ntapi",
- "windows 0.54.0",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -4277,11 +4406,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643caef17e3128658ff44d85923ef2d28af81bb71e0d67bbfe1d76f19a73e053"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
 dependencies = [
- "thiserror-impl 2.0.5",
+ "thiserror-impl 2.0.6",
 ]
 
 [[package]]
@@ -4297,9 +4426,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995d0bbc9995d1f19d28b7215a9352b0fc3cd3a2d2ec95c2cadc485cdedbcdde"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4361,6 +4490,16 @@ dependencies = [
  "strict-num",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -4384,31 +4523,20 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.6.18",
+ "winnow",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -4417,9 +4545,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4428,9 +4556,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -4453,7 +4581,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528bdd1f0e27b5dd9a4ededf154e824b0532731e4af73bb531de46276e0aab1e"
 dependencies = [
- "bindgen 0.70.1",
+ "bindgen",
  "cc",
  "cfg-if",
  "once_cell",
@@ -4464,9 +4592,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -4505,9 +4633,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
 
 [[package]]
 name = "ttf-parser"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "twox-hash"
@@ -4521,15 +4649,15 @@ dependencies = [
 
 [[package]]
 name = "typeid"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -4545,9 +4673,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-linebreak"
@@ -4555,15 +4683,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-properties"
 version = "0.1.3"
@@ -4578,15 +4697,15 @@ checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
@@ -4596,9 +4715,9 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -4606,10 +4725,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "uuid"
-version = "1.10.0"
+name = "utf16_iter"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
@@ -4718,9 +4849,9 @@ checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -4732,9 +4863,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.5"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
 dependencies = [
  "bitflags 2.6.0",
  "rustix",
@@ -4755,9 +4886,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.5"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95"
+checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -4766,9 +4897,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.3"
+version = "0.32.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
+checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -4778,9 +4909,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
+checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -4791,9 +4922,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
+checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -4804,9 +4935,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -4815,9 +4946,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
 dependencies = [
  "dlib",
  "log",
@@ -4847,9 +4978,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923"
+checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535"
 dependencies = [
  "block2",
  "core-foundation 0.10.0",
@@ -5016,6 +5147,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -5036,19 +5177,42 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement 0.57.0",
+ "windows-interface 0.57.0",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
  "windows-result 0.2.0",
  "windows-strings",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.58.0"
@@ -5060,6 +5224,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.58.0"
@@ -5315,9 +5490,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.30.4"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4225ddd8ab67b8b59a2fee4b34889ebf13c0460c1c3fa297c58e21eb87801b33"
+checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
 dependencies = [
  "ahash",
  "android-activity",
@@ -5367,21 +5542,24 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winnow"
-version = "0.6.18"
+name = "write16"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
-dependencies = [
- "memchr",
-]
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "x11-dl"
@@ -5417,9 +5595,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xcursor"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7"
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
 [[package]]
 name = "xkbcommon-dl"
@@ -5442,9 +5620,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.20"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432"
 
 [[package]]
 name = "yazi"
@@ -5452,6 +5630,30 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeno"
 version = "0.2.3"
@@ -5478,3 +5680,46 @@ dependencies = [
  "quote",
  "syn",
 ]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/src/dev_tools/mod.rs b/src/dev_tools/mod.rs
index ad48bfc..bffe244 100644
--- a/src/dev_tools/mod.rs
+++ b/src/dev_tools/mod.rs
@@ -1,4 +1,32 @@
-mod plugin;
 mod ui;
 
-pub use plugin::DevToolsPlugin;
+use crate::screens::Screen;
+use bevy::{
+    dev_tools::{
+        states::log_transitions,
+        ui_debug_overlay::{DebugUiPlugin, UiDebugOptions},
+    },
+    input::common_conditions::input_just_pressed,
+    prelude::*,
+};
+use bevy_egui::EguiPlugin;
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
+use ui::maze_controls_ui;
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(Update, log_transitions::<Screen>)
+        .add_plugins(EguiPlugin)
+        .add_plugins(WorldInspectorPlugin::new())
+        .add_plugins(DebugUiPlugin)
+        .add_systems(Update, maze_controls_ui)
+        .add_systems(
+            Update,
+            toggle_debug_ui.run_if(input_just_pressed(TOGGLE_KEY)),
+        );
+}
+
+const TOGGLE_KEY: KeyCode = KeyCode::Backquote;
+
+fn toggle_debug_ui(mut options: ResMut<UiDebugOptions>) {
+    options.toggle();
+}
diff --git a/src/dev_tools/plugin.rs b/src/dev_tools/plugin.rs
deleted file mode 100644
index f94886a..0000000
--- a/src/dev_tools/plugin.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::screens::Screen;
-use bevy::{
-    dev_tools::{
-        states::log_transitions,
-        ui_debug_overlay::{DebugUiPlugin, UiDebugOptions},
-    },
-    input::common_conditions::input_just_pressed,
-    prelude::*,
-};
-use bevy_egui::EguiPlugin;
-use bevy_inspector_egui::quick::WorldInspectorPlugin;
-
-use super::ui::maze_controls_ui;
-
-#[derive(Debug)]
-pub struct DevToolsPlugin;
-
-impl Plugin for DevToolsPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(Update, log_transitions::<Screen>)
-            .add_plugins(EguiPlugin)
-            .add_plugins(WorldInspectorPlugin::new())
-            .add_plugins(DebugUiPlugin)
-            .add_systems(Update, maze_controls_ui)
-            .add_systems(
-                Update,
-                toggle_debug_ui.run_if(input_just_pressed(TOGGLE_KEY)),
-            );
-    }
-}
-
-const TOGGLE_KEY: KeyCode = KeyCode::Backquote;
-
-fn toggle_debug_ui(mut options: ResMut<UiDebugOptions>) {
-    options.toggle();
-}
diff --git a/src/lib.rs b/src/lib.rs
index 226dc46..df3f5c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,6 +3,7 @@ pub mod audio;
 #[cfg(feature = "dev")]
 mod dev_tools;
 mod maze;
+mod player;
 mod screens;
 mod theme;
 
@@ -57,14 +58,15 @@ impl Plugin for AppPlugin {
         // Add other plugins.
         app.add_plugins((
             asset_tracking::plugin,
-            maze::plugin::MazePlugin,
             screens::plugin,
             theme::plugin,
+            maze::plugin,
+            player::plugin,
         ));
 
         // Enable dev tools for dev builds.
         #[cfg(feature = "dev")]
-        app.add_plugins(dev_tools::DevToolsPlugin);
+        app.add_plugins(dev_tools::plugin);
     }
 }
 
diff --git a/src/maze/mod.rs b/src/maze/mod.rs
index 56894da..d4be988 100644
--- a/src/maze/mod.rs
+++ b/src/maze/mod.rs
@@ -1,14 +1,21 @@
-use bevy::{ecs::world::Command, prelude::*};
-use plugin::MazePlugin;
+use bevy::{ecs::system::RunSystemOnce, prelude::*};
+use events::RecreateMazeEvent;
 mod assets;
 mod components;
 pub mod events;
-pub mod plugin;
 mod resources;
 mod systems;
 
 pub use resources::{MazeConfig, MazePluginLoaded};
+use systems::recreation::handle_maze_recreation_event;
+
+pub(super) fn plugin(app: &mut App) {
+    app.init_resource::<MazeConfig>()
+        .add_event::<RecreateMazeEvent>()
+        .add_systems(Update, handle_maze_recreation_event);
+}
 
 pub fn spawn_maze(world: &mut World) {
-    MazePlugin.apply(world);
+    world.insert_resource(MazePluginLoaded);
+    world.run_system_once(systems::setup::setup);
 }
diff --git a/src/maze/resources.rs b/src/maze/resources.rs
index f25a59f..dee34ff 100644
--- a/src/maze/resources.rs
+++ b/src/maze/resources.rs
@@ -1,8 +1,7 @@
-use std::num::TryFromIntError;
-
 use bevy::prelude::*;
 use hexx::{Hex, HexLayout, HexOrientation};
 use rand::{rngs::StdRng, thread_rng, Rng, SeedableRng};
+use std::num::TryFromIntError;
 use thiserror::Error;
 
 #[derive(Debug, Default, Reflect, Resource)]
diff --git a/src/player/components.rs b/src/player/components.rs
new file mode 100644
index 0000000..b31e58b
--- /dev/null
+++ b/src/player/components.rs
@@ -0,0 +1,5 @@
+use bevy::prelude::*;
+
+#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Default, Reflect)]
+#[reflect(Component)]
+pub struct Player;
diff --git a/src/player/mod.rs b/src/player/mod.rs
new file mode 100644
index 0000000..aa903a1
--- /dev/null
+++ b/src/player/mod.rs
@@ -0,0 +1,9 @@
+mod components;
+mod systems;
+
+use bevy::prelude::*;
+use components::Player;
+
+pub(super) fn plugin(app: &mut App) {
+    app.register_type::<Player>().add_plugins(());
+}
diff --git a/src/player/systems.rs b/src/player/systems.rs
new file mode 100644
index 0000000..1e9a7f5
--- /dev/null
+++ b/src/player/systems.rs
@@ -0,0 +1,21 @@
+use super::components::Player;
+use crate::maze::{events::RecreateMazeEvent, MazeConfig};
+use bevy::prelude::*;
+
+pub fn spawn_player(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    maze_config: Res<MazeConfig>,
+) {
+}
+
+pub fn respawn_player(
+    mut commands: Commands,
+    player_query: Query<Entity, With<Player>>,
+    mut recreation_events: EventReader<RecreateMazeEvent>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    maze_config: Res<MazeConfig>,
+) {
+}

From 6f0f8471c53a8e2f9b7fb14c9db0304fd88e6b38 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Sun, 8 Dec 2024 21:26:49 +0200
Subject: [PATCH 2/8] feat(player): spawn player pill

---
 src/lib.rs                               |  2 +-
 src/player/assets.rs                     | 17 ++++++++++++++++
 src/player/mod.rs                        |  5 ++++-
 src/player/systems.rs                    | 26 +++++++++++++++---------
 src/theme/mod.rs                         |  1 -
 src/theme/{palette.rs => palette/mod.rs} | 10 +++++++++
 src/theme/palette/rose_pine.rs           | 18 ++++++++++++++++
 7 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 src/player/assets.rs
 rename src/theme/{palette.rs => palette/mod.rs} (68%)
 create mode 100644 src/theme/palette/rose_pine.rs

diff --git a/src/lib.rs b/src/lib.rs
index df3f5c0..2ca0c9e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@ mod dev_tools;
 mod maze;
 mod player;
 mod screens;
-mod theme;
+pub mod theme;
 
 use bevy::{
     asset::AssetMetaCheck,
diff --git a/src/player/assets.rs b/src/player/assets.rs
new file mode 100644
index 0000000..f4be8fa
--- /dev/null
+++ b/src/player/assets.rs
@@ -0,0 +1,17 @@
+use crate::theme::palette::rose_pine::PINE;
+use bevy::prelude::*;
+
+pub(super) fn generate_pill_mesh(radius: f32, half_length: f32) -> Mesh {
+    Mesh::from(Capsule3d {
+        radius,
+        half_length,
+    })
+}
+
+pub(super) fn blue_material() -> StandardMaterial {
+    StandardMaterial {
+        base_color: PINE,
+        emissive: PINE.to_linear() * 3.,
+        ..default()
+    }
+}
diff --git a/src/player/mod.rs b/src/player/mod.rs
index aa903a1..fd85629 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -1,9 +1,12 @@
+mod assets;
 mod components;
 mod systems;
 
 use bevy::prelude::*;
 use components::Player;
+use systems::spawn_player;
 
 pub(super) fn plugin(app: &mut App) {
-    app.register_type::<Player>().add_plugins(());
+    app.register_type::<Player>()
+        .add_systems(Startup, spawn_player);
 }
diff --git a/src/player/systems.rs b/src/player/systems.rs
index 1e9a7f5..c2bc1b7 100644
--- a/src/player/systems.rs
+++ b/src/player/systems.rs
@@ -1,4 +1,7 @@
-use super::components::Player;
+use super::{
+    assets::{blue_material, generate_pill_mesh},
+    components::Player,
+};
 use crate::maze::{events::RecreateMazeEvent, MazeConfig};
 use bevy::prelude::*;
 
@@ -8,14 +11,17 @@ pub fn spawn_player(
     mut materials: ResMut<Assets<StandardMaterial>>,
     maze_config: Res<MazeConfig>,
 ) {
-}
+    let player_height = maze_config.height * 0.5;
+    let player_radius = maze_config.hex_size * 0.5;
 
-pub fn respawn_player(
-    mut commands: Commands,
-    player_query: Query<Entity, With<Player>>,
-    mut recreation_events: EventReader<RecreateMazeEvent>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    maze_config: Res<MazeConfig>,
-) {
+    commands.spawn((
+        Name::new("Player"),
+        Player,
+        PbrBundle {
+            mesh: meshes.add(generate_pill_mesh(player_radius, player_height / 2.)),
+            material: materials.add(blue_material()),
+            transform: Transform::from_xyz(0., player_height * 2., 0.),
+            ..default()
+        },
+    ));
 }
diff --git a/src/theme/mod.rs b/src/theme/mod.rs
index 135fcd2..1d0e466 100644
--- a/src/theme/mod.rs
+++ b/src/theme/mod.rs
@@ -1,7 +1,6 @@
 //! Reusable UI widgets & theming.
 
 // Unused utilities may trigger this lints undesirably.
-#![allow(dead_code)]
 
 pub mod interaction;
 pub mod palette;
diff --git a/src/theme/palette.rs b/src/theme/palette/mod.rs
similarity index 68%
rename from src/theme/palette.rs
rename to src/theme/palette/mod.rs
index 9b2d2e8..960cca2 100644
--- a/src/theme/palette.rs
+++ b/src/theme/palette/mod.rs
@@ -1,3 +1,5 @@
+pub mod rose_pine;
+
 use bevy::prelude::*;
 
 pub const BUTTON_HOVERED_BACKGROUND: Color = Color::srgb(0.186, 0.328, 0.573);
@@ -8,3 +10,11 @@ pub const LABEL_TEXT: Color = Color::srgb(0.867, 0.827, 0.412);
 pub const HEADER_TEXT: Color = Color::srgb(0.867, 0.827, 0.412);
 
 pub const NODE_BACKGROUND: Color = Color::srgb(0.286, 0.478, 0.773);
+
+pub(super) const fn rgb_u8(red: u8, green: u8, blue: u8) -> Color {
+    Color::srgb(scale(red), scale(green), scale(blue))
+}
+
+const fn scale(value: u8) -> f32 {
+    value as f32 / 255.
+}
diff --git a/src/theme/palette/rose_pine.rs b/src/theme/palette/rose_pine.rs
new file mode 100644
index 0000000..e69a56b
--- /dev/null
+++ b/src/theme/palette/rose_pine.rs
@@ -0,0 +1,18 @@
+use super::rgb_u8;
+use bevy::prelude::*;
+
+pub const BASE: Color = rgb_u8(25, 23, 36);
+pub const SURFACE: Color = rgb_u8(31, 29, 46);
+pub const OVERLAY: Color = rgb_u8(38, 35, 58);
+pub const MUTED: Color = rgb_u8(110, 106, 134);
+pub const SUBTLE: Color = rgb_u8(144, 140, 170);
+pub const TEXT: Color = rgb_u8(224, 222, 244);
+pub const LOVE: Color = rgb_u8(235, 111, 146);
+pub const GOLD: Color = rgb_u8(246, 193, 119);
+pub const ROSE: Color = rgb_u8(235, 188, 186);
+pub const PINE: Color = rgb_u8(49, 116, 143);
+pub const FOAM: Color = rgb_u8(156, 207, 216);
+pub const IRIS: Color = rgb_u8(196, 167, 231);
+pub const HIGHLIGHT_LOW: Color = rgb_u8(33, 32, 46);
+pub const HIGHLIGHT_MED: Color = rgb_u8(64, 61, 82);
+pub const HIGHLIGHT_HIGH: Color = rgb_u8(82, 79, 103);

From 0fb3504b81455db325945adae102702adee20212 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Mon, 9 Dec 2024 20:25:33 +0200
Subject: [PATCH 3/8] feat(player): add movement system

---
 src/maze/mod.rs                             |  2 +-
 src/player/components.rs                    |  6 ++--
 src/player/mod.rs                           | 12 ++++---
 src/player/systems/mod.rs                   |  9 +++++
 src/player/systems/movement.rs              | 38 +++++++++++++++++++++
 src/player/{systems.rs => systems/spawn.rs} | 12 ++++---
 src/screens/gameplay.rs                     |  4 ++-
 7 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 src/player/systems/mod.rs
 create mode 100644 src/player/systems/movement.rs
 rename src/player/{systems.rs => systems/spawn.rs} (79%)

diff --git a/src/maze/mod.rs b/src/maze/mod.rs
index d4be988..3ad26fc 100644
--- a/src/maze/mod.rs
+++ b/src/maze/mod.rs
@@ -15,7 +15,7 @@ pub(super) fn plugin(app: &mut App) {
         .add_systems(Update, handle_maze_recreation_event);
 }
 
-pub fn spawn_maze(world: &mut World) {
+pub fn spawn_level_command(world: &mut World) {
     world.insert_resource(MazePluginLoaded);
     world.run_system_once(systems::setup::setup);
 }
diff --git a/src/player/components.rs b/src/player/components.rs
index b31e58b..746f505 100644
--- a/src/player/components.rs
+++ b/src/player/components.rs
@@ -1,5 +1,7 @@
 use bevy::prelude::*;
 
-#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Default, Reflect)]
+#[derive(Component, Debug, Clone, Copy, PartialEq, Default, Reflect)]
 #[reflect(Component)]
-pub struct Player;
+pub struct Player {
+    pub speed: f32,
+}
diff --git a/src/player/mod.rs b/src/player/mod.rs
index fd85629..baf5698 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -1,12 +1,14 @@
 mod assets;
-mod components;
+pub mod components;
 mod systems;
 
-use bevy::prelude::*;
+use bevy::{ecs::system::RunSystemOnce, prelude::*};
 use components::Player;
-use systems::spawn_player;
 
 pub(super) fn plugin(app: &mut App) {
-    app.register_type::<Player>()
-        .add_systems(Startup, spawn_player);
+    app.register_type::<Player>().add_plugins(systems::plugin);
+}
+
+pub fn spawn_player_command(world: &mut World) {
+    world.run_system_once(systems::spawn::spawn_player);
 }
diff --git a/src/player/systems/mod.rs b/src/player/systems/mod.rs
new file mode 100644
index 0000000..fc506a3
--- /dev/null
+++ b/src/player/systems/mod.rs
@@ -0,0 +1,9 @@
+pub mod movement;
+pub mod spawn;
+
+use bevy::prelude::*;
+use movement::player_movement;
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(Update, player_movement);
+}
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
new file mode 100644
index 0000000..73bde06
--- /dev/null
+++ b/src/player/systems/movement.rs
@@ -0,0 +1,38 @@
+use bevy::prelude::*;
+use hexx::{EdgeDirection, Hex};
+
+use crate::{maze::MazeConfig, player::components::Player};
+
+const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
+    match key {
+        KeyCode::KeyD => Some(EdgeDirection::FLAT_SOUTH),
+        KeyCode::KeyS => Some(EdgeDirection::FLAT_NORTH_EAST),
+        KeyCode::KeyA => Some(EdgeDirection::FLAT_NORTH),
+        KeyCode::KeyQ => Some(EdgeDirection::FLAT_NORTH_WEST),
+        KeyCode::KeyW => Some(EdgeDirection::FLAT_SOUTH_WEST),
+        KeyCode::KeyE => Some(EdgeDirection::FLAT_SOUTH_EAST),
+        _ => None,
+    }
+}
+
+pub fn player_movement(
+    time: Res<Time>,
+    input: Res<ButtonInput<KeyCode>>,
+    mut player_query: Query<(&Player, &mut Transform)>,
+    maze_config: Res<MazeConfig>,
+) {
+    for (player, mut transform) in player_query.iter_mut() {
+        let direction = input.get_pressed().find_map(|key| create_direction(key));
+
+        if let Some(hex_dir) = direction {
+            let hex_vec = Hex::from(hex_dir);
+            let world_pos = maze_config.layout.hex_to_world_pos(hex_vec);
+
+            let move_vec = Vec3::new(world_pos.x, 0.0, world_pos.y).normalize()
+                * player.speed
+                * time.delta_seconds();
+
+            transform.translation += move_vec;
+        }
+    }
+}
diff --git a/src/player/systems.rs b/src/player/systems/spawn.rs
similarity index 79%
rename from src/player/systems.rs
rename to src/player/systems/spawn.rs
index c2bc1b7..aa5c2ad 100644
--- a/src/player/systems.rs
+++ b/src/player/systems/spawn.rs
@@ -1,8 +1,10 @@
-use super::{
-    assets::{blue_material, generate_pill_mesh},
-    components::Player,
+use crate::{
+    maze::MazeConfig,
+    player::{
+        assets::{blue_material, generate_pill_mesh},
+        components::Player,
+    },
 };
-use crate::maze::{events::RecreateMazeEvent, MazeConfig};
 use bevy::prelude::*;
 
 pub fn spawn_player(
@@ -16,7 +18,7 @@ pub fn spawn_player(
 
     commands.spawn((
         Name::new("Player"),
-        Player,
+        Player { speed: 50. },
         PbrBundle {
             mesh: meshes.add(generate_pill_mesh(player_radius, player_height / 2.)),
             material: materials.add(blue_material()),
diff --git a/src/screens/gameplay.rs b/src/screens/gameplay.rs
index 20cde2c..9af42b2 100644
--- a/src/screens/gameplay.rs
+++ b/src/screens/gameplay.rs
@@ -2,7 +2,8 @@
 
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
 
-use crate::maze::spawn_maze as spawn_level_command;
+use crate::maze::spawn_level_command;
+use crate::player::spawn_player_command;
 use crate::{asset_tracking::LoadResource, audio::Music, screens::Screen};
 
 pub(super) fn plugin(app: &mut App) {
@@ -21,6 +22,7 @@ pub(super) fn plugin(app: &mut App) {
 
 fn spawn_level(mut commands: Commands) {
     commands.queue(spawn_level_command);
+    commands.queue(spawn_player_command);
 }
 
 #[derive(Resource, Asset, Reflect, Clone)]

From 4ac52cfb380a5a33aa90abd2651a1deabec7a674 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Tue, 10 Dec 2024 17:22:04 +0200
Subject: [PATCH 4/8] feat(player): add tile movement

---
 src/player/components.rs       | 15 +++++++++++-
 src/player/systems/movement.rs | 42 ++++++++++++++++++++++------------
 src/player/systems/spawn.rs    |  2 +-
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/player/components.rs b/src/player/components.rs
index 746f505..060e302 100644
--- a/src/player/components.rs
+++ b/src/player/components.rs
@@ -1,7 +1,20 @@
 use bevy::prelude::*;
+use hexx::Hex;
 
-#[derive(Component, Debug, Clone, Copy, PartialEq, Default, Reflect)]
+#[derive(Component, Debug, Clone, Copy, PartialEq, Reflect)]
 #[reflect(Component)]
 pub struct Player {
     pub speed: f32,
+    pub current_hex: Hex,
+    pub target_hex: Option<Hex>,
+}
+
+impl Default for Player {
+    fn default() -> Self {
+        Self {
+            speed: 50.,
+            current_hex: Hex::ZERO,
+            target_hex: None,
+        }
+    }
 }
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
index 73bde06..0ff3430 100644
--- a/src/player/systems/movement.rs
+++ b/src/player/systems/movement.rs
@@ -1,7 +1,6 @@
-use bevy::prelude::*;
-use hexx::{EdgeDirection, Hex};
-
 use crate::{maze::MazeConfig, player::components::Player};
+use bevy::prelude::*;
+use hexx::EdgeDirection;
 
 const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
     match key {
@@ -18,21 +17,36 @@ const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
 pub fn player_movement(
     time: Res<Time>,
     input: Res<ButtonInput<KeyCode>>,
-    mut player_query: Query<(&Player, &mut Transform)>,
+    mut player_query: Query<(&mut Player, &mut Transform)>,
     maze_config: Res<MazeConfig>,
 ) {
-    for (player, mut transform) in player_query.iter_mut() {
-        let direction = input.get_pressed().find_map(|key| create_direction(key));
+    for (mut player, mut transform) in player_query.iter_mut() {
+        if let Some(direction) = input.get_pressed().find_map(|key| create_direction(key)) {
+            let next_hex = player.current_hex + direction.into_hex();
+            player.target_hex = Some(next_hex);
+        }
 
-        if let Some(hex_dir) = direction {
-            let hex_vec = Hex::from(hex_dir);
-            let world_pos = maze_config.layout.hex_to_world_pos(hex_vec);
+        if let Some(target_hex) = player.target_hex {
+            let current_pos = transform.translation;
+            let target_pos = {
+                let world_pos = maze_config.layout.hex_to_world_pos(target_hex);
+                Vec3::new(world_pos.x, current_pos.y, world_pos.y)
+            };
+            let direction = target_pos - current_pos;
+            let distance = direction.length();
 
-            let move_vec = Vec3::new(world_pos.x, 0.0, world_pos.y).normalize()
-                * player.speed
-                * time.delta_seconds();
-
-            transform.translation += move_vec;
+            if distance < 0.1 {
+                transform.translation = target_pos;
+                player.current_hex = target_hex;
+                player.target_hex = None;
+            } else {
+                let movement = direction.normalize() * player.speed * time.delta_seconds();
+                if movement.length() > distance {
+                    transform.translation = target_pos;
+                } else {
+                    transform.translation += movement;
+                }
+            }
         }
     }
 }
diff --git a/src/player/systems/spawn.rs b/src/player/systems/spawn.rs
index aa5c2ad..c49ca51 100644
--- a/src/player/systems/spawn.rs
+++ b/src/player/systems/spawn.rs
@@ -18,7 +18,7 @@ pub fn spawn_player(
 
     commands.spawn((
         Name::new("Player"),
-        Player { speed: 50. },
+        Player::default(),
         PbrBundle {
             mesh: meshes.add(generate_pill_mesh(player_radius, player_height / 2.)),
             material: materials.add(blue_material()),

From 6bdfc2f67225beef9805c4e47fcc12c662027a8a Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Tue, 10 Dec 2024 17:31:45 +0200
Subject: [PATCH 5/8] refactor(player): separate into 2 systems

---
 src/player/systems/input.rs    | 28 +++++++++++
 src/player/systems/mod.rs      |  6 ++-
 src/player/systems/movement.rs | 88 ++++++++++++++++++++--------------
 3 files changed, 83 insertions(+), 39 deletions(-)
 create mode 100644 src/player/systems/input.rs

diff --git a/src/player/systems/input.rs b/src/player/systems/input.rs
new file mode 100644
index 0000000..917699f
--- /dev/null
+++ b/src/player/systems/input.rs
@@ -0,0 +1,28 @@
+use crate::player::components::Player;
+use bevy::prelude::*;
+use hexx::EdgeDirection;
+
+const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
+    match key {
+        KeyCode::KeyD => Some(EdgeDirection::FLAT_SOUTH),
+        KeyCode::KeyS => Some(EdgeDirection::FLAT_NORTH_EAST),
+        KeyCode::KeyA => Some(EdgeDirection::FLAT_NORTH),
+        KeyCode::KeyQ => Some(EdgeDirection::FLAT_NORTH_WEST),
+        KeyCode::KeyW => Some(EdgeDirection::FLAT_SOUTH_WEST),
+        KeyCode::KeyE => Some(EdgeDirection::FLAT_SOUTH_EAST),
+        _ => None,
+    }
+}
+
+pub(super) fn player_input(input: Res<ButtonInput<KeyCode>>, mut player_query: Query<&mut Player>) {
+    for mut player in player_query.iter_mut() {
+        if player.target_hex.is_some() {
+            continue;
+        }
+
+        if let Some(direction) = input.get_pressed().find_map(|key| create_direction(key)) {
+            let next_hex = player.current_hex + direction.into_hex();
+            player.target_hex = Some(next_hex);
+        }
+    }
+}
diff --git a/src/player/systems/mod.rs b/src/player/systems/mod.rs
index fc506a3..b43f2f4 100644
--- a/src/player/systems/mod.rs
+++ b/src/player/systems/mod.rs
@@ -1,9 +1,11 @@
-pub mod movement;
+mod input;
+mod movement;
 pub mod spawn;
 
 use bevy::prelude::*;
+use input::player_input;
 use movement::player_movement;
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_systems(Update, player_movement);
+    app.add_systems(Update, (player_input, player_movement.after(player_input)));
 }
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
index 0ff3430..3d607f4 100644
--- a/src/player/systems/movement.rs
+++ b/src/player/systems/movement.rs
@@ -1,52 +1,66 @@
 use crate::{maze::MazeConfig, player::components::Player};
 use bevy::prelude::*;
-use hexx::EdgeDirection;
+use hexx::Hex;
 
-const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
-    match key {
-        KeyCode::KeyD => Some(EdgeDirection::FLAT_SOUTH),
-        KeyCode::KeyS => Some(EdgeDirection::FLAT_NORTH_EAST),
-        KeyCode::KeyA => Some(EdgeDirection::FLAT_NORTH),
-        KeyCode::KeyQ => Some(EdgeDirection::FLAT_NORTH_WEST),
-        KeyCode::KeyW => Some(EdgeDirection::FLAT_SOUTH_WEST),
-        KeyCode::KeyE => Some(EdgeDirection::FLAT_SOUTH_EAST),
-        _ => None,
-    }
-}
-
-pub fn player_movement(
+pub(super) fn player_movement(
     time: Res<Time>,
-    input: Res<ButtonInput<KeyCode>>,
     mut player_query: Query<(&mut Player, &mut Transform)>,
     maze_config: Res<MazeConfig>,
 ) {
     for (mut player, mut transform) in player_query.iter_mut() {
-        if let Some(direction) = input.get_pressed().find_map(|key| create_direction(key)) {
-            let next_hex = player.current_hex + direction.into_hex();
-            player.target_hex = Some(next_hex);
-        }
-
         if let Some(target_hex) = player.target_hex {
             let current_pos = transform.translation;
-            let target_pos = {
-                let world_pos = maze_config.layout.hex_to_world_pos(target_hex);
-                Vec3::new(world_pos.x, current_pos.y, world_pos.y)
-            };
-            let direction = target_pos - current_pos;
-            let distance = direction.length();
+            let target_pos = calculate_target_position(&maze_config, target_hex, current_pos.y);
 
-            if distance < 0.1 {
-                transform.translation = target_pos;
-                player.current_hex = target_hex;
-                player.target_hex = None;
-            } else {
-                let movement = direction.normalize() * player.speed * time.delta_seconds();
-                if movement.length() > distance {
-                    transform.translation = target_pos;
-                } else {
-                    transform.translation += movement;
-                }
+            if should_complete_movement(current_pos, target_pos) {
+                complete_movement(&mut player, &mut transform, target_pos, target_hex);
+                continue;
             }
+
+            update_position(
+                &mut transform,
+                current_pos,
+                target_pos,
+                player.speed,
+                time.delta_seconds(),
+            );
         }
     }
 }
+
+fn calculate_target_position(maze_config: &MazeConfig, target_hex: Hex, y: f32) -> Vec3 {
+    let world_pos = maze_config.layout.hex_to_world_pos(target_hex);
+    Vec3::new(world_pos.x, y, world_pos.y)
+}
+
+fn should_complete_movement(current_pos: Vec3, target_pos: Vec3) -> bool {
+    (target_pos - current_pos).length() < 0.1
+}
+
+fn complete_movement(
+    player: &mut Player,
+    transform: &mut Transform,
+    target_pos: Vec3,
+    target_hex: Hex,
+) {
+    transform.translation = target_pos;
+    player.current_hex = target_hex;
+    player.target_hex = None;
+}
+
+fn update_position(
+    transform: &mut Transform,
+    current_pos: Vec3,
+    target_pos: Vec3,
+    speed: f32,
+    delta_time: f32,
+) {
+    let direction = target_pos - current_pos;
+    let movement = direction.normalize() * speed * delta_time;
+
+    if movement.length() > direction.length() {
+        transform.translation = target_pos;
+        return;
+    }
+    transform.translation += movement;
+}

From 30d6cf5fba2746bf27e566d60f73d76f3229a71c Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Thu, 12 Dec 2024 17:24:14 +0200
Subject: [PATCH 6/8] feat(player): add collision check

---
 Cargo.lock                     |  2 -
 Cargo.toml                     |  2 +-
 src/maze/components.rs         | 11 +++--
 src/maze/mod.rs                |  4 +-
 src/maze/systems/recreation.rs | 10 ++--
 src/maze/systems/setup.rs      |  9 +++-
 src/maze/systems/spawn.rs      |  6 +--
 src/player/components.rs       | 29 +++++++-----
 src/player/mod.rs              |  2 +-
 src/player/systems/input.rs    | 85 +++++++++++++++++++++++++++-------
 src/player/systems/movement.rs | 48 ++++++++++---------
 src/player/systems/spawn.rs    | 15 +++---
 src/screens/gameplay.rs        | 13 +++---
 13 files changed, 150 insertions(+), 86 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fed8ef6..6174fc6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2590,8 +2590,6 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 [[package]]
 name = "hexlab"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9414db96618050e085e36c92ed9e87f0140d3a611914764ee73c7c0e4ebaa2de"
 dependencies = [
  "bevy",
  "hexx",
diff --git a/Cargo.toml b/Cargo.toml
index a1414b0..ac7d4b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ tracing = { version = "0.1", features = [
   "release_max_level_warn",
 ] }
 hexx = { version = "0.19", features = ["bevy_reflect", "grid"] }
-hexlab = { version = "0.2", features = ["bevy"] }
+hexlab = { path = "../hexlab", features = ["bevy"] }
 bevy-inspector-egui = { version = "0.28", optional = true }
 bevy_egui = { version = "0.31", optional = true }
 thiserror = "2.0"
diff --git a/src/maze/components.rs b/src/maze/components.rs
index 1d9ccd8..badb2b0 100644
--- a/src/maze/components.rs
+++ b/src/maze/components.rs
@@ -1,13 +1,18 @@
 use bevy::prelude::*;
+use hexlab::HexMaze;
 
 #[derive(Debug, Reflect, Component)]
 #[reflect(Component)]
-pub(crate) struct MazeFloor(pub(crate) u8);
+pub(crate) struct Maze(pub(crate) HexMaze);
 
 #[derive(Debug, Reflect, Component)]
 #[reflect(Component)]
-pub(crate) struct MazeTile;
+pub(crate) struct Floor(pub(crate) u8);
 
 #[derive(Debug, Reflect, Component)]
 #[reflect(Component)]
-pub(crate) struct MazeWall;
+pub(crate) struct Tile;
+
+#[derive(Debug, Reflect, Component)]
+#[reflect(Component)]
+pub(crate) struct Wall;
diff --git a/src/maze/mod.rs b/src/maze/mod.rs
index 3ad26fc..34d31a3 100644
--- a/src/maze/mod.rs
+++ b/src/maze/mod.rs
@@ -1,7 +1,7 @@
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
 use events::RecreateMazeEvent;
 mod assets;
-mod components;
+pub mod components;
 pub mod events;
 mod resources;
 mod systems;
@@ -17,5 +17,5 @@ pub(super) fn plugin(app: &mut App) {
 
 pub fn spawn_level_command(world: &mut World) {
     world.insert_resource(MazePluginLoaded);
-    world.run_system_once(systems::setup::setup);
+    let _ = world.run_system_once(systems::setup::setup);
 }
diff --git a/src/maze/systems/recreation.rs b/src/maze/systems/recreation.rs
index b3a6472..11b37f2 100644
--- a/src/maze/systems/recreation.rs
+++ b/src/maze/systems/recreation.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::maze::{components::MazeFloor, events::RecreateMazeEvent, MazeConfig};
+use crate::maze::{components::Floor, events::RecreateMazeEvent, MazeConfig};
 
 use super::setup::setup_maze;
 
@@ -9,7 +9,7 @@ pub(crate) fn handle_maze_recreation_event(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     config: Res<MazeConfig>,
-    query: Query<(Entity, &MazeFloor)>,
+    query: Query<(Entity, &Floor)>,
     mut event_reader: EventReader<RecreateMazeEvent>,
 ) {
     for event in event_reader.read() {
@@ -18,9 +18,9 @@ pub(crate) fn handle_maze_recreation_event(
     }
 }
 
-fn despawn_floor(commands: &mut Commands, query: &Query<(Entity, &MazeFloor)>, floor_num: u8) {
-    for (entity, maze_floor) in query.iter() {
-        if maze_floor.0 == floor_num {
+fn despawn_floor(commands: &mut Commands, query: &Query<(Entity, &Floor)>, floor_num: u8) {
+    for (entity, floor) in query.iter() {
+        if floor.0 == floor_num {
             commands.entity(entity).despawn_recursive();
         }
     }
diff --git a/src/maze/systems/setup.rs b/src/maze/systems/setup.rs
index 37b0538..b44f9e8 100644
--- a/src/maze/systems/setup.rs
+++ b/src/maze/systems/setup.rs
@@ -1,7 +1,11 @@
 use bevy::prelude::*;
 use hexlab::{GeneratorType, MazeBuilder};
 
-use crate::maze::{assets::MazeAssets, components::MazeFloor, MazeConfig};
+use crate::maze::{
+    assets::MazeAssets,
+    components::{Floor, Maze},
+    MazeConfig,
+};
 
 use super::spawn::spawn_single_hex_tile;
 
@@ -31,7 +35,8 @@ pub(super) fn setup_maze(
     commands
         .spawn((
             Name::new("Floor"),
-            MazeFloor(1),
+            Maze(maze.clone()),
+            Floor(1),
             Transform::from_translation(Vec3::ZERO),
             Visibility::Visible,
         ))
diff --git a/src/maze/systems/spawn.rs b/src/maze/systems/spawn.rs
index 5849088..be9a9d7 100644
--- a/src/maze/systems/spawn.rs
+++ b/src/maze/systems/spawn.rs
@@ -6,7 +6,7 @@ use hexx::HexOrientation;
 
 use crate::maze::{
     assets::MazeAssets,
-    components::{MazeTile, MazeWall},
+    components::{Tile, Wall},
     MazeConfig,
 };
 
@@ -25,7 +25,7 @@ pub(super) fn spawn_single_hex_tile(
     parent
         .spawn((
             Name::new(format!("Hex {}", tile)),
-            MazeTile,
+            Tile,
             Mesh3d(assets.hex_mesh.clone()),
             MeshMaterial3d(assets.hex_material.clone()),
             Transform::from_translation(world_pos).with_rotation(rotation),
@@ -58,7 +58,7 @@ fn spawn_walls(parent: &mut ChildBuilder, assets: &MazeAssets, config: &MazeConf
 fn spawn_single_wall(parent: &mut ChildBuilder, assets: &MazeAssets, rotation: Quat, offset: Vec3) {
     parent.spawn((
         Name::new("Wall"),
-        MazeWall,
+        Wall,
         Mesh3d(assets.wall_mesh.clone()),
         MeshMaterial3d(assets.wall_material.clone()),
         Transform::from_translation(offset).with_rotation(rotation),
diff --git a/src/player/components.rs b/src/player/components.rs
index 060e302..87f7d18 100644
--- a/src/player/components.rs
+++ b/src/player/components.rs
@@ -1,20 +1,25 @@
 use bevy::prelude::*;
 use hexx::Hex;
 
-#[derive(Component, Debug, Clone, Copy, PartialEq, Reflect)]
+#[derive(Debug, Reflect, Component)]
 #[reflect(Component)]
-pub struct Player {
-    pub speed: f32,
-    pub current_hex: Hex,
-    pub target_hex: Option<Hex>,
-}
+#[require(CurrentPosition, MovementSpeed, MovementTarget)]
+pub struct Player;
 
-impl Default for Player {
+#[derive(Debug, Reflect, Component, Deref, DerefMut, Default)]
+#[reflect(Component)]
+pub struct CurrentPosition(pub Hex);
+
+#[derive(Debug, Reflect, Component, Deref, DerefMut)]
+#[reflect(Component)]
+pub struct MovementSpeed(pub f32);
+
+impl Default for MovementSpeed {
     fn default() -> Self {
-        Self {
-            speed: 50.,
-            current_hex: Hex::ZERO,
-            target_hex: None,
-        }
+        Self(50.)
     }
 }
+
+#[derive(Debug, Reflect, Component, Deref, DerefMut, Default)]
+#[reflect(Component)]
+pub struct MovementTarget(pub Option<Hex>);
diff --git a/src/player/mod.rs b/src/player/mod.rs
index baf5698..7d067d4 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -10,5 +10,5 @@ pub(super) fn plugin(app: &mut App) {
 }
 
 pub fn spawn_player_command(world: &mut World) {
-    world.run_system_once(systems::spawn::spawn_player);
+    let _ = world.run_system_once(systems::spawn::spawn_player);
 }
diff --git a/src/player/systems/input.rs b/src/player/systems/input.rs
index 917699f..6163700 100644
--- a/src/player/systems/input.rs
+++ b/src/player/systems/input.rs
@@ -1,28 +1,77 @@
-use crate::player::components::Player;
+use crate::{
+    maze::{
+        components::{Floor, Maze},
+        MazeConfig,
+    },
+    player::components::{CurrentPosition, MovementTarget, Player},
+};
 use bevy::prelude::*;
-use hexx::EdgeDirection;
+use hexx::{EdgeDirection, HexOrientation};
 
-const fn create_direction(key: &KeyCode) -> Option<EdgeDirection> {
-    match key {
-        KeyCode::KeyD => Some(EdgeDirection::FLAT_SOUTH),
-        KeyCode::KeyS => Some(EdgeDirection::FLAT_NORTH_EAST),
-        KeyCode::KeyA => Some(EdgeDirection::FLAT_NORTH),
-        KeyCode::KeyQ => Some(EdgeDirection::FLAT_NORTH_WEST),
-        KeyCode::KeyW => Some(EdgeDirection::FLAT_SOUTH_WEST),
-        KeyCode::KeyE => Some(EdgeDirection::FLAT_SOUTH_EAST),
-        _ => None,
-    }
+fn create_direction(
+    input: &ButtonInput<KeyCode>,
+    orientation: &HexOrientation,
+) -> Option<EdgeDirection> {
+    let w = input.pressed(KeyCode::KeyW);
+    let a = input.pressed(KeyCode::KeyA);
+    let s = input.pressed(KeyCode::KeyS);
+    let d = input.pressed(KeyCode::KeyD);
+
+    let direction = match orientation {
+        HexOrientation::Pointy => {
+            match (w, a, s, d) {
+                (true, false, false, false) => Some(EdgeDirection::POINTY_WEST), // W
+                (false, false, true, false) => Some(EdgeDirection::POINTY_EAST), // S
+                (false, true, true, false) => Some(EdgeDirection::POINTY_NORTH_EAST), // A+S
+                (false, false, true, true) => Some(EdgeDirection::POINTY_SOUTH_EAST), // S+D
+                (true, true, false, false) => Some(EdgeDirection::POINTY_NORTH_WEST), // W+A
+                (true, false, false, true) => Some(EdgeDirection::POINTY_SOUTH_WEST), // W+D
+                _ => None,
+            }
+        }
+        HexOrientation::Flat => {
+            match (w, a, s, d) {
+                (false, true, false, false) => Some(EdgeDirection::FLAT_NORTH), // A
+                (false, false, false, true) => Some(EdgeDirection::FLAT_SOUTH), // D
+                (false, true, true, false) => Some(EdgeDirection::FLAT_NORTH_EAST), // A+S
+                (false, false, true, true) => Some(EdgeDirection::FLAT_SOUTH_EAST), // S+D
+                (true, true, false, false) => Some(EdgeDirection::FLAT_NORTH_WEST), // W+A
+                (true, false, false, true) => Some(EdgeDirection::FLAT_SOUTH_WEST), // W+D
+                _ => None,
+            }
+        }
+    }?;
+    Some(direction.rotate_cw(0))
 }
 
-pub(super) fn player_input(input: Res<ButtonInput<KeyCode>>, mut player_query: Query<&mut Player>) {
-    for mut player in player_query.iter_mut() {
-        if player.target_hex.is_some() {
+pub(super) fn player_input(
+    input: Res<ButtonInput<KeyCode>>,
+    mut player_query: Query<(&mut MovementTarget, &CurrentPosition), With<Player>>,
+    maze_query: Query<(&Maze, &Floor)>,
+    maze_config: Res<MazeConfig>,
+) {
+    let Ok((maze, _floor)) = maze_query.get_single() else {
+        return;
+    };
+
+    for (mut target_pos, current_pos) in player_query.iter_mut() {
+        if target_pos.is_some() {
             continue;
         }
 
-        if let Some(direction) = input.get_pressed().find_map(|key| create_direction(key)) {
-            let next_hex = player.current_hex + direction.into_hex();
-            player.target_hex = Some(next_hex);
+        let Some(direction) = create_direction(&input, &maze_config.layout.orientation) else {
+            continue;
+        };
+
+        let Some(tile) = maze.0.get_tile(&current_pos) else {
+            continue;
+        };
+
+        if tile.walls().contains(direction) {
+            continue;
         }
+
+        let next_hex = current_pos.0.neighbor(direction);
+        target_pos.0 = Some(next_hex);
     }
 }
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
index 3d607f4..26ec3d2 100644
--- a/src/player/systems/movement.rs
+++ b/src/player/systems/movement.rs
@@ -1,19 +1,32 @@
-use crate::{maze::MazeConfig, player::components::Player};
+use crate::{
+    maze::MazeConfig,
+    player::components::{CurrentPosition, MovementSpeed, MovementTarget, Player},
+};
 use bevy::prelude::*;
 use hexx::Hex;
 
 pub(super) fn player_movement(
     time: Res<Time>,
-    mut player_query: Query<(&mut Player, &mut Transform)>,
+    mut query: Query<
+        (
+            &mut MovementTarget,
+            &MovementSpeed,
+            &mut CurrentPosition,
+            &mut Transform,
+        ),
+        With<Player>,
+    >,
     maze_config: Res<MazeConfig>,
 ) {
-    for (mut player, mut transform) in player_query.iter_mut() {
-        if let Some(target_hex) = player.target_hex {
+    for (mut target, speed, mut current_hex, mut transform) in query.iter_mut() {
+        if let Some(target_hex) = target.0 {
             let current_pos = transform.translation;
             let target_pos = calculate_target_position(&maze_config, target_hex, current_pos.y);
 
             if should_complete_movement(current_pos, target_pos) {
-                complete_movement(&mut player, &mut transform, target_pos, target_hex);
+                transform.translation = target_pos;
+                current_hex.0 = target_hex;
+                target.0 = None;
                 continue;
             }
 
@@ -21,33 +34,17 @@ pub(super) fn player_movement(
                 &mut transform,
                 current_pos,
                 target_pos,
-                player.speed,
-                time.delta_seconds(),
+                speed.0,
+                time.delta_secs(),
             );
         }
     }
 }
 
-fn calculate_target_position(maze_config: &MazeConfig, target_hex: Hex, y: f32) -> Vec3 {
-    let world_pos = maze_config.layout.hex_to_world_pos(target_hex);
-    Vec3::new(world_pos.x, y, world_pos.y)
-}
-
 fn should_complete_movement(current_pos: Vec3, target_pos: Vec3) -> bool {
     (target_pos - current_pos).length() < 0.1
 }
 
-fn complete_movement(
-    player: &mut Player,
-    transform: &mut Transform,
-    target_pos: Vec3,
-    target_hex: Hex,
-) {
-    transform.translation = target_pos;
-    player.current_hex = target_hex;
-    player.target_hex = None;
-}
-
 fn update_position(
     transform: &mut Transform,
     current_pos: Vec3,
@@ -64,3 +61,8 @@ fn update_position(
     }
     transform.translation += movement;
 }
+
+fn calculate_target_position(maze_config: &MazeConfig, target_hex: Hex, y: f32) -> Vec3 {
+    let world_pos = maze_config.layout.hex_to_world_pos(target_hex);
+    Vec3::new(world_pos.x, y, world_pos.y)
+}
diff --git a/src/player/systems/spawn.rs b/src/player/systems/spawn.rs
index c49ca51..aacb49e 100644
--- a/src/player/systems/spawn.rs
+++ b/src/player/systems/spawn.rs
@@ -2,10 +2,11 @@ use crate::{
     maze::MazeConfig,
     player::{
         assets::{blue_material, generate_pill_mesh},
-        components::Player,
+        components::{CurrentPosition, Player},
     },
 };
 use bevy::prelude::*;
+use hexx::Hex;
 
 pub fn spawn_player(
     mut commands: Commands,
@@ -18,12 +19,10 @@ pub fn spawn_player(
 
     commands.spawn((
         Name::new("Player"),
-        Player::default(),
-        PbrBundle {
-            mesh: meshes.add(generate_pill_mesh(player_radius, player_height / 2.)),
-            material: materials.add(blue_material()),
-            transform: Transform::from_xyz(0., player_height * 2., 0.),
-            ..default()
-        },
+        Player,
+        CurrentPosition(Hex::new(1, 1)),
+        Mesh3d(meshes.add(generate_pill_mesh(player_radius, player_height / 2.))),
+        MeshMaterial3d(materials.add(blue_material())),
+        Transform::from_xyz(0., player_height * 2., 0.),
     ));
 }
diff --git a/src/screens/gameplay.rs b/src/screens/gameplay.rs
index 9af42b2..84945f8 100644
--- a/src/screens/gameplay.rs
+++ b/src/screens/gameplay.rs
@@ -7,7 +7,13 @@ use crate::player::spawn_player_command;
 use crate::{asset_tracking::LoadResource, audio::Music, screens::Screen};
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_systems(OnEnter(Screen::Gameplay), spawn_level);
+    app.add_systems(
+        OnEnter(Screen::Gameplay),
+        (
+            spawn_level_command,
+            spawn_player_command.after(spawn_level_command),
+        ),
+    );
 
     app.load_resource::<GameplayMusic>();
     app.add_systems(OnEnter(Screen::Gameplay), play_gameplay_music);
@@ -20,11 +26,6 @@ pub(super) fn plugin(app: &mut App) {
     );
 }
 
-fn spawn_level(mut commands: Commands) {
-    commands.queue(spawn_level_command);
-    commands.queue(spawn_player_command);
-}
-
 #[derive(Resource, Asset, Reflect, Clone)]
 pub struct GameplayMusic {
     #[dependency]

From b89921dcd690068b8c267ae2907d8037a587c0e8 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Thu, 12 Dec 2024 19:33:35 +0200
Subject: [PATCH 7/8] fix(player): spawn position

---
 src/player/systems/spawn.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/player/systems/spawn.rs b/src/player/systems/spawn.rs
index aacb49e..08a35f5 100644
--- a/src/player/systems/spawn.rs
+++ b/src/player/systems/spawn.rs
@@ -17,12 +17,15 @@ pub fn spawn_player(
     let player_height = maze_config.height * 0.5;
     let player_radius = maze_config.hex_size * 0.5;
 
+    let start_hex = Hex::new(1, 1);
+    let start_pos = maze_config.layout.hex_to_world_pos(start_hex);
+
     commands.spawn((
         Name::new("Player"),
         Player,
-        CurrentPosition(Hex::new(1, 1)),
+        CurrentPosition(start_hex),
         Mesh3d(meshes.add(generate_pill_mesh(player_radius, player_height / 2.))),
         MeshMaterial3d(materials.add(blue_material())),
-        Transform::from_xyz(0., player_height * 2., 0.),
+        Transform::from_xyz(start_pos.x, player_height * 2., start_pos.y),
     ));
 }

From f4aefb00faef80d93631621d027cf4455beab6c7 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Thu, 12 Dec 2024 20:33:26 +0200
Subject: [PATCH 8/8] feat(player): add player respawn and despawn

---
 Cargo.lock                        |  7 +++---
 Cargo.toml                        |  4 +--
 src/dev_tools/ui/maze_controls.rs | 22 +++++++++-------
 src/maze/mod.rs                   |  3 +--
 src/maze/plugin.rs                | 28 ---------------------
 src/maze/resources.rs             |  4 +--
 src/maze/systems/despawn.rs       | 13 +++++++++-
 src/maze/systems/mod.rs           | 10 +++++++-
 src/maze/systems/recreation.rs    | 14 +++--------
 src/maze/systems/setup.rs         | 42 +++----------------------------
 src/maze/systems/spawn.rs         | 41 ++++++++++++++++++++++++------
 src/player/components.rs          |  2 +-
 src/player/events.rs              |  4 +++
 src/player/mod.rs                 |  8 ++++--
 src/player/systems/despawn.rs     |  9 +++++++
 src/player/systems/mod.rs         | 13 +++++++++-
 src/player/systems/respawn.rs     | 21 ++++++++++++++++
 src/player/systems/setup.rs       | 14 +++++++++++
 src/player/systems/spawn.rs       | 24 +++++++++---------
 19 files changed, 162 insertions(+), 121 deletions(-)
 delete mode 100644 src/maze/plugin.rs
 create mode 100644 src/player/events.rs
 create mode 100644 src/player/systems/despawn.rs
 create mode 100644 src/player/systems/respawn.rs
 create mode 100644 src/player/systems/setup.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6174fc6..cbd3b59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2589,12 +2589,13 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "hexlab"
-version = "0.2.1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b912e78d292803bc279aec3a4e2a0cdd0e0ac1540bcdc5d0f32cbfe9e4d234dc"
 dependencies = [
  "bevy",
  "hexx",
  "rand",
- "rand_chacha",
  "thiserror 2.0.6",
 ]
 
@@ -3076,7 +3077,7 @@ dependencies = [
 
 [[package]]
 name = "maze-ascension"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
diff --git a/Cargo.toml b/Cargo.toml
index ac7d4b5..5059061 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "maze-ascension"
 authors = ["Kristofers Solo <dev@kristofers.xyz>"]
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [dependencies]
@@ -18,7 +18,7 @@ tracing = { version = "0.1", features = [
   "release_max_level_warn",
 ] }
 hexx = { version = "0.19", features = ["bevy_reflect", "grid"] }
-hexlab = { path = "../hexlab", features = ["bevy"] }
+hexlab = { version = "0.3", features = ["bevy"] }
 bevy-inspector-egui = { version = "0.28", optional = true }
 bevy_egui = { version = "0.31", optional = true }
 thiserror = "2.0"
diff --git a/src/dev_tools/ui/maze_controls.rs b/src/dev_tools/ui/maze_controls.rs
index 387fbdc..f611a2c 100644
--- a/src/dev_tools/ui/maze_controls.rs
+++ b/src/dev_tools/ui/maze_controls.rs
@@ -1,14 +1,15 @@
-use std::ops::RangeInclusive;
-
+use crate::{
+    maze::{events::RecreateMazeEvent, MazeConfig, MazePluginLoaded},
+    player::events::RespawnPlayer,
+};
 use bevy::{prelude::*, window::PrimaryWindow};
-use hexx::{Hex, HexOrientation};
-use rand::{thread_rng, Rng};
-
-use crate::maze::{events::RecreateMazeEvent, MazeConfig, MazePluginLoaded};
 use bevy_egui::{
     egui::{self, emath::Numeric, DragValue, TextEdit, Ui},
     EguiContext,
 };
+use hexx::{Hex, HexOrientation};
+use rand::{thread_rng, Rng};
+use std::ops::RangeInclusive;
 
 pub(crate) fn maze_controls_ui(world: &mut World) {
     if world.get_resource::<MazePluginLoaded>().is_none() {
@@ -55,6 +56,9 @@ pub(crate) fn maze_controls_ui(world: &mut World) {
                 {
                     event_writer.send(RecreateMazeEvent { floor: 1 });
                 }
+                if let Some(mut event_writer) = world.get_resource_mut::<Events<RespawnPlayer>>() {
+                    event_writer.send(RespawnPlayer);
+                }
             }
         }
     });
@@ -82,9 +86,9 @@ fn add_position_control(ui: &mut Ui, label: &str, pos: &mut Hex) -> bool {
 
     ui.horizontal(|ui| {
         ui.label(label);
-        let response_x = ui.add(DragValue::new(&mut pos.x).speed(1).prefix("x: "));
-        let response_y = ui.add(DragValue::new(&mut pos.y).speed(1).prefix("y: "));
-        changed = response_x.changed() || response_y.changed();
+        let response_q = ui.add(DragValue::new(&mut pos.x).speed(1).prefix("q: "));
+        let response_r = ui.add(DragValue::new(&mut pos.y).speed(1).prefix("r: "));
+        changed = response_r.changed() || response_q.changed();
     });
     changed
 }
diff --git a/src/maze/mod.rs b/src/maze/mod.rs
index 34d31a3..db58ab1 100644
--- a/src/maze/mod.rs
+++ b/src/maze/mod.rs
@@ -7,12 +7,11 @@ mod resources;
 mod systems;
 
 pub use resources::{MazeConfig, MazePluginLoaded};
-use systems::recreation::handle_maze_recreation_event;
 
 pub(super) fn plugin(app: &mut App) {
     app.init_resource::<MazeConfig>()
         .add_event::<RecreateMazeEvent>()
-        .add_systems(Update, handle_maze_recreation_event);
+        .add_plugins(systems::plugin);
 }
 
 pub fn spawn_level_command(world: &mut World) {
diff --git a/src/maze/plugin.rs b/src/maze/plugin.rs
deleted file mode 100644
index aa87236..0000000
--- a/src/maze/plugin.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use bevy::{
-    ecs::{system::RunSystemOnce, world::Command},
-    prelude::*,
-};
-
-use super::{
-    events::RecreateMazeEvent,
-    systems::{self, recreation::handle_maze_recreation_event},
-    MazeConfig, MazePluginLoaded,
-};
-
-#[derive(Default)]
-pub(crate) struct MazePlugin;
-
-impl Plugin for MazePlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<MazeConfig>()
-            .add_event::<RecreateMazeEvent>()
-            .add_systems(Update, handle_maze_recreation_event);
-    }
-}
-
-impl Command for MazePlugin {
-    fn apply(self, world: &mut World) {
-        world.insert_resource(MazePluginLoaded);
-        let _ = world.run_system_once(systems::setup::setup);
-    }
-}
diff --git a/src/maze/resources.rs b/src/maze/resources.rs
index dee34ff..0f24456 100644
--- a/src/maze/resources.rs
+++ b/src/maze/resources.rs
@@ -40,8 +40,8 @@ impl MazeConfig {
         let start_pos = generate_pos(radius, &mut rng)?;
         let end_pos = generate_pos(radius, &mut rng)?;
 
-        debug!("Start pos: ({},{})", start_pos.x, start_pos.y);
-        debug!("End pos: ({},{})", end_pos.x, end_pos.y);
+        info!("Start pos: (q={}, r={})", start_pos.x, start_pos.y);
+        info!("End pos: (q={}, r={})", end_pos.x, end_pos.y);
 
         let layout = HexLayout {
             orientation,
diff --git a/src/maze/systems/despawn.rs b/src/maze/systems/despawn.rs
index ad25077..16385f1 100644
--- a/src/maze/systems/despawn.rs
+++ b/src/maze/systems/despawn.rs
@@ -1,3 +1,14 @@
+use crate::maze::components::Floor;
 use bevy::prelude::*;
 
-use crate::maze::components::MazeFloor;
+pub(crate) fn despawn_floor(
+    commands: &mut Commands,
+    query: &Query<(Entity, &Floor)>,
+    floor_num: u8,
+) {
+    for (entity, floor) in query.iter() {
+        if floor.0 == floor_num {
+            commands.entity(entity).despawn_recursive();
+        }
+    }
+}
diff --git a/src/maze/systems/mod.rs b/src/maze/systems/mod.rs
index 6fe5160..8965842 100644
--- a/src/maze/systems/mod.rs
+++ b/src/maze/systems/mod.rs
@@ -1,3 +1,11 @@
+pub mod despawn;
 pub mod recreation;
 pub mod setup;
-mod spawn;
+pub mod spawn;
+
+use bevy::prelude::*;
+use recreation::recreate_maze;
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(Update, recreate_maze);
+}
diff --git a/src/maze/systems/recreation.rs b/src/maze/systems/recreation.rs
index 11b37f2..358e458 100644
--- a/src/maze/systems/recreation.rs
+++ b/src/maze/systems/recreation.rs
@@ -2,9 +2,9 @@ use bevy::prelude::*;
 
 use crate::maze::{components::Floor, events::RecreateMazeEvent, MazeConfig};
 
-use super::setup::setup_maze;
+use super::{despawn::despawn_floor, spawn::spawn_floor};
 
-pub(crate) fn handle_maze_recreation_event(
+pub(crate) fn recreate_maze(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
@@ -14,14 +14,6 @@ pub(crate) fn handle_maze_recreation_event(
 ) {
     for event in event_reader.read() {
         despawn_floor(&mut commands, &query, event.floor);
-        setup_maze(&mut commands, &mut meshes, &mut materials, &config);
-    }
-}
-
-fn despawn_floor(commands: &mut Commands, query: &Query<(Entity, &Floor)>, floor_num: u8) {
-    for (entity, floor) in query.iter() {
-        if floor.0 == floor_num {
-            commands.entity(entity).despawn_recursive();
-        }
+        spawn_floor(&mut commands, &mut meshes, &mut materials, &config);
     }
 }
diff --git a/src/maze/systems/setup.rs b/src/maze/systems/setup.rs
index b44f9e8..113cf89 100644
--- a/src/maze/systems/setup.rs
+++ b/src/maze/systems/setup.rs
@@ -1,13 +1,6 @@
+use super::spawn::spawn_floor;
+use crate::maze::MazeConfig;
 use bevy::prelude::*;
-use hexlab::{GeneratorType, MazeBuilder};
-
-use crate::maze::{
-    assets::MazeAssets,
-    components::{Floor, Maze},
-    MazeConfig,
-};
-
-use super::spawn::spawn_single_hex_tile;
 
 pub(crate) fn setup(
     mut commands: Commands,
@@ -15,34 +8,5 @@ pub(crate) fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
     config: Res<MazeConfig>,
 ) {
-    setup_maze(&mut commands, &mut meshes, &mut materials, &config);
-}
-
-pub(super) fn setup_maze(
-    commands: &mut Commands,
-    meshes: &mut ResMut<Assets<Mesh>>,
-    materials: &mut ResMut<Assets<StandardMaterial>>,
-    config: &MazeConfig,
-) {
-    let maze = MazeBuilder::new()
-        .with_radius(config.radius)
-        .with_seed(config.seed)
-        .with_generator(GeneratorType::RecursiveBacktracking)
-        .build()
-        .expect("Something went wrong while creating maze");
-
-    let assets = MazeAssets::new(meshes, materials, config);
-    commands
-        .spawn((
-            Name::new("Floor"),
-            Maze(maze.clone()),
-            Floor(1),
-            Transform::from_translation(Vec3::ZERO),
-            Visibility::Visible,
-        ))
-        .with_children(|parent| {
-            for tile in maze.values() {
-                spawn_single_hex_tile(parent, &assets, tile, config)
-            }
-        });
+    spawn_floor(&mut commands, &mut meshes, &mut materials, &config);
 }
diff --git a/src/maze/systems/spawn.rs b/src/maze/systems/spawn.rs
index be9a9d7..8cb229c 100644
--- a/src/maze/systems/spawn.rs
+++ b/src/maze/systems/spawn.rs
@@ -1,14 +1,41 @@
-use std::f32::consts::{FRAC_PI_2, FRAC_PI_3, FRAC_PI_6};
-
+use crate::maze::{
+    assets::MazeAssets,
+    components::{Floor, Maze, Tile, Wall},
+    MazeConfig,
+};
 use bevy::prelude::*;
 use hexlab::prelude::*;
 use hexx::HexOrientation;
+use std::f32::consts::{FRAC_PI_2, FRAC_PI_3, FRAC_PI_6};
 
-use crate::maze::{
-    assets::MazeAssets,
-    components::{Tile, Wall},
-    MazeConfig,
-};
+pub(super) fn spawn_floor(
+    commands: &mut Commands,
+    meshes: &mut ResMut<Assets<Mesh>>,
+    materials: &mut ResMut<Assets<StandardMaterial>>,
+    config: &MazeConfig,
+) {
+    let maze = MazeBuilder::new()
+        .with_radius(config.radius)
+        .with_seed(config.seed)
+        .with_generator(GeneratorType::RecursiveBacktracking)
+        .build()
+        .expect("Something went wrong while creating maze");
+
+    let assets = MazeAssets::new(meshes, materials, config);
+    commands
+        .spawn((
+            Name::new("Floor"),
+            Maze(maze.clone()),
+            Floor(1),
+            Transform::from_translation(Vec3::ZERO),
+            Visibility::Visible,
+        ))
+        .with_children(|parent| {
+            for tile in maze.values() {
+                spawn_single_hex_tile(parent, &assets, tile, config)
+            }
+        });
+}
 
 pub(super) fn spawn_single_hex_tile(
     parent: &mut ChildBuilder,
diff --git a/src/player/components.rs b/src/player/components.rs
index 87f7d18..26f8a8b 100644
--- a/src/player/components.rs
+++ b/src/player/components.rs
@@ -16,7 +16,7 @@ pub struct MovementSpeed(pub f32);
 
 impl Default for MovementSpeed {
     fn default() -> Self {
-        Self(50.)
+        Self(100.)
     }
 }
 
diff --git a/src/player/events.rs b/src/player/events.rs
new file mode 100644
index 0000000..edd056e
--- /dev/null
+++ b/src/player/events.rs
@@ -0,0 +1,4 @@
+use bevy::prelude::*;
+
+#[derive(Debug, Event)]
+pub(crate) struct RespawnPlayer;
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 7d067d4..5db0cf0 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -1,14 +1,18 @@
 mod assets;
 pub mod components;
+pub mod events;
 mod systems;
 
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
 use components::Player;
+use events::RespawnPlayer;
 
 pub(super) fn plugin(app: &mut App) {
-    app.register_type::<Player>().add_plugins(systems::plugin);
+    app.register_type::<Player>()
+        .add_event::<RespawnPlayer>()
+        .add_plugins(systems::plugin);
 }
 
 pub fn spawn_player_command(world: &mut World) {
-    let _ = world.run_system_once(systems::spawn::spawn_player);
+    let _ = world.run_system_once(systems::setup::setup);
 }
diff --git a/src/player/systems/despawn.rs b/src/player/systems/despawn.rs
new file mode 100644
index 0000000..24dc9f4
--- /dev/null
+++ b/src/player/systems/despawn.rs
@@ -0,0 +1,9 @@
+use bevy::prelude::*;
+
+use crate::player::components::Player;
+
+pub(crate) fn despawn_players(commands: &mut Commands, query: &Query<Entity, With<Player>>) {
+    for entity in query.iter() {
+        commands.entity(entity).despawn_recursive();
+    }
+}
diff --git a/src/player/systems/mod.rs b/src/player/systems/mod.rs
index b43f2f4..ea066cd 100644
--- a/src/player/systems/mod.rs
+++ b/src/player/systems/mod.rs
@@ -1,11 +1,22 @@
+pub mod despawn;
 mod input;
 mod movement;
+pub mod respawn;
+pub mod setup;
 pub mod spawn;
 
 use bevy::prelude::*;
 use input::player_input;
 use movement::player_movement;
+use respawn::respawn_player;
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_systems(Update, (player_input, player_movement.after(player_input)));
+    app.add_systems(
+        Update,
+        (
+            player_input,
+            player_movement.after(player_input),
+            respawn_player,
+        ),
+    );
 }
diff --git a/src/player/systems/respawn.rs b/src/player/systems/respawn.rs
new file mode 100644
index 0000000..af2446a
--- /dev/null
+++ b/src/player/systems/respawn.rs
@@ -0,0 +1,21 @@
+use crate::{
+    maze::MazeConfig,
+    player::{components::Player, events::RespawnPlayer},
+};
+use bevy::prelude::*;
+
+use super::{despawn::despawn_players, spawn::spawn_player};
+
+pub(crate) fn respawn_player(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    config: Res<MazeConfig>,
+    query: Query<Entity, With<Player>>,
+    mut event_reader: EventReader<RespawnPlayer>,
+) {
+    for _ in event_reader.read() {
+        despawn_players(&mut commands, &query);
+        spawn_player(&mut commands, &mut meshes, &mut materials, &config);
+    }
+}
diff --git a/src/player/systems/setup.rs b/src/player/systems/setup.rs
new file mode 100644
index 0000000..4092d52
--- /dev/null
+++ b/src/player/systems/setup.rs
@@ -0,0 +1,14 @@
+use bevy::prelude::*;
+
+use crate::maze::MazeConfig;
+
+use super::spawn::spawn_player;
+
+pub(crate) fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    config: Res<MazeConfig>,
+) {
+    spawn_player(&mut commands, &mut meshes, &mut materials, &config);
+}
diff --git a/src/player/systems/spawn.rs b/src/player/systems/spawn.rs
index 08a35f5..19a5a85 100644
--- a/src/player/systems/spawn.rs
+++ b/src/player/systems/spawn.rs
@@ -6,26 +6,26 @@ use crate::{
     },
 };
 use bevy::prelude::*;
-use hexx::Hex;
 
-pub fn spawn_player(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    maze_config: Res<MazeConfig>,
+pub(super) fn spawn_player(
+    commands: &mut Commands,
+    meshes: &mut ResMut<Assets<Mesh>>,
+    materials: &mut ResMut<Assets<StandardMaterial>>,
+    config: &MazeConfig,
 ) {
-    let player_height = maze_config.height * 0.5;
-    let player_radius = maze_config.hex_size * 0.5;
+    let player_radius = config.hex_size * 0.5;
+    let player_height = player_radius * 3.5;
 
-    let start_hex = Hex::new(1, 1);
-    let start_pos = maze_config.layout.hex_to_world_pos(start_hex);
+    let y_offset = config.height / 2. + player_height / 1.3;
+
+    let start_pos = config.layout.hex_to_world_pos(config.start_pos);
 
     commands.spawn((
         Name::new("Player"),
         Player,
-        CurrentPosition(start_hex),
+        CurrentPosition(config.start_pos),
         Mesh3d(meshes.add(generate_pill_mesh(player_radius, player_height / 2.))),
         MeshMaterial3d(materials.add(blue_material())),
-        Transform::from_xyz(start_pos.x, player_height * 2., start_pos.y),
+        Transform::from_xyz(start_pos.x, y_offset, start_pos.y),
     ));
 }