fix(hyperion): general arrow heading (#671)

still need to fix initial yaw/pitch

Author: andrewgazelka

Cargo.lock

@@ -15,29 +15,30 @@ incremental = true
 [workspace]
 members = [
   'crates/bvh-region',
+  'crates/geometry',
   'crates/hyperion',
+  'crates/hyperion-clap',
+  'crates/hyperion-command',
   'crates/hyperion-crafting',
   'crates/hyperion-event-macros',
+  'crates/hyperion-gui',
   'crates/hyperion-inventory',
+  'crates/hyperion-item',
   'crates/hyperion-minecraft-proto',
   'crates/hyperion-nerd-font',
   'crates/hyperion-palette',
+  'crates/hyperion-permission',
   'crates/hyperion-proto',
   'crates/hyperion-proxy',
+  'crates/hyperion-rank-tree',
   'crates/hyperion-scheduled',
   'crates/hyperion-stats',
   'crates/hyperion-text',
   'crates/hyperion-utils',
-  'events/tag',
-  'crates/hyperion-permission',
-  'crates/hyperion-clap',
-  'crates/hyperion-command',
-  'crates/hyperion-rank-tree',
-  'crates/hyperion-item',
-  'crates/geometry',
   'crates/simd-utils',
-  'crates/system-order',
   'crates/spatial',
+  'crates/system-order',
+  'events/tag',
 ]
 resolver = '2'
 
@@ -121,6 +122,9 @@ version = '1.0.0-beta.7'
 [workspace.dependencies.divan]
 git = 'https://github.com/nvzqz/divan'
 
+[workspace.dependencies.hyperion-gui]
+path = 'crates/hyperion-gui'
+
 [workspace.dependencies.flate2]
 default-features = false
 version = '1.0.30'

Cargo.toml

@@ -77,7 +77,7 @@ pub trait MinecraftCommand: Parser + CommandPermission {
 
                                     let mut bundle = DataBundle::new(compose, system);
                                     bundle.add_packet(&chat).unwrap();
-                                    bundle.send(*stream).unwrap();
+                                    bundle.unicast(*stream).unwrap();
 
                                     false
                                 }

crates/hyperion-clap/src/lib.rs

@@ -2,6 +2,7 @@
 
 [dependencies]
 rkyv = {workspace = true}
+glam = {workspace = true}
 
 [lints]
 workspace = true

crates/hyperion-proto/Cargo.toml

@@ -1,3 +1,4 @@
+use glam::I16Vec2;
 use rkyv::{Archive, Deserialize, Serialize};
 
 #[derive(Archive, Deserialize, Serialize, Clone, Copy, PartialEq, Debug)]
@@ -13,3 +14,12 @@ impl ChunkPosition {
         Self { x, z }
     }
 }
+
+impl From<I16Vec2> for ChunkPosition {
+    fn from(value: I16Vec2) -> Self {
+        Self {
+            x: value.x,
+            z: value.y,
+        }
+    }
+}

crates/hyperion-proto/src/shared.rs

