From d2943f8afb8b01bbe5fdf9005c3eb1eefb9f3260 Mon Sep 17 00:00:00 2001
From: Cody Wyatt Neiman <neiman@cody.to>
Date: Sun, 2 Nov 2025 13:01:04 -0500
Subject: [PATCH] chore: upgrade to bevy 0.17

---
 Cargo.toml                 |  8 ++++----
 examples/minimal_avian.rs  | 14 +++++++-------
 examples/minimal_rapier.rs | 13 +++++++------
 src/controller_avian.rs    |  2 +-
 src/controller_rapier.rs   |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ca3faed..e61988b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_fps_controller"
-version = "16.1.0"
+version = "17.0.0"
 edition = "2021"
 authors = ["bevy_fps_controller"]
 repository = "https://github.com/qhdwight/bevy_fps_controller"
@@ -10,9 +10,9 @@ readme = "README.md"
 description = "Bevy plugin that adds a Source engine inspired FPS movement controller"
 
 [dependencies]
-bevy = "0.16"
-bevy_rapier3d = { version = "0.31", optional = true }
-avian3d = { version = "0.3", optional = true }
+bevy = "0.17"
+bevy_rapier3d = { version = "0.31", optional = true, git = "https://github.com/Deniskore/bevy_rapier.git", branch = "bevy-0.17" }
+avian3d = { version = "0.4", optional = true }
 
 [features]
 default = []
diff --git a/examples/minimal_avian.rs b/examples/minimal_avian.rs
index 8227f61..ded8065 100644
--- a/examples/minimal_avian.rs
+++ b/examples/minimal_avian.rs
@@ -2,11 +2,11 @@ use std::f32::consts::TAU;
 
 use avian3d::prelude::*;
 use bevy::{
+    camera::Exposure,
     gltf::{Gltf, GltfMesh, GltfNode},
     math::Vec3Swizzles,
     prelude::*,
-    render::camera::Exposure,
-    window::CursorGrabMode,
+    window::{CursorGrabMode, CursorOptions},
 };
 
 use bevy_fps_controller::controller::*;
@@ -70,7 +70,6 @@ fn setup(mut commands: Commands, mut window: Query<&mut Window>, assets: Res<Ass
             },
             LinearVelocity::ZERO,
             RigidBody::Dynamic,
-            Sleeping,
             LockedAxes::ROTATION_LOCKED,
             Mass(1.0),
             GravityScale(0.0),
@@ -179,19 +178,20 @@ fn manage_cursor(
     btn: Res<ButtonInput<MouseButton>>,
     key: Res<ButtonInput<KeyCode>>,
     mut window_query: Query<&mut Window>,
+    mut cursor: Single<&mut CursorOptions>,
     mut controller_query: Query<&mut FpsController>,
 ) {
     for mut window in &mut window_query {
         if btn.just_pressed(MouseButton::Left) {
-            window.cursor_options.grab_mode = CursorGrabMode::Locked;
-            window.cursor_options.visible = false;
+            cursor.grab_mode = CursorGrabMode::Locked;
+            cursor.visible = false;
             for mut controller in &mut controller_query {
                 controller.enable_input = true;
             }
         }
         if key.just_pressed(KeyCode::Escape) {
-            window.cursor_options.grab_mode = CursorGrabMode::None;
-            window.cursor_options.visible = true;
+            cursor.grab_mode = CursorGrabMode::None;
+            cursor.visible = true;
             for mut controller in &mut controller_query {
                 controller.enable_input = false;
             }
diff --git a/examples/minimal_rapier.rs b/examples/minimal_rapier.rs
index d0cdce1..1ead611 100644
--- a/examples/minimal_rapier.rs
+++ b/examples/minimal_rapier.rs
@@ -1,11 +1,11 @@
 use std::f32::consts::TAU;
 
 use bevy::{
+    camera::Exposure,
     gltf::{Gltf, GltfMesh, GltfNode},
     math::Vec3Swizzles,
     prelude::*,
-    render::camera::Exposure,
-    window::CursorGrabMode,
+    window::{CursorGrabMode, CursorOptions},
 };
 use bevy_rapier3d::prelude::*;
 
@@ -184,19 +184,20 @@ fn manage_cursor(
     btn: Res<ButtonInput<MouseButton>>,
     key: Res<ButtonInput<KeyCode>>,
     mut window_query: Query<&mut Window>,
+    mut cursor: Single<&mut CursorOptions>,
     mut controller_query: Query<&mut FpsController>,
 ) {
     for mut window in &mut window_query {
         if btn.just_pressed(MouseButton::Left) {
-            window.cursor_options.grab_mode = CursorGrabMode::Locked;
-            window.cursor_options.visible = false;
+            cursor.grab_mode = CursorGrabMode::Locked;
+            cursor.visible = false;
             for mut controller in &mut controller_query {
                 controller.enable_input = true;
             }
         }
         if key.just_pressed(KeyCode::Escape) {
-            window.cursor_options.grab_mode = CursorGrabMode::None;
-            window.cursor_options.visible = true;
+            cursor.grab_mode = CursorGrabMode::None;
+            cursor.visible = true;
             for mut controller in &mut controller_query {
                 controller.enable_input = false;
             }
diff --git a/src/controller_avian.rs b/src/controller_avian.rs
index d304eb5..f251939 100644
--- a/src/controller_avian.rs
+++ b/src/controller_avian.rs
@@ -195,7 +195,7 @@ const SLIGHT_SCALE_DOWN: f32 = 0.9375;
 
 pub fn fps_controller_input(
     key_input: Res<ButtonInput<KeyCode>>,
-    mut mouse_events: EventReader<MouseMotion>,
+    mut mouse_events: MessageReader<MouseMotion>,
     mut query: Query<(&FpsController, &mut FpsControllerInput)>,
 ) {
     for (controller, mut input) in query
diff --git a/src/controller_rapier.rs b/src/controller_rapier.rs
index 86dde63..c35618a 100644
--- a/src/controller_rapier.rs
+++ b/src/controller_rapier.rs
@@ -190,7 +190,7 @@ const SLIGHT_SCALE_DOWN: f32 = 0.9375;
 
 pub fn fps_controller_input(
     key_input: Res<ButtonInput<KeyCode>>,
-    mut mouse_events: EventReader<MouseMotion>,
+    mut mouse_events: MessageReader<MouseMotion>,
     mut query: Query<(&FpsController, &mut FpsControllerInput)>,
 ) {
     for (controller, mut input) in query