diff --git a/Cargo.toml b/Cargo.toml
index a04488dcd..fa23ff461 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
     "pumpkin-protocol/",
     "pumpkin-registry/",
     "pumpkin-world",
-    "pumpkin/",
+    "pumpkin/", "pumpkin-data",
 ]
 
 [workspace.package]
diff --git a/assets/noise_parameters.json b/assets/noise_parameters.json
new file mode 100644
index 000000000..634c5b9fc
--- /dev/null
+++ b/assets/noise_parameters.json
@@ -0,0 +1 @@
+{"aquifer_barrier":{"first_octave":-3,"amplitudes":[1.0]},"aquifer_fluid_level_floodedness":{"first_octave":-7,"amplitudes":[1.0]},"aquifer_fluid_level_spread":{"first_octave":-5,"amplitudes":[1.0]},"aquifer_lava":{"first_octave":-1,"amplitudes":[1.0]},"badlands_pillar":{"first_octave":-2,"amplitudes":[1.0,1.0,1.0,1.0]},"badlands_pillar_roof":{"first_octave":-8,"amplitudes":[1.0]},"badlands_surface":{"first_octave":-6,"amplitudes":[1.0,1.0,1.0]},"calcite":{"first_octave":-9,"amplitudes":[1.0,1.0,1.0,1.0]},"cave_cheese":{"first_octave":-8,"amplitudes":[0.5,1.0,2.0,1.0,2.0,1.0,0.0,2.0,0.0]},"cave_entrance":{"first_octave":-7,"amplitudes":[0.4,0.5,1.0]},"cave_layer":{"first_octave":-8,"amplitudes":[1.0]},"clay_bands_offset":{"first_octave":-8,"amplitudes":[1.0]},"continentalness":{"first_octave":-9,"amplitudes":[1.0,1.0,2.0,2.0,2.0,1.0,1.0,1.0,1.0]},"continentalness_large":{"first_octave":-11,"amplitudes":[1.0,1.0,2.0,2.0,2.0,1.0,1.0,1.0,1.0]},"erosion":{"first_octave":-9,"amplitudes":[1.0,1.0,0.0,1.0,1.0]},"erosion_large":{"first_octave":-11,"amplitudes":[1.0,1.0,0.0,1.0,1.0]},"gravel":{"first_octave":-8,"amplitudes":[1.0,1.0,1.0,1.0]},"gravel_layer":{"first_octave":-8,"amplitudes":[1.0,1.0,1.0,1.0,0.0,0.0,0.0,0.0,0.013333333333333334]},"ice":{"first_octave":-4,"amplitudes":[1.0,1.0,1.0,1.0]},"iceberg_pillar":{"first_octave":-6,"amplitudes":[1.0,1.0,1.0,1.0]},"iceberg_pillar_roof":{"first_octave":-3,"amplitudes":[1.0]},"iceberg_surface":{"first_octave":-6,"amplitudes":[1.0,1.0,1.0]},"jagged":{"first_octave":-16,"amplitudes":[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]},"nether_state_selector":{"first_octave":-4,"amplitudes":[1.0]},"nether_wart":{"first_octave":-3,"amplitudes":[1.0,0.0,0.0,0.9]},"netherrack":{"first_octave":-3,"amplitudes":[1.0,0.0,0.0,0.35]},"noodle":{"first_octave":-8,"amplitudes":[1.0]},"noodle_ridge_a":{"first_octave":-7,"amplitudes":[1.0]},"noodle_ridge_b":{"first_octave":-7,"amplitudes":[1.0]},"noodle_thickness":{"first_octave":-8,"amplitudes":[1.0]},"offset":{"first_octave":-3,"amplitudes":[1.0,1.0,1.0,0.0]},"ore_gap":{"first_octave":-5,"amplitudes":[1.0]},"ore_vein_a":{"first_octave":-7,"amplitudes":[1.0]},"ore_vein_b":{"first_octave":-7,"amplitudes":[1.0]},"ore_veininess":{"first_octave":-8,"amplitudes":[1.0]},"packed_ice":{"first_octave":-7,"amplitudes":[1.0,1.0,1.0,1.0]},"patch":{"first_octave":-5,"amplitudes":[1.0,0.0,0.0,0.0,0.0,0.013333333333333334]},"pillar":{"first_octave":-7,"amplitudes":[1.0,1.0]},"pillar_rareness":{"first_octave":-8,"amplitudes":[1.0]},"pillar_thickness":{"first_octave":-8,"amplitudes":[1.0]},"powder_snow":{"first_octave":-6,"amplitudes":[1.0,1.0,1.0,1.0]},"ridge":{"first_octave":-7,"amplitudes":[1.0,2.0,1.0,0.0,0.0,0.0]},"soul_sand_layer":{"first_octave":-8,"amplitudes":[1.0,1.0,1.0,1.0,0.0,0.0,0.0,0.0,0.013333333333333334]},"spaghetti_2d":{"first_octave":-7,"amplitudes":[1.0]},"spaghetti_2d_elevation":{"first_octave":-8,"amplitudes":[1.0]},"spaghetti_2d_modulator":{"first_octave":-11,"amplitudes":[1.0]},"spaghetti_2d_thickness":{"first_octave":-11,"amplitudes":[1.0]},"spaghetti_3d_1":{"first_octave":-7,"amplitudes":[1.0]},"spaghetti_3d_2":{"first_octave":-7,"amplitudes":[1.0]},"spaghetti_3d_rarity":{"first_octave":-11,"amplitudes":[1.0]},"spaghetti_3d_thickness":{"first_octave":-8,"amplitudes":[1.0]},"spaghetti_roughness":{"first_octave":-5,"amplitudes":[1.0]},"spaghetti_roughness_modulator":{"first_octave":-8,"amplitudes":[1.0]},"surface":{"first_octave":-6,"amplitudes":[1.0,1.0,1.0]},"surface_secondary":{"first_octave":-6,"amplitudes":[1.0,1.0,0.0,1.0]},"surface_swamp":{"first_octave":-2,"amplitudes":[1.0]},"temperature":{"first_octave":-10,"amplitudes":[1.5,0.0,1.0,0.0,0.0,0.0]},"temperature_large":{"first_octave":-12,"amplitudes":[1.5,0.0,1.0,0.0,0.0,0.0]},"vegetation":{"first_octave":-8,"amplitudes":[1.0,1.0,0.0,0.0,0.0,0.0]},"vegetation_large":{"first_octave":-10,"amplitudes":[1.0,1.0,0.0,0.0,0.0,0.0]}}
\ No newline at end of file
diff --git a/pumpkin-data/Cargo.toml b/pumpkin-data/Cargo.toml
new file mode 100644
index 000000000..747a5818a
--- /dev/null
+++ b/pumpkin-data/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "pumpkin-data"
+version.workspace = true
+edition.workspace = true
+build = "build/build.rs"
+
+[build-dependencies]
+serde.workspace = true
+serde_json.workspace = true
+
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = "2.0"
\ No newline at end of file
diff --git a/pumpkin-data/src/lib.rs b/pumpkin-data/src/lib.rs
new file mode 100644
index 000000000..c7f10b1b0
--- /dev/null
+++ b/pumpkin-data/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod packet {
+    include!(concat!(env!("OUT_DIR"), "/packet.rs"));
+}
diff --git a/pumpkin-macros/src/lib.rs b/pumpkin-macros/src/lib.rs
index 75f5167ff..baa458603 100644
--- a/pumpkin-macros/src/lib.rs
+++ b/pumpkin-macros/src/lib.rs
@@ -3,20 +3,19 @@ use quote::quote;
 
 extern crate proc_macro;
 
-mod packet;
 #[proc_macro_attribute]
 pub fn client_packet(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: proc_macro2::TokenStream = packet::packet_clientbound(input);
+    let input: proc_macro2::TokenStream = input.into();
     let item: proc_macro2::TokenStream = item.into();
 
     let gen = quote! {
         #item
         impl #impl_generics crate::bytebuf::packet_id::Packet for #name #ty_generics {
-            const PACKET_ID: i32 = #input as i32;
+            const PACKET_ID: i32 = #input;
         }
     };
 
@@ -29,13 +28,13 @@ pub fn server_packet(input: TokenStream, item: TokenStream) -> TokenStream {
     let name = &ast.ident;
     let (impl_generics, ty_generics, _) = ast.generics.split_for_impl();
 
-    let input: proc_macro2::TokenStream = packet::packet_serverbound(input);
+    let input: proc_macro2::TokenStream = input.into();
     let item: proc_macro2::TokenStream = item.into();
 
     let gen = quote! {
         #item
         impl #impl_generics crate::bytebuf::packet_id::Packet for #name #ty_generics {
-            const PACKET_ID: i32 = #input as i32;
+            const PACKET_ID: i32 = #input;
         }
     };
 
diff --git a/pumpkin-macros/src/packet.rs b/pumpkin-macros/src/packet.rs
deleted file mode 100644
index 09ac49fd5..000000000
--- a/pumpkin-macros/src/packet.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::{collections::HashMap, sync::LazyLock};
-
-use proc_macro::TokenStream;
-use quote::quote;
-use serde::Deserialize;
-
-#[derive(Deserialize)]
-pub struct Packets {
-    serverbound: HashMap<String, Vec<String>>,
-    clientbound: HashMap<String, Vec<String>>,
-}
-
-static PACKETS: LazyLock<Packets> = LazyLock::new(|| {
-    serde_json::from_str(include_str!("../../assets/packets.json"))
-        .expect("Could not parse packets.json registry.")
-});
-
-pub(crate) fn packet_clientbound(item: TokenStream) -> proc_macro2::TokenStream {
-    let input_string = item.to_string();
-    let packet_name = input_string.trim_matches('"');
-    let packet_name_split: Vec<&str> = packet_name.split(":").collect();
-    let phase = PACKETS
-        .clientbound
-        .get(packet_name_split[0])
-        .expect("Invalid Phase");
-    let id = phase
-        .iter()
-        .enumerate()
-        .find(|s| s.1 == packet_name_split[1])
-        .map(|(i, _)| i)
-        .expect("Invalid Packet name");
-    quote! { #id }
-}
-
-pub(crate) fn packet_serverbound(item: TokenStream) -> proc_macro2::TokenStream {
-    let input_string = item.to_string();
-    let packet_name = input_string.trim_matches('"');
-    let packet_name_split: Vec<&str> = packet_name.split(":").collect();
-
-    let phase = PACKETS
-        .serverbound
-        .get(packet_name_split[0])
-        .expect("Invalid Phase");
-    let id = phase
-        .iter()
-        .enumerate()
-        .find(|s| s.1 == packet_name_split[1])
-        .map(|(i, _)| i)
-        .expect("Invalid Packet name");
-    quote! { #id }
-}
diff --git a/pumpkin-protocol/Cargo.toml b/pumpkin-protocol/Cargo.toml
index e4910d607..a4ec21eee 100644
--- a/pumpkin-protocol/Cargo.toml
+++ b/pumpkin-protocol/Cargo.toml
@@ -12,6 +12,7 @@ query = []
 
 [dependencies]
 pumpkin-nbt = { path = "../pumpkin-nbt" }
+pumpkin-data = { path = "../pumpkin-data" }
 pumpkin-macros = { path = "../pumpkin-macros" }
 pumpkin-world = { path = "../pumpkin-world" }
 pumpkin-util = { path = "../pumpkin-util" }
diff --git a/pumpkin-protocol/src/client/config/c_add_resource_pack.rs b/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
index 4dd96c98a..d9b934ed9 100644
--- a/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
+++ b/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
@@ -3,8 +3,10 @@ use pumpkin_util::text::TextComponent;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
+use pumpkin_data::packet::clientbound::CONFIG_RESOURCE_PACK_PUSH;
+
 #[derive(Serialize)]
-#[client_packet("config:resource_pack_push")]
+#[client_packet(CONFIG_RESOURCE_PACK_PUSH)]
 pub struct CConfigAddResourcePack<'a> {
     uuid: uuid::Uuid,
     url: &'a str,
diff --git a/pumpkin-protocol/src/client/config/c_config_disconnect.rs b/pumpkin-protocol/src/client/config/c_config_disconnect.rs
index cf0fc4def..65e86a191 100644
--- a/pumpkin-protocol/src/client/config/c_config_disconnect.rs
+++ b/pumpkin-protocol/src/client/config/c_config_disconnect.rs
@@ -1,7 +1,9 @@
 use pumpkin_macros::client_packet;
 
+use pumpkin_data::packet::clientbound::CONFIG_DISCONNECT;
+
 #[derive(serde::Serialize)]
-#[client_packet("config:disconnect")]
+#[client_packet(CONFIG_DISCONNECT)]
 pub struct CConfigDisconnect<'a> {
     reason: &'a str,
 }
diff --git a/pumpkin-protocol/src/client/config/c_cookie_request.rs b/pumpkin-protocol/src/client/config/c_cookie_request.rs
index 71fb9aca3..f32011fdc 100644
--- a/pumpkin-protocol/src/client/config/c_cookie_request.rs
+++ b/pumpkin-protocol/src/client/config/c_cookie_request.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::clientbound::CONFIG_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 
 use crate::codec::identifier::Identifier;
 
 #[derive(serde::Serialize)]
-#[client_packet("config:cookie_request")]
+#[client_packet(CONFIG_COOKIE_REQUEST)]
 /// Requests a cookie that was previously stored.
 pub struct CCookieRequest<'a> {
     key: &'a Identifier,
diff --git a/pumpkin-protocol/src/client/config/c_finish_config.rs b/pumpkin-protocol/src/client/config/c_finish_config.rs
index acb301b99..7dc0d978d 100644
--- a/pumpkin-protocol/src/client/config/c_finish_config.rs
+++ b/pumpkin-protocol/src/client/config/c_finish_config.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::clientbound::CONFIG_FINISH_CONFIGURATION;
 use pumpkin_macros::client_packet;
 
 #[derive(serde::Serialize)]
-#[client_packet("config:finish_configuration")]
+#[client_packet(CONFIG_FINISH_CONFIGURATION)]
 pub struct CFinishConfig {}
 
 impl Default for CFinishConfig {
diff --git a/pumpkin-protocol/src/client/config/c_known_packs.rs b/pumpkin-protocol/src/client/config/c_known_packs.rs
index 7622b93ef..344750255 100644
--- a/pumpkin-protocol/src/client/config/c_known_packs.rs
+++ b/pumpkin-protocol/src/client/config/c_known_packs.rs
@@ -1,9 +1,10 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::CONFIG_SELECT_KNOWN_PACKS;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, KnownPack};
 
-#[client_packet("config:select_known_packs")]
+#[client_packet(CONFIG_SELECT_KNOWN_PACKS)]
 pub struct CKnownPacks<'a> {
     known_packs: &'a [KnownPack<'a>],
 }
