Remove `on_connecting` observer

- Steal `asset_loading` from `bevy_new_2d`
- Rename `BlockResources` to `BlockAssets`
- Remove `common::blocks::*` re-exports
- Turn `Args` into a resource and insert it
- Add `Screen` state to see when loading finishes
- Run gameplay systems only in `Gameplay` state
- Start server / connect when loading finishes

client/src/args.rs

@@ -1,6 +1,6 @@
 use bevy::ecs::resource::Resource;
 use clap::{Parser, Subcommand};
-use common::network::DEFAULT_PORT;
+use common::network::{DEFAULT_ADDRESS, DEFAULT_PORT};
 
 #[derive(Resource, Parser, Default, Debug)]
 #[command(version, about)]
@@ -22,6 +22,7 @@ pub enum Mode {
     /// Connect to an existing server.
     Connect {
         /// Address to connect to.
+        #[arg(default_value = DEFAULT_ADDRESS)]
         address: String,
         /// Certificate digest provided by the server.
         digest: String,

common/src/network/client_webtransport.rs

@@ -4,7 +4,7 @@ use bevy::prelude::*;
 use lightyear::prelude::client::*;
 use lightyear::prelude::*;
 
-use crate::network::DEFAULT_PORT;
+use thiserror::Error;
 
 pub struct ConnectWebTransportCommand {
     server_addr: SocketAddr,
@@ -13,8 +13,9 @@ pub struct ConnectWebTransportCommand {
 
 impl ConnectWebTransportCommand {
     pub fn new(server_addr: &str, certificate_digest: String) -> Result<Self> {
+        let server_addr = to_socket_addr_with_default_port(server_addr, super::DEFAULT_PORT)?;
         Ok(Self {
-            server_addr: resolve_addr(&server_addr, DEFAULT_PORT)?,
+            server_addr,
             certificate_digest,
         })
     }
@@ -40,31 +41,23 @@ impl Command for ConnectWebTransportCommand {
 
 // TODO: Move this to its own `utils` module?
 // FIXME: Hostname resolving does not work on web.
-fn resolve_addr(addr: &str, default_port: u16) -> Result<SocketAddr> {
+fn to_socket_addr_with_default_port(addr: &str, default_port: u16) -> Result<SocketAddr> {
-    let addr = with_default_port(addr, default_port);
+    let has_port = match (addr.rfind(']'), addr.rfind(':')) {
-    let socket_addrs = addr.to_socket_addrs()?.collect::<Vec<_>>();
-    if let Some(ipv4) = socket_addrs.iter().find(|a| a.is_ipv4()) {
-        Ok(*ipv4) // Prefer first IPv4 address found..
-    } else if let Some(ipv6) = socket_addrs.first() {
-        Ok(*ipv6) // ..otherwise fallback to IPv6.
-    } else {
-        Err(std::io::Error::other("hostname could not be resolved").into())
-    }
-}
-
-fn with_default_port(addr: &str, default_port: u16) -> String {
-    if is_port_specified(addr) {
-        addr.to_string()
-    } else {
-        format!("{addr}:{default_port}")
-    }
-}
-
-fn is_port_specified(addr: &str) -> bool {
-    match (addr.rfind(']'), addr.rfind(':')) {
         // This doesn't match colons within IPv6 brackets, like `[::1]`.
         (Some(bracket), Some(colon)) if bracket < colon => true,
         (None, Some(_)) => true,
         _ => false,
-    }
+    };
+
+    let mut socket_addrs = if has_port {
+        addr.to_socket_addrs()
+    } else {
+        (addr, default_port).to_socket_addrs()
+    }?;
+
+    socket_addrs.next().ok_or(ResolveError.into())
 }
+
+#[derive(Error, Debug)]
+#[error("hostname could not be resolved to any address")]
+pub struct ResolveError;

common/src/network/mod.rs

@@ -10,3 +10,4 @@ pub use protocol::*;
 pub use server::*;
 
 pub const DEFAULT_PORT: u16 = 13580;
+pub const DEFAULT_ADDRESS: &str = "localhost:13580";