Merge remote-tracking branch 'upstream/main' into andrew/fix-crash-attack

Author: TestingPlant

Cargo.lock

@@ -68,20 +68,20 @@ dotenvy = '0.15.7'
 eframe = "0.31.0"
 egui = "0.31.0"
 egui_dock = "0.16.0"
-enumset = '1.1.5'
+enumset = '1.1.6'
 fastrand = '2.1.0'
 flume = '0.11.1'
 futures-util = '0.3.31'
-glam = "0.30.2"
+glam = "0.30.3"
 heapless = '0.8.0'
 heed = "0.21.0"
 hex = '0.4.3'
 humantime = '2.1.0'
 hyperion-proxy = { path = "crates/hyperion-proxy" }
 itertools = "0.14.0"
 kanal = '0.1.1'
-libc = '0.2.170'
-libdeflater = '1.23.1'
+libc = '0.2.172'
+libdeflater = '1.24.0'
 memmap2 = '0.9.5'
 mio = { version = '1.0.3', features = ['os-poll', 'net'] }
 more-asserts = '0.3.1'
@@ -94,23 +94,23 @@ ouroboros = '0.18.5'
 papaya = "0.2.1"
 parking_lot = '0.12.3'
 plotters-bitmap = '0.3.6'
-proc-macro2 = '1.0.94'
+proc-macro2 = '1.0.95'
 proptest = '1.5.0'
 quote = '1.0.39'
-rand = "0.9.0"
+rand = "0.9.1"
 rayon = '1.10.0'
 rkyv = '0.8.8'
 serde = '1.0.217'
 serde_json = '1.0.140'
 slotmap = '1.0.7'
 snafu = '0.8.5'
-syn = '2.0.99'
+syn = '2.0.101'
 tango-bench = "0.6.0"
 tar = '0.4.41'
 thiserror = '2.0.12'
 tikv-jemallocator = '0.6.0'
 time = '0.3.41'
-tokio = '1.44.2'
+tokio = '1.45.0'
 toml = '0.8.14'
 tracing-appender = '0.2.3'
 uuid = '1.16.0'
@@ -126,11 +126,11 @@ path = 'crates/bvh-region'
 
 [workspace.dependencies.bytemuck]
 features = ['derive']
-version = '1.22.0'
+version = '1.23.0'
 
 [workspace.dependencies.clap]
 features = ['derive']
-version = '4.5.36'
+version = '4.5.38'
 
 [workspace.dependencies.derive_more]
 features = ['display', 'from', 'deref', 'deref_mut', 'debug', 'constructor', 'add', 'add_assign']
@@ -235,7 +235,7 @@ features = ['nightly']
 version = '2.0.0'
 
 [workspace.dependencies.sha2]
-version = '0.10.8'
+version = '0.10.9'
 
 [workspace.dependencies.simd-utils]
 path = 'crates/simd-utils'
@@ -249,7 +249,7 @@ path = 'crates/system-order'
 
 [workspace.dependencies.tokio-util]
 features = ['full']
-version = '0.7.12'
+version = '0.7.15'
 
 [workspace.dependencies.tracing]
 features = ['release_max_level_info']

Cargo.toml

@@ -35,6 +35,22 @@ This document outlines the simple governance structure for Hyperion, a high-perf
 - If consensus cannot be reached, Project Lead makes the final decision
 - Technical merit and alignment with project goals are primary criteria
 
+### Governance Changes
+Changes to this document require discussion and consensus among Core Contributors and Leads.
+Proposed changes must be submitted in the form of a PR. The discussion should occur in the PR reviews and comments.
+
+Minor changes like typos (1-2 characters changed, fixing URLs) or formatting (reordering sections of text verbatim,
+changing whitespace, etc.) do not require this process, but should still follow the usual PR review process.
+Minor changes require 1 Lead approval.
+
+A governance change requires all Core Contributors and Leads (voting members) to approve the change by submitting
+an approving PR review, or to abstain. Upon receiving all approvals, the change will be merged.
+
+All voting members must be notified both in discord and via github. Requesting a review from a voting members
+is sufficient to notify them on github. Voting members will have 2 weeks to respond to the governance change,
+after which they will automatically be considered to have abstained. If a voting member has responded to the
+governance change raising concerns, they *cannot* be automatically considered to have abstained.
+
 ## Becoming a Core Contributor
 
 1. Make consistent contributions to the project

