fix clippy

user622628252416 · Dec 1, 2024 · cdf2498 · cdf2498
1 parent 490c82f
commit cdf2498
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/pumpkin-macros/src/block.rs b/pumpkin-macros/src/block.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::str::FromStr;
 use std::sync::LazyLock;
 
 use proc_macro::TokenStream;
@@ -43,8 +42,12 @@ pub(super) fn block_id_impl(item: TokenStream) -> TokenStream {
         .get(&identifier)
         .expect(&format!("block {identifier:?} does not exist"));
 
-    // integer literal without type information
-    TokenStream::from_str(&format!("{id}")).unwrap()
+    let id = *id as u16;
+
+    quote::quote! {
+        #id
+    }
+    .into()
 }
 
 pub(super) fn block_state_id_impl(item: TokenStream) -> TokenStream {
@@ -57,8 +60,10 @@ pub(super) fn block_state_id_impl(item: TokenStream) -> TokenStream {
     let block = &BLOCKS[*block_id];
     let id = block.default_state_id;
 
-    // integer literal without type information
-    TokenStream::from_str(&format!("{id}")).unwrap()
+    quote::quote! {
+        #id
+    }
+    .into()
 }
 
 pub(super) fn block_entity_id_impl(item: TokenStream) -> TokenStream {
@@ -68,6 +73,10 @@ pub(super) fn block_entity_id_impl(item: TokenStream) -> TokenStream {
         .get(&identifier)
         .expect(&format!("block enitity {identifier:?} does not exist"));
 
-    // integer literal without type information
-    TokenStream::from_str(&format!("{id}")).unwrap()
+    let id = *id as u32;
+
+    quote::quote! {
+        #id
+    }
+    .into()
 }
diff --git a/pumpkin-macros/src/lib.rs b/pumpkin-macros/src/lib.rs
@@ -89,7 +89,7 @@ pub fn block_entity_id(item: TokenStream) -> TokenStream {
     use std::hash::{DefaultHasher, Hash, Hasher};
     let mut hasher = DefaultHasher::new();
     item.to_string().hash(&mut hasher);
-    let id = hasher.finish() as u16;
+    let id = hasher.finish() as u32;
     quote::quote! { #id }.into()
 }
 

diff --git a/pumpkin-world/src/block/block_registry.rs b/pumpkin-world/src/block/block_registry.rs
@@ -70,8 +70,6 @@ pub fn get_shapes_by_block_state(block_state_id: u16) -> Option<Vec<&'static Sha
 
 #[cfg(test)]
 mod tests {
-    use std::u16;
-
     use pumpkin_macros::block_entity_id;
     use pumpkin_macros::block_id;
     use pumpkin_macros::block_state_id;