ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(client): use .map for queries

Browse Source
This commit is contained in:
Ryan
2026-04-13 19:59:41 -04:00
parent 1acaa3d88c
commit 55ee91885d
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/lua/client/world/queries.rs
View File

@@ -2,7 +2,7 @@
macro_rules! get_entities {
($client:ident) => {{
let ecs = $client.ecs.read();
if let Some(mut query) = ecs.try_query::<(
ecs.try_query::<(
&AzaleaPosition,
&CustomName,
&EntityKindComponent,
@@ -11,7 +11,8 @@ macro_rules! get_entities {
&MinecraftEntityId,
Option<&Owneruuid>,
&Pose,
)>() {
)>()
.map(|mut query| {
query
.iter(&ecs)
.map(
@@ -29,9 +30,8 @@ macro_rules! get_entities {
},
)
.collect::<Vec<_>>()
} else {
Vec::new()
}
})
.unwrap_or_default()
}};
}
@@ -39,7 +39,7 @@ macro_rules! get_entities {
macro_rules! get_players {
($client:ident) => {{
let ecs = $client.ecs.read();
if let Some(mut query) = ecs.try_query_filtered::<(
ecs.try_query_filtered::<(
&MinecraftEntityId,
&EntityUuid,
&EntityKindComponent,
@@ -47,22 +47,21 @@ macro_rules! get_players {
&LookDirection,
&Pose,
), (With<Player>, Without<Dead>)>()
{
query
.iter(&ecs)
.map(|(id, uuid, kind, position, direction, pose)| {
(
id.0,
uuid.to_string(),
kind.to_string(),
Vec3::from(*position),
Direction::from(direction),
*pose as u8,
)
})
.collect::<Vec<_>>()
} else {
Vec::new()
}
.map(|mut query| {
query
.iter(&ecs)
.map(|(id, uuid, kind, position, direction, pose)| {
(
id.0,
uuid.to_string(),
kind.to_string(),
Vec3::from(*position),
Direction::from(direction),
*pose as u8,
)
})
.collect::<Vec<_>>()
})
.unwrap_or_default()
}};
}