GOVERNANCE.md

@@ -2,7 +2,7 @@ use std::iter::zip;
 
 use clap::{Arg as ClapArg, Parser, ValueEnum, ValueHint, error::ErrorKind};
 use flecs_ecs::{
-    core::{Entity, EntityView, EntityViewGet, World, WorldGet, WorldProvider},
+    core::{Entity, EntityView, EntityViewGet, World, WorldGet, WorldProvider, id},
     prelude::{Component, Module},
 };
 use hyperion::{
@@ -45,7 +45,7 @@ pub trait MinecraftCommand: Parser + CommandPermission {
         let mut on = world
             .entity()
             .set(node_to_register)
-            .child_of_id(get_root_command_entity());
+            .child_of(get_root_command_entity());
 
         for arg in cmd.get_arguments() {
             use valence_protocol::packets::play::command_tree_s2c::Parser as ValenceParser;
@@ -56,7 +56,7 @@ pub trait MinecraftCommand: Parser + CommandPermission {
                 ValenceParser::String(StringArg::SingleWord),
             );
 
-            on = world.entity().set(node_to_register).child_of_id(on);
+            on = world.entity().set(node_to_register).child_of(on);
         }
 
         let on_execute = |input: &str, system: EntityView<'_>, caller: Entity| {
@@ -315,7 +315,7 @@ impl MinecraftCommand for PermissionCommand {
                     entity.entity_view(world).get::<&mut Group>(|group| {
                         if *group != cmd.group {
                             *group = cmd.group;
-                            entity.entity_view(world).modified::<Group>();
+                            entity.entity_view(world).modified(id::<Group>());
                         }
 
                         caller.entity_view(world).get::<&ConnectionId>(|stream| {

crates/hyperion-clap/src/lib.rs

@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 flecs_ecs = { workspace = true }
-bytemuck = "1.22.0"
+bytemuck = "1.23.0"
 valence_protocol = { workspace = true }
 hyperion = { workspace = true }
 hyperion-inventory = { workspace = true }

crates/hyperion-item/Cargo.toml

@@ -1,6 +1,6 @@
 use clap::ValueEnum;
 use flecs_ecs::{
-    core::{EntityViewGet, QueryBuilderImpl, SystemAPI, TermBuilderImpl, World, WorldGet},
+    core::{EntityViewGet, QueryBuilderImpl, SystemAPI, TermBuilderImpl, World, WorldGet, id},
     macros::{Component, observer},
     prelude::{Module, flecs},
 };
@@ -50,22 +50,22 @@ impl Module for PermissionModule {
         });
 
         observer!(world, flecs::OnSet, &Uuid, &storage::PermissionStorage($))
-            .with::<Player>()
+            .with(id::<Player>())
             .each_entity(|entity, (uuid, permissions)| {
                 let group = permissions.get(**uuid);
                 entity.set(group);
             });
 
         observer!(world, flecs::OnRemove, &Uuid, &Group, &storage::PermissionStorage($))
-            .with::<Player>()
+            .with(id::<Player>())
             .each(|(uuid, group, permissions)| {
                 permissions.set(**uuid, *group).unwrap();
             });
 
         observer!(world, flecs::OnSet, &Group).each_iter(|it, row, _group| {
             let system = it.system();
             let world = it.world();
-            let entity = it.entity(row);
+            let entity = it.entity(row).expect("row must be in bounds");
 
             let root_command = hyperion::simulation::command::get_root_command_entity();
 

crates/hyperion-permission/src/lib.rs

@@ -1,7 +1,7 @@
 use hyperion::{
     flecs_ecs::{
         self,
-        core::{EntityViewGet, World, WorldGet},
+        core::{id, EntityViewGet, World, WorldGet},
         macros::Component,
         prelude::Module,
     },
@@ -65,7 +65,7 @@ impl Module for RespawnModule {
                             health.heal(20.);
 
                             *pose = Pose::Standing;
-                            client.modified::<Pose>(); // this is so observers detect the change
+                            client.modified(id::<Pose>()); // this is so observers detect the change
 
                             let pkt_health = play::HealthUpdateS2c {
                                 health: health.abs(),

crates/hyperion-respawn/src/lib.rs

@@ -46,8 +46,8 @@ impl Module for EgressModule {
 
         let pipeline = world
             .entity()
-            .add::<flecs::pipeline::Phase>()
-            .depends_on::<flecs::pipeline::OnStore>();
+            .add(id::<flecs::pipeline::Phase>())
+            .depends_on(id::<flecs::pipeline::OnStore>());
 
         world.import::<StatsModule>();
         world.import::<PlayerJoinModule>();
@@ -60,7 +60,7 @@ impl Module for EgressModule {
             &Compose($),
             &mut Blocks($),
         )
-        .kind::<flecs::pipeline::OnUpdate>()
+        .kind(id::<flecs::pipeline::OnUpdate>())
         .each_iter(move |it: TableIter<'_, false>, _, (compose, mc)| {
             let span = info_span!("broadcast_chunk_deltas");
             let _enter = span.enter();
@@ -101,7 +101,7 @@ impl Module for EgressModule {
             &mut Compose($),
             &mut EgressComm($),
         )
-        .kind_id(pipeline)
+        .kind(pipeline)
         .each(move |(compose, egress)| {
             let span = info_span!("egress");
             let _enter = span.enter();
@@ -166,7 +166,7 @@ impl Module for EgressModule {
             world,
             &mut Compose($),
         )
-        .kind_id(pipeline)
+        .kind(pipeline)
         .each(move |compose| {
             let span = info_span!("clear_bump");
             let _enter = span.enter();

crates/hyperion/src/egress/mod.rs

@@ -244,7 +244,7 @@ pub fn player_join_world(
             .iter_stage(world)
             .each_iter(|it, idx, (uuid, _, position, yaw, pitch, _, flags)| {
                 let mut result = || {
-                    let query_entity = it.entity(idx);
+                    let query_entity = it.entity(idx).expect("idx must be in bounds");
 
                     if entity.id() == query_entity.id() {
                         return anyhow::Ok(());
@@ -545,7 +545,7 @@ impl Module for PlayerJoinModule {
             &Config($),
             &RayonWorldStages($),
         )
-        .kind::<flecs::pipeline::PreUpdate>()
+        .kind(id::<flecs::pipeline::PreUpdate>())
         .each_iter(
             move |it, _, (comms, compose, crafting_registry, config, stages)| {
                 let span = tracing::info_span!("joins");

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

@@ -18,7 +18,7 @@ impl Module for StatsModule {
         // let system_id = GLOBAL_STATS;
 
         system!("global_update", world, &mut Compose($))
-            .kind::<flecs::pipeline::OnUpdate>() // ? OnUpdate
+            .kind(id::<flecs::pipeline::OnUpdate>()) // ? OnUpdate
             .each_iter(move |_, _, compose| {
                 let global = compose.global_mut();
 
@@ -41,7 +41,7 @@ impl Module for StatsModule {
             world,
             &mut Blocks($),
         )
-        .kind::<flecs::pipeline::OnUpdate>()
+        .kind(id::<flecs::pipeline::OnUpdate>())
         .each_iter(|_iter, _, blocks| {
             let span = info_span!("load_pending");
             let _enter = span.enter();