diff --git a/pumpkin-protocol/src/client/config/c_plugin_message.rs b/pumpkin-protocol/src/client/config/c_plugin_message.rs
index ba519e91e..95464bc70 100644
--- a/pumpkin-protocol/src/client/config/c_plugin_message.rs
+++ b/pumpkin-protocol/src/client/config/c_plugin_message.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::CONFIG_CUSTOM_PAYLOAD;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("config:custom_payload")]
+#[client_packet(CONFIG_CUSTOM_PAYLOAD)]
 pub struct CPluginMessage<'a> {
     channel: &'a str,
     data: &'a [u8],
diff --git a/pumpkin-protocol/src/client/config/c_registry_data.rs b/pumpkin-protocol/src/client/config/c_registry_data.rs
index 5a04e6823..eb69e5da1 100644
--- a/pumpkin-protocol/src/client/config/c_registry_data.rs
+++ b/pumpkin-protocol/src/client/config/c_registry_data.rs
@@ -1,9 +1,10 @@
 use bytes::{BufMut, BytesMut};
+use pumpkin_data::packet::clientbound::CONFIG_REGISTRY_DATA;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, codec::identifier::Identifier, ClientPacket};
 
-#[client_packet("config:registry_data")]
+#[client_packet(CONFIG_REGISTRY_DATA)]
 pub struct CRegistryData<'a> {
     registry_id: &'a Identifier,
     entries: &'a [RegistryEntry],
diff --git a/pumpkin-protocol/src/client/config/c_server_links.rs b/pumpkin-protocol/src/client/config/c_server_links.rs
index b14547ca5..32bf22cdf 100644
--- a/pumpkin-protocol/src/client/config/c_server_links.rs
+++ b/pumpkin-protocol/src/client/config/c_server_links.rs
@@ -1,9 +1,10 @@
 use crate::{Link, VarInt};
+use pumpkin_data::packet::clientbound::CONFIG_SERVER_LINKS;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("config:server_links")]
+#[client_packet(CONFIG_SERVER_LINKS)]
 pub struct CConfigServerLinks<'a> {
     links_count: &'a VarInt,
     links: &'a [Link<'a>],
diff --git a/pumpkin-protocol/src/client/config/c_store_cookie.rs b/pumpkin-protocol/src/client/config/c_store_cookie.rs
index 0334df2d1..e6b283316 100644
--- a/pumpkin-protocol/src/client/config/c_store_cookie.rs
+++ b/pumpkin-protocol/src/client/config/c_store_cookie.rs
@@ -1,8 +1,9 @@
 use crate::{codec::identifier::Identifier, VarInt};
+use pumpkin_data::packet::clientbound::CONFIG_STORE_COOKIE;
 use pumpkin_macros::client_packet;
 
 #[derive(serde::Serialize)]
-#[client_packet("config:store_cookie")]
+#[client_packet(CONFIG_STORE_COOKIE)]
 /// Stores some arbitrary data on the client, which persists between server transfers.
 /// The Notchian (vanilla) client only accepts cookies of up to 5 kiB in size.
 pub struct CStoreCookie<'a> {
diff --git a/pumpkin-protocol/src/client/config/c_transfer.rs b/pumpkin-protocol/src/client/config/c_transfer.rs
index d5e6bc69a..c7aa76fcf 100644
--- a/pumpkin-protocol/src/client/config/c_transfer.rs
+++ b/pumpkin-protocol/src/client/config/c_transfer.rs
@@ -1,9 +1,10 @@
 use crate::VarInt;
+use pumpkin_data::packet::clientbound::CONFIG_TRANSFER;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("config:transfer")]
+#[client_packet(CONFIG_TRANSFER)]
 pub struct CTransfer<'a> {
     host: &'a str,
     port: &'a VarInt,
diff --git a/pumpkin-protocol/src/client/login/c_cookie_request.rs b/pumpkin-protocol/src/client/login/c_cookie_request.rs
index 174e85691..0d8564a4c 100644
--- a/pumpkin-protocol/src/client/login/c_cookie_request.rs
+++ b/pumpkin-protocol/src/client/login/c_cookie_request.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::LOGIN_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::codec::identifier::Identifier;
 
 #[derive(Serialize)]
-#[client_packet("login:cookie_request")]
+#[client_packet(LOGIN_COOKIE_REQUEST)]
 /// Requests a cookie that was previously stored.
 pub struct CLoginCookieRequest<'a> {
     key: &'a Identifier,
diff --git a/pumpkin-protocol/src/client/login/c_encryption_request.rs b/pumpkin-protocol/src/client/login/c_encryption_request.rs
index 7ff9eeb10..91ac9cc00 100644
--- a/pumpkin-protocol/src/client/login/c_encryption_request.rs
+++ b/pumpkin-protocol/src/client/login/c_encryption_request.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::LOGIN_HELLO;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("login:hello")]
+#[client_packet(LOGIN_HELLO)]
 pub struct CEncryptionRequest<'a> {
     server_id: &'a str, // 20
     public_key_length: VarInt,
diff --git a/pumpkin-protocol/src/client/login/c_login_disconnect.rs b/pumpkin-protocol/src/client/login/c_login_disconnect.rs
index 30806dd70..b2499f776 100644
--- a/pumpkin-protocol/src/client/login/c_login_disconnect.rs
+++ b/pumpkin-protocol/src/client/login/c_login_disconnect.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::LOGIN_LOGIN_DISCONNECT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("login:login_disconnect")]
+#[client_packet(LOGIN_LOGIN_DISCONNECT)]
 pub struct CLoginDisconnect<'a> {
     json_reason: &'a str,
 }
diff --git a/pumpkin-protocol/src/client/login/c_login_success.rs b/pumpkin-protocol/src/client/login/c_login_success.rs
index 290ca4c28..a581128c4 100644
--- a/pumpkin-protocol/src/client/login/c_login_success.rs
+++ b/pumpkin-protocol/src/client/login/c_login_success.rs
@@ -1,9 +1,10 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::LOGIN_LOGIN_FINISHED;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, Property};
 
-#[client_packet("login:login_finished")]
+#[client_packet(LOGIN_LOGIN_FINISHED)]
 pub struct CLoginSuccess<'a> {
     pub uuid: &'a uuid::Uuid,
     pub username: &'a str, // 16
diff --git a/pumpkin-protocol/src/client/login/c_plugin_request.rs b/pumpkin-protocol/src/client/login/c_plugin_request.rs
index ab9edf558..97fea6330 100644
--- a/pumpkin-protocol/src/client/login/c_plugin_request.rs
+++ b/pumpkin-protocol/src/client/login/c_plugin_request.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::LOGIN_CUSTOM_QUERY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("login:custom_query")]
+#[client_packet(LOGIN_CUSTOM_QUERY)]
 pub struct CLoginPluginRequest<'a> {
     message_id: VarInt,
     channel: &'a str,
diff --git a/pumpkin-protocol/src/client/login/c_set_compression.rs b/pumpkin-protocol/src/client/login/c_set_compression.rs
index 8033737a7..3b572f000 100644
--- a/pumpkin-protocol/src/client/login/c_set_compression.rs
+++ b/pumpkin-protocol/src/client/login/c_set_compression.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::LOGIN_LOGIN_COMPRESSION;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("login:login_compression")]
+#[client_packet(LOGIN_LOGIN_COMPRESSION)]
 pub struct CSetCompression {
     threshold: VarInt,
 }
diff --git a/pumpkin-protocol/src/client/play/c_acknowledge_block.rs b/pumpkin-protocol/src/client/play/c_acknowledge_block.rs
index 7cde985d6..2d86fe002 100644
--- a/pumpkin-protocol/src/client/play/c_acknowledge_block.rs
+++ b/pumpkin-protocol/src/client/play/c_acknowledge_block.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_BLOCK_CHANGED_ACK;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:block_changed_ack")]
+#[client_packet(PLAY_BLOCK_CHANGED_ACK)]
 pub struct CAcknowledgeBlockChange {
     sequence_id: VarInt,
 }
diff --git a/pumpkin-protocol/src/client/play/c_actionbar.rs b/pumpkin-protocol/src/client/play/c_actionbar.rs
index af9a5e438..6242f329b 100644
--- a/pumpkin-protocol/src/client/play/c_actionbar.rs
+++ b/pumpkin-protocol/src/client/play/c_actionbar.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_ACTION_BAR_TEXT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_action_bar_text")]
+#[client_packet(PLAY_SET_ACTION_BAR_TEXT)]
 pub struct CActionBar<'a> {
     action_bar: &'a TextComponent,
 }
diff --git a/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs b/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs
index 8ce150961..103794103 100644
--- a/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs
+++ b/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_BLOCK_DESTRUCTION;
 use pumpkin_util::math::position::WorldPosition;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:block_destruction")]
