BlockStates

azalea-rs · mat-1 · Mar 8, 2023 · Feb 27, 2023 · Mar 7, 2023 · Mar 8, 2023
commit 683de171211f403a120b5600cff10762d8151c3a
diff --git a/azalea-block/azalea-block-macros/src/lib.rs b/azalea-block/azalea-block-macros/src/lib.rs
@@ -310,7 +310,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
     let mut from_state_to_block_match = quote! {};
     let mut from_registry_block_to_block_match = quote! {};
     let mut from_registry_block_to_blockstate_match = quote! {};
-    let mut from_registry_block_to_blockstate_range_match = quote! {};
+    let mut from_registry_block_to_blockstates_match = quote! {};
 
     for block in &input.block_definitions.blocks {
         let block_property_names = &block
@@ -524,8 +524,8 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
         from_registry_block_to_blockstate_match.extend(quote! {
             azalea_registry::Block::#block_name_pascal_case => BlockState { id: #default_state_id },
         });
-        from_registry_block_to_blockstate_range_match.extend(quote! {
-            azalea_registry::Block::#block_name_pascal_case => BlockStateRange { id: #first_state_id..=#last_state_id },
+        from_registry_block_to_blockstates_match.extend(quote! {
+            azalea_registry::Block::#block_name_pascal_case => BlockStates::from(#first_state_id..=#last_state_id),
         });
 
         let mut block_default_fields = quote! {};
@@ -629,10 +629,10 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
                 }
             }
         }
-        impl From<azalea_registry::Block> for BlockStateRange {
+        impl From<azalea_registry::Block> for BlockStates {
             fn from(block: azalea_registry::Block) -> Self {
                 match block {
-                    #from_registry_block_to_blockstate_range_match
+                    #from_registry_block_to_blockstates_match
                     _ => unreachable!("There should always be a block state for every azalea_registry::Block variant")
                 }
             }

diff --git a/azalea-block/src/blocks.rs b/azalea-block/src/blocks.rs
@@ -1,4 +1,4 @@
-use crate::{Block, BlockBehavior, BlockState, BlockStateRange};
+use crate::{Block, BlockBehavior, BlockState, BlockStates};
 use azalea_block_macros::make_block_states;
 use std::fmt::Debug;
 

diff --git a/azalea-block/src/lib.rs b/azalea-block/src/lib.rs
@@ -8,7 +8,7 @@ mod range;
 use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable};
 pub use behavior::BlockBehavior;
 use core::fmt::Debug;
-pub use range::BlockStateRange;
+pub use range::BlockStates;
 use std::{
     any::Any,
     io::{Cursor, Write},

diff --git a/azalea-block/src/range.rs b/azalea-block/src/range.rs
@@ -1,6 +1,33 @@
-use std::ops::RangeInclusive;
+use std::{collections::HashSet, ops::RangeInclusive};
+
+use crate::BlockState;
 
 #[derive(Debug, Clone)]
-pub struct BlockStateRange {
-    pub id: RangeInclusive<u32>,
+pub struct BlockStates {
+    pub set: HashSet<BlockState>,
+}
+
+impl From<RangeInclusive<u32>> for BlockStates {
+    fn from(range: RangeInclusive<u32>) -> Self {
+        let mut set = HashSet::with_capacity((range.end() - range.start() + 1) as usize);
+        for id in range {
+            set.insert(BlockState { id });
+        }
+        Self { set }
+    }
+}
+
+impl IntoIterator for BlockStates {
+    type Item = BlockState;
+    type IntoIter = std::collections::hash_set::IntoIter<BlockState>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.set.into_iter()
+    }
+}
+
+impl BlockStates {
+    pub fn contains(&self, state: &BlockState) -> bool {
+        self.set.contains(state)
+    }
 }
diff --git a/azalea-world/src/world.rs b/azalea-world/src/world.rs
@@ -6,7 +6,7 @@ use crate::{
     palette::Palette,
     ChunkStorage, PartialChunkStorage, WorldContainer,
 };
-use azalea_block::BlockState;
+use azalea_block::{BlockState, BlockStates};
 use azalea_core::{BlockPos, ChunkPos};
 use azalea_ecs::{
     entity::Entity,
@@ -198,12 +198,11 @@ impl World {
     pub fn find_block(
         &self,
         nearest_to: impl Into<BlockPos>,
-        block_states: impl Into<HashSet<BlockState>>,
+        block_states: &BlockStates,
     ) -> Option<BlockPos> {
         // iterate over every chunk in a 3d spiral pattern
         // and then check the palette for the block state
 
-        let block_states = block_states.into();
         let nearest_to: BlockPos = nearest_to.into();
         let start_chunk: ChunkPos = (&nearest_to).into();
         // todo (correctness): rename this to something like SquareChunkIterator and

diff --git a/azalea/examples/testbot.rs b/azalea/examples/testbot.rs
@@ -143,7 +143,7 @@ async fn handle(mut bot: Client, event: Event, _state: State) -> anyhow::Result<
                     "findblock" => {
                         let target_pos = bot.world().read().find_block(
                             bot.component::<Position>(),
-                            azalea_registry::Block::DiamondBlock.into(),
+                            &azalea_registry::Block::DiamondBlock.into(),
                         );
                         bot.chat(&format!("target_pos: {target_pos:?}",));
                     }