Some Refactors

pumpkin-inventory/src/crafting.rs

@@ -1,7 +1,7 @@
 use pumpkin_registry::{
     flatten_3x3, get_tag_values, IngredientSlot, IngredientType, RecipeResult, TagCategory, RECIPES,
 };
-use pumpkin_world::item::item_registry::get_item;
+use pumpkin_world::item::registry::get_item;
 use pumpkin_world::item::ItemStack;
 use rayon::prelude::*;
 

pumpkin-inventory/src/open_container.rs

@@ -2,7 +2,7 @@ use crate::crafting::check_if_matches_crafting;
 use crate::Container;
 use pumpkin_data::screen::WindowType;
 use pumpkin_util::math::position::BlockPos;
-use pumpkin_world::block::block_registry::Block;
+use pumpkin_world::block::registry::Block;
 use pumpkin_world::item::ItemStack;
 use std::sync::Arc;
 use tokio::sync::Mutex;

pumpkin-macros/src/lib.rs

@@ -78,7 +78,7 @@ pub fn client_packet(input: TokenStream, item: TokenStream) -> TokenStream {
 
     let gen = quote! {
         #item
-        impl #impl_generics crate::bytebuf::packet_id::Packet for #name #ty_generics {
+        impl #impl_generics crate::bytebuf::packet::Packet for #name #ty_generics {
             const PACKET_ID: i32 = #input;
         }
     };
@@ -97,7 +97,7 @@ pub fn server_packet(input: TokenStream, item: TokenStream) -> TokenStream {
 
     let gen = quote! {
         #item
-        impl #impl_generics crate::bytebuf::packet_id::Packet for #name #ty_generics {
+        impl #impl_generics crate::bytebuf::packet::Packet for #name #ty_generics {
             const PACKET_ID: i32 = #input;
         }
     };
@@ -131,6 +131,32 @@ pub fn pumpkin_block(input: TokenStream, item: TokenStream) -> TokenStream {
     gen.into()
 }
 
+#[proc_macro_attribute]
+pub fn pumpkin_item(input: TokenStream, item: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(item.clone()).unwrap();
+    let name = &ast.ident;
+    let (impl_generics, ty_generics, _) = ast.generics.split_for_impl();
+
+    let input_string = input.to_string();
+    let packet_name = input_string.trim_matches('"');
+    let packet_name_split: Vec<&str> = packet_name.split(":").collect();
+
+    let namespace = packet_name_split[0];
+    let id = packet_name_split[1];
+
+    let item: proc_macro2::TokenStream = item.into();
+
+    let gen = quote! {
+        #item
+        impl #impl_generics crate::block::pumpkin_block::BlockMetadata for #name #ty_generics {
+            const NAMESPACE: &'static str = #namespace;
+            const ID: &'static str = #id;
+        }
+    };
+
+    gen.into()
+}
+
 mod block_state;
 #[proc_macro]
 pub fn block_state(item: TokenStream) -> TokenStream {

pumpkin-protocol/src/bytebuf/mod.rs

@@ -11,7 +11,7 @@ use bytes::{Buf, BufMut};
 
 mod deserializer;
 use thiserror::Error;
-pub mod packet_id;
+pub mod packet;
 mod serializer;
 
 use std::mem::size_of;

pumpkin-protocol/src/client/config/mod.rs

@@ -1,21 +1,21 @@
-mod c_add_resource_pack;
-mod c_config_disconnect;
-mod c_cookie_request;
-mod c_finish_config;
-mod c_known_packs;
-mod c_plugin_message;
-mod c_registry_data;
-mod c_server_links;
-mod c_store_cookie;
-mod c_transfer;
+mod add_resource_pack;
+mod config_disconnect;
+mod cookie_request;
+mod finish_config;
+mod known_packs;
+mod plugin_message;
+mod registry_data;
+mod server_links;
+mod store_cookie;
+mod transfer;
 
-pub use c_add_resource_pack::*;
-pub use c_config_disconnect::*;
-pub use c_cookie_request::*;
-pub use c_finish_config::*;
-pub use c_known_packs::*;
-pub use c_plugin_message::*;
-pub use c_registry_data::*;
-pub use c_server_links::*;
-pub use c_store_cookie::*;
-pub use c_transfer::*;
+pub use add_resource_pack::*;
+pub use config_disconnect::*;
+pub use cookie_request::*;
+pub use finish_config::*;
+pub use known_packs::*;
+pub use plugin_message::*;
+pub use registry_data::*;
+pub use server_links::*;
+pub use store_cookie::*;
+pub use transfer::*;

pumpkin-protocol/src/client/login/mod.rs

@@ -1,13 +1,13 @@
-mod c_cookie_request;
-mod c_encryption_request;
-mod c_login_disconnect;
-mod c_login_success;
-mod c_plugin_request;
-mod c_set_compression;
+mod cookie_request;
+mod encryption_request;
+mod login_disconnect;
+mod login_success;
+mod plugin_request;
+mod set_compression;
 
-pub use c_cookie_request::*;
-pub use c_encryption_request::*;
-pub use c_login_disconnect::*;
-pub use c_login_success::*;
-pub use c_plugin_request::*;
-pub use c_set_compression::*;
+pub use cookie_request::*;
+pub use encryption_request::*;
+pub use login_disconnect::*;
+pub use login_success::*;
+pub use plugin_request::*;
+pub use set_compression::*;