Merge remote-tracking branch 'origin/main' into blockbreak

Author: koskja

Cargo.lock

@@ -44,7 +44,7 @@ members = [
     "feather/server",
 
     # Other
-    "tools/proxy",
+    "proxy",
 ]
 
 # No longer need to use release for "development":

Cargo.toml

@@ -40,6 +40,3 @@ bytemuck = { version = "1", features = ["derive"] }
 rand = "0.8"
 rand_pcg = "0.3"
 serde_test = "1"
-
-[features]
-proxy = []

feather/base/Cargo.toml

@@ -71,18 +71,17 @@ pub struct InventorySlot {
 
 impl InventorySlot {
     /// Converts an [`ItemStack`] and network protocol index into an [`InventorySlot`].
-    pub fn from_network_index(network: usize, stack: &ItemStack) -> Option<Self> {
-        let slot = if SLOT_HOTBAR_OFFSET <= network && network < SLOT_HOTBAR_OFFSET + HOTBAR_SIZE {
+    #[allow(clippy::manual_range_contains)]
+    pub fn from_network_index(index: usize, stack: &ItemStack) -> Option<Self> {
+        let slot = if SLOT_HOTBAR_OFFSET <= index && index < SLOT_HOTBAR_OFFSET + HOTBAR_SIZE {
             // Hotbar
-            (network - SLOT_HOTBAR_OFFSET) as i8
-        } else if network == SLOT_OFFHAND {
+            (index - SLOT_HOTBAR_OFFSET) as i8
+        } else if index == SLOT_OFFHAND {
             -106
-        } else if SLOT_ARMOR_MIN <= network && network <= SLOT_ARMOR_MAX {
-            ((SLOT_ARMOR_MAX - network) + 100) as i8
-        } else if SLOT_INVENTORY_OFFSET <= network
-            && network < SLOT_INVENTORY_OFFSET + INVENTORY_SIZE
-        {
-            network as i8
+        } else if SLOT_ARMOR_MIN <= index && index <= SLOT_ARMOR_MAX {
+            ((SLOT_ARMOR_MAX - index) + 100) as i8
+        } else if SLOT_INVENTORY_OFFSET <= index && index < SLOT_INVENTORY_OFFSET + INVENTORY_SIZE {
+            index as i8
         } else {
             return None;
         };

feather/base/src/anvil/player.rs

@@ -51,7 +51,6 @@ impl BlockStore {
         &self.blocks
     }
 
-    #[cfg(feature = "proxy")]
     pub fn data_mut(&mut self) -> &mut PackedArray {
         &mut self.blocks
     }
@@ -60,7 +59,6 @@ impl BlockStore {
         self.palette.as_ref()
     }
 
-    #[cfg(feature = "proxy")]
     pub fn palette_mut(&mut self) -> Option<&mut Palette> {
         self.palette.as_mut()
     }
@@ -83,7 +81,6 @@ impl BlockStore {
         self.air_block_count
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_air_blocks(&mut self, new_value: u32) {
         self.air_block_count = new_value;
     }

feather/base/src/chunk/blocks.rs

@@ -142,7 +142,6 @@ where
         self.heights.set(index, height as u64);
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_height_index(&mut self, index: usize, height: i64) {
         self.heights.as_u64_mut_vec()[index] = height as u64;
     }

feather/base/src/chunk/heightmap.rs

@@ -16,14 +16,13 @@ impl Default for LightStore {
 }
 
 impl LightStore {
-    /// Creates a `LightStore` with all light set to 15.
+    /// Creates a `LightStore` with sky light set to 15.
     pub fn new() -> Self {
         let mut this = LightStore {
             block_light: PackedArray::new(SECTION_VOLUME, 4),
             sky_light: PackedArray::new(SECTION_VOLUME, 4),
         };
-        fill_with_default_light(&mut this.block_light);
-        fill_with_default_light(&mut this.sky_light);
+        this.sky_light.fill(15);
         this
     }
 
@@ -73,9 +72,3 @@ impl LightStore {
         &self.sky_light
     }
 }
-
-fn fill_with_default_light(arr: &mut PackedArray) {
-    for i in 0..arr.len() {
-        arr.set(i, 15);
-    }
-}

feather/base/src/chunk/light.rs

@@ -166,7 +166,6 @@ impl PackedArray {
         self.bits_per_value
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_bits_per_value(&mut self, new_value: usize) {
         self.bits_per_value = new_value;
     }
@@ -176,7 +175,6 @@ impl PackedArray {
         &self.bits
     }
 
-    #[cfg(feature = "proxy")]
     pub fn as_u64_mut_vec(&mut self) -> &mut Vec<u64> {
         &mut self.bits
     }

feather/base/src/chunk/packed_array.rs

@@ -199,7 +199,7 @@ impl ChunkMap {
     /// Retrieves a handle to the chunk at the given
     /// position, or `None` if it is not loaded.
     pub fn chunk_at_mut(&self, pos: ChunkPosition) -> Option<RwLockWriteGuard<Chunk>> {
-        self.0.get(&pos).map(|lock| lock.write()).flatten()
+        self.0.get(&pos).and_then(|lock| lock.write())
     }
 
     /// Returns an `Arc<RwLock<Chunk>>` at the given position.
@@ -212,8 +212,7 @@ impl ChunkMap {
 
         let (x, y, z) = chunk_relative_pos(pos.into());
         self.chunk_at(pos.chunk())
-            .map(|chunk| chunk.block_at(x, y, z))
-            .flatten()
+            .and_then(|chunk| chunk.block_at(x, y, z))
     }
 
     pub fn set_block_at(&self, pos: ValidBlockPosition, block: BlockId) -> bool {

feather/common/src/world.rs

@@ -12,6 +12,7 @@ mod block;
 mod component;
 mod entity;
 mod entity_builder;
+mod event;
 mod plugin_message;
 mod query;
 mod system;
@@ -49,6 +50,7 @@ use block::*;
 use component::*;
 use entity::*;
 use entity_builder::*;
+use event::*;
 use plugin_message::*;
 use query::*;
 use system::*;
@@ -57,6 +59,8 @@ host_calls! {
     "register_system" => register_system,
     "entity_get_component" => entity_get_component,
     "entity_set_component" => entity_set_component,
+    "entity_add_event" => entity_add_event,
+    "add_event" => add_event,
     "entity_builder_new_empty" => entity_builder_new_empty,
     "entity_builder_new" => entity_builder_new,
     "entity_builder_add_component" => entity_builder_add_component,