Fixed the block macro i think

Author: ReCore-sys

src/bin/src/packet_handlers/play_packets/place_block.rs

@@ -14,6 +14,7 @@ use tracing::{debug, error, trace};
 
 use ferrumc_inventories::hotbar::Hotbar;
 use ferrumc_inventories::inventory::Inventory;
+use ferrumc_world::block_id::BlockId;
 use once_cell::sync::Lazy;
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -128,9 +129,12 @@ pub fn handle(
                         continue 'ev_loop;
                     }
 
-                    if let Err(err) =
-                        chunk.set_block(x & 0xF, y as i32, z & 0xF, VarInt::new(*mapped_block_id))
-                    {
+                    if let Err(err) = chunk.set_block(
+                        x & 0xF,
+                        y as i32,
+                        z & 0xF,
+                        BlockId(*mapped_block_id as u32),
+                    ) {
                         error!("Failed to set block: {:?}", err);
                         continue 'ev_loop;
                     }

src/bin/src/packet_handlers/play_packets/player_action.rs

@@ -42,7 +42,7 @@ pub fn handle(
                         event.location.y as i32,
                         event.location.z.abs() % 16,
                     );
-                    chunk.set_block(relative_x, relative_y, relative_z, BlockData::default())?;
+                    chunk.set_block(relative_x, relative_y, relative_z, BlockId::default())?;
                     // Save the chunk to disk
                     state.0.world.save_chunk(Arc::new(chunk))?;
                     for (eid, conn) in query {

src/lib/derive_macros/src/block/mod.rs

@@ -1,4 +1,5 @@
-use proc_macro::{quote, TokenStream};
+use proc_macro::TokenStream;
+use quote::quote;
 use simd_json::prelude::{ValueAsObject, ValueAsScalar, ValueObjectAccess};
 use syn::parse::{Parse, ParseStream};
 use syn::punctuated::Punctuated;
@@ -179,7 +180,7 @@ pub fn block(input: TokenStream) -> TokenStream {
             }
         } else {
             let res = matched[0];
-            return quote! { ferrumc_world::block_id::BlockId($res) };
+            quote! { BlockId(#res) }.into()
         }
     } else if filtered_names.len() > 1 {
         syn::Error::new_spanned(
@@ -200,7 +201,7 @@ pub fn block(input: TokenStream) -> TokenStream {
         .into()
     } else {
         let first = filtered_names[0].0;
-        return quote! { ferrumc_world::block_id::BlockId($first) };
+        quote! { BlockId(#first) }.into()
     }
 }
 
@@ -274,26 +275,3 @@ fn pretty_print_given_props(props: Opts) -> String {
     }
     s.trim_end_matches(", ").to_string()
 }
-
-fn get_name_from_id(id: u32) -> Option<String> {
-    let mut buf = JSON_FILE.to_vec();
-    let v = simd_json::to_owned_value(&mut buf).unwrap();
-    let filtered_names = v
-        .as_object()
-        .unwrap()
-        .iter()
-        .filter(|v| {
-            let id_in_json = v.0.parse::<u32>().unwrap();
-            id_in_json == id
-        })
-        .map(|v| v.1)
-        .collect::<Vec<_>>();
-    if let Some(first) = filtered_names.first() {
-        if let Some(obj) = first.as_object() {
-            if let Some(name) = obj.get("name").and_then(|n| n.as_str()) {
-                return Some(name.to_string());
-            }
-        }
-    }
-    None
-}

src/lib/derive_macros/src/lib.rs

@@ -70,7 +70,7 @@ pub fn lookup_packet(input: TokenStream) -> TokenStream {
 ///
 /// Usage example:
 ///
-/// ```
+/// ```ignore
 /// #[command("hello")]
 /// fn command(#[sender] sender: Sender) {
 ///     sender.send_message(TextComponent::from("Hello, world!"), false);

src/lib/world/src/benches/edit_bench.rs

@@ -1,6 +1,7 @@
 use criterion::{Criterion, Throughput};
+use ferrumc_macros::block;
+use ferrumc_world::block_id::BlockId;
 use ferrumc_world::chunk_format::Chunk;
-use ferrumc_world::vanilla_chunk_format::BlockData;
 use rand::Rng;
 use std::hint::black_box;
 
@@ -44,32 +45,14 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
     write_group.bench_with_input("Write 0,0,0", &chunk, |b, chunk| {
         b.iter(|| {
             let mut chunk = chunk.clone();
-            black_box(chunk.set_block(
-                0,
-                0,
-                0,
-                BlockData {
-                    name: "minecraft:bricks".to_string(),
-                    properties: None,
-                },
-            ))
-            .unwrap();
+            black_box(chunk.set_block(0, 0, 0, block!("bricks"))).unwrap();
         });
     });
 
     write_group.bench_with_input("Write 8,8,150", &chunk, |b, chunk| {
         b.iter(|| {
             let mut chunk = chunk.clone();
-            black_box(chunk.set_block(
-                8,
-                8,
-                150,
-                BlockData {
-                    name: "minecraft:bricks".to_string(),
-                    properties: None,
-                },
-            ))
-            .unwrap();
+            black_box(chunk.set_block(8, 8, 150, block!("bricks"))).unwrap();
         });
     });
 
@@ -80,10 +63,7 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
                 get_rand_in_range(0, 15),
                 get_rand_in_range(0, 15),
                 get_rand_in_range(0, 255),
-                BlockData {
-                    name: "minecraft:bricks".to_string(),
-                    properties: None,
-                },
+                block!("bricks"),
             ))
             .unwrap();
         });
@@ -94,11 +74,7 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
     write_group.bench_with_input("Fill", &chunk, |b, chunk| {
         b.iter(|| {
             let mut chunk = chunk.clone();
-            black_box(chunk.fill(BlockData {
-                name: "minecraft:bricks".to_string(),
-                properties: None,
-            }))
-            .unwrap();
+            black_box(chunk.fill(block!("bricks"))).unwrap();
         });
     });
 
@@ -108,16 +84,7 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
             for x in 0..16 {
                 for y in 0..256 {
                     for z in 0..16 {
-                        black_box(chunk.set_block(
-                            x,
-                            y,
-                            z,
-                            BlockData {
-                                name: "minecraft:bricks".to_string(),
-                                properties: None,
-                            },
-                        ))
-                        .unwrap();
+                        black_box(chunk.set_block(x, y, z, block!("bricks"))).unwrap();
                     }
                 }
             }
@@ -131,15 +98,7 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
             for x in 0..16 {
                 for y in 0..256 {
                     for z in 0..16 {
-                        batch.set_block(
-                            x,
-                            y,
-                            z,
-                            black_box(BlockData {
-                                name: "minecraft:bricks".to_string(),
-                                properties: None,
-                            }),
-                        );
+                        batch.set_block(x, y, z, black_box(block!("bricks")));
                     }
                 }
             }
@@ -155,19 +114,11 @@ pub(crate) fn bench_edits(c: &mut Criterion) {
                 for y in 0..256 {
                     for z in 0..16 {
                         let block = if (x + y + z) % 2 == 0 {
-                            "minecraft:bricks"
+                            block!("bricks")
                         } else {
-                            "minecraft:stone"
+                            block!("stone")
                         };
-                        batch.set_block(
-                            x,
-                            y,
-                            z,
-                            black_box(BlockData {
-                                name: block.to_string(),
-                                properties: None,
-                            }),
-                        );
+                        batch.set_block(x, y, z, black_box(block));
                     }
                 }
             }

src/lib/world/src/chunk_format.rs

@@ -266,30 +266,25 @@ impl Chunk {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::block_id::BlockId;
+    use ferrumc_macros::block;
 
     #[test]
     fn test_chunk_set_block() {
         let mut chunk = Chunk::new(0, 0, "overworld".to_string());
-        let block = BlockData {
-            name: "minecraft:stone".to_string(),
-            properties: None,
-        }
-        .to_block_id();
+        let block = block!("stone");
         chunk.set_block(0, 0, 0, block).unwrap();
         assert_eq!(chunk.get_block(0, 0, 0).unwrap(), block);
     }
 
     #[test]
     fn test_chunk_fill() {
         let mut chunk = Chunk::new(0, 0, "overworld".to_string());
-        let stone_block = BlockData {
-            name: "minecraft:stone".to_string(),
-            properties: None,
-        };
-        chunk.fill(stone_block.clone()).unwrap();
+        let stone_block = block!("stone");
+        chunk.fill(stone_block).unwrap();
         for section in &chunk.sections {
             for (block, count) in &section.block_states.block_counts {
-                assert_eq!(*block, stone_block.to_block_id());
+                assert_eq!(*block, stone_block);
                 assert_eq!(count, &4096);
             }
         }
@@ -312,21 +307,14 @@ mod tests {
             block_light: vec![255; 2048],
             sky_light: vec![255; 2048],
         };
-        let stone_block = BlockData {
-            name: "minecraft:stone".to_string(),
-            properties: None,
-        };
-        section.fill(stone_block.clone()).unwrap();
+        let stone_block = block!("stone");
+        section.fill(stone_block).unwrap();
         assert_eq!(
             section.block_states.block_data,
             PaletteType::Single(VarInt::from(1))
         );
         assert_eq!(
-            section
-                .block_states
-                .block_counts
-                .get(&stone_block.to_block_id())
-                .unwrap(),
+            section.block_states.block_counts.get(&stone_block).unwrap(),
             &4096
         );
     }
@@ -346,12 +334,9 @@ mod tests {
     #[test]
     fn test_doesnt_fail() {
         let mut chunk = Chunk::new(0, 0, "overworld".to_string());
-        let block = BlockData {
-            name: "minecraft:stone".to_string(),
-            properties: None,
-        };
-        assert!(chunk.set_block(0, 0, 0, block.clone()).is_ok());
-        assert!(chunk.set_block(0, 0, 0, block.clone()).is_ok());
+        let block = block!("stone");
+        assert!(chunk.set_block(0, 0, 0, block).is_ok());
+        assert!(chunk.set_block(0, 0, 0, block).is_ok());
         assert!(chunk.get_block(0, 0, 0).is_ok());
     }
 }

src/lib/world/src/edit_batch.rs

@@ -15,13 +15,15 @@ use std::hash::{Hash, Hasher};
 ///
 /// # Example
 /// ```
+/// # use ferrumc_macros::block;
+/// # use ferrumc_world::block_id::BlockId;
 /// # use ferrumc_world::chunk_format::Chunk;
 /// # use ferrumc_world::edit_batch::EditBatch;
 /// # use ferrumc_world::vanilla_chunk_format::BlockData;
 /// # let mut chunk = Chunk::new(0, 0, "overworld".to_string());
 /// let mut batch = EditBatch::new(&mut chunk);
-/// batch.set_block(1, 64, 1, BlockData { name: "minecraft:stone".to_string(), properties: None });
-/// batch.set_block(2, 64, 1, BlockData { name: "minecraft:bricks".to_string(), properties: None });
+/// batch.set_block(1, 64, 1, block!("stone"));
+/// batch.set_block(2, 64, 1, block!("stone"));
 /// batch.apply().unwrap();
 /// ```
 ///
@@ -47,13 +49,9 @@ pub(crate) struct Edit {
 }
 
 fn get_palette_hash(palette: &[VarInt]) -> i32 {
-    let mut rolling = 0;
     let mut hasher = AHasher::default();
-    for block in palette.iter() {
-        (rolling + block.0).hash(&mut hasher);
-        rolling = hasher.finish() as i32;
-    }
-    rolling
+    palette.hash(&mut hasher);
+    hasher.finish() as i32
 }
 
 impl<'a> EditBatch<'a> {
@@ -75,13 +73,8 @@ impl<'a> EditBatch<'a> {
     /// Sets a block at the given chunk-relative coordinates.
     ///
     /// This won't have any effect until `apply()` is called.
-    pub fn set_block(&mut self, x: i32, y: i32, z: i32, block: impl Into<BlockId>) {
-        self.edits.push(Edit {
-            x,
-            y,
-            z,
-            block: block.into(),
-        });
+    pub fn set_block(&mut self, x: i32, y: i32, z: i32, block: BlockId) {
+        self.edits.push(Edit { x, y, z, block });
     }
 
     /// Applies all edits in the batch to the chunk.