Merge #119: Replace With<GameProfile> -> With<PlayerMarker>

Replace With<GameProfile> -> With<PlayerMarker>

Author: dylanopen

.github/workflows/meloncraft-checks.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Build
       run: cargo build --verbose --workspace
     - name: Run tests
-      run: cargo test --verbose --workspace
+      run: cargo test --verbose --workspace --bins --tests
     - name: Lint with clippy
       run: cargo clippy
     - name: Check formatting

Cargo.toml

@@ -168,6 +168,9 @@ manual_hash_one = "forbid"
 manual_inspect = "forbid"
 manual_is_multiple_of = "forbid"
 manual_main_separator_str = "forbid"
+manual_noop_waker = "forbid"
+manual_option_zip = "forbid"
+manual_pop_if = "forbid"
 manual_ok_err = "forbid"
 manual_option_as_slice = "forbid"
 manual_range_patterns = "forbid"

src/meloncraft_chat/src/title.rs

@@ -4,11 +4,10 @@
 /// See the fields for more details.
 #[derive(Debug, Clone)]
 pub enum TitlePosition {
-
     /// Display the message in the middle of the screen.
     /// Largest font size.
     Title,
-    
+
     /// Display the message just below where a [`TitlePosition::Title`] would be,
     /// in a smaller font size.
     ///
@@ -25,7 +24,6 @@ pub enum TitlePosition {
 /// fade out.
 #[derive(Debug, Clone)]
 pub struct TitleTimings {
-
     /// The number of ticks that it takes for any titles to fade *in* on the client's screen.
     pub fade_in_ticks: i32,
 
@@ -35,4 +33,3 @@ pub struct TitleTimings {
     /// The number of ticks that it takes for any titles to fade *out* on the client's screen.
     pub fade_out_ticks: i32,
 }
-

src/meloncraft_chat_broadcasting/src/send.rs

@@ -34,4 +34,3 @@ pub fn send_player_chat(
         });
     }
 }
-

src/meloncraft_packet_forwarding/src/chat_message.rs

@@ -2,7 +2,11 @@ use bevy::ecs::message::{MessageReader, MessageWriter};
 use meloncraft_chat::send::{ClearTitles, SendChatMessage, SendTitleMessage};
 use meloncraft_chat::sent::PlayerSentChatMessage;
 use meloncraft_chat::title::TitlePosition;
-use meloncraft_packets::{ClientboundClearTitles, ClientboundSetActionbarText, ClientboundSetSubtitleText, ClientboundSetTitleAnimationTimes, ClientboundSetTitleText, ClientboundSystemChat, ServerboundChat};
+use meloncraft_packets::{
+    ClientboundClearTitles, ClientboundSetActionbarText, ClientboundSetSubtitleText,
+    ClientboundSetTitleAnimationTimes, ClientboundSetTitleText, ClientboundSystemChat,
+    ServerboundChat,
+};
 
 pub fn fwd_player_sent(
     mut chat_pr: MessageReader<ServerboundChat>,
@@ -42,7 +46,12 @@ pub fn fwd_send_title(
     for send_title in send_title_mr.read() {
         for receiver in send_title.receivers.clone() {
             if let Some(times) = &send_title.times {
-                set_title_animation_times_pw.write(ClientboundSetTitleAnimationTimes { client: receiver, fade_in_ticks: times.fade_in_ticks, stay_ticks: times.stay_ticks, fade_out_ticks: times.fade_out_ticks });
+                set_title_animation_times_pw.write(ClientboundSetTitleAnimationTimes {
+                    client: receiver,
+                    fade_in_ticks: times.fade_in_ticks,
+                    stay_ticks: times.stay_ticks,
+                    fade_out_ticks: times.fade_out_ticks,
+                });
             }
 
             match send_title.position {
@@ -51,19 +60,19 @@ pub fn fwd_send_title(
                         client: receiver,
                         title: send_title.message.clone(),
                     });
-                },
+                }
                 TitlePosition::Subtitle => {
                     set_subtitle_text_pw.write(ClientboundSetSubtitleText {
                         client: receiver,
                         title: send_title.message.clone(),
                     });
-                },
+                }
                 TitlePosition::Actionbar => {
                     set_actionbar_text_pw.write(ClientboundSetActionbarText {
                         client: receiver,
                         title: send_title.message.clone(),
                     });
-                },
+                }
             }
         }
     }