+#[client_packet(PLAY_BLOCK_DESTRUCTION)]
 pub struct CSetBlockDestroyStage {
     entity_id: VarInt,
     location: WorldPosition,
diff --git a/pumpkin-protocol/src/client/play/c_block_event.rs b/pumpkin-protocol/src/client/play/c_block_event.rs
index 1cc658e23..fc1931196 100644
--- a/pumpkin-protocol/src/client/play/c_block_event.rs
+++ b/pumpkin-protocol/src/client/play/c_block_event.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_BLOCK_EVENT;
 use pumpkin_util::math::position::WorldPosition;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:block_event")]
+#[client_packet(PLAY_BLOCK_EVENT)]
 pub struct CBlockAction<'a> {
     location: &'a WorldPosition,
     action_id: u8,
diff --git a/pumpkin-protocol/src/client/play/c_block_update.rs b/pumpkin-protocol/src/client/play/c_block_update.rs
index 332a0fab8..37ecf3b8a 100644
--- a/pumpkin-protocol/src/client/play/c_block_update.rs
+++ b/pumpkin-protocol/src/client/play/c_block_update.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_BLOCK_UPDATE;
 use pumpkin_util::math::position::WorldPosition;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:block_update")]
+#[client_packet(PLAY_BLOCK_UPDATE)]
 pub struct CBlockUpdate<'a> {
     location: &'a WorldPosition,
     block_id: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_boss_event.rs b/pumpkin-protocol/src/client/play/c_boss_event.rs
index 00109f61c..f103f184a 100644
--- a/pumpkin-protocol/src/client/play/c_boss_event.rs
+++ b/pumpkin-protocol/src/client/play/c_boss_event.rs
@@ -2,9 +2,10 @@ use crate::bytebuf::ByteBufMut;
 use crate::client::play::bossevent_action::BosseventAction;
 use crate::{ClientPacket, VarInt};
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_BOSS_EVENT;
 use pumpkin_macros::client_packet;
 
-#[client_packet("play:boss_event")]
+#[client_packet(PLAY_BOSS_EVENT)]
 pub struct CBossEvent<'a> {
     pub uuid: &'a uuid::Uuid,
     pub action: BosseventAction,
diff --git a/pumpkin-protocol/src/client/play/c_center_chunk.rs b/pumpkin-protocol/src/client/play/c_center_chunk.rs
index b64e8ad4a..02b447b4b 100644
--- a/pumpkin-protocol/src/client/play/c_center_chunk.rs
+++ b/pumpkin-protocol/src/client/play/c_center_chunk.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_CHUNK_CACHE_CENTER;
 use pumpkin_macros::client_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Serialize)]
-#[client_packet("play:set_chunk_cache_center")]
+#[client_packet(PLAY_SET_CHUNK_CACHE_CENTER)]
 pub struct CCenterChunk {
     pub chunk_x: VarInt,
     pub chunk_z: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_change_difficulty.rs b/pumpkin-protocol/src/client/play/c_change_difficulty.rs
index e4cee5f88..91498c195 100644
--- a/pumpkin-protocol/src/client/play/c_change_difficulty.rs
+++ b/pumpkin-protocol/src/client/play/c_change_difficulty.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_CHANGE_DIFFICULTY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:change_difficulty")]
+#[client_packet(PLAY_CHANGE_DIFFICULTY)]
 pub struct CChangeDifficulty {
     difficulty: u8,
     locked: bool,
diff --git a/pumpkin-protocol/src/client/play/c_chunk_data.rs b/pumpkin-protocol/src/client/play/c_chunk_data.rs
index b97fb3e02..4b265748f 100644
--- a/pumpkin-protocol/src/client/play/c_chunk_data.rs
+++ b/pumpkin-protocol/src/client/play/c_chunk_data.rs
@@ -1,13 +1,14 @@
 use crate::{bytebuf::ByteBufMut, codec::bit_set::BitSet, ClientPacket, VarInt};
 
 use bytes::{BufMut, BytesMut};
+use pumpkin_data::packet::clientbound::PLAY_LEVEL_CHUNK_WITH_LIGHT;
 use pumpkin_macros::client_packet;
 use pumpkin_world::{
     chunk::{ChunkData, SUBCHUNKS_COUNT},
     DIRECT_PALETTE_BITS,
 };
 
-#[client_packet("play:level_chunk_with_light")]
+#[client_packet(PLAY_LEVEL_CHUNK_WITH_LIGHT)]
 pub struct CChunkData<'a>(pub &'a ChunkData);
 
 impl ClientPacket for CChunkData<'_> {
diff --git a/pumpkin-protocol/src/client/play/c_close_container.rs b/pumpkin-protocol/src/client/play/c_close_container.rs
index b2346166a..284020212 100644
--- a/pumpkin-protocol/src/client/play/c_close_container.rs
+++ b/pumpkin-protocol/src/client/play/c_close_container.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_CONTAINER_CLOSE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:container_close")]
+#[client_packet(PLAY_CONTAINER_CLOSE)]
 pub struct CCloseContainer {
     window_id: VarInt,
 }
diff --git a/pumpkin-protocol/src/client/play/c_combat_death.rs b/pumpkin-protocol/src/client/play/c_combat_death.rs
index f138e981c..a2b9522e4 100644
--- a/pumpkin-protocol/src/client/play/c_combat_death.rs
+++ b/pumpkin-protocol/src/client/play/c_combat_death.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_COMBAT_KILL;
 use pumpkin_macros::client_packet;
 use pumpkin_util::text::TextComponent;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:player_combat_kill")]
+#[client_packet(PLAY_PLAYER_COMBAT_KILL)]
 pub struct CCombatDeath<'a> {
     player_id: VarInt,
     message: &'a TextComponent,
diff --git a/pumpkin-protocol/src/client/play/c_command_suggestions.rs b/pumpkin-protocol/src/client/play/c_command_suggestions.rs
index d9b883730..f9a19cb82 100644
--- a/pumpkin-protocol/src/client/play/c_command_suggestions.rs
+++ b/pumpkin-protocol/src/client/play/c_command_suggestions.rs
@@ -1,10 +1,11 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_COMMAND_SUGGESTIONS;
 use pumpkin_macros::client_packet;
 use pumpkin_util::text::TextComponent;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, VarInt};
 
-#[client_packet("play:command_suggestions")]
+#[client_packet(PLAY_COMMAND_SUGGESTIONS)]
 pub struct CCommandSuggestions {
     id: VarInt,
     start: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_commands.rs b/pumpkin-protocol/src/client/play/c_commands.rs
index 264a51331..7b337c5fe 100644
--- a/pumpkin-protocol/src/client/play/c_commands.rs
+++ b/pumpkin-protocol/src/client/play/c_commands.rs
@@ -1,9 +1,10 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_COMMANDS;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, VarInt};
 
-#[client_packet("play:commands")]
+#[client_packet(PLAY_COMMANDS)]
 pub struct CCommands<'a> {
     pub nodes: Vec<ProtoNode<'a>>,
     pub root_node_index: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_cookie_request.rs b/pumpkin-protocol/src/client/play/c_cookie_request.rs
index fb9bc806a..1618accde 100644
--- a/pumpkin-protocol/src/client/play/c_cookie_request.rs
+++ b/pumpkin-protocol/src/client/play/c_cookie_request.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::codec::identifier::Identifier;
 
 #[derive(Serialize)]
-#[client_packet("play:cookie_request")]
+#[client_packet(PLAY_COOKIE_REQUEST)]
 /// Requests a cookie that was previously stored.
 pub struct CPlayCookieRequest<'a> {
     key: &'a Identifier,
