Small refactors for plugins

pumpkin-data/build/biome.rs

@@ -11,7 +11,7 @@ pub(crate) fn build() -> TokenStream {
     let variants = array_to_tokenstream(biomes);
 
     quote! {
-        #[derive(Clone, Copy)]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum Biome {
             #variants

pumpkin-data/build/build.rs

@@ -11,8 +11,8 @@ mod entity_pose;
 mod entity_type;
 mod game_event;
 mod message_type;
-mod noise_parmeter;
-mod packet;
+mod noise_parameters;
+mod packets;
 mod particle;
 mod scoreboard_slot;
 mod screen;
@@ -21,7 +21,7 @@ mod sound_category;
 mod world_event;
 
 pub fn main() {
-    write_generated_file(packet::build(), "packet.rs");
+    write_generated_file(packets::build(), "packets.rs");
     write_generated_file(screen::build(), "screen.rs");
     write_generated_file(particle::build(), "particle.rs");
     write_generated_file(sound::build(), "sound.rs");
@@ -32,7 +32,7 @@ pub fn main() {
     write_generated_file(scoreboard_slot::build(), "scoreboard_slot.rs");
     write_generated_file(world_event::build(), "world_event.rs");
     write_generated_file(entity_type::build(), "entity_type.rs");
-    write_generated_file(noise_parmeter::build(), "noise_parmeter.rs");
+    write_generated_file(noise_parameters::build(), "noise_parameters.rs");
     write_generated_file(biome::build(), "biome.rs");
     write_generated_file(message_type::build(), "message_type.rs");
 }

pumpkin-data/build/chunk_status.rs

@@ -23,7 +23,7 @@ pub(crate) fn build() -> TokenStream {
     quote! {
         use serde::{Deserialize, Serialize};
 
-        #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+        #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Hash)]
         pub enum ChunkStatus {
             #variants
         }

pumpkin-data/build/entity_pose.rs

@@ -11,7 +11,7 @@ pub(crate) fn build() -> TokenStream {
     let variants = array_to_tokenstream(poses);
 
     quote! {
-        #[derive(Clone, Copy)]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum EntityPose {
             #variants

pumpkin-data/build/entity_type.rs

@@ -41,7 +41,7 @@ pub(crate) fn build() -> TokenStream {
         .collect::<TokenStream>();
 
     quote! {
-        #[derive(Clone, Copy)]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum EntityType {
             #variants

pumpkin-data/build/game_event.rs

@@ -12,6 +12,7 @@ pub(crate) fn build() -> TokenStream {
     let variants = array_to_tokenstream(game_events);
 
     quote! {
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum GameEvent {
             #variants

pumpkin-data/build/message_type.rs

@@ -7,19 +7,19 @@ use serde::{Deserialize, Serialize};
 
 use crate::ident;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct RawChatType {
     id: u32,
     components: ChatType,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct ChatType {
     chat: Decoration,
     narration: Decoration,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct Decoration {
     translation_key: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]

pumpkin-data/build/noise_parmeter.rs → pumpkin-data/build/noise_parameters.rs

@@ -2,11 +2,10 @@ use std::collections::HashMap;
 
 use proc_macro2::TokenStream;
 use quote::quote;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use crate::ident;
-
-#[derive(Deserialize)]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct DoublePerlinNoiseParameters {
     #[serde(rename = "firstOctave")]
     first_octave: i32,

pumpkin-data/build/packet.rs → pumpkin-data/build/packets.rs

@@ -2,11 +2,11 @@ use std::collections::HashMap;
 
 use proc_macro2::TokenStream;
 use quote::quote;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use crate::ident;
 
-#[derive(Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct Packets {
     serverbound: HashMap<String, Vec<String>>,
     clientbound: HashMap<String, Vec<String>>,

pumpkin-data/build/scoreboard_slot.rs

@@ -12,6 +12,7 @@ pub(crate) fn build() -> TokenStream {
     let variants = array_to_tokenstream(sound_categories);
 
     quote! {
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum ScoreboardDisplaySlot {
             #variants

pumpkin-data/build/sound_category.rs

@@ -12,7 +12,7 @@ pub(crate) fn build() -> TokenStream {
     let variants = array_to_tokenstream(sound_categories);
 
     quote! {
-        #[derive(Clone, Copy)]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u8)]
         pub enum SoundCategory {
             #variants

pumpkin-data/build/world_event.rs

@@ -21,6 +21,7 @@ pub(crate) fn build() -> TokenStream {
         }]);
     }
     quote! {
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
         #[repr(u16)]
         pub enum WorldEvent {
             #variants

pumpkin-data/src/lib.rs

@@ -1,5 +1,5 @@
-pub mod packet {
-    include!(concat!(env!("OUT_DIR"), "/packet.rs"));
+pub mod packets {
+    include!(concat!(env!("OUT_DIR"), "/packets.rs"));
 }
 
 pub mod screen {
@@ -17,7 +17,7 @@ pub mod sound {
 
 pub mod chunk {
     include!(concat!(env!("OUT_DIR"), "/biome.rs"));
-    include!(concat!(env!("OUT_DIR"), "/noise_parmeter.rs"));
+    include!(concat!(env!("OUT_DIR"), "/noise_parameters.rs"));
     include!(concat!(env!("OUT_DIR"), "/chunk_status.rs"));
 }
 

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

@@ -3,7 +3,7 @@ use pumpkin_util::text::TextComponent;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 
-use pumpkin_data::packet::clientbound::CONFIG_RESOURCE_PACK_PUSH;
+use pumpkin_data::packets::clientbound::CONFIG_RESOURCE_PACK_PUSH;
 
 #[derive(Serialize)]
 #[client_packet(CONFIG_RESOURCE_PACK_PUSH)]

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

@@ -1,6 +1,6 @@
 use pumpkin_macros::client_packet;
 
-use pumpkin_data::packet::clientbound::CONFIG_DISCONNECT;
+use pumpkin_data::packets::clientbound::CONFIG_DISCONNECT;
 
 #[derive(serde::Serialize)]
 #[client_packet(CONFIG_DISCONNECT)]

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::CONFIG_COOKIE_REQUEST;
+use pumpkin_data::packets::clientbound::CONFIG_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 
 use crate::codec::identifier::Identifier;

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::CONFIG_FINISH_CONFIGURATION;
+use pumpkin_data::packets::clientbound::CONFIG_FINISH_CONFIGURATION;
 use pumpkin_macros::client_packet;
 
 #[derive(serde::Serialize)]

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

@@ -1,5 +1,5 @@
 use bytes::BufMut;
-use pumpkin_data::packet::clientbound::CONFIG_SELECT_KNOWN_PACKS;
+use pumpkin_data::packets::clientbound::CONFIG_SELECT_KNOWN_PACKS;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, KnownPack};

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::CONFIG_CUSTOM_PAYLOAD;
+use pumpkin_data::packets::clientbound::CONFIG_CUSTOM_PAYLOAD;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,5 +1,5 @@
 use bytes::{BufMut, BytesMut};
-use pumpkin_data::packet::clientbound::CONFIG_REGISTRY_DATA;
+use pumpkin_data::packets::clientbound::CONFIG_REGISTRY_DATA;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, codec::identifier::Identifier, ClientPacket};

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

@@ -1,5 +1,5 @@
 use crate::{Link, VarInt};
-use pumpkin_data::packet::clientbound::CONFIG_SERVER_LINKS;
+use pumpkin_data::packets::clientbound::CONFIG_SERVER_LINKS;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,5 +1,5 @@
 use crate::{codec::identifier::Identifier, VarInt};
-use pumpkin_data::packet::clientbound::CONFIG_STORE_COOKIE;
+use pumpkin_data::packets::clientbound::CONFIG_STORE_COOKIE;
 use pumpkin_macros::client_packet;
 
 #[derive(serde::Serialize)]

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

@@ -1,5 +1,5 @@
 use crate::VarInt;
-use pumpkin_data::packet::clientbound::CONFIG_TRANSFER;
+use pumpkin_data::packets::clientbound::CONFIG_TRANSFER;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::LOGIN_COOKIE_REQUEST;
+use pumpkin_data::packets::clientbound::LOGIN_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::LOGIN_HELLO;
+use pumpkin_data::packets::clientbound::LOGIN_HELLO;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::LOGIN_LOGIN_DISCONNECT;
+use pumpkin_data::packets::clientbound::LOGIN_LOGIN_DISCONNECT;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,5 +1,5 @@
 use bytes::BufMut;
-use pumpkin_data::packet::clientbound::LOGIN_LOGIN_FINISHED;
+use pumpkin_data::packets::clientbound::LOGIN_LOGIN_FINISHED;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, Property};

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::LOGIN_CUSTOM_QUERY;
+use pumpkin_data::packets::clientbound::LOGIN_CUSTOM_QUERY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

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

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::LOGIN_LOGIN_COMPRESSION;
+use pumpkin_data::packets::clientbound::LOGIN_LOGIN_COMPRESSION;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_acknowledge_block.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_BLOCK_CHANGED_ACK;
+use pumpkin_data::packets::clientbound::PLAY_BLOCK_CHANGED_ACK;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_actionbar.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_SET_ACTION_BAR_TEXT;
+use pumpkin_data::packets::clientbound::PLAY_SET_ACTION_BAR_TEXT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;

pumpkin-protocol/src/client/play/c_block_destroy_stage.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_BLOCK_DESTRUCTION;
+use pumpkin_data::packets::clientbound::PLAY_BLOCK_DESTRUCTION;
 use pumpkin_util::math::position::BlockPos;
 
 use pumpkin_macros::client_packet;

pumpkin-protocol/src/client/play/c_block_event.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_BLOCK_EVENT;
+use pumpkin_data::packets::clientbound::PLAY_BLOCK_EVENT;
 use pumpkin_util::math::position::BlockPos;
 
 use pumpkin_macros::client_packet;

pumpkin-protocol/src/client/play/c_block_update.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_BLOCK_UPDATE;
+use pumpkin_data::packets::clientbound::PLAY_BLOCK_UPDATE;
 use pumpkin_util::math::position::BlockPos;
 
 use pumpkin_macros::client_packet;

pumpkin-protocol/src/client/play/c_boss_event.rs

@@ -2,7 +2,7 @@ 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_data::packets::clientbound::PLAY_BOSS_EVENT;
 use pumpkin_macros::client_packet;
 
 #[client_packet(PLAY_BOSS_EVENT)]

pumpkin-protocol/src/client/play/c_center_chunk.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_SET_CHUNK_CACHE_CENTER;
+use pumpkin_data::packets::clientbound::PLAY_SET_CHUNK_CACHE_CENTER;
 use pumpkin_macros::client_packet;
 
 use crate::VarInt;

pumpkin-protocol/src/client/play/c_change_difficulty.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_CHANGE_DIFFICULTY;
+use pumpkin_data::packets::clientbound::PLAY_CHANGE_DIFFICULTY;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_chunk_data.rs

@@ -1,7 +1,7 @@
 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_data::packets::clientbound::PLAY_LEVEL_CHUNK_WITH_LIGHT;
 use pumpkin_macros::client_packet;
 use pumpkin_world::{
     chunk::{ChunkData, SUBCHUNKS_COUNT},

pumpkin-protocol/src/client/play/c_clear_title.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_CLEAR_TITLES;
+use pumpkin_data::packets::clientbound::PLAY_CLEAR_TITLES;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_close_container.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_CONTAINER_CLOSE;
+use pumpkin_data::packets::clientbound::PLAY_CONTAINER_CLOSE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_combat_death.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_PLAYER_COMBAT_KILL;
+use pumpkin_data::packets::clientbound::PLAY_PLAYER_COMBAT_KILL;
 use pumpkin_macros::client_packet;
 use pumpkin_util::text::TextComponent;
 use serde::Serialize;

pumpkin-protocol/src/client/play/c_command_suggestions.rs

@@ -1,5 +1,5 @@
 use bytes::BufMut;
-use pumpkin_data::packet::clientbound::PLAY_COMMAND_SUGGESTIONS;
+use pumpkin_data::packets::clientbound::PLAY_COMMAND_SUGGESTIONS;
 use pumpkin_macros::client_packet;
 use pumpkin_util::text::TextComponent;
 

pumpkin-protocol/src/client/play/c_commands.rs

@@ -1,5 +1,5 @@
 use bytes::BufMut;
-use pumpkin_data::packet::clientbound::PLAY_COMMANDS;
+use pumpkin_data::packets::clientbound::PLAY_COMMANDS;
 use pumpkin_macros::client_packet;
 
 use crate::{bytebuf::ByteBufMut, ClientPacket, VarInt};

pumpkin-protocol/src/client/play/c_cookie_request.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_COOKIE_REQUEST;
+use pumpkin_data::packets::clientbound::PLAY_COOKIE_REQUEST;
 use pumpkin_macros::client_packet;
 use serde::Serialize;
 

pumpkin-protocol/src/client/play/c_damage_event.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_DAMAGE_EVENT;
+use pumpkin_data::packets::clientbound::PLAY_DAMAGE_EVENT;
 use pumpkin_macros::client_packet;
 use pumpkin_util::math::vector3::Vector3;
 use serde::Serialize;

pumpkin-protocol/src/client/play/c_disguised_chat_message.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_DISGUISED_CHAT;
+use pumpkin_data::packets::clientbound::PLAY_DISGUISED_CHAT;
 use pumpkin_util::text::TextComponent;
 
 use pumpkin_macros::client_packet;

pumpkin-protocol/src/client/play/c_display_objective.rs

@@ -1,5 +1,5 @@
 use pumpkin_data::{
-    packet::clientbound::PLAY_SET_DISPLAY_OBJECTIVE, scoreboard::ScoreboardDisplaySlot,
+    packets::clientbound::PLAY_SET_DISPLAY_OBJECTIVE, scoreboard::ScoreboardDisplaySlot,
 };
 use pumpkin_macros::client_packet;
 use serde::Serialize;

pumpkin-protocol/src/client/play/c_entity_animation.rs

@@ -1,4 +1,4 @@
-use pumpkin_data::packet::clientbound::PLAY_ANIMATE;
+use pumpkin_data::packets::clientbound::PLAY_ANIMATE;
 use pumpkin_macros::client_packet;
 use serde::Serialize;