2 files changed, 13 insertions, 13 deletions

diff --git a/engine/src/renderer.rs b/engine/src/renderer.rs
index 1a27c62..15a2571 100644
--- a/engine/src/renderer.rs
+++ b/engine/src/renderer.rs
@@ -4,7 +4,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use bitflags::bitflags;
 use ecs::actions::Actions;
 use ecs::component::local::Local;
-use ecs::event::component::{Changed, Removed};
+use ecs::event::component::{Changed, EventMatchExt, Removed};
 use ecs::pair::{ChildOf, Pair};
 use ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase};
 use ecs::query::term::With;
@@ -460,13 +460,13 @@ fn handle_window_changed(
 )
 {
     for evt_match in &observe {
-        let window_ent = evt_match.get_ent_infallible();
+        let window_ent = evt_match.get_entity();
 
         let Some(window_surface_spec) = window_ent.get::<SurfaceSpec>() else {
             continue;
         };
 
-        let window = evt_match.get_changed_comp();
+        let window = evt_match.get_ent_target_comp();
 
         tracing::debug!(
             window_id=?window.wid(),
@@ -476,7 +476,7 @@ fn handle_window_changed(
 
         command_queue.queue.push_front(Command::SetSurfaceSize(
             window_surface_spec.id,
-            evt_match.get_changed_comp().inner_size().clone(),
+            evt_match.get_ent_target_comp().inner_size().clone(),
         ));
 
         command_queue
@@ -493,13 +493,13 @@ fn handle_window_removed(
 )
 {
     for evt_match in &observe {
-        let window_ent_id = evt_match.id();
+        let window_ent_id = evt_match.entity_id();
 
-        let window_ent = evt_match.get_ent_infallible();
+        let window_ent = evt_match.get_entity();
 
         tracing::debug!(
             entity_id = %window_ent_id,
-            title = %evt_match.get_removed_comp().title,
+            title = %evt_match.get_ent_target_comp().title,
             "Handling removal of window"
         );
 
diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs
index b02a34c..e07ba3e 100644
--- a/engine/src/windowing.rs
+++ b/engine/src/windowing.rs
@@ -11,7 +11,7 @@ use crossbeam_channel::{
 use ecs::actions::Actions;
 use ecs::component::Component;
 use ecs::entity::obtainer::Obtainer as EntityObtainer;
-use ecs::event::component::{Added, Changed, Removed};
+use ecs::event::component::{Added, Changed, EventMatchExt, Removed};
 use ecs::pair::{ChildOf, Pair};
 use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
 use ecs::sole::Single;
@@ -99,7 +99,7 @@ fn handle_window_creation_ready(
 )
 {
     for evt_match in &observe {
-        let Some(ent) = evt_match.get_entity() else {
+        let Some(ent) = evt_match.try_get_entity() else {
             unreachable!();
         };
 
@@ -252,9 +252,9 @@ fn handle_window_changed(
 )
 {
     for evt_match in &observe {
-        let window_ent_id = evt_match.id();
+        let window_ent_id = evt_match.entity_id();
 
-        let window = evt_match.get_changed_comp();
+        let window = evt_match.get_ent_target_comp();
 
         let Some((winit_window, _)) = context.windows.get(&window.wid()) else {
             tracing::error!(
@@ -282,11 +282,11 @@ fn handle_window_removed(
 )
 {
     for evt_match in &observe {
-        let window = evt_match.get_removed_comp();
+        let window = evt_match.get_ent_target_comp();
 
         context.windows.remove(window.wid());
 
-        actions.add_components(evt_match.id(), (WindowClosed,));
+        actions.add_components(evt_match.entity_id(), (WindowClosed,));
     }
 
     if window_query.iter().count() == 1 {