diff --git a/pumpkin-protocol/src/client/play/c_damage_event.rs b/pumpkin-protocol/src/client/play/c_damage_event.rs
index 1121dd27d..976610946 100644
--- a/pumpkin-protocol/src/client/play/c_damage_event.rs
+++ b/pumpkin-protocol/src/client/play/c_damage_event.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_DAMAGE_EVENT;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:damage_event")]
+#[client_packet(PLAY_DAMAGE_EVENT)]
 pub struct CDamageEvent {
     entity_id: VarInt,
     source_type_id: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs b/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
index a67179878..324dc537a 100644
--- a/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
+++ b/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_DISGUISED_CHAT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:disguised_chat")]
+#[client_packet(PLAY_DISGUISED_CHAT)]
 pub struct CDisguisedChatMessage<'a> {
     message: &'a TextComponent,
     chat_type: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_display_objective.rs b/pumpkin-protocol/src/client/play/c_display_objective.rs
index 1bc39ac33..73f7e8edd 100644
--- a/pumpkin-protocol/src/client/play/c_display_objective.rs
+++ b/pumpkin-protocol/src/client/play/c_display_objective.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_DISPLAY_OBJECTIVE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_display_objective")]
+#[client_packet(PLAY_SET_DISPLAY_OBJECTIVE)]
 pub struct CDisplayObjective<'a> {
     position: VarInt,
     score_name: &'a str,
diff --git a/pumpkin-protocol/src/client/play/c_entity_animation.rs b/pumpkin-protocol/src/client/play/c_entity_animation.rs
index 1c2e6da8b..9e2a216c2 100644
--- a/pumpkin-protocol/src/client/play/c_entity_animation.rs
+++ b/pumpkin-protocol/src/client/play/c_entity_animation.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_ANIMATE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:animate")]
+#[client_packet(PLAY_ANIMATE)]
 pub struct CEntityAnimation {
     entity_id: VarInt,
     /// See `Animation`
diff --git a/pumpkin-protocol/src/client/play/c_entity_metadata.rs b/pumpkin-protocol/src/client/play/c_entity_metadata.rs
index 67b35e834..831e49094 100644
--- a/pumpkin-protocol/src/client/play/c_entity_metadata.rs
+++ b/pumpkin-protocol/src/client/play/c_entity_metadata.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_ENTITY_DATA;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_entity_data")]
+#[client_packet(PLAY_SET_ENTITY_DATA)]
 pub struct CSetEntityMetadata<T> {
     entity_id: VarInt,
     metadata: Metadata<T>,
diff --git a/pumpkin-protocol/src/client/play/c_entity_sound_effect.rs b/pumpkin-protocol/src/client/play/c_entity_sound_effect.rs
index 27de764fe..c750a6d3d 100644
--- a/pumpkin-protocol/src/client/play/c_entity_sound_effect.rs
+++ b/pumpkin-protocol/src/client/play/c_entity_sound_effect.rs
@@ -1,9 +1,10 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_SOUND_ENTITY;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, IDOrSoundEvent, SoundCategory, SoundEvent, VarInt};
 
-#[client_packet("play:sound_entity")]
+#[client_packet(PLAY_SOUND_ENTITY)]
 pub struct CEntitySoundEffect {
     sound_event: IDOrSoundEvent,
     sound_category: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_entity_status.rs b/pumpkin-protocol/src/client/play/c_entity_status.rs
index 9c7247aff..a58a1dbae 100644
--- a/pumpkin-protocol/src/client/play/c_entity_status.rs
+++ b/pumpkin-protocol/src/client/play/c_entity_status.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_ENTITY_EVENT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:entity_event")]
+#[client_packet(PLAY_ENTITY_EVENT)]
 pub struct CEntityStatus {
     entity_id: i32,
     entity_status: i8,
diff --git a/pumpkin-protocol/src/client/play/c_entity_velocity.rs b/pumpkin-protocol/src/client/play/c_entity_velocity.rs
index 63c543501..7228a2c63 100644
--- a/pumpkin-protocol/src/client/play/c_entity_velocity.rs
+++ b/pumpkin-protocol/src/client/play/c_entity_velocity.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_ENTITY_MOTION;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_entity_motion")]
+#[client_packet(PLAY_SET_ENTITY_MOTION)]
 pub struct CEntityVelocity<'a> {
     entity_id: &'a VarInt,
     velocity_x: i16,
diff --git a/pumpkin-protocol/src/client/play/c_game_event.rs b/pumpkin-protocol/src/client/play/c_game_event.rs
index 606e6f3d2..82064b685 100644
--- a/pumpkin-protocol/src/client/play/c_game_event.rs
+++ b/pumpkin-protocol/src/client/play/c_game_event.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_GAME_EVENT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:game_event")]
+#[client_packet(PLAY_GAME_EVENT)]
 pub struct CGameEvent {
     event: u8,
     value: f32,
diff --git a/pumpkin-protocol/src/client/play/c_head_rot.rs b/pumpkin-protocol/src/client/play/c_head_rot.rs
index f38733957..3244d5e5f 100644
--- a/pumpkin-protocol/src/client/play/c_head_rot.rs
+++ b/pumpkin-protocol/src/client/play/c_head_rot.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_ROTATE_HEAD;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:rotate_head")]
+#[client_packet(PLAY_ROTATE_HEAD)]
 pub struct CHeadRot {
     entity_id: VarInt,
     head_yaw: u8,
diff --git a/pumpkin-protocol/src/client/play/c_hurt_animation.rs b/pumpkin-protocol/src/client/play/c_hurt_animation.rs
index 196c3e0f3..63c895f22 100644
--- a/pumpkin-protocol/src/client/play/c_hurt_animation.rs
+++ b/pumpkin-protocol/src/client/play/c_hurt_animation.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_HURT_ANIMATION;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:hurt_animation")]
+#[client_packet(PLAY_HURT_ANIMATION)]
 pub struct CHurtAnimation<'a> {
     entity_id: &'a VarInt,
     yaw: f32,
diff --git a/pumpkin-protocol/src/client/play/c_initialize_world_border.rs b/pumpkin-protocol/src/client/play/c_initialize_world_border.rs
index f2ab72f6c..01eb9d568 100644
--- a/pumpkin-protocol/src/client/play/c_initialize_world_border.rs
+++ b/pumpkin-protocol/src/client/play/c_initialize_world_border.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_INITIALIZE_BORDER;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::{codec::var_long::VarLong, VarInt};
 
 #[derive(Serialize)]
-#[client_packet("play:initialize_border")]
+#[client_packet(PLAY_INITIALIZE_BORDER)]
 pub struct CInitializeWorldBorder {
     x: f64,
     z: f64,
diff --git a/pumpkin-protocol/src/client/play/c_keep_alive.rs b/pumpkin-protocol/src/client/play/c_keep_alive.rs
index 5d962ae88..99727eddc 100644
--- a/pumpkin-protocol/src/client/play/c_keep_alive.rs
+++ b/pumpkin-protocol/src/client/play/c_keep_alive.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_KEEP_ALIVE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:keep_alive")]
+#[client_packet(PLAY_KEEP_ALIVE)]
 pub struct CKeepAlive {
     keep_alive_id: i64,
 }
diff --git a/pumpkin-protocol/src/client/play/c_level_event.rs b/pumpkin-protocol/src/client/play/c_level_event.rs
index 5af47194d..fabc681fe 100644
--- a/pumpkin-protocol/src/client/play/c_level_event.rs
+++ b/pumpkin-protocol/src/client/play/c_level_event.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::clientbound::PLAY_LEVEL_EVENT;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::position::WorldPosition;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:level_event")]
+#[client_packet(PLAY_LEVEL_EVENT)]
 pub struct CLevelEvent {
     event: i32,
     location: WorldPosition,
diff --git a/pumpkin-protocol/src/client/play/c_login.rs b/pumpkin-protocol/src/client/play/c_login.rs
index 73e7a908c..d26856630 100644
--- a/pumpkin-protocol/src/client/play/c_login.rs
+++ b/pumpkin-protocol/src/client/play/c_login.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_LOGIN;
 use pumpkin_util::math::position::WorldPosition;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::{codec::identifier::Identifier, VarInt};
 
 #[derive(Serialize)]
-#[client_packet("play:login")]
+#[client_packet(PLAY_LOGIN)]
 pub struct CLogin<'a> {
     entity_id: i32,
     is_hardcore: bool,
diff --git a/pumpkin-protocol/src/client/play/c_open_screen.rs b/pumpkin-protocol/src/client/play/c_open_screen.rs
index b487400b4..6e9ea18de 100644
--- a/pumpkin-protocol/src/client/play/c_open_screen.rs
+++ b/pumpkin-protocol/src/client/play/c_open_screen.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_OPEN_SCREEN;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:open_screen")]
+#[client_packet(PLAY_OPEN_SCREEN)]
 pub struct COpenScreen<'a> {
     window_id: VarInt,
     window_type: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_particle.rs b/pumpkin-protocol/src/client/play/c_particle.rs
index 3a720b795..57a06309e 100644
--- a/pumpkin-protocol/src/client/play/c_particle.rs
+++ b/pumpkin-protocol/src/client/play/c_particle.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_LEVEL_PARTICLES;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:level_particles")]
+#[client_packet(PLAY_LEVEL_PARTICLES)]
 pub struct CParticle<'a> {
     /// If true, particle distance increases from 256 to 65536.
     long_distance: bool,
diff --git a/pumpkin-protocol/src/client/play/c_ping_response.rs b/pumpkin-protocol/src/client/play/c_ping_response.rs
index ad3b86038..5c8891586 100644
--- a/pumpkin-protocol/src/client/play/c_ping_response.rs
+++ b/pumpkin-protocol/src/client/play/c_ping_response.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_PONG_RESPONSE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:pong_response")]
+#[client_packet(PLAY_PONG_RESPONSE)]
 pub struct CPingResponse {
     payload: i64,
 }
diff --git a/pumpkin-protocol/src/client/play/c_play_disconnect.rs b/pumpkin-protocol/src/client/play/c_play_disconnect.rs
index fc0633ab2..5bc3e6cf8 100644
--- a/pumpkin-protocol/src/client/play/c_play_disconnect.rs
+++ b/pumpkin-protocol/src/client/play/c_play_disconnect.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_DISCONNECT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:disconnect")]
+#[client_packet(PLAY_DISCONNECT)]
 pub struct CPlayDisconnect<'a> {
     reason: &'a TextComponent,
 }
diff --git a/pumpkin-protocol/src/client/play/c_player_abilities.rs b/pumpkin-protocol/src/client/play/c_player_abilities.rs
index 096824a8f..1f8e287db 100644
--- a/pumpkin-protocol/src/client/play/c_player_abilities.rs
+++ b/pumpkin-protocol/src/client/play/c_player_abilities.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_ABILITIES;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:player_abilities")]
+#[client_packet(PLAY_PLAYER_ABILITIES)]
 pub struct CPlayerAbilities {
     flags: i8,
     flying_speed: f32,
diff --git a/pumpkin-protocol/src/client/play/c_player_chat_message.rs b/pumpkin-protocol/src/client/play/c_player_chat_message.rs
index c161e3c3a..6cf12f3a8 100644
--- a/pumpkin-protocol/src/client/play/c_player_chat_message.rs
+++ b/pumpkin-protocol/src/client/play/c_player_chat_message.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_CHAT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::{codec::bit_set::BitSet, VarInt};
 
 #[derive(Serialize)]
-#[client_packet("play:player_chat")]
+#[client_packet(PLAY_PLAYER_CHAT)]
 pub struct CPlayerChatMessage<'a> {
     #[serde(with = "uuid::serde::compact")]
     sender: uuid::Uuid,
diff --git a/pumpkin-protocol/src/client/play/c_player_info_update.rs b/pumpkin-protocol/src/client/play/c_player_info_update.rs
index 72d912cbf..502485fa1 100644
--- a/pumpkin-protocol/src/client/play/c_player_info_update.rs
+++ b/pumpkin-protocol/src/client/play/c_player_info_update.rs
@@ -1,11 +1,12 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_INFO_UPDATE;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, Property};
 
 use super::PlayerAction;
 
-#[client_packet("play:player_info_update")]
+#[client_packet(PLAY_PLAYER_INFO_UPDATE)]
 pub struct CPlayerInfoUpdate<'a> {
     pub actions: i8,
     pub players: &'a [Player<'a>],
diff --git a/pumpkin-protocol/src/client/play/c_player_position.rs b/pumpkin-protocol/src/client/play/c_player_position.rs
index e14c3f88d..8aae24c6e 100644
--- a/pumpkin-protocol/src/client/play/c_player_position.rs
+++ b/pumpkin-protocol/src/client/play/c_player_position.rs
@@ -1,10 +1,11 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_POSITION;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, PositionFlag, VarInt};
 
-#[client_packet("play:player_position")]
+#[client_packet(PLAY_PLAYER_POSITION)]
 pub struct CPlayerPosition<'a> {
     teleport_id: VarInt,
     position: Vector3<f64>,
diff --git a/pumpkin-protocol/src/client/play/c_player_remove.rs b/pumpkin-protocol/src/client/play/c_player_remove.rs
index d92d6dbf3..cfb57d369 100644
--- a/pumpkin-protocol/src/client/play/c_player_remove.rs
+++ b/pumpkin-protocol/src/client/play/c_player_remove.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_PLAYER_INFO_REMOVE;
 use pumpkin_macros::client_packet;
 use serde::{ser::SerializeSeq, Serialize};
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:player_info_remove")]
+#[client_packet(PLAY_PLAYER_INFO_REMOVE)]
 pub struct CRemovePlayerInfo<'a> {
     players_count: VarInt,
     #[serde(serialize_with = "serialize_slice_uuids")]
diff --git a/pumpkin-protocol/src/client/play/c_remove_entities.rs b/pumpkin-protocol/src/client/play/c_remove_entities.rs
index 50ed65736..2b5f38016 100644
--- a/pumpkin-protocol/src/client/play/c_remove_entities.rs
+++ b/pumpkin-protocol/src/client/play/c_remove_entities.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_REMOVE_ENTITIES;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:remove_entities")]
+#[client_packet(PLAY_REMOVE_ENTITIES)]
 pub struct CRemoveEntities<'a> {
     count: VarInt,
     entity_ids: &'a [VarInt],
diff --git a/pumpkin-protocol/src/client/play/c_reset_score.rs b/pumpkin-protocol/src/client/play/c_reset_score.rs
index a5b5c3d05..d9c7e6707 100644
--- a/pumpkin-protocol/src/client/play/c_reset_score.rs
+++ b/pumpkin-protocol/src/client/play/c_reset_score.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_RESET_SCORE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:reset_score")]
+#[client_packet(PLAY_RESET_SCORE)]
 pub struct CResetScore {
     entity_name: String,
     objective_name: Option<String>,
diff --git a/pumpkin-protocol/src/client/play/c_respawn.rs b/pumpkin-protocol/src/client/play/c_respawn.rs
index 4a9c0e561..d2aad300e 100644
--- a/pumpkin-protocol/src/client/play/c_respawn.rs
+++ b/pumpkin-protocol/src/client/play/c_respawn.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_RESPAWN;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::position::WorldPosition;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::{codec::identifier::Identifier, VarInt};
 
 #[derive(Serialize)]
-#[client_packet("play:respawn")]
+#[client_packet(PLAY_RESPAWN)]
 pub struct CRespawn {
     dimension_type: VarInt,
     dimension_name: Identifier,
diff --git a/pumpkin-protocol/src/client/play/c_server_links.rs b/pumpkin-protocol/src/client/play/c_server_links.rs
index a2cb76fa6..566e90ce5 100644
--- a/pumpkin-protocol/src/client/play/c_server_links.rs
+++ b/pumpkin-protocol/src/client/play/c_server_links.rs
@@ -1,9 +1,10 @@
 use crate::{Link, VarInt};
+use pumpkin_data::packet::clientbound::PLAY_SERVER_LINKS;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:server_links")]
+#[client_packet(PLAY_SERVER_LINKS)]
 pub struct CPlayServerLinks<'a> {
     links_count: &'a VarInt,
     links: &'a [Link<'a>],
diff --git a/pumpkin-protocol/src/client/play/c_set_border_center.rs b/pumpkin-protocol/src/client/play/c_set_border_center.rs
index dfb10d203..f4df21066 100644
--- a/pumpkin-protocol/src/client/play/c_set_border_center.rs
+++ b/pumpkin-protocol/src/client/play/c_set_border_center.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_BORDER_CENTER;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_border_center")]
+#[client_packet(PLAY_SET_BORDER_CENTER)]
 pub struct CSetBorderCenter {
     x: f64,
     z: f64,
diff --git a/pumpkin-protocol/src/client/play/c_set_border_lerp_size.rs b/pumpkin-protocol/src/client/play/c_set_border_lerp_size.rs
index 5f8861a71..e768d10ea 100644
--- a/pumpkin-protocol/src/client/play/c_set_border_lerp_size.rs
+++ b/pumpkin-protocol/src/client/play/c_set_border_lerp_size.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_BORDER_LERP_SIZE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::codec::var_long::VarLong;
 
 #[derive(Serialize)]
-#[client_packet("play:set_border_lerp_size")]
+#[client_packet(PLAY_SET_BORDER_LERP_SIZE)]
 pub struct CSetBorderLerpSize {
     old_diameter: f64,
     new_diameter: f64,
diff --git a/pumpkin-protocol/src/client/play/c_set_border_size.rs b/pumpkin-protocol/src/client/play/c_set_border_size.rs
index 725830f00..9a1193dd0 100644
--- a/pumpkin-protocol/src/client/play/c_set_border_size.rs
+++ b/pumpkin-protocol/src/client/play/c_set_border_size.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_BORDER_SIZE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_border_size")]
+#[client_packet(PLAY_SET_BORDER_SIZE)]
 pub struct CSetBorderSize {
     diameter: f64,
 }
diff --git a/pumpkin-protocol/src/client/play/c_set_border_warning_delay.rs b/pumpkin-protocol/src/client/play/c_set_border_warning_delay.rs
index 20c05766f..c74475e8c 100644
--- a/pumpkin-protocol/src/client/play/c_set_border_warning_delay.rs
+++ b/pumpkin-protocol/src/client/play/c_set_border_warning_delay.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_BORDER_WARNING_DELAY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_border_warning_delay")]
+#[client_packet(PLAY_SET_BORDER_WARNING_DELAY)]
 pub struct CSetBorderWarningDelay {
     warning_time: VarInt,
 }
diff --git a/pumpkin-protocol/src/client/play/c_set_border_warning_distance.rs b/pumpkin-protocol/src/client/play/c_set_border_warning_distance.rs
index be569478f..5d8be60da 100644
--- a/pumpkin-protocol/src/client/play/c_set_border_warning_distance.rs
+++ b/pumpkin-protocol/src/client/play/c_set_border_warning_distance.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_BORDER_WARNING_DISTANCE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_border_warning_distance")]
+#[client_packet(PLAY_SET_BORDER_WARNING_DISTANCE)]
 pub struct CSetBorderWarningDistance {
     warning_blocks: VarInt,
 }
diff --git a/pumpkin-protocol/src/client/play/c_set_container_content.rs b/pumpkin-protocol/src/client/play/c_set_container_content.rs
index 275739f23..da715f576 100644
--- a/pumpkin-protocol/src/client/play/c_set_container_content.rs
+++ b/pumpkin-protocol/src/client/play/c_set_container_content.rs
@@ -1,11 +1,12 @@
 use crate::codec::slot::Slot;
 use crate::VarInt;
 
+use pumpkin_data::packet::clientbound::PLAY_CONTAINER_SET_CONTENT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:container_set_content")]
+#[client_packet(PLAY_CONTAINER_SET_CONTENT)]
 pub struct CSetContainerContent<'a> {
     window_id: VarInt,
     state_id: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_set_container_property.rs b/pumpkin-protocol/src/client/play/c_set_container_property.rs
index fdd231b81..06924b80d 100644
--- a/pumpkin-protocol/src/client/play/c_set_container_property.rs
+++ b/pumpkin-protocol/src/client/play/c_set_container_property.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_CONTAINER_SET_DATA;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:container_set_data")]
+#[client_packet(PLAY_CONTAINER_SET_DATA)]
 pub struct CSetContainerProperty {
     window_id: VarInt,
     property: i16,
diff --git a/pumpkin-protocol/src/client/play/c_set_container_slot.rs b/pumpkin-protocol/src/client/play/c_set_container_slot.rs
index e632da4e0..035b78719 100644
--- a/pumpkin-protocol/src/client/play/c_set_container_slot.rs
+++ b/pumpkin-protocol/src/client/play/c_set_container_slot.rs
@@ -1,11 +1,12 @@
 use crate::codec::slot::Slot;
 use crate::VarInt;
 
+use pumpkin_data::packet::clientbound::PLAY_CONTAINER_SET_SLOT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:container_set_slot")]
+#[client_packet(PLAY_CONTAINER_SET_SLOT)]
 pub struct CSetContainerSlot<'a> {
     window_id: i8,
     state_id: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_set_health.rs b/pumpkin-protocol/src/client/play/c_set_health.rs
index 0d1b3e165..4384ce628 100644
--- a/pumpkin-protocol/src/client/play/c_set_health.rs
+++ b/pumpkin-protocol/src/client/play/c_set_health.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_HEALTH;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:set_health")]
+#[client_packet(PLAY_SET_HEALTH)]
 pub struct CSetHealth {
     health: f32,
     food: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_set_held_item.rs b/pumpkin-protocol/src/client/play/c_set_held_item.rs
index 1bbc0c403..8e8ba6d0a 100644
--- a/pumpkin-protocol/src/client/play/c_set_held_item.rs
+++ b/pumpkin-protocol/src/client/play/c_set_held_item.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_HELD_SLOT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_held_slot")]
+#[client_packet(PLAY_SET_HELD_SLOT)]
 pub struct CSetHeldItem {
     slot: i8,
 }
diff --git a/pumpkin-protocol/src/client/play/c_set_time.rs b/pumpkin-protocol/src/client/play/c_set_time.rs
index 1ffdc9b10..e432796e5 100644
--- a/pumpkin-protocol/src/client/play/c_set_time.rs
+++ b/pumpkin-protocol/src/client/play/c_set_time.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_TIME;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_time")]
+#[client_packet(PLAY_SET_TIME)]
 pub struct CUpdateTime {
     world_age: i64,
     time_of_day: i64,
diff --git a/pumpkin-protocol/src/client/play/c_set_title.rs b/pumpkin-protocol/src/client/play/c_set_title.rs
index fa62c402d..f9a2254b4 100644
--- a/pumpkin-protocol/src/client/play/c_set_title.rs
+++ b/pumpkin-protocol/src/client/play/c_set_title.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_TITLE_TEXT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_title_text")]
+#[client_packet(PLAY_SET_TITLE_TEXT)]
 pub struct CTitleText<'a> {
     title: &'a TextComponent,
 }
diff --git a/pumpkin-protocol/src/client/play/c_sound_effect.rs b/pumpkin-protocol/src/client/play/c_sound_effect.rs
index d34af9711..095785376 100644
--- a/pumpkin-protocol/src/client/play/c_sound_effect.rs
+++ b/pumpkin-protocol/src/client/play/c_sound_effect.rs
@@ -1,9 +1,10 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_SOUND;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, IDOrSoundEvent, SoundCategory, SoundEvent, VarInt};
 
-#[client_packet("play:sound")]
+#[client_packet(PLAY_SOUND)]
 pub struct CSoundEffect {
     sound_event: IDOrSoundEvent,
     sound_category: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_spawn_entity.rs b/pumpkin-protocol/src/client/play/c_spawn_entity.rs
index 258101049..7888e8bfe 100644
--- a/pumpkin-protocol/src/client/play/c_spawn_entity.rs
+++ b/pumpkin-protocol/src/client/play/c_spawn_entity.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_ADD_ENTITY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:add_entity")]
+#[client_packet(PLAY_ADD_ENTITY)]
 pub struct CSpawnEntity {
     entity_id: VarInt,
     #[serde(with = "uuid::serde::compact")]
diff --git a/pumpkin-protocol/src/client/play/c_store_cookie.rs b/pumpkin-protocol/src/client/play/c_store_cookie.rs
index da715f22b..d20e7d91d 100644
--- a/pumpkin-protocol/src/client/play/c_store_cookie.rs
+++ b/pumpkin-protocol/src/client/play/c_store_cookie.rs
@@ -1,11 +1,12 @@
 use crate::{codec::identifier::Identifier, VarInt};
+use pumpkin_data::packet::clientbound::PLAY_STORE_COOKIE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 /// Stores some arbitrary data on the client, which persists between server transfers.
 /// The Notchian client only accepts cookies of up to 5 kiB in size.
 #[derive(Serialize)]
-#[client_packet("play:store_cookie")]
+#[client_packet(PLAY_STORE_COOKIE)]
 pub struct CStoreCookie<'a> {
     key: &'a Identifier,
     payload_length: VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_subtitle.rs b/pumpkin-protocol/src/client/play/c_subtitle.rs
index 3b5162bba..8953eaf32 100644
--- a/pumpkin-protocol/src/client/play/c_subtitle.rs
+++ b/pumpkin-protocol/src/client/play/c_subtitle.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_SUBTITLE_TEXT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:set_subtitle_text")]
+#[client_packet(PLAY_SET_SUBTITLE_TEXT)]
 pub struct CSubtitle<'a> {
     subtitle: &'a TextComponent,
 }
diff --git a/pumpkin-protocol/src/client/play/c_system_chat_message.rs b/pumpkin-protocol/src/client/play/c_system_chat_message.rs
index 4c78d8177..054240241 100644
--- a/pumpkin-protocol/src/client/play/c_system_chat_message.rs
+++ b/pumpkin-protocol/src/client/play/c_system_chat_message.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_SYSTEM_CHAT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:system_chat")]
+#[client_packet(PLAY_SYSTEM_CHAT)]
 pub struct CSystemChatMessage<'a> {
     content: &'a TextComponent,
     overlay: bool,
diff --git a/pumpkin-protocol/src/client/play/c_teleport_entity.rs b/pumpkin-protocol/src/client/play/c_teleport_entity.rs
index 759917c11..789852406 100644
--- a/pumpkin-protocol/src/client/play/c_teleport_entity.rs
+++ b/pumpkin-protocol/src/client/play/c_teleport_entity.rs
@@ -1,10 +1,11 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_TELEPORT_ENTITY;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, PositionFlag, VarInt};
 
-#[client_packet("play:teleport_entity")]
+#[client_packet(PLAY_TELEPORT_ENTITY)]
 pub struct CTeleportEntity<'a> {
     entity_id: VarInt,
     position: Vector3<f64>,
diff --git a/pumpkin-protocol/src/client/play/c_transfer.rs b/pumpkin-protocol/src/client/play/c_transfer.rs
index 0a02af9c3..176859923 100644
--- a/pumpkin-protocol/src/client/play/c_transfer.rs
+++ b/pumpkin-protocol/src/client/play/c_transfer.rs
@@ -1,9 +1,10 @@
 use crate::VarInt;
+use pumpkin_data::packet::clientbound::PLAY_TRANSFER;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:transfer")]
+#[client_packet(PLAY_TRANSFER)]
 pub struct CTransfer<'a> {
     host: &'a str,
     port: &'a VarInt,
diff --git a/pumpkin-protocol/src/client/play/c_unload_chunk.rs b/pumpkin-protocol/src/client/play/c_unload_chunk.rs
index 5c8343c0e..582ba4877 100644
--- a/pumpkin-protocol/src/client/play/c_unload_chunk.rs
+++ b/pumpkin-protocol/src/client/play/c_unload_chunk.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::PLAY_FORGET_LEVEL_CHUNK;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:forget_level_chunk")]
+#[client_packet(PLAY_FORGET_LEVEL_CHUNK)]
 pub struct CUnloadChunk {
     z: i32,
     x: i32,
diff --git a/pumpkin-protocol/src/client/play/c_update_entity_pos.rs b/pumpkin-protocol/src/client/play/c_update_entity_pos.rs
index abe1bfe89..1453e7f9c 100644
--- a/pumpkin-protocol/src/client/play/c_update_entity_pos.rs
+++ b/pumpkin-protocol/src/client/play/c_update_entity_pos.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_MOVE_ENTITY_POS;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:move_entity_pos")]
+#[client_packet(PLAY_MOVE_ENTITY_POS)]
 pub struct CUpdateEntityPos {
     entity_id: VarInt,
     delta: Vector3<i16>,
diff --git a/pumpkin-protocol/src/client/play/c_update_entity_pos_rot.rs b/pumpkin-protocol/src/client/play/c_update_entity_pos_rot.rs
index 9697299ec..eb631fcec 100644
--- a/pumpkin-protocol/src/client/play/c_update_entity_pos_rot.rs
+++ b/pumpkin-protocol/src/client/play/c_update_entity_pos_rot.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_MOVE_ENTITY_POS_ROT;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 use serde::Serialize;
@@ -5,7 +6,7 @@ use serde::Serialize;
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:move_entity_pos_rot")]
+#[client_packet(PLAY_MOVE_ENTITY_POS_ROT)]
 pub struct CUpdateEntityPosRot {
     entity_id: VarInt,
     delta: Vector3<i16>,
diff --git a/pumpkin-protocol/src/client/play/c_update_entity_rot.rs b/pumpkin-protocol/src/client/play/c_update_entity_rot.rs
index 8cd95a942..b0377b695 100644
--- a/pumpkin-protocol/src/client/play/c_update_entity_rot.rs
+++ b/pumpkin-protocol/src/client/play/c_update_entity_rot.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_MOVE_ENTITY_ROT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 use crate::VarInt;
 
 #[derive(Serialize)]
-#[client_packet("play:move_entity_rot")]
+#[client_packet(PLAY_MOVE_ENTITY_ROT)]
 pub struct CUpdateEntityRot {
     entity_id: VarInt,
     yaw: u8,
diff --git a/pumpkin-protocol/src/client/play/c_update_objectives.rs b/pumpkin-protocol/src/client/play/c_update_objectives.rs
index 95f667493..5835528f3 100644
--- a/pumpkin-protocol/src/client/play/c_update_objectives.rs
+++ b/pumpkin-protocol/src/client/play/c_update_objectives.rs
@@ -1,10 +1,11 @@
 use bytes::BufMut;
+use pumpkin_data::packet::clientbound::PLAY_SET_OBJECTIVE;
 use pumpkin_macros::client_packet;
 use pumpkin_util::text::TextComponent;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, NumberFormat, VarInt};
 
-#[client_packet("play:set_objective")]
+#[client_packet(PLAY_SET_OBJECTIVE)]
 pub struct CUpdateObjectives<'a> {
     objective_name: &'a str,
     mode: u8,
diff --git a/pumpkin-protocol/src/client/play/c_update_score.rs b/pumpkin-protocol/src/client/play/c_update_score.rs
index 912f4e94d..d02a2bc09 100644
--- a/pumpkin-protocol/src/client/play/c_update_score.rs
+++ b/pumpkin-protocol/src/client/play/c_update_score.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::clientbound::PLAY_SET_SCORE;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;
@@ -6,7 +7,7 @@ use serde::Serialize;
 use crate::{NumberFormat, VarInt};
 
 #[derive(Serialize)]
-#[client_packet("play:set_score")]
+#[client_packet(PLAY_SET_SCORE)]
 pub struct CUpdateScore<'a> {
     entity_name: &'a str,
     objective_name: &'a str,
diff --git a/pumpkin-protocol/src/client/play/c_worldevent.rs b/pumpkin-protocol/src/client/play/c_worldevent.rs
index 8eb2eb4e6..eec64d7cd 100644
--- a/pumpkin-protocol/src/client/play/c_worldevent.rs
+++ b/pumpkin-protocol/src/client/play/c_worldevent.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::clientbound::PLAY_LEVEL_EVENT;
 use pumpkin_util::math::position::WorldPosition;
 
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("play:level_event")]
+#[client_packet(PLAY_LEVEL_EVENT)]
 pub struct CWorldEvent<'a> {
     event: i32,
     location: &'a WorldPosition,
diff --git a/pumpkin-protocol/src/client/status/c_ping_response.rs b/pumpkin-protocol/src/client/status/c_ping_response.rs
index ffe4a480c..c2fc67f14 100644
--- a/pumpkin-protocol/src/client/status/c_ping_response.rs
+++ b/pumpkin-protocol/src/client/status/c_ping_response.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::STATUS_PONG_RESPONSE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("status:pong_response")]
+#[client_packet(STATUS_PONG_RESPONSE)]
 pub struct CPingResponse {
     payload: i64, // must responde with the same as in `SPingRequest`
 }
diff --git a/pumpkin-protocol/src/client/status/c_status_response.rs b/pumpkin-protocol/src/client/status/c_status_response.rs
index bfed7dae3..2d918e9f4 100644
--- a/pumpkin-protocol/src/client/status/c_status_response.rs
+++ b/pumpkin-protocol/src/client/status/c_status_response.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::clientbound::STATUS_STATUS_RESPONSE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
-#[client_packet("status:status_response")]
+#[client_packet(STATUS_STATUS_RESPONSE)]
 pub struct CStatusResponse<'a> {
     json_response: &'a str, // 32767
 }
diff --git a/pumpkin-protocol/src/packet_encoder.rs b/pumpkin-protocol/src/packet_encoder.rs
index 4e7a49bd9..8e07f110d 100644
--- a/pumpkin-protocol/src/packet_encoder.rs
+++ b/pumpkin-protocol/src/packet_encoder.rs
@@ -221,12 +221,13 @@ mod tests {
     use cfb8::cipher::AsyncStreamCipher;
     use cfb8::Decryptor as Cfb8Decryptor;
     use libdeflater::{DecompressionError, Decompressor};
+    use pumpkin_data::packet::clientbound::STATUS_STATUS_RESPONSE;
     use pumpkin_macros::client_packet;
     use serde::Serialize;
 
     /// Define a custom packet for testing maximum packet size
     #[derive(Serialize)]
-    #[client_packet("status:status_response")]
+    #[client_packet(STATUS_STATUS_RESPONSE)]
     pub struct MaxSizePacket {
         data: Vec<u8>,
     }
diff --git a/pumpkin-protocol/src/server/config/s_acknowledge_finish_config.rs b/pumpkin-protocol/src/server/config/s_acknowledge_finish_config.rs
index da08345cd..d57d7d130 100644
--- a/pumpkin-protocol/src/server/config/s_acknowledge_finish_config.rs
+++ b/pumpkin-protocol/src/server/config/s_acknowledge_finish_config.rs
@@ -1,5 +1,6 @@
+use pumpkin_data::packet::serverbound::CONFIG_FINISH_CONFIGURATION;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("config:finish_configuration")]
+#[server_packet(CONFIG_FINISH_CONFIGURATION)]
 pub struct SAcknowledgeFinishConfig {}
diff --git a/pumpkin-protocol/src/server/config/s_client_information.rs b/pumpkin-protocol/src/server/config/s_client_information.rs
index ecb6fe1cf..0274128ba 100644
--- a/pumpkin-protocol/src/server/config/s_client_information.rs
+++ b/pumpkin-protocol/src/server/config/s_client_information.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::CONFIG_CLIENT_INFORMATION;
 use pumpkin_macros::server_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("config:client_information")]
+#[server_packet(CONFIG_CLIENT_INFORMATION)]
 pub struct SClientInformationConfig {
     pub locale: String, // 16
     pub view_distance: i8,
diff --git a/pumpkin-protocol/src/server/config/s_cookie_response.rs b/pumpkin-protocol/src/server/config/s_cookie_response.rs
index 9f683a5ca..dfad993f0 100644
--- a/pumpkin-protocol/src/server/config/s_cookie_response.rs
+++ b/pumpkin-protocol/src/server/config/s_cookie_response.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::CONFIG_COOKIE_RESPONSE;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -7,7 +8,7 @@ use crate::{
     ServerPacket, VarInt,
 };
 
-#[server_packet("config:cookie_response")]
+#[server_packet(CONFIG_COOKIE_RESPONSE)]
 /// Response to a Cookie Request (configuration) from the server.
 /// The Notchian (vanilla) server only accepts responses of up to 5 kiB in size.
 pub struct SConfigCookieResponse {
diff --git a/pumpkin-protocol/src/server/config/s_known_packs.rs b/pumpkin-protocol/src/server/config/s_known_packs.rs
index e935ff9ba..4e10cc9ea 100644
--- a/pumpkin-protocol/src/server/config/s_known_packs.rs
+++ b/pumpkin-protocol/src/server/config/s_known_packs.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::CONFIG_SELECT_KNOWN_PACKS;
 use pumpkin_macros::server_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("config:select_known_packs")]
+#[server_packet(CONFIG_SELECT_KNOWN_PACKS)]
 pub struct SKnownPacks {
     pub known_pack_count: VarInt,
     // known_packs: &'a [KnownPack]
diff --git a/pumpkin-protocol/src/server/config/s_plugin_message.rs b/pumpkin-protocol/src/server/config/s_plugin_message.rs
index e5313443b..018a3b7c9 100644
--- a/pumpkin-protocol/src/server/config/s_plugin_message.rs
+++ b/pumpkin-protocol/src/server/config/s_plugin_message.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::CONFIG_CUSTOM_PAYLOAD;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -8,7 +9,7 @@ use crate::{
 };
 const MAX_PAYLOAD_SIZE: usize = 1048576;
 
-#[server_packet("config:custom_payload")]
+#[server_packet(CONFIG_CUSTOM_PAYLOAD)]
 pub struct SPluginMessage {
     pub channel: Identifier,
     pub data: bytes::Bytes,
diff --git a/pumpkin-protocol/src/server/handshake/mod.rs b/pumpkin-protocol/src/server/handshake/mod.rs
index 71ca0bc7a..268bd34ee 100644
--- a/pumpkin-protocol/src/server/handshake/mod.rs
+++ b/pumpkin-protocol/src/server/handshake/mod.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::HANDSHAKE_INTENTION;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -6,7 +7,7 @@ use crate::{
     ConnectionState, ServerPacket, VarInt,
 };
 
-#[server_packet("handshake:intention")]
+#[server_packet(HANDSHAKE_INTENTION)]
 pub struct SHandShake {
     pub protocol_version: VarInt,
     pub server_address: String, // 255
diff --git a/pumpkin-protocol/src/server/login/s_cookie_response.rs b/pumpkin-protocol/src/server/login/s_cookie_response.rs
index 6a6d7383c..a111300b6 100644
--- a/pumpkin-protocol/src/server/login/s_cookie_response.rs
+++ b/pumpkin-protocol/src/server/login/s_cookie_response.rs
@@ -4,9 +4,10 @@ use crate::{
     ServerPacket, VarInt,
 };
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::LOGIN_COOKIE_RESPONSE;
 use pumpkin_macros::server_packet;
 
-#[server_packet("login:cookie_response")]
+#[server_packet(LOGIN_COOKIE_RESPONSE)]
 /// Response to a Cookie Request (login) from the server.
 /// The Notchian server only accepts responses of up to 5 kiB in size.
 pub struct SLoginCookieResponse {
diff --git a/pumpkin-protocol/src/server/login/s_encryption_response.rs b/pumpkin-protocol/src/server/login/s_encryption_response.rs
index f094231dd..32efa839c 100644
--- a/pumpkin-protocol/src/server/login/s_encryption_response.rs
+++ b/pumpkin-protocol/src/server/login/s_encryption_response.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::LOGIN_KEY;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -6,7 +7,7 @@ use crate::{
     ServerPacket, VarInt,
 };
 
-#[server_packet("login:key")]
+#[server_packet(LOGIN_KEY)]
 pub struct SEncryptionResponse {
     pub shared_secret_length: VarInt,
     pub shared_secret: bytes::Bytes,
diff --git a/pumpkin-protocol/src/server/login/s_login_response.rs b/pumpkin-protocol/src/server/login/s_login_response.rs
index aaf250bf6..45c79871d 100644
--- a/pumpkin-protocol/src/server/login/s_login_response.rs
+++ b/pumpkin-protocol/src/server/login/s_login_response.rs
@@ -1,6 +1,7 @@
+use pumpkin_data::packet::serverbound::LOGIN_LOGIN_ACKNOWLEDGED;
 use pumpkin_macros::server_packet;
 
 // Acknowledgement to the Login Success packet sent to the server.
 #[derive(serde::Deserialize)]
-#[server_packet("login:login_acknowledged")]
+#[server_packet(LOGIN_LOGIN_ACKNOWLEDGED)]
 pub struct SLoginAcknowledged {}
diff --git a/pumpkin-protocol/src/server/login/s_login_start.rs b/pumpkin-protocol/src/server/login/s_login_start.rs
index 88bda1877..2e684021f 100644
--- a/pumpkin-protocol/src/server/login/s_login_start.rs
+++ b/pumpkin-protocol/src/server/login/s_login_start.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::LOGIN_HELLO;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -6,7 +7,7 @@ use crate::{
     ServerPacket,
 };
 
-#[server_packet("login:hello")]
+#[server_packet(LOGIN_HELLO)]
 pub struct SLoginStart {
     pub name: String, // 16
     pub uuid: uuid::Uuid,
diff --git a/pumpkin-protocol/src/server/login/s_plugin_response.rs b/pumpkin-protocol/src/server/login/s_plugin_response.rs
index bffc72b93..16f5c0850 100644
--- a/pumpkin-protocol/src/server/login/s_plugin_response.rs
+++ b/pumpkin-protocol/src/server/login/s_plugin_response.rs
@@ -3,11 +3,12 @@ use crate::{
     ServerPacket, VarInt,
 };
 use bytes::{Buf, Bytes};
+use pumpkin_data::packet::serverbound::LOGIN_CUSTOM_QUERY_ANSWER;
 use pumpkin_macros::server_packet;
 
 const MAX_PAYLOAD_SIZE: usize = 1048576;
 
-#[server_packet("login:custom_query_answer")]
+#[server_packet(LOGIN_CUSTOM_QUERY_ANSWER)]
 pub struct SLoginPluginResponse {
     pub message_id: VarInt,
     pub data: Option<Bytes>,
diff --git a/pumpkin-protocol/src/server/play/s_chat_command.rs b/pumpkin-protocol/src/server/play/s_chat_command.rs
index c5c572cfb..f52670dfd 100644
--- a/pumpkin-protocol/src/server/play/s_chat_command.rs
+++ b/pumpkin-protocol/src/server/play/s_chat_command.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::serverbound::PLAY_CHAT_COMMAND;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:chat_command")]
+#[server_packet(PLAY_CHAT_COMMAND)]
 pub struct SChatCommand {
     pub command: String,
 }
diff --git a/pumpkin-protocol/src/server/play/s_chat_message.rs b/pumpkin-protocol/src/server/play/s_chat_message.rs
index c0049af28..0fac277c1 100644
--- a/pumpkin-protocol/src/server/play/s_chat_message.rs
+++ b/pumpkin-protocol/src/server/play/s_chat_message.rs
@@ -1,4 +1,5 @@
 use bytes::{Buf, Bytes};
+use pumpkin_data::packet::serverbound::PLAY_CHAT;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -7,7 +8,7 @@ use crate::{
 };
 
 // derive(Deserialize)]
-#[server_packet("play:chat")]
+#[server_packet(PLAY_CHAT)]
 pub struct SChatMessage {
     pub message: String,
     pub timestamp: i64,
diff --git a/pumpkin-protocol/src/server/play/s_click_container.rs b/pumpkin-protocol/src/server/play/s_click_container.rs
index 954d7b02b..e155b5be2 100644
--- a/pumpkin-protocol/src/server/play/s_click_container.rs
+++ b/pumpkin-protocol/src/server/play/s_click_container.rs
@@ -1,10 +1,11 @@
 use crate::codec::slot::Slot;
 use crate::VarInt;
+use pumpkin_data::packet::serverbound::PLAY_CONTAINER_CLICK;
 use pumpkin_macros::server_packet;
 use serde::de::SeqAccess;
 use serde::{de, Deserialize};
 
-#[server_packet("play:container_click")]
+#[server_packet(PLAY_CONTAINER_CLICK)]
 pub struct SClickContainer {
     pub window_id: VarInt,
     pub state_id: VarInt,
diff --git a/pumpkin-protocol/src/server/play/s_client_command.rs b/pumpkin-protocol/src/server/play/s_client_command.rs
index df913e088..4c8a7a0ed 100644
--- a/pumpkin-protocol/src/server/play/s_client_command.rs
+++ b/pumpkin-protocol/src/server/play/s_client_command.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_CLIENT_COMMAND;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 use crate::VarInt;
 
 #[derive(Deserialize)]
-#[server_packet("play:client_command")]
+#[server_packet(PLAY_CLIENT_COMMAND)]
 pub struct SClientCommand {
     pub action_id: VarInt,
 }
diff --git a/pumpkin-protocol/src/server/play/s_client_information.rs b/pumpkin-protocol/src/server/play/s_client_information.rs
index b16be1380..898bf1590 100644
--- a/pumpkin-protocol/src/server/play/s_client_information.rs
+++ b/pumpkin-protocol/src/server/play/s_client_information.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::PLAY_CLIENT_INFORMATION;
 use pumpkin_macros::server_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:client_information")]
+#[server_packet(PLAY_CLIENT_INFORMATION)]
 pub struct SClientInformationPlay {
     pub locale: String, // 16
     pub view_distance: i8,
diff --git a/pumpkin-protocol/src/server/play/s_client_tick_end.rs b/pumpkin-protocol/src/server/play/s_client_tick_end.rs
index fb2866838..2602250db 100644
--- a/pumpkin-protocol/src/server/play/s_client_tick_end.rs
+++ b/pumpkin-protocol/src/server/play/s_client_tick_end.rs
@@ -1,5 +1,6 @@
+use pumpkin_data::packet::serverbound::PLAY_CLIENT_TICK_END;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:client_tick_end")]
+#[server_packet(PLAY_CLIENT_TICK_END)]
 pub struct SClientTickEnd {}
diff --git a/pumpkin-protocol/src/server/play/s_close_container.rs b/pumpkin-protocol/src/server/play/s_close_container.rs
index d6f97dadc..0f080e6db 100644
--- a/pumpkin-protocol/src/server/play/s_close_container.rs
+++ b/pumpkin-protocol/src/server/play/s_close_container.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_CONTAINER_CLOSE;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 use crate::VarInt;
 
 #[derive(Deserialize)]
-#[server_packet("play:container_close")]
+#[server_packet(PLAY_CONTAINER_CLOSE)]
 pub struct SCloseContainer {
     pub window_id: VarInt,
 }
diff --git a/pumpkin-protocol/src/server/play/s_command_suggestion.rs b/pumpkin-protocol/src/server/play/s_command_suggestion.rs
index a73e89aab..5cd455e96 100644
--- a/pumpkin-protocol/src/server/play/s_command_suggestion.rs
+++ b/pumpkin-protocol/src/server/play/s_command_suggestion.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_COMMAND_SUGGESTION;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 use crate::VarInt;
 
 #[derive(Deserialize)]
-#[server_packet("play:command_suggestion")]
+#[server_packet(PLAY_COMMAND_SUGGESTION)]
 pub struct SCommandSuggestion {
     pub id: VarInt,
     pub command: String,
diff --git a/pumpkin-protocol/src/server/play/s_confirm_teleport.rs b/pumpkin-protocol/src/server/play/s_confirm_teleport.rs
index b6f724e26..4909fa771 100644
--- a/pumpkin-protocol/src/server/play/s_confirm_teleport.rs
+++ b/pumpkin-protocol/src/server/play/s_confirm_teleport.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::PLAY_ACCEPT_TELEPORTATION;
 use pumpkin_macros::server_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:accept_teleportation")]
+#[server_packet(PLAY_ACCEPT_TELEPORTATION)]
 pub struct SConfirmTeleport {
     pub teleport_id: VarInt,
 }
diff --git a/pumpkin-protocol/src/server/play/s_cookie_response.rs b/pumpkin-protocol/src/server/play/s_cookie_response.rs
index e8e5d4bb5..0aa23eba7 100644
--- a/pumpkin-protocol/src/server/play/s_cookie_response.rs
+++ b/pumpkin-protocol/src/server/play/s_cookie_response.rs
@@ -4,9 +4,10 @@ use crate::{
     ServerPacket, VarInt,
 };
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::PLAY_COOKIE_RESPONSE;
 use pumpkin_macros::server_packet;
 
-#[server_packet("play:cookie_response")]
+#[server_packet(PLAY_COOKIE_RESPONSE)]
 /// Response to a Cookie Request (play) from the server.
 /// The Notchian (vanilla) server only accepts responses of up to 5 kiB in size.
 pub struct SCookieResponse {
diff --git a/pumpkin-protocol/src/server/play/s_interact.rs b/pumpkin-protocol/src/server/play/s_interact.rs
index 0f974aaf3..e7a68532d 100644
--- a/pumpkin-protocol/src/server/play/s_interact.rs
+++ b/pumpkin-protocol/src/server/play/s_interact.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::PLAY_INTERACT;
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::vector3::Vector3;
 
@@ -7,7 +8,7 @@ use crate::{
     ServerPacket, VarInt,
 };
 
-#[server_packet("play:interact")]
+#[server_packet(PLAY_INTERACT)]
 pub struct SInteract {
     pub entity_id: VarInt,
     pub typ: VarInt,
diff --git a/pumpkin-protocol/src/server/play/s_keep_alive.rs b/pumpkin-protocol/src/server/play/s_keep_alive.rs
index 714aaa134..c49be01a0 100644
--- a/pumpkin-protocol/src/server/play/s_keep_alive.rs
+++ b/pumpkin-protocol/src/server/play/s_keep_alive.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_KEEP_ALIVE;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-#[server_packet("play:keep_alive")]
+#[server_packet(PLAY_KEEP_ALIVE)]
 pub struct SKeepAlive {
     pub keep_alive_id: i64,
 }
diff --git a/pumpkin-protocol/src/server/play/s_pick_item.rs b/pumpkin-protocol/src/server/play/s_pick_item.rs
index 38f7827a9..52c699794 100644
--- a/pumpkin-protocol/src/server/play/s_pick_item.rs
+++ b/pumpkin-protocol/src/server/play/s_pick_item.rs
@@ -1,16 +1,17 @@
+use pumpkin_data::packet::serverbound::{PLAY_PICK_ITEM_FROM_BLOCK, PLAY_PICK_ITEM_FROM_ENTITY};
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::position::WorldPosition;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-#[server_packet("play:pick_item_from_block")]
+#[server_packet(PLAY_PICK_ITEM_FROM_BLOCK)]
 pub struct SPickItemFromBlock {
     pub pos: WorldPosition,
     pub include_data: bool,
 }
 
 #[derive(Deserialize)]
-#[server_packet("play:pick_item_from_entity")]
+#[server_packet(PLAY_PICK_ITEM_FROM_ENTITY)]
 pub struct SPickItemFromEntity {
     pub id: i32,
     pub include_data: bool,
diff --git a/pumpkin-protocol/src/server/play/s_ping_request.rs b/pumpkin-protocol/src/server/play/s_ping_request.rs
index 77655ed3e..12c493c11 100644
--- a/pumpkin-protocol/src/server/play/s_ping_request.rs
+++ b/pumpkin-protocol/src/server/play/s_ping_request.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_PING_REQUEST;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-#[server_packet("play:ping_request")]
+#[server_packet(PLAY_PING_REQUEST)]
 pub struct SPlayPingRequest {
     pub payload: i64,
 }
diff --git a/pumpkin-protocol/src/server/play/s_player_abilities.rs b/pumpkin-protocol/src/server/play/s_player_abilities.rs
index 0bd5c06ed..e4e8a3c02 100644
--- a/pumpkin-protocol/src/server/play/s_player_abilities.rs
+++ b/pumpkin-protocol/src/server/play/s_player_abilities.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_PLAYER_ABILITIES;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 //The vanilla client sends this packet when the player starts/stops flying. Bitmask 0x02 is set when the player is flying.
 
 #[derive(Deserialize)]
-#[server_packet("play:player_abilities")]
+#[server_packet(PLAY_PLAYER_ABILITIES)]
 pub struct SPlayerAbilities {
     pub flags: i8,
 }
diff --git a/pumpkin-protocol/src/server/play/s_player_action.rs b/pumpkin-protocol/src/server/play/s_player_action.rs
index 875208d26..90f31a0aa 100644
--- a/pumpkin-protocol/src/server/play/s_player_action.rs
+++ b/pumpkin-protocol/src/server/play/s_player_action.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_PLAYER_ACTION;
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::position::WorldPosition;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:player_action")]
+#[server_packet(PLAY_PLAYER_ACTION)]
 pub struct SPlayerAction {
     pub status: VarInt,
     pub location: WorldPosition,
diff --git a/pumpkin-protocol/src/server/play/s_player_command.rs b/pumpkin-protocol/src/server/play/s_player_command.rs
index 02dcf5082..a946a07c3 100644
--- a/pumpkin-protocol/src/server/play/s_player_command.rs
+++ b/pumpkin-protocol/src/server/play/s_player_command.rs
@@ -1,4 +1,5 @@
 use bytes::Buf;
+use pumpkin_data::packet::serverbound::PLAY_PLAYER_COMMAND;
 use pumpkin_macros::server_packet;
 
 use crate::{
@@ -6,7 +7,7 @@ use crate::{
     ServerPacket, VarInt,
 };
 
-#[server_packet("play:player_command")]
+#[server_packet(PLAY_PLAYER_COMMAND)]
 pub struct SPlayerCommand {
     pub entity_id: VarInt,
     pub action: VarInt,
diff --git a/pumpkin-protocol/src/server/play/s_player_ground.rs b/pumpkin-protocol/src/server/play/s_player_ground.rs
index dca0d17ee..4cac6bde1 100644
--- a/pumpkin-protocol/src/server/play/s_player_ground.rs
+++ b/pumpkin-protocol/src/server/play/s_player_ground.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_MOVE_PLAYER_STATUS_ONLY;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-#[server_packet("play:move_player_status_only")]
+#[server_packet(PLAY_MOVE_PLAYER_STATUS_ONLY)]
 pub struct SSetPlayerGround {
     pub on_ground: bool,
 }
diff --git a/pumpkin-protocol/src/server/play/s_player_input.rs b/pumpkin-protocol/src/server/play/s_player_input.rs
index e5e8f6469..c1693cadf 100644
--- a/pumpkin-protocol/src/server/play/s_player_input.rs
+++ b/pumpkin-protocol/src/server/play/s_player_input.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::serverbound::PLAY_PLAYER_INPUT;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:player_input")]
+#[server_packet(PLAY_PLAYER_INPUT)]
 pub struct SPlayerInput {
     // Yep exactly how it looks like
     _input: i8,
diff --git a/pumpkin-protocol/src/server/play/s_player_loaded.rs b/pumpkin-protocol/src/server/play/s_player_loaded.rs
index 3d6b5f23c..10c56c542 100644
--- a/pumpkin-protocol/src/server/play/s_player_loaded.rs
+++ b/pumpkin-protocol/src/server/play/s_player_loaded.rs
@@ -1,5 +1,6 @@
+use pumpkin_data::packet::serverbound::PLAY_PLAYER_LOADED;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:player_loaded")]
+#[server_packet(PLAY_PLAYER_LOADED)]
 pub struct SPlayerLoaded;
diff --git a/pumpkin-protocol/src/server/play/s_player_position.rs b/pumpkin-protocol/src/server/play/s_player_position.rs
index 2af449ada..09a6ea818 100644
--- a/pumpkin-protocol/src/server/play/s_player_position.rs
+++ b/pumpkin-protocol/src/server/play/s_player_position.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_MOVE_PLAYER_POS;
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::vector3::Vector3;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:move_player_pos")]
+#[server_packet(PLAY_MOVE_PLAYER_POS)]
 pub struct SPlayerPosition {
     pub position: Vector3<f64>,
     pub ground: bool,
diff --git a/pumpkin-protocol/src/server/play/s_player_position_rotation.rs b/pumpkin-protocol/src/server/play/s_player_position_rotation.rs
index 98ad4b003..a3376fea5 100644
--- a/pumpkin-protocol/src/server/play/s_player_position_rotation.rs
+++ b/pumpkin-protocol/src/server/play/s_player_position_rotation.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_MOVE_PLAYER_POS_ROT;
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::vector3::Vector3;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:move_player_pos_rot")]
+#[server_packet(PLAY_MOVE_PLAYER_POS_ROT)]
 pub struct SPlayerPositionRotation {
     pub position: Vector3<f64>,
     pub yaw: f32,
diff --git a/pumpkin-protocol/src/server/play/s_player_rotation.rs b/pumpkin-protocol/src/server/play/s_player_rotation.rs
index ac2acafa8..512b5219f 100644
--- a/pumpkin-protocol/src/server/play/s_player_rotation.rs
+++ b/pumpkin-protocol/src/server/play/s_player_rotation.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::serverbound::PLAY_MOVE_PLAYER_ROT;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:move_player_rot")]
+#[server_packet(PLAY_MOVE_PLAYER_ROT)]
 pub struct SPlayerRotation {
     pub yaw: f32,
     pub pitch: f32,
diff --git a/pumpkin-protocol/src/server/play/s_set_creative_slot.rs b/pumpkin-protocol/src/server/play/s_set_creative_slot.rs
index 59835a434..849a48562 100644
--- a/pumpkin-protocol/src/server/play/s_set_creative_slot.rs
+++ b/pumpkin-protocol/src/server/play/s_set_creative_slot.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::PLAY_SET_CREATIVE_MODE_SLOT;
 use pumpkin_macros::server_packet;
 
 use crate::codec::slot::Slot;
 
 #[derive(serde::Deserialize, Debug)]
-#[server_packet("play:set_creative_mode_slot")]
+#[server_packet(PLAY_SET_CREATIVE_MODE_SLOT)]
 pub struct SSetCreativeSlot {
     pub slot: i16,
     pub clicked_item: Slot,
diff --git a/pumpkin-protocol/src/server/play/s_set_held_item.rs b/pumpkin-protocol/src/server/play/s_set_held_item.rs
index 9452cb929..3c2ecefc7 100644
--- a/pumpkin-protocol/src/server/play/s_set_held_item.rs
+++ b/pumpkin-protocol/src/server/play/s_set_held_item.rs
@@ -1,8 +1,9 @@
+use pumpkin_data::packet::serverbound::PLAY_SET_CARRIED_ITEM;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-#[server_packet("play:set_carried_item")]
+#[server_packet(PLAY_SET_CARRIED_ITEM)]
 pub struct SSetHeldItem {
     pub slot: i16,
 }
diff --git a/pumpkin-protocol/src/server/play/s_swing_arm.rs b/pumpkin-protocol/src/server/play/s_swing_arm.rs
index 0f7d0f16e..5134d15c5 100644
--- a/pumpkin-protocol/src/server/play/s_swing_arm.rs
+++ b/pumpkin-protocol/src/server/play/s_swing_arm.rs
@@ -1,9 +1,10 @@
+use pumpkin_data::packet::serverbound::PLAY_SWING;
 use pumpkin_macros::server_packet;
 
 use crate::VarInt;
 
 #[derive(serde::Deserialize)]
-#[server_packet("play:swing")]
+#[server_packet(PLAY_SWING)]
 pub struct SSwingArm {
     pub hand: VarInt,
 }
diff --git a/pumpkin-protocol/src/server/play/s_use_item.rs b/pumpkin-protocol/src/server/play/s_use_item.rs
index 7035fd0a9..03abfc98c 100644
--- a/pumpkin-protocol/src/server/play/s_use_item.rs
+++ b/pumpkin-protocol/src/server/play/s_use_item.rs
@@ -1,10 +1,11 @@
+use pumpkin_data::packet::serverbound::PLAY_USE_ITEM;
 use pumpkin_macros::server_packet;
 use serde::Deserialize;
 
 use crate::VarInt;
 
 #[derive(Deserialize)]
-#[server_packet("play:use_item")]
+#[server_packet(PLAY_USE_ITEM)]
 pub struct SUseItem {
     // 0 for main hand, 1 for off hand
     pub hand: VarInt,
diff --git a/pumpkin-protocol/src/server/play/s_use_item_on.rs b/pumpkin-protocol/src/server/play/s_use_item_on.rs
index adf022a17..f3e3e95a3 100644
--- a/pumpkin-protocol/src/server/play/s_use_item_on.rs
+++ b/pumpkin-protocol/src/server/play/s_use_item_on.rs
@@ -1,3 +1,4 @@
+use pumpkin_data::packet::serverbound::PLAY_USE_ITEM_ON;
 use pumpkin_macros::server_packet;
 use pumpkin_util::math::{position::WorldPosition, vector3::Vector3};
 use serde::Deserialize;
@@ -5,7 +6,7 @@ use serde::Deserialize;
 use crate::VarInt;
 
 #[derive(Deserialize)]
-#[server_packet("play:use_item_on")]
+#[server_packet(PLAY_USE_ITEM_ON)]
 pub struct SUseItemOn {
     pub hand: VarInt,
     pub location: WorldPosition,
diff --git a/pumpkin-protocol/src/server/status/s_ping_request.rs b/pumpkin-protocol/src/server/status/s_ping_request.rs
index b8fd75c16..1c46e7d8b 100644
--- a/pumpkin-protocol/src/server/status/s_ping_request.rs
+++ b/pumpkin-protocol/src/server/status/s_ping_request.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::serverbound::STATUS_PING_REQUEST;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("status:ping_request")]
+#[server_packet(STATUS_PING_REQUEST)]
 pub struct SStatusPingRequest {
     pub payload: i64,
 }
diff --git a/pumpkin-protocol/src/server/status/s_status_request.rs b/pumpkin-protocol/src/server/status/s_status_request.rs
index 9d96fcc66..07f22dade 100644
--- a/pumpkin-protocol/src/server/status/s_status_request.rs
+++ b/pumpkin-protocol/src/server/status/s_status_request.rs
@@ -1,7 +1,8 @@
+use pumpkin_data::packet::serverbound::STATUS_STATUS_REQUEST;
 use pumpkin_macros::server_packet;
 
 #[derive(serde::Deserialize)]
-#[server_packet("status:status_request")]
+#[server_packet(STATUS_STATUS_REQUEST)]
 pub struct SStatusRequest {
     // empty
 }