@@ -76,7 +85,10 @@ pub fn fwd_clear_titles(
     for send_title in clear_title_mr.read() {
         for receiver in send_title.receivers.clone() {
             // for now, we always 'reset'.
-            clear_titles_pw.write(ClientboundClearTitles { client: receiver, reset: true });
+            clear_titles_pw.write(ClientboundClearTitles {
+                client: receiver,
+                reset: true,
+            });
         }
     }
 }

src/meloncraft_packets/src/clientbound/play/set_experience.rs

@@ -43,14 +43,12 @@ impl ClientboundPacket for ClientboundSetExperience {
         reason = "Both are needed for calculating experience level and bar size"
     )]
     fn data(&self, data: &mut Vec<u8>) {
-        let bar = self.bar.map_or_else(
-            || return experience::total_to_level(self.total.0) % 1.0,
-            |bar| return bar,
-        );
-        let level = self.level.map_or_else(
-            || return experience::total_to_level(self.total.0) as i32,
-            |level| return level,
-        );
+        let bar = self
+            .bar
+            .unwrap_or_else(|| return experience::total_to_level(self.total.0) % 1.0);
+        let level = self
+            .level
+            .unwrap_or_else(|| return experience::total_to_level(self.total.0) as i32);
 
         data.extend(bar.net_serialize());
         data.extend(VarInt(level).net_serialize());

src/meloncraft_player/src/marker.rs

@@ -4,10 +4,14 @@ use bevy::ecs::component::Component;
 
 /// Marker to allow querying specifically for player entities. This is added to a client once they
 /// have *finished* spawning into the world, in the **play** connection state.
+///
+/// Added **before** the [`LoadedPlayer`] marker.
 #[derive(Component)]
 pub struct PlayerMarker;
 
 /// Marker to allow querying specifically for player entities. This is added to a client once the
 /// *library user* has added any components they need to add before they are acted upon (e.g. positions).
+///
+/// Added **after** [`PlayerMarker`].
 #[derive(Component)]
 pub struct LoadedPlayer;

src/meloncraft_player_state/src/movement.rs

@@ -6,6 +6,7 @@ use meloncraft_entity::position::teleport::TeleportEntity;
 use meloncraft_logger::warnlog;
 use meloncraft_packets::{ClientboundSynchronizePlayerPosition, ServerboundSetPlayerPosition};
 use meloncraft_player::GameProfile;
+use meloncraft_player::marker::LoadedPlayer;
 
 /// System for forwarding player movement packets as [`EntityMoved`] messages.
 ///
@@ -19,7 +20,7 @@ use meloncraft_player::GameProfile;
 pub fn fwd_player_moved(
     mut set_position_pr: MessageReader<ServerboundSetPlayerPosition>,
     mut player_moved_mw: MessageWriter<EntityMoved>,
-    existing_positions: Query<&EntityPosition, With<GameProfile>>,
+    existing_positions: Query<&EntityPosition, With<LoadedPlayer>>,
 ) {
     for packet in set_position_pr.read() {
         let Ok(old_position) = existing_positions.get(packet.client) else {

src/meloncraft_world_manager/src/setblock.rs

@@ -8,7 +8,7 @@ use bevy::math::UVec3;
 use meloncraft_block::set::SetBlock;
 use meloncraft_entity::position::EntityPosition;
 use meloncraft_packets::ClientboundBlockUpdate;
-use meloncraft_player::{ClientViewDistance, GameProfile};
+use meloncraft_player::{ClientViewDistance, PlayerMarker};
 use meloncraft_world::world::World;
 
 pub fn store_set_blocks(
@@ -41,7 +41,7 @@ pub fn store_set_blocks(
 
 pub fn send_set_blocks(
     mut set_block_mr: MessageReader<SetBlock>,
-    players: Query<(Entity, &ClientViewDistance, &EntityPosition), With<GameProfile>>,
+    players: Query<(Entity, &ClientViewDistance, &EntityPosition), With<PlayerMarker>>,
     mut block_update_pw: MessageWriter<ClientboundBlockUpdate>,
 ) {
     for set_block in set_block_mr.read() {