@@ -11,7 +11,7 @@ use tracing::{info, instrument, warn};
 pub struct Config {
     pub border_diameter: Option<f64>,
     pub max_players: i32,
-    pub view_distance: i32,
+    pub view_distance: i16,
     pub simulation_distance: i32,
     pub server_desc: String,
     pub spawn: Spawn,

crates/hyperion/src/common/config.rs

@@ -118,8 +118,8 @@ impl Module for EgressModule {
                     stream.push(io.inner());
 
                     let position = hyperion_proto::ChunkPosition {
-                        x: i16::try_from(pos.position.x).unwrap(),
-                        z: i16::try_from(pos.position.y).unwrap(),
+                        x: pos.position.x,
+                        z: pos.position.y,
                     };
 
                     positions.push(position);

crates/hyperion/src/egress/mod.rs

@@ -94,7 +94,7 @@ pub fn player_join_world(
         dimension_names: Cow::Owned(dimension_names),
         registry_codec: Cow::Borrowed(registry_codec),
         max_players: config.max_players.into(),
-        view_distance: config.view_distance.into(), // max view distance
+        view_distance: VarInt(i32::from(config.view_distance)),
         simulation_distance: config.simulation_distance.into(),
         reduced_debug_info: false,
         enable_respawn_screen: false,
@@ -116,8 +116,8 @@ pub fn player_join_world(
     let center_chunk = position.to_chunk();
 
     let pkt = play::ChunkRenderDistanceCenterS2c {
-        chunk_x: center_chunk.x.into(),
-        chunk_z: center_chunk.y.into(),
+        chunk_x: VarInt(i32::from(center_chunk.x)),
+        chunk_z: VarInt(i32::from(center_chunk.y)),
     };
 
     bundle.add_packet(&pkt)?;
@@ -362,7 +362,7 @@ pub fn player_join_world(
 
     bundle.add_packet(&command_packet)?;
 
-    bundle.send(io)?;
+    bundle.unicast(io)?;
 
     info!("{name} joined the world");
 

crates/hyperion/src/egress/player_join/mod.rs

@@ -2,10 +2,11 @@ use std::cmp::Ordering;
 
 use derive_more::derive::{Deref, DerefMut};
 use flecs_ecs::prelude::*;
-use glam::IVec2;
+use glam::I16Vec2;
+use itertools::Itertools;
 use tracing::error;
 use valence_protocol::{
-    ChunkPos,
+    ChunkPos, VarInt,
     packets::play::{self},
 };
 
@@ -20,7 +21,7 @@ use crate::{
 
 #[derive(Component, Deref, DerefMut, Default)]
 pub struct ChunkSendQueue {
-    changes: Vec<IVec2>,
+    changes: Vec<I16Vec2>,
 }
 
 #[derive(Component)]
@@ -59,8 +60,8 @@ impl Module for SyncChunksModule {
 
                 // center chunk
                 let center_chunk = play::ChunkRenderDistanceCenterS2c {
-                    chunk_x: current_chunk.x.into(),
-                    chunk_z: current_chunk.y.into(),
+                    chunk_x: VarInt(i32::from(current_chunk.x)),
+                    chunk_z: VarInt(i32::from(current_chunk.y)),
                 };
 
                 if let Err(e) = compose.unicast(&center_chunk, stream_id, system) {
@@ -91,15 +92,14 @@ impl Module for SyncChunksModule {
 
                 let removed_chunks = last_sent_range_x
                     .clone()
-                    .flat_map(|x| last_sent_range_z.clone().map(move |z| IVec2::new(x, z)))
-                    .filter(|pos| {
-                        !current_range_x.contains(&pos.x) || !current_range_z.contains(&pos.y)
-                    });
+                    .cartesian_product(last_sent_range_z.clone())
+                    .filter(|(x, y)| !current_range_x.contains(x) || !current_range_z.contains(y))
+                    .map(|(x, y)| I16Vec2::new(x, y));
 
                 let mut bundle = DataBundle::new(compose, system);
 
                 for chunk in removed_chunks {
-                    let pos = ChunkPos::new(chunk.x, chunk.y);
+                    let pos = ChunkPos::new(i32::from(chunk.x), i32::from(chunk.y));
                     let unload_chunk = play::UnloadChunkS2c { pos };
 
                     bundle.add_packet(&unload_chunk).unwrap();
@@ -111,13 +111,14 @@ impl Module for SyncChunksModule {
                     // }
                 }
 
-                bundle.send(stream_id).unwrap();
+                bundle.unicast(stream_id).unwrap();
 
                 let added_chunks = current_range_x
-                    .flat_map(move |x| current_range_z.clone().map(move |z| IVec2::new(x, z)))
-                    .filter(|pos| {
-                        !last_sent_range_x.contains(&pos.x) || !last_sent_range_z.contains(&pos.y)
-                    });
+                    .cartesian_product(current_range_z)
+                    .filter(|(x, y)| {
+                        !last_sent_range_x.contains(x) || !last_sent_range_z.contains(y)
+                    })
+                    .map(|(x, y)| I16Vec2::new(x, y));
 
                 let mut num_chunks_added = 0;
 
@@ -222,7 +223,7 @@ impl Module for SyncChunksModule {
                         idx -= 1;
                     }
 
-                    bundle.send(stream_id).unwrap();
+                    bundle.unicast(stream_id).unwrap();
                 },
             );
     }