.vscode/launch.json

@@ -11,7 +11,7 @@
       "cargo": {
         "args": ["build"]
       },
-      "args": ["--seed=gargamel", "--port=25565"],
+      "args": ["--seed=gargamel"],
       "cwd": "${workspaceFolder}",
       "env": {
         "CARGO_MANIFEST_DIR": "${workspaceFolder}",
@@ -30,7 +30,7 @@
       "cargo": {
         "args": ["build"]
       },
-      "args": ["--connect=[::1]:25565"],
+      "args": ["--port=25566", "--connect=[::1]:25565"],
       "cwd": "${workspaceFolder}",
       "env": {
         "CARGO_MANIFEST_DIR": "${workspaceFolder}",

src/game/mod.rs

@@ -6,7 +6,6 @@ mod runtime;
 mod seed;
 mod setup;
 pub mod state;
-mod ui;
 
 #[allow(unused_imports)]
 pub mod prelude {

src/game/net.rs

@@ -11,6 +11,7 @@ pub fn handle_new_peer(
 ) {
     if let Some(seed) = seed {
         for peer in new_peers {
+            warn!("Sending seed to peer: {}", peer.uuid);
             outbound.write(OutboundPacket(Packet::new((*seed).into(), peer.uuid)));
         }
     }

src/game/plugin.rs

@@ -9,11 +9,8 @@ use super::{
     net::{handle_deleted_peer, handle_incoming_packets, handle_new_peer},
     runtime::{move_camera, move_player, quit, zoom_camera},
     seed::Seed,
-    setup::{
+    setup::{check_for_seed, setup_balls, setup_from_seed, setup_player, setup_ui, setup_walls},
-        check_for_seed, setup_balls, setup_camera, setup_from_seed, setup_player, setup_walls,
-    },
     state::AppState,
-    ui::{setup_peer_ui, setup_seed_ui, update_peer_ui, update_peer_ui_timings, update_seed_ui},
 };
 
 #[derive(Debug, Clone, Copy)]
@@ -59,7 +56,7 @@ impl Plugin for GamePlugin {
             PhysicsPlugins::default().with_length_unit(50.0),
         ))
         .init_state::<AppState>()
-        .add_systems(Startup, (setup_camera, setup_seed_ui, setup_peer_ui))
+        .add_systems(Startup, setup_ui)
         .add_systems(
             OnEnter(AppState::InGame),
             (
@@ -84,9 +81,6 @@ impl Plugin for GamePlugin {
             (
                 ((move_player, move_camera).chain(), zoom_camera)
                     .run_if(in_state(AppState::InGame)),
-                update_seed_ui,
-                (update_peer_ui, update_peer_ui_timings)
-                    .run_if(in_state(NetworkState::MultiPlayer)),
                 quit.run_if(input_pressed(KeyCode::KeyQ)),
             ),
         );

src/game/setup.rs

@@ -43,7 +43,7 @@ pub fn setup_from_seed(mut commands: Commands, seed: Res<Seed>) {
 }
 
 /// I mean, a camera is technically a user interface, I guess
-pub fn setup_camera(mut commands: Commands) {
+pub fn setup_ui(mut commands: Commands) {
     commands.spawn((Name::new("Camera"), Camera2d, IsDefaultUiCamera));
 }
 

src/game/ui.rs

@@ -1,102 +0,0 @@
-use bevy::prelude::*;
-
-use crate::net::prelude::{Peer, PeerReceiveTiming, PeerSendTiming};
-
-use super::seed::Seed;
-
-#[derive(Component, Debug)]
-pub struct SeedUI;
-
-pub fn setup_seed_ui(mut commands: Commands) {
-    commands
-        .spawn((
-            Text::new("Seed: "),
-            Node {
-                position_type: PositionType::Absolute,
-                bottom: Val::Px(5.0),
-                left: Val::Px(5.0),
-                ..default()
-            },
-        ))
-        .with_child((TextSpan::new("<N/A>"), SeedUI));
-}
-
-pub fn update_seed_ui(seed: Option<Res<Seed>>, text: Query<&mut TextSpan, With<SeedUI>>) {
-    if let Some(value) = seed {
-        if value.is_changed() {
-            for mut span in text {
-                let number: u64 = (*value).into();
-                **span = format!("{}", number);
-            }
-        }
-    }
-}
-
-#[derive(Component, Debug)]
-pub struct PeerUI;
-
-pub fn setup_peer_ui(mut commands: Commands) {
-    commands
-        .spawn((
-            Node {
-                display: Display::Flex,
-                position_type: PositionType::Absolute,
-                top: Val::Px(5.0),
-                right: Val::Px(5.0),
-                row_gap: Val::Px(5.0),
-                flex_direction: FlexDirection::Column,
-                align_items: AlignItems::FlexEnd,
-                justify_content: JustifyContent::FlexStart,
-                ..default()
-            },
-            PeerUI,
-        ))
-        .with_children(|builder| {
-            builder.spawn(Text::new("Peer Recv Send"));
-        });
-}
-
-#[derive(Component)]
-pub struct PeerID(Entity);
-
-pub fn update_peer_ui(
-    ui: Query<(Entity, &Children), With<PeerUI>>,
-    rows: Query<&PeerID>,
-    added: Query<Entity, Added<Peer>>,
-    mut removed: RemovedComponents<Peer>,
-    mut commands: Commands,
-) {
-    for (table, children) in ui {
-        for addition in added {
-            commands
-                .entity(table)
-                .with_child((Text::new("---- ---- ----"), PeerID(addition)));
-        }
-        for removal in removed.read() {
-            for child in children {
-                if let Ok(id) = rows.get(*child) {
-                    if id.0 == removal {
-                        commands.entity(*child).despawn();
-                    }
-                }
-            }
-        }
-    }
-}
-
-pub fn update_peer_ui_timings(
-    rows: Query<(&mut Text, &PeerID)>,
-    peers: Query<(&Peer, &PeerReceiveTiming, &PeerSendTiming)>,
-    time: Res<Time>,
-) {
-    for (mut row, id) in rows {
-        if let Ok((peer, recv, send)) = peers.get(id.0) {
-            **row = format!(
-                "{} {:.2} {:.2}",
-                peer.uuid,
-                (time.elapsed() - recv.time().unwrap_or(default())).as_secs_f64(),
-                (time.elapsed() - send.time()).as_secs_f64()
-            )
-        }
-    }
-}

src/lib.rs

@@ -20,7 +20,7 @@ pub struct AppSettings {
     source: Source,
 
     /// The port the app should listen for connections on
-    #[arg(short, long, default_value = "0")]
+    #[arg(short, long, default_value = "25565")]
     port: u16,
 }
 

src/net/io.rs

@@ -26,9 +26,7 @@ pub fn handle_network_input(
             .into());
         }
         let uuid = Uuid::from_slice(message.split_off(message.len() - 16).as_slice())?;
-        if !message.is_empty() {
         to_app.write(InboundPacket(Packet::new(message, uuid)));
-        }
         if let Some(peer_id) = peer_map.get(&uuid) {
             let (peer, mut last) = peers.get_mut(*peer_id)?;
             last.update(&time);
@@ -76,7 +74,7 @@ pub fn heartbeat(
     }
 }
 
-pub fn timeout(
+pub fn timeouts(
     peers: Query<(&Peer, &PeerReceiveTiming)>,
     time: Res<Time>,
     mut delete: EventWriter<PeerChangeEvent>,

src/net/mod.rs

@@ -9,6 +9,6 @@ mod thread;
 #[allow(unused_imports)]
 pub mod prelude {
     pub use super::packet::{InboundPacket, OutboundPacket, Packet};
-    pub use super::peer::{Peer, PeerReceiveTiming, PeerSendTiming};
+    pub use super::peer::Peer;
     pub use super::plugin::{NetIOPlugin, NetworkState};
 }

src/net/peer.rs

@@ -107,7 +107,7 @@ pub fn handle_peer_change(
                 peer_map.remove(&change.peer);
             }
         } else if let Some(addr) = change.addr {
-            info!("Adding peer {} ({})", change.peer, addr);
+            info!("Adding peer {} ({:?})", change.peer, change.addr);
             peer_map.insert(
                 change.peer,
                 commands

src/net/plugin.rs

@@ -4,7 +4,7 @@ use bevy::prelude::*;
 use uuid::Uuid;
 
 use super::{
-    io::{Config, handle_network_input, handle_network_output, heartbeat, timeout},
+    io::{Config, handle_network_input, handle_network_output, heartbeat, timeouts},
     packet::{InboundPacket, OutboundPacket},
     peer::{Peer, PeerChangeEvent, PeerMap, handle_new_peer, handle_peer_change},
     queues::{NetworkReceive, NetworkSend},
@@ -40,7 +40,7 @@ impl Plugin for NetIOPlugin {
             )
             .add_systems(
                 FixedUpdate,
-                (heartbeat, timeout, handle_new_peer).run_if(in_state(NetworkState::MultiPlayer)),
+                (heartbeat, timeouts, handle_new_peer).run_if(in_state(NetworkState::MultiPlayer)),
             )
             .add_systems(
                 FixedPostUpdate,