diff --git a/Cargo.toml b/Cargo.toml index 371e6e846..a04488dcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ "pumpkin-config", - "pumpkin-core", + "pumpkin-util", "pumpkin-entity", "pumpkin-inventory", "pumpkin-macros/", diff --git a/pumpkin-config/Cargo.toml b/pumpkin-config/Cargo.toml index c9bf9ba85..53471a761 100644 --- a/pumpkin-config/Cargo.toml +++ b/pumpkin-config/Cargo.toml @@ -4,7 +4,7 @@ version.workspace = true edition.workspace = true [dependencies] -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } serde.workspace = true log.workspace = true uuid.workspace = true diff --git a/pumpkin-config/src/commands.rs b/pumpkin-config/src/commands.rs index bf686b0fa..4acf7bf4f 100644 --- a/pumpkin-config/src/commands.rs +++ b/pumpkin-config/src/commands.rs @@ -1,4 +1,4 @@ -use pumpkin_core::PermissionLvl; +use pumpkin_util::PermissionLvl; use serde::{Deserialize, Serialize}; #[derive(Deserialize, Serialize)] diff --git a/pumpkin-config/src/lib.rs b/pumpkin-config/src/lib.rs index f93da45a1..24f10e6c2 100644 --- a/pumpkin-config/src/lib.rs +++ b/pumpkin-config/src/lib.rs @@ -1,6 +1,6 @@ use log::warn; use logging::LoggingConfig; -use pumpkin_core::{Difficulty, GameMode, PermissionLvl}; +use pumpkin_util::{Difficulty, GameMode, PermissionLvl}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::{ diff --git a/pumpkin-config/src/networking/auth.rs b/pumpkin-config/src/networking/auth.rs index acfe2206f..74f669eba 100644 --- a/pumpkin-config/src/networking/auth.rs +++ b/pumpkin-config/src/networking/auth.rs @@ -1,4 +1,4 @@ -use pumpkin_core::ProfileAction; +use pumpkin_util::ProfileAction; use serde::{Deserialize, Serialize}; #[derive(Deserialize, Serialize)] diff --git a/pumpkin-config/src/op.rs b/pumpkin-config/src/op.rs index edbd71bca..f0de992a1 100644 --- a/pumpkin-config/src/op.rs +++ b/pumpkin-config/src/op.rs @@ -1,4 +1,4 @@ -use pumpkin_core::permission::PermissionLvl; +use pumpkin_util::permission::PermissionLvl; use serde::{Deserialize, Serialize}; use uuid::Uuid; diff --git a/pumpkin-inventory/Cargo.toml b/pumpkin-inventory/Cargo.toml index 3fe57edc0..2d30c0592 100644 --- a/pumpkin-inventory/Cargo.toml +++ b/pumpkin-inventory/Cargo.toml @@ -9,7 +9,7 @@ pumpkin-protocol = { path = "../pumpkin-protocol" } pumpkin-world = { path = "../pumpkin-world" } pumpkin-registry = {path = "../pumpkin-registry"} pumpkin-macros = { path = "../pumpkin-macros" } -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } log.workspace = true rayon.workspace = true diff --git a/pumpkin-inventory/src/open_container.rs b/pumpkin-inventory/src/open_container.rs index c563ee47f..b4f725c14 100644 --- a/pumpkin-inventory/src/open_container.rs +++ b/pumpkin-inventory/src/open_container.rs @@ -1,6 +1,6 @@ use crate::crafting::check_if_matches_crafting; use crate::{Container, WindowType}; -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::ItemStack; use std::sync::Arc; diff --git a/pumpkin-protocol/Cargo.toml b/pumpkin-protocol/Cargo.toml index 489e653c5..e4910d607 100644 --- a/pumpkin-protocol/Cargo.toml +++ b/pumpkin-protocol/Cargo.toml @@ -14,7 +14,7 @@ query = [] pumpkin-nbt = { path = "../pumpkin-nbt" } pumpkin-macros = { path = "../pumpkin-macros" } pumpkin-world = { path = "../pumpkin-world" } -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } uuid.workspace = true serde.workspace = true 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 bcda7fcc7..4dd96c98a 100644 --- a/pumpkin-protocol/src/client/config/c_add_resource_pack.rs +++ b/pumpkin-protocol/src/client/config/c_add_resource_pack.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/bossevent_action.rs b/pumpkin-protocol/src/client/play/bossevent_action.rs index fbf8d2b66..d5c4e47f9 100644 --- a/pumpkin-protocol/src/client/play/bossevent_action.rs +++ b/pumpkin-protocol/src/client/play/bossevent_action.rs @@ -1,5 +1,5 @@ use crate::VarInt; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; pub enum BosseventAction { Add { diff --git a/pumpkin-protocol/src/client/play/c_actionbar.rs b/pumpkin-protocol/src/client/play/c_actionbar.rs index 1da6dcade..af9a5e438 100644 --- a/pumpkin-protocol/src/client/play/c_actionbar.rs +++ b/pumpkin-protocol/src/client/play/c_actionbar.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; 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 3c3a6f79e..8ce150961 100644 --- a/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs +++ b/pumpkin-protocol/src/client/play/c_block_destroy_stage.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_block_event.rs b/pumpkin-protocol/src/client/play/c_block_event.rs index c1b2e6e09..1cc658e23 100644 --- a/pumpkin-protocol/src/client/play/c_block_event.rs +++ b/pumpkin-protocol/src/client/play/c_block_event.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_block_update.rs b/pumpkin-protocol/src/client/play/c_block_update.rs index 408116393..332a0fab8 100644 --- a/pumpkin-protocol/src/client/play/c_block_update.rs +++ b/pumpkin-protocol/src/client/play/c_block_update.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_combat_death.rs b/pumpkin-protocol/src/client/play/c_combat_death.rs index 2186b7960..f138e981c 100644 --- a/pumpkin-protocol/src/client/play/c_combat_death.rs +++ b/pumpkin-protocol/src/client/play/c_combat_death.rs @@ -1,5 +1,5 @@ -use pumpkin_core::text::TextComponent; use pumpkin_macros::client_packet; +use pumpkin_util::text::TextComponent; use serde::Serialize; use crate::VarInt; diff --git a/pumpkin-protocol/src/client/play/c_command_suggestions.rs b/pumpkin-protocol/src/client/play/c_command_suggestions.rs index bfda9b2b4..d9b883730 100644 --- a/pumpkin-protocol/src/client/play/c_command_suggestions.rs +++ b/pumpkin-protocol/src/client/play/c_command_suggestions.rs @@ -1,6 +1,6 @@ use bytes::BufMut; -use pumpkin_core::text::TextComponent; use pumpkin_macros::client_packet; +use pumpkin_util::text::TextComponent; use crate::{bytebuf::ByteBufMut, ClientPacket, VarInt}; diff --git a/pumpkin-protocol/src/client/play/c_damage_event.rs b/pumpkin-protocol/src/client/play/c_damage_event.rs index 4d2d04eaf..1121dd27d 100644 --- a/pumpkin-protocol/src/client/play/c_damage_event.rs +++ b/pumpkin-protocol/src/client/play/c_damage_event.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use serde::Serialize; use crate::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 9f1fc879f..a67179878 100644 --- a/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs +++ b/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_level_event.rs b/pumpkin-protocol/src/client/play/c_level_event.rs index df1cde149..5af47194d 100644 --- a/pumpkin-protocol/src/client/play/c_level_event.rs +++ b/pumpkin-protocol/src/client/play/c_level_event.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::position::WorldPosition; use pumpkin_macros::client_packet; +use pumpkin_util::math::position::WorldPosition; use serde::Serialize; #[derive(Serialize)] diff --git a/pumpkin-protocol/src/client/play/c_login.rs b/pumpkin-protocol/src/client/play/c_login.rs index ec6e23bb4..73e7a908c 100644 --- a/pumpkin-protocol/src/client/play/c_login.rs +++ b/pumpkin-protocol/src/client/play/c_login.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_open_screen.rs b/pumpkin-protocol/src/client/play/c_open_screen.rs index 518f03076..b487400b4 100644 --- a/pumpkin-protocol/src/client/play/c_open_screen.rs +++ b/pumpkin-protocol/src/client/play/c_open_screen.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_particle.rs b/pumpkin-protocol/src/client/play/c_particle.rs index 45cc14340..3a720b795 100644 --- a/pumpkin-protocol/src/client/play/c_particle.rs +++ b/pumpkin-protocol/src/client/play/c_particle.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use serde::Serialize; use crate::VarInt; diff --git a/pumpkin-protocol/src/client/play/c_play_disconnect.rs b/pumpkin-protocol/src/client/play/c_play_disconnect.rs index 6ac87017e..fc0633ab2 100644 --- a/pumpkin-protocol/src/client/play/c_play_disconnect.rs +++ b/pumpkin-protocol/src/client/play/c_play_disconnect.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; 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 f84f03ab4..c161e3c3a 100644 --- a/pumpkin-protocol/src/client/play/c_player_chat_message.rs +++ b/pumpkin-protocol/src/client/play/c_player_chat_message.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_player_position.rs b/pumpkin-protocol/src/client/play/c_player_position.rs index 287c1b2ff..e14c3f88d 100644 --- a/pumpkin-protocol/src/client/play/c_player_position.rs +++ b/pumpkin-protocol/src/client/play/c_player_position.rs @@ -1,6 +1,6 @@ use bytes::BufMut; -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use crate::{bytebuf::ByteBufMut, ClientPacket, PositionFlag, VarInt}; diff --git a/pumpkin-protocol/src/client/play/c_respawn.rs b/pumpkin-protocol/src/client/play/c_respawn.rs index 9d68b059c..4a9c0e561 100644 --- a/pumpkin-protocol/src/client/play/c_respawn.rs +++ b/pumpkin-protocol/src/client/play/c_respawn.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::position::WorldPosition; use pumpkin_macros::client_packet; +use pumpkin_util::math::position::WorldPosition; use serde::Serialize; use crate::{codec::identifier::Identifier, VarInt}; diff --git a/pumpkin-protocol/src/client/play/c_set_title.rs b/pumpkin-protocol/src/client/play/c_set_title.rs index 7692a5fb9..fa62c402d 100644 --- a/pumpkin-protocol/src/client/play/c_set_title.rs +++ b/pumpkin-protocol/src/client/play/c_set_title.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_subtitle.rs b/pumpkin-protocol/src/client/play/c_subtitle.rs index 45a89d421..3b5162bba 100644 --- a/pumpkin-protocol/src/client/play/c_subtitle.rs +++ b/pumpkin-protocol/src/client/play/c_subtitle.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; 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 0112a18d2..4c78d8177 100644 --- a/pumpkin-protocol/src/client/play/c_system_chat_message.rs +++ b/pumpkin-protocol/src/client/play/c_system_chat_message.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_teleport_entity.rs b/pumpkin-protocol/src/client/play/c_teleport_entity.rs index 2ec004922..759917c11 100644 --- a/pumpkin-protocol/src/client/play/c_teleport_entity.rs +++ b/pumpkin-protocol/src/client/play/c_teleport_entity.rs @@ -1,6 +1,6 @@ use bytes::BufMut; -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use crate::{bytebuf::ByteBufMut, ClientPacket, PositionFlag, VarInt}; 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 b94e92530..abe1bfe89 100644 --- a/pumpkin-protocol/src/client/play/c_update_entity_pos.rs +++ b/pumpkin-protocol/src/client/play/c_update_entity_pos.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use serde::Serialize; use crate::VarInt; 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 c15b0237a..9697299ec 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,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::client_packet; +use pumpkin_util::math::vector3::Vector3; use serde::Serialize; use crate::VarInt; diff --git a/pumpkin-protocol/src/client/play/c_update_objectives.rs b/pumpkin-protocol/src/client/play/c_update_objectives.rs index 31d9dadb1..95f667493 100644 --- a/pumpkin-protocol/src/client/play/c_update_objectives.rs +++ b/pumpkin-protocol/src/client/play/c_update_objectives.rs @@ -1,6 +1,6 @@ use bytes::BufMut; -use pumpkin_core::text::TextComponent; use pumpkin_macros::client_packet; +use pumpkin_util::text::TextComponent; use crate::{bytebuf::ByteBufMut, ClientPacket, NumberFormat, VarInt}; diff --git a/pumpkin-protocol/src/client/play/c_update_score.rs b/pumpkin-protocol/src/client/play/c_update_score.rs index b82aa5d75..912f4e94d 100644 --- a/pumpkin-protocol/src/client/play/c_update_score.rs +++ b/pumpkin-protocol/src/client/play/c_update_score.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/client/play/c_worldevent.rs b/pumpkin-protocol/src/client/play/c_worldevent.rs index 8a168d39c..8eb2eb4e6 100644 --- a/pumpkin-protocol/src/client/play/c_worldevent.rs +++ b/pumpkin-protocol/src/client/play/c_worldevent.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::position::WorldPosition; +use pumpkin_util::math::position::WorldPosition; use pumpkin_macros::client_packet; use serde::Serialize; diff --git a/pumpkin-protocol/src/lib.rs b/pumpkin-protocol/src/lib.rs index 4936cd3bc..d152b3208 100644 --- a/pumpkin-protocol/src/lib.rs +++ b/pumpkin-protocol/src/lib.rs @@ -3,7 +3,7 @@ use std::num::NonZeroU16; use bytebuf::{packet_id::Packet, ReadingError}; use bytes::{Buf, BufMut, Bytes}; use codec::{identifier::Identifier, var_int::VarInt}; -use pumpkin_core::text::{style::Style, TextComponent}; +use pumpkin_util::text::{style::Style, TextComponent}; use serde::{Deserialize, Serialize, Serializer}; pub mod bytebuf; diff --git a/pumpkin-protocol/src/server/play/s_interact.rs b/pumpkin-protocol/src/server/play/s_interact.rs index 3251f6edf..0f974aaf3 100644 --- a/pumpkin-protocol/src/server/play/s_interact.rs +++ b/pumpkin-protocol/src/server/play/s_interact.rs @@ -1,6 +1,6 @@ use bytes::Buf; -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::server_packet; +use pumpkin_util::math::vector3::Vector3; use crate::{ bytebuf::{ByteBuf, ReadingError}, diff --git a/pumpkin-protocol/src/server/play/s_pick_item.rs b/pumpkin-protocol/src/server/play/s_pick_item.rs index 8ff25b1d3..38f7827a9 100644 --- a/pumpkin-protocol/src/server/play/s_pick_item.rs +++ b/pumpkin-protocol/src/server/play/s_pick_item.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::position::WorldPosition; use pumpkin_macros::server_packet; +use pumpkin_util::math::position::WorldPosition; use serde::Deserialize; #[derive(Deserialize)] diff --git a/pumpkin-protocol/src/server/play/s_player_action.rs b/pumpkin-protocol/src/server/play/s_player_action.rs index 55ceb4dfd..875208d26 100644 --- a/pumpkin-protocol/src/server/play/s_player_action.rs +++ b/pumpkin-protocol/src/server/play/s_player_action.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::position::WorldPosition; use pumpkin_macros::server_packet; +use pumpkin_util::math::position::WorldPosition; use crate::VarInt; diff --git a/pumpkin-protocol/src/server/play/s_player_position.rs b/pumpkin-protocol/src/server/play/s_player_position.rs index ea0b6a74b..2af449ada 100644 --- a/pumpkin-protocol/src/server/play/s_player_position.rs +++ b/pumpkin-protocol/src/server/play/s_player_position.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::server_packet; +use pumpkin_util::math::vector3::Vector3; #[derive(serde::Deserialize)] #[server_packet("play:move_player_pos")] 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 0b4453558..98ad4b003 100644 --- a/pumpkin-protocol/src/server/play/s_player_position_rotation.rs +++ b/pumpkin-protocol/src/server/play/s_player_position_rotation.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::server_packet; +use pumpkin_util::math::vector3::Vector3; #[derive(serde::Deserialize)] #[server_packet("play:move_player_pos_rot")] 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 6ad28fb65..adf022a17 100644 --- a/pumpkin-protocol/src/server/play/s_use_item_on.rs +++ b/pumpkin-protocol/src/server/play/s_use_item_on.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::{position::WorldPosition, vector3::Vector3}; use pumpkin_macros::server_packet; +use pumpkin_util::math::{position::WorldPosition, vector3::Vector3}; use serde::Deserialize; use crate::VarInt; diff --git a/pumpkin-registry/Cargo.toml b/pumpkin-registry/Cargo.toml index a90646d70..c63200dd0 100644 --- a/pumpkin-registry/Cargo.toml +++ b/pumpkin-registry/Cargo.toml @@ -6,7 +6,7 @@ edition.workspace = true [dependencies] pumpkin-protocol = { path = "../pumpkin-protocol" } pumpkin-nbt = { path = "../pumpkin-nbt" } -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } indexmap = { version = "2.7.0", features = ["serde"] } diff --git a/pumpkin-registry/src/chat_type.rs b/pumpkin-registry/src/chat_type.rs index 93b46e89e..9fb57264a 100644 --- a/pumpkin-registry/src/chat_type.rs +++ b/pumpkin-registry/src/chat_type.rs @@ -1,4 +1,4 @@ -use pumpkin_core::text::style::Style; +use pumpkin_util::text::style::Style; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/pumpkin-core/Cargo.toml b/pumpkin-util/Cargo.toml similarity index 91% rename from pumpkin-core/Cargo.toml rename to pumpkin-util/Cargo.toml index 71888b00d..5a0a924c7 100644 --- a/pumpkin-core/Cargo.toml +++ b/pumpkin-util/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pumpkin-core" +name = "pumpkin-util" version.workspace = true edition.workspace = true diff --git a/pumpkin-core/src/gamemode.rs b/pumpkin-util/src/gamemode.rs similarity index 100% rename from pumpkin-core/src/gamemode.rs rename to pumpkin-util/src/gamemode.rs diff --git a/pumpkin-core/src/lib.rs b/pumpkin-util/src/lib.rs similarity index 100% rename from pumpkin-core/src/lib.rs rename to pumpkin-util/src/lib.rs diff --git a/pumpkin-core/src/math/boundingbox.rs b/pumpkin-util/src/math/boundingbox.rs similarity index 100% rename from pumpkin-core/src/math/boundingbox.rs rename to pumpkin-util/src/math/boundingbox.rs diff --git a/pumpkin-core/src/math/mod.rs b/pumpkin-util/src/math/mod.rs similarity index 100% rename from pumpkin-core/src/math/mod.rs rename to pumpkin-util/src/math/mod.rs diff --git a/pumpkin-core/src/math/position.rs b/pumpkin-util/src/math/position.rs similarity index 100% rename from pumpkin-core/src/math/position.rs rename to pumpkin-util/src/math/position.rs diff --git a/pumpkin-core/src/math/vector2.rs b/pumpkin-util/src/math/vector2.rs similarity index 100% rename from pumpkin-core/src/math/vector2.rs rename to pumpkin-util/src/math/vector2.rs diff --git a/pumpkin-core/src/math/vector3.rs b/pumpkin-util/src/math/vector3.rs similarity index 100% rename from pumpkin-core/src/math/vector3.rs rename to pumpkin-util/src/math/vector3.rs diff --git a/pumpkin-core/src/math/voxel_shape.rs b/pumpkin-util/src/math/voxel_shape.rs similarity index 100% rename from pumpkin-core/src/math/voxel_shape.rs rename to pumpkin-util/src/math/voxel_shape.rs diff --git a/pumpkin-core/src/permission.rs b/pumpkin-util/src/permission.rs similarity index 100% rename from pumpkin-core/src/permission.rs rename to pumpkin-util/src/permission.rs diff --git a/pumpkin-core/src/random/gaussian.rs b/pumpkin-util/src/random/gaussian.rs similarity index 100% rename from pumpkin-core/src/random/gaussian.rs rename to pumpkin-util/src/random/gaussian.rs diff --git a/pumpkin-core/src/random/legacy_rand.rs b/pumpkin-util/src/random/legacy_rand.rs similarity index 100% rename from pumpkin-core/src/random/legacy_rand.rs rename to pumpkin-util/src/random/legacy_rand.rs diff --git a/pumpkin-core/src/random/mod.rs b/pumpkin-util/src/random/mod.rs similarity index 100% rename from pumpkin-core/src/random/mod.rs rename to pumpkin-util/src/random/mod.rs diff --git a/pumpkin-core/src/random/xoroshiro128.rs b/pumpkin-util/src/random/xoroshiro128.rs similarity index 100% rename from pumpkin-core/src/random/xoroshiro128.rs rename to pumpkin-util/src/random/xoroshiro128.rs diff --git a/pumpkin-core/src/text/README.md b/pumpkin-util/src/text/README.md similarity index 100% rename from pumpkin-core/src/text/README.md rename to pumpkin-util/src/text/README.md diff --git a/pumpkin-core/src/text/click.rs b/pumpkin-util/src/text/click.rs similarity index 100% rename from pumpkin-core/src/text/click.rs rename to pumpkin-util/src/text/click.rs diff --git a/pumpkin-core/src/text/color.rs b/pumpkin-util/src/text/color.rs similarity index 100% rename from pumpkin-core/src/text/color.rs rename to pumpkin-util/src/text/color.rs diff --git a/pumpkin-core/src/text/hover.rs b/pumpkin-util/src/text/hover.rs similarity index 100% rename from pumpkin-core/src/text/hover.rs rename to pumpkin-util/src/text/hover.rs diff --git a/pumpkin-core/src/text/mod.rs b/pumpkin-util/src/text/mod.rs similarity index 100% rename from pumpkin-core/src/text/mod.rs rename to pumpkin-util/src/text/mod.rs diff --git a/pumpkin-core/src/text/style.rs b/pumpkin-util/src/text/style.rs similarity index 100% rename from pumpkin-core/src/text/style.rs rename to pumpkin-util/src/text/style.rs diff --git a/pumpkin-world/Cargo.toml b/pumpkin-world/Cargo.toml index b84d88655..391f13f0c 100644 --- a/pumpkin-world/Cargo.toml +++ b/pumpkin-world/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true [dependencies] pumpkin-nbt = { path = "../pumpkin-nbt" } -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } pumpkin-config = { path = "../pumpkin-config" } pumpkin-macros = { path = "../pumpkin-macros" } diff --git a/pumpkin-world/src/block/mod.rs b/pumpkin-world/src/block/mod.rs index 01fbb97c2..2a40622d0 100644 --- a/pumpkin-world/src/block/mod.rs +++ b/pumpkin-world/src/block/mod.rs @@ -1,7 +1,7 @@ pub mod block_registry; pub mod block_state; -use pumpkin_core::math::vector3::Vector3; +use pumpkin_util::math::vector3::Vector3; pub use block_state::BlockState; diff --git a/pumpkin-world/src/chunk/anvil.rs b/pumpkin-world/src/chunk/anvil.rs index 926c65beb..ad2a3c25a 100644 --- a/pumpkin-world/src/chunk/anvil.rs +++ b/pumpkin-world/src/chunk/anvil.rs @@ -2,7 +2,7 @@ use bytes::*; use fastnbt::LongArray; use flate2::bufread::{GzDecoder, GzEncoder, ZlibDecoder, ZlibEncoder}; use indexmap::IndexMap; -use pumpkin_core::math::ceil_log2; +use pumpkin_util::math::ceil_log2; use std::time::{SystemTime, UNIX_EPOCH}; use std::{ collections::HashSet, @@ -135,7 +135,7 @@ impl ChunkReader for AnvilChunkFormat { fn read_chunk( &self, save_file: &LevelFolder, - at: &pumpkin_core::math::vector2::Vector2, + at: &pumpkin_util::math::vector2::Vector2, ) -> Result { let region = (at.x >> 5, at.z >> 5); @@ -219,7 +219,7 @@ impl ChunkWriter for AnvilChunkFormat { &self, chunk_data: &ChunkData, level_folder: &LevelFolder, - at: &pumpkin_core::math::vector2::Vector2, + at: &pumpkin_util::math::vector2::Vector2, ) -> Result<(), super::ChunkWritingError> { let region = (at.x >> 5, at.z >> 5); @@ -477,7 +477,7 @@ impl AnvilChunkFormat { #[cfg(test)] mod tests { - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; use std::fs; use std::path::PathBuf; diff --git a/pumpkin-world/src/chunk/mod.rs b/pumpkin-world/src/chunk/mod.rs index 2281f57ba..68a87ffed 100644 --- a/pumpkin-world/src/chunk/mod.rs +++ b/pumpkin-world/src/chunk/mod.rs @@ -1,5 +1,5 @@ use fastnbt::LongArray; -use pumpkin_core::math::{ceil_log2, vector2::Vector2}; +use pumpkin_util::math::{ceil_log2, vector2::Vector2}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, iter::repeat_with}; use thiserror::Error; diff --git a/pumpkin-world/src/coordinates.rs b/pumpkin-world/src/coordinates.rs index 87d9e0902..74f3c4bb5 100644 --- a/pumpkin-world/src/coordinates.rs +++ b/pumpkin-world/src/coordinates.rs @@ -3,8 +3,8 @@ use std::ops::Deref; use crate::{WORLD_LOWEST_Y, WORLD_MAX_Y}; use derive_more::derive::{AsMut, AsRef, Display, Into}; use num_traits::{PrimInt, Signed, Unsigned}; -use pumpkin_core::math::vector2::Vector2; -use pumpkin_core::math::vector3::Vector3; +use pumpkin_util::math::vector2::Vector2; +use pumpkin_util::math::vector3::Vector3; use serde::{Deserialize, Serialize}; #[derive( diff --git a/pumpkin-world/src/cylindrical_chunk_iterator.rs b/pumpkin-world/src/cylindrical_chunk_iterator.rs index d8b65fe34..c588e86f1 100644 --- a/pumpkin-world/src/cylindrical_chunk_iterator.rs +++ b/pumpkin-world/src/cylindrical_chunk_iterator.rs @@ -1,6 +1,6 @@ use std::num::NonZeroU8; -use pumpkin_core::math::vector2::Vector2; +use pumpkin_util::math::vector2::Vector2; #[derive(Debug, Clone, Copy, PartialEq)] pub struct Cylindrical { @@ -87,7 +87,7 @@ mod test { use std::num::NonZeroU8; use super::Cylindrical; - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; #[test] fn test_bounds() { diff --git a/pumpkin-world/src/generation/aquifer_sampler.rs b/pumpkin-world/src/generation/aquifer_sampler.rs index 8dfb46469..06e7d1492 100644 --- a/pumpkin-world/src/generation/aquifer_sampler.rs +++ b/pumpkin-world/src/generation/aquifer_sampler.rs @@ -1,6 +1,6 @@ use enum_dispatch::enum_dispatch; use num_traits::PrimInt; -use pumpkin_core::{ +use pumpkin_util::{ math::{floor_div, vector2::Vector2, vector3::Vector3}, random::RandomDeriver, }; @@ -657,7 +657,7 @@ pub trait AquiferSamplerImpl { #[cfg(test)] mod test { - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; use crate::{ block::BlockState, diff --git a/pumpkin-world/src/generation/chunk_noise.rs b/pumpkin-world/src/generation/chunk_noise.rs index cab1abf04..1fb28be46 100644 --- a/pumpkin-world/src/generation/chunk_noise.rs +++ b/pumpkin-world/src/generation/chunk_noise.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, hash::Hash, mem, num::Wrapping, ops::AddAssign, sync::Arc}; use num_traits::Zero; -use pumpkin_core::math::{floor_div, vector2::Vector2, vector3::Vector3}; use pumpkin_macros::block_state; +use pumpkin_util::math::{floor_div, vector2::Vector2, vector3::Vector3}; use crate::{ block::BlockState, @@ -1377,7 +1377,7 @@ impl ChunkNoiseGenerator { #[cfg(test)] mod test { - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; use crate::generation::{ aquifer_sampler::{FluidLevel, FluidLevelSampler}, diff --git a/pumpkin-world/src/generation/generator.rs b/pumpkin-world/src/generation/generator.rs index 754051a04..56bfd4d40 100644 --- a/pumpkin-world/src/generation/generator.rs +++ b/pumpkin-world/src/generation/generator.rs @@ -1,6 +1,6 @@ use noise::Perlin; -use pumpkin_core::math::vector2::Vector2; -use pumpkin_core::math::vector3::Vector3; +use pumpkin_util::math::vector2::Vector2; +use pumpkin_util::math::vector3::Vector3; use crate::biome::Biome; use crate::block::block_state::BlockState; diff --git a/pumpkin-world/src/generation/generic_generator.rs b/pumpkin-world/src/generation/generic_generator.rs index a6710e2b8..11e2b8fe8 100644 --- a/pumpkin-world/src/generation/generic_generator.rs +++ b/pumpkin-world/src/generation/generic_generator.rs @@ -1,5 +1,5 @@ use noise::{NoiseFn, Perlin}; -use pumpkin_core::math::vector2::Vector2; +use pumpkin_util::math::vector2::Vector2; use crate::{ chunk::{ChunkData, Subchunks}, diff --git a/pumpkin-world/src/generation/implementation/overworld/biome/plains.rs b/pumpkin-world/src/generation/implementation/overworld/biome/plains.rs index 38618143d..48f5d0e8d 100644 --- a/pumpkin-world/src/generation/implementation/overworld/biome/plains.rs +++ b/pumpkin-world/src/generation/implementation/overworld/biome/plains.rs @@ -1,6 +1,6 @@ use noise::Perlin; -use pumpkin_core::math::vector2::Vector2; use pumpkin_macros::block_state; +use pumpkin_util::math::vector2::Vector2; use rand::Rng; use crate::{ diff --git a/pumpkin-world/src/generation/implementation/superflat.rs b/pumpkin-world/src/generation/implementation/superflat.rs index 4e12eba77..32f1c7376 100644 --- a/pumpkin-world/src/generation/implementation/superflat.rs +++ b/pumpkin-world/src/generation/implementation/superflat.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::vector2::Vector2; +use pumpkin_util::math::vector2::Vector2; use crate::{ biome::Biome, @@ -45,7 +45,7 @@ impl TerrainGenerator for SuperflatTerrainGenerator { fn generate_block( &self, _chunk_pos: &Vector2, - _at: pumpkin_core::math::vector3::Vector3, + _at: pumpkin_util::math::vector3::Vector3, _biome: Biome, ) -> BlockState { todo!() diff --git a/pumpkin-world/src/generation/implementation/test.rs b/pumpkin-world/src/generation/implementation/test.rs index e94865459..ac5173d8f 100644 --- a/pumpkin-world/src/generation/implementation/test.rs +++ b/pumpkin-world/src/generation/implementation/test.rs @@ -5,7 +5,7 @@ use std::{ use dashmap::{DashMap, Entry}; use num_traits::Zero; -use pumpkin_core::math::{vector2::Vector2, vector3::Vector3}; +use pumpkin_util::math::{vector2::Vector2, vector3::Vector3}; use crate::{ biome::Biome, diff --git a/pumpkin-world/src/generation/noise/config.rs b/pumpkin-world/src/generation/noise/config.rs index a1e16a0f8..bcd3117b6 100644 --- a/pumpkin-world/src/generation/noise/config.rs +++ b/pumpkin-world/src/generation/noise/config.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::Arc}; -use pumpkin_core::random::{ +use pumpkin_util::random::{ legacy_rand::LegacyRand, xoroshiro128::Xoroshiro, RandomDeriver, RandomGenerator, RandomImpl, }; @@ -145,7 +145,7 @@ impl NoiseConfig { mod test { use std::{fs, path::Path}; - use pumpkin_core::{ + use pumpkin_util::{ assert_eq_delta, random::{xoroshiro128::Xoroshiro, RandomDeriver, RandomImpl}, }; diff --git a/pumpkin-world/src/generation/noise/density/component_functions.rs b/pumpkin-world/src/generation/noise/density/component_functions.rs index 036c4eba0..31fdee016 100644 --- a/pumpkin-world/src/generation/noise/density/component_functions.rs +++ b/pumpkin-world/src/generation/noise/density/component_functions.rs @@ -951,7 +951,7 @@ impl ComponentReference for MutableComponentRe mod test { use std::sync::Arc; - use pumpkin_core::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; + use pumpkin_util::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; use crate::generation::noise::{ built_in_noise_params, diff --git a/pumpkin-world/src/generation/noise/density/end.rs b/pumpkin-world/src/generation/noise/density/end.rs index c1c3db33d..c56cc519b 100644 --- a/pumpkin-world/src/generation/noise/density/end.rs +++ b/pumpkin-world/src/generation/noise/density/end.rs @@ -1,4 +1,4 @@ -use pumpkin_core::random::{legacy_rand::LegacyRand, RandomImpl}; +use pumpkin_util::random::{legacy_rand::LegacyRand, RandomImpl}; use crate::generation::noise::simplex::SimplexNoiseSampler; diff --git a/pumpkin-world/src/generation/noise/density/mod.rs b/pumpkin-world/src/generation/noise/density/mod.rs index e789b3bd0..b38e864bb 100644 --- a/pumpkin-world/src/generation/noise/density/mod.rs +++ b/pumpkin-world/src/generation/noise/density/mod.rs @@ -79,7 +79,7 @@ pub mod built_in_density_function { use crate::generation::noise::built_in_noise_params::{self}; use crate::generation::positions::{MAX_COLUMN_HEIGHT, MIN_HEIGHT}; - use pumpkin_core::math::floor_div; + use pumpkin_util::math::floor_div; use super::{apply_blending, noise_in_range, vertical_range_choice}; @@ -875,7 +875,7 @@ pub fn lerp_density_static_start( mod test { use std::sync::Arc; - use pumpkin_core::random::{ + use pumpkin_util::random::{ legacy_rand::LegacyRand, RandomDeriver, RandomDeriverImpl, RandomImpl, }; diff --git a/pumpkin-world/src/generation/noise/density/noise.rs b/pumpkin-world/src/generation/noise/density/noise.rs index 1fe139376..9eeb070b1 100644 --- a/pumpkin-world/src/generation/noise/density/noise.rs +++ b/pumpkin-world/src/generation/noise/density/noise.rs @@ -1,6 +1,6 @@ use std::{marker::PhantomData, sync::Arc}; -use pumpkin_core::random::{xoroshiro128::Xoroshiro, RandomGenerator, RandomImpl}; +use pumpkin_util::random::{xoroshiro128::Xoroshiro, RandomGenerator, RandomImpl}; use crate::{ generation::noise::{ diff --git a/pumpkin-world/src/generation/noise/density/spline.rs b/pumpkin-world/src/generation/noise/density/spline.rs index 142079a9d..ceea9902f 100644 --- a/pumpkin-world/src/generation/noise/density/spline.rs +++ b/pumpkin-world/src/generation/noise/density/spline.rs @@ -742,7 +742,7 @@ impl SplineBuilder { #[cfg(test)] mod test { - use pumpkin_core::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; + use pumpkin_util::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; use crate::generation::noise::density::{ built_in_density_function::CONTINENTS_OVERWORLD, diff --git a/pumpkin-world/src/generation/noise/density/terrain_helpers.rs b/pumpkin-world/src/generation/noise/density/terrain_helpers.rs index cc8ad7040..1ad12dd21 100644 --- a/pumpkin-world/src/generation/noise/density/terrain_helpers.rs +++ b/pumpkin-world/src/generation/noise/density/terrain_helpers.rs @@ -521,7 +521,7 @@ pub fn create_jaggedness_spline( #[cfg(test)] mod test { - use pumpkin_core::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; + use pumpkin_util::random::{legacy_rand::LegacyRand, RandomDeriver, RandomImpl}; use crate::generation::noise::density::{ built_in_density_function::{ diff --git a/pumpkin-world/src/generation/noise/perlin.rs b/pumpkin-world/src/generation/noise/perlin.rs index 4e8de285c..630aa006a 100644 --- a/pumpkin-world/src/generation/noise/perlin.rs +++ b/pumpkin-world/src/generation/noise/perlin.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use num_traits::Pow; -use pumpkin_core::random::RandomGenerator; +use pumpkin_util::random::RandomGenerator; use super::{lerp3, GRADIENTS}; @@ -377,7 +377,7 @@ impl DoublePerlinNoiseSampler { #[cfg(test)] mod double_perlin_noise_sampler_test { - use pumpkin_core::random::{ + use pumpkin_util::random::{ legacy_rand::LegacyRand, xoroshiro128::Xoroshiro, RandomGenerator, RandomImpl, }; @@ -582,7 +582,7 @@ mod double_perlin_noise_sampler_test { #[cfg(test)] mod octave_perline_noise_sampler_test { - use pumpkin_core::random::{ + use pumpkin_util::random::{ legacy_rand::LegacyRand, xoroshiro128::Xoroshiro, RandomGenerator, RandomImpl, }; @@ -755,7 +755,7 @@ mod octave_perline_noise_sampler_test { mod perlin_noise_sampler_test { use std::{fs, path::Path}; - use pumpkin_core::{ + use pumpkin_util::{ assert_eq_delta, random::{xoroshiro128::Xoroshiro, RandomDeriverImpl, RandomGenerator, RandomImpl}, }; diff --git a/pumpkin-world/src/generation/noise/router.rs b/pumpkin-world/src/generation/noise/router.rs index cb8093c16..d5cd23559 100644 --- a/pumpkin-world/src/generation/noise/router.rs +++ b/pumpkin-world/src/generation/noise/router.rs @@ -470,7 +470,7 @@ fn create_caves(sloped_cheese: SharedComponentReference) -> SharedComponentRefer mod test { use std::{fs, path::Path, sync::Arc}; - use pumpkin_core::{ + use pumpkin_util::{ assert_eq_delta, random::{legacy_rand::LegacyRand, xoroshiro128::Xoroshiro, RandomDeriver, RandomImpl}, }; diff --git a/pumpkin-world/src/generation/noise/simplex.rs b/pumpkin-world/src/generation/noise/simplex.rs index c69128c3c..b4dcb55d9 100644 --- a/pumpkin-world/src/generation/noise/simplex.rs +++ b/pumpkin-world/src/generation/noise/simplex.rs @@ -1,7 +1,7 @@ use std::hash::Hash; use num_traits::Pow; -use pumpkin_core::random::{legacy_rand::LegacyRand, RandomImpl}; +use pumpkin_util::random::{legacy_rand::LegacyRand, RandomImpl}; use super::GRADIENTS; @@ -274,7 +274,7 @@ impl OctaveSimplexNoiseSampler { #[cfg(test)] mod octave_simplex_noise_sampler_test { - use pumpkin_core::random::{xoroshiro128::Xoroshiro, RandomImpl}; + use pumpkin_util::random::{xoroshiro128::Xoroshiro, RandomImpl}; use crate::generation::noise::simplex::OctaveSimplexNoiseSampler; @@ -411,7 +411,7 @@ mod octave_simplex_noise_sampler_test { mod simplex_noise_sampler_test { use std::ops::Deref; - use pumpkin_core::random::{xoroshiro128::Xoroshiro, RandomImpl}; + use pumpkin_util::random::{xoroshiro128::Xoroshiro, RandomImpl}; use crate::generation::noise::simplex::SimplexNoiseSampler; diff --git a/pumpkin-world/src/generation/ore_sampler.rs b/pumpkin-world/src/generation/ore_sampler.rs index 36f6867b5..22a2dba38 100644 --- a/pumpkin-world/src/generation/ore_sampler.rs +++ b/pumpkin-world/src/generation/ore_sampler.rs @@ -1,4 +1,4 @@ -use pumpkin_core::random::RandomDeriver; +use pumpkin_util::random::RandomDeriver; use crate::block::BlockState; diff --git a/pumpkin-world/src/generation/positions.rs b/pumpkin-world/src/generation/positions.rs index 27d30467c..6cb79d352 100644 --- a/pumpkin-world/src/generation/positions.rs +++ b/pumpkin-world/src/generation/positions.rs @@ -1,7 +1,7 @@ -use pumpkin_core::math::{floor_log2, smallest_encompassing_power_of_two}; +use pumpkin_util::math::{floor_log2, smallest_encompassing_power_of_two}; pub mod block_pos { - use pumpkin_core::math::vector3::Vector3; + use pumpkin_util::math::vector3::Vector3; use super::{ BITS_X, BITS_Y, BITS_Z, BIT_SHIFT_X, BIT_SHIFT_Z, SIZE_BITS_X, SIZE_BITS_Y, SIZE_BITS_Z, @@ -34,7 +34,7 @@ pub mod block_pos { } pub mod chunk_pos { - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; // A chunk outside of normal bounds pub const MARKER: u64 = packed(&Vector2::new(1875066, 1875066)); @@ -89,7 +89,7 @@ pub const MIN_HEIGHT_CELL: i32 = MIN_HEIGHT << 4; #[cfg(test)] mod test { - use pumpkin_core::math::{vector2::Vector2, vector3::Vector3}; + use pumpkin_util::math::{vector2::Vector2, vector3::Vector3}; use super::{block_pos, chunk_pos}; diff --git a/pumpkin-world/src/generation/proto_chunk.rs b/pumpkin-world/src/generation/proto_chunk.rs index 056a702f4..4c7c3196f 100644 --- a/pumpkin-world/src/generation/proto_chunk.rs +++ b/pumpkin-world/src/generation/proto_chunk.rs @@ -1,4 +1,4 @@ -use pumpkin_core::math::{vector2::Vector2, vector3::Vector3}; +use pumpkin_util::math::{vector2::Vector2, vector3::Vector3}; use crate::{ block::BlockState, @@ -216,7 +216,7 @@ impl ProtoChunk { mod test { use std::{fs, path::Path}; - use pumpkin_core::math::vector2::Vector2; + use pumpkin_util::math::vector2::Vector2; use crate::read_data_from_file; diff --git a/pumpkin-world/src/generation/seed.rs b/pumpkin-world/src/generation/seed.rs index 1d9aa9cbf..fb39f7e32 100644 --- a/pumpkin-world/src/generation/seed.rs +++ b/pumpkin-world/src/generation/seed.rs @@ -1,4 +1,4 @@ -use pumpkin_core::random::{get_seed, java_string_hash, legacy_rand::LegacyRand, RandomImpl}; +use pumpkin_util::random::{get_seed, java_string_hash, legacy_rand::LegacyRand, RandomImpl}; #[derive(Clone, Copy)] pub struct Seed(pub u64); diff --git a/pumpkin-world/src/level.rs b/pumpkin-world/src/level.rs index 2a26dbf91..0f705129b 100644 --- a/pumpkin-world/src/level.rs +++ b/pumpkin-world/src/level.rs @@ -2,7 +2,7 @@ use std::{path::PathBuf, sync::Arc}; use dashmap::{DashMap, Entry}; use num_traits::Zero; -use pumpkin_core::math::vector2::Vector2; +use pumpkin_util::math::vector2::Vector2; use rayon::iter::{IntoParallelRefIterator, ParallelIterator}; use tokio::{ runtime::Handle, diff --git a/pumpkin-world/src/lib.rs b/pumpkin-world/src/lib.rs index c80fa97a9..2582a37a4 100644 --- a/pumpkin-world/src/lib.rs +++ b/pumpkin-world/src/lib.rs @@ -5,7 +5,7 @@ use generation::{ noise::{config::NoiseConfig, router::OVERWORLD_NOISE_ROUTER}, proto_chunk::{ProtoChunk, StandardChunkFluidLevelSampler}, }; -use pumpkin_core::math::vector2::Vector2; +use pumpkin_util::math::vector2::Vector2; pub mod biome; pub mod block; diff --git a/pumpkin-world/src/world_info/mod.rs b/pumpkin-world/src/world_info/mod.rs index d06be497b..9e5d5c312 100644 --- a/pumpkin-world/src/world_info/mod.rs +++ b/pumpkin-world/src/world_info/mod.rs @@ -1,5 +1,5 @@ use pumpkin_config::BASIC_CONFIG; -use pumpkin_core::Difficulty; +use pumpkin_util::Difficulty; use serde::{Deserialize, Serialize}; use thiserror::Error; diff --git a/pumpkin/Cargo.toml b/pumpkin/Cargo.toml index 54fe88a13..f0cef7ae4 100644 --- a/pumpkin/Cargo.toml +++ b/pumpkin/Cargo.toml @@ -12,7 +12,7 @@ LegalCopyright = "Copyright © 2025 Aleksander Medvedev" [dependencies] # pumpkin -pumpkin-core = { path = "../pumpkin-core" } +pumpkin-util = { path = "../pumpkin-util" } pumpkin-config = { path = "../pumpkin-config" } pumpkin-inventory = { path = "../pumpkin-inventory" } pumpkin-world = { path = "../pumpkin-world" } diff --git a/pumpkin/src/block/block_manager.rs b/pumpkin/src/block/block_manager.rs index 0fb26ede3..b3034c04d 100644 --- a/pumpkin/src/block/block_manager.rs +++ b/pumpkin/src/block/block_manager.rs @@ -1,8 +1,8 @@ use crate::block::pumpkin_block::{BlockMetadata, PumpkinBlock}; use crate::entity::player::Player; use crate::server::Server; -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::OpenContainer; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::item_registry::Item; use std::collections::HashMap; diff --git a/pumpkin/src/block/blocks/chest.rs b/pumpkin/src/block/blocks/chest.rs index 5a83570ee..8aa3329cb 100644 --- a/pumpkin/src/block/blocks/chest.rs +++ b/pumpkin/src/block/blocks/chest.rs @@ -1,8 +1,8 @@ use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::{Chest, OpenContainer, WindowType}; use pumpkin_macros::{pumpkin_block, sound}; use pumpkin_protocol::{client::play::CBlockAction, codec::var_int::VarInt}; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::{ block::block_registry::{get_block, Block}, item::item_registry::Item, diff --git a/pumpkin/src/block/blocks/crafting_table.rs b/pumpkin/src/block/blocks/crafting_table.rs index c879f0601..2538286b4 100644 --- a/pumpkin/src/block/blocks/crafting_table.rs +++ b/pumpkin/src/block/blocks/crafting_table.rs @@ -3,9 +3,9 @@ use crate::block::pumpkin_block::PumpkinBlock; use crate::entity::player::Player; use crate::server::Server; use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::{CraftingTable, OpenContainer, WindowType}; use pumpkin_macros::pumpkin_block; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::{block::block_registry::Block, item::item_registry::Item}; #[pumpkin_block("minecraft:crafting_table")] diff --git a/pumpkin/src/block/blocks/furnace.rs b/pumpkin/src/block/blocks/furnace.rs index 1ecdf9950..61921fcb4 100644 --- a/pumpkin/src/block/blocks/furnace.rs +++ b/pumpkin/src/block/blocks/furnace.rs @@ -1,10 +1,10 @@ use crate::block::block_manager::BlockActionResult; use crate::entity::player::Player; use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::Furnace; use pumpkin_inventory::WindowType; use pumpkin_macros::pumpkin_block; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::item_registry::Item; diff --git a/pumpkin/src/block/blocks/jukebox.rs b/pumpkin/src/block/blocks/jukebox.rs index 4836c4be7..4588c4dc2 100644 --- a/pumpkin/src/block/blocks/jukebox.rs +++ b/pumpkin/src/block/blocks/jukebox.rs @@ -3,9 +3,9 @@ use crate::block::pumpkin_block::PumpkinBlock; use crate::entity::player::Player; use crate::server::Server; use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; use pumpkin_macros::pumpkin_block; use pumpkin_registry::SYNCED_REGISTRIES; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::item_registry::Item; diff --git a/pumpkin/src/block/blocks/mod.rs b/pumpkin/src/block/blocks/mod.rs index b0b128028..a926ad71b 100644 --- a/pumpkin/src/block/blocks/mod.rs +++ b/pumpkin/src/block/blocks/mod.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::{Container, OpenContainer, WindowType}; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use crate::{entity::player::Player, server::Server}; diff --git a/pumpkin/src/block/pumpkin_block.rs b/pumpkin/src/block/pumpkin_block.rs index 90de57189..364875bac 100644 --- a/pumpkin/src/block/pumpkin_block.rs +++ b/pumpkin/src/block/pumpkin_block.rs @@ -2,8 +2,8 @@ use crate::block::block_manager::BlockActionResult; use crate::entity::player::Player; use crate::server::Server; use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; use pumpkin_inventory::OpenContainer; +use pumpkin_util::math::position::WorldPosition; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::item_registry::Item; diff --git a/pumpkin/src/command/args/arg_gamemode.rs b/pumpkin/src/command/args/arg_gamemode.rs index 77d5199df..df75ddd81 100644 --- a/pumpkin/src/command/args/arg_gamemode.rs +++ b/pumpkin/src/command/args/arg_gamemode.rs @@ -1,10 +1,10 @@ use std::str::FromStr; use async_trait::async_trait; -use pumpkin_core::GameMode; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::GameMode; use crate::{ command::{dispatcher::CommandError, tree::RawArgs, CommandSender}, diff --git a/pumpkin/src/command/args/arg_position_2d.rs b/pumpkin/src/command/args/arg_position_2d.rs index e97dbda5b..0e875694e 100644 --- a/pumpkin/src/command/args/arg_position_2d.rs +++ b/pumpkin/src/command/args/arg_position_2d.rs @@ -1,9 +1,9 @@ use async_trait::async_trait; -use pumpkin_core::math::vector2::Vector2; -use pumpkin_core::math::vector3::Vector3; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::math::vector2::Vector2; +use pumpkin_util::math::vector3::Vector3; use crate::command::dispatcher::CommandError; use crate::command::tree::RawArgs; diff --git a/pumpkin/src/command/args/arg_position_3d.rs b/pumpkin/src/command/args/arg_position_3d.rs index d8b0fef32..70b6d5367 100644 --- a/pumpkin/src/command/args/arg_position_3d.rs +++ b/pumpkin/src/command/args/arg_position_3d.rs @@ -1,8 +1,8 @@ use async_trait::async_trait; -use pumpkin_core::math::vector3::Vector3; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::math::vector3::Vector3; use crate::command::dispatcher::CommandError; use crate::command::tree::RawArgs; diff --git a/pumpkin/src/command/args/arg_position_block.rs b/pumpkin/src/command/args/arg_position_block.rs index 07001b00d..f692dc8d8 100644 --- a/pumpkin/src/command/args/arg_position_block.rs +++ b/pumpkin/src/command/args/arg_position_block.rs @@ -1,9 +1,9 @@ use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; -use pumpkin_core::math::vector3::Vector3; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::math::position::WorldPosition; +use pumpkin_util::math::vector3::Vector3; use crate::command::dispatcher::CommandError; use crate::command::tree::RawArgs; diff --git a/pumpkin/src/command/args/arg_textcomponent.rs b/pumpkin/src/command/args/arg_textcomponent.rs index fbe8ba97a..940cde153 100644 --- a/pumpkin/src/command/args/arg_textcomponent.rs +++ b/pumpkin/src/command/args/arg_textcomponent.rs @@ -4,10 +4,10 @@ use crate::command::tree::RawArgs; use crate::command::CommandSender; use crate::server::Server; use async_trait::async_trait; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::text::TextComponent; pub(crate) struct TextComponentArgConsumer; diff --git a/pumpkin/src/command/args/mod.rs b/pumpkin/src/command/args/mod.rs index 145aaba05..8cc7e2d4b 100644 --- a/pumpkin/src/command/args/mod.rs +++ b/pumpkin/src/command/args/mod.rs @@ -2,14 +2,14 @@ use std::{collections::HashMap, hash::Hash, sync::Arc}; use arg_bounded_num::{NotInBounds, Number}; use async_trait::async_trait; -use pumpkin_core::text::TextComponent; -use pumpkin_core::{ - math::{position::WorldPosition, vector2::Vector2, vector3::Vector3}, - GameMode, -}; use pumpkin_protocol::client::play::{ CommandSuggestion, ProtoCmdArgParser, ProtoCmdArgSuggestionType, }; +use pumpkin_util::text::TextComponent; +use pumpkin_util::{ + math::{position::WorldPosition, vector2::Vector2, vector3::Vector3}, + GameMode, +}; use super::{ dispatcher::CommandError, diff --git a/pumpkin/src/command/commands/cmd_bossbar.rs b/pumpkin/src/command/commands/cmd_bossbar.rs index 9e3291136..1ecd61102 100644 --- a/pumpkin/src/command/commands/cmd_bossbar.rs +++ b/pumpkin/src/command/commands/cmd_bossbar.rs @@ -16,8 +16,8 @@ use crate::server::Server; use crate::world::bossbar::Bossbar; use crate::world::custom_bossbar::BossbarUpdateError; use async_trait::async_trait; -use pumpkin_core::text::color::{Color, NamedColor}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::{Color, NamedColor}; +use pumpkin_util::text::TextComponent; use uuid::Uuid; const NAMES: [&str; 1] = ["bossbar"]; diff --git a/pumpkin/src/command/commands/cmd_clear.rs b/pumpkin/src/command/commands/cmd_clear.rs index 067ebf52d..e7eeed446 100644 --- a/pumpkin/src/command/commands/cmd_clear.rs +++ b/pumpkin/src/command/commands/cmd_clear.rs @@ -1,9 +1,9 @@ use std::sync::Arc; use async_trait::async_trait; -use pumpkin_core::text::color::NamedColor; -use pumpkin_core::text::TextComponent; use pumpkin_inventory::Container; +use pumpkin_util::text::color::NamedColor; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_entities::EntitiesArgumentConsumer; use crate::command::args::{Arg, ConsumedArgs}; diff --git a/pumpkin/src/command/commands/cmd_deop.rs b/pumpkin/src/command/commands/cmd_deop.rs index 8b20d28e2..78ffcfea9 100644 --- a/pumpkin/src/command/commands/cmd_deop.rs +++ b/pumpkin/src/command/commands/cmd_deop.rs @@ -8,7 +8,7 @@ use crate::{ data::{op_data::OPERATOR_CONFIG, SaveJSONConfiguration}, }; use async_trait::async_trait; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use CommandError::InvalidConsumption; const NAMES: [&str; 1] = ["deop"]; @@ -45,7 +45,7 @@ impl CommandExecutor for DeopExecutor { player .set_permission_lvl( - pumpkin_core::PermissionLvl::Zero, + pumpkin_util::PermissionLvl::Zero, &server.command_dispatcher, ) .await; diff --git a/pumpkin/src/command/commands/cmd_fill.rs b/pumpkin/src/command/commands/cmd_fill.rs index 29e4dfb01..cb84ff902 100644 --- a/pumpkin/src/command/commands/cmd_fill.rs +++ b/pumpkin/src/command/commands/cmd_fill.rs @@ -6,9 +6,9 @@ use crate::command::tree_builder::{argument, literal}; use crate::command::{CommandError, CommandExecutor, CommandSender}; use async_trait::async_trait; -use pumpkin_core::math::position::WorldPosition; -use pumpkin_core::math::vector3::Vector3; -use pumpkin_core::text::TextComponent; +use pumpkin_util::math::position::WorldPosition; +use pumpkin_util::math::vector3::Vector3; +use pumpkin_util::text::TextComponent; const NAMES: [&str; 1] = ["fill"]; diff --git a/pumpkin/src/command/commands/cmd_give.rs b/pumpkin/src/command/commands/cmd_give.rs index fcd60da15..40cd1af00 100644 --- a/pumpkin/src/command/commands/cmd_give.rs +++ b/pumpkin/src/command/commands/cmd_give.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::{Color, NamedColor}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::{Color, NamedColor}; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_bounded_num::BoundedNumArgumentConsumer; use crate::command::args::arg_item::ItemArgumentConsumer; diff --git a/pumpkin/src/command/commands/cmd_help.rs b/pumpkin/src/command/commands/cmd_help.rs index 3808c0acf..b2faf4677 100644 --- a/pumpkin/src/command/commands/cmd_help.rs +++ b/pumpkin/src/command/commands/cmd_help.rs @@ -1,7 +1,7 @@ use async_trait::async_trait; -use pumpkin_core::text::click::ClickEvent; -use pumpkin_core::text::color::{Color, NamedColor}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::click::ClickEvent; +use pumpkin_util::text::color::{Color, NamedColor}; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_bounded_num::BoundedNumArgumentConsumer; use crate::command::args::arg_command::CommandTreeArgumentConsumer; diff --git a/pumpkin/src/command/commands/cmd_kick.rs b/pumpkin/src/command/commands/cmd_kick.rs index 9a6dff636..259e536a7 100644 --- a/pumpkin/src/command/commands/cmd_kick.rs +++ b/pumpkin/src/command/commands/cmd_kick.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::NamedColor; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::NamedColor; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_players::PlayersArgumentConsumer; use crate::command::args::{Arg, ConsumedArgs}; diff --git a/pumpkin/src/command/commands/cmd_kill.rs b/pumpkin/src/command/commands/cmd_kill.rs index a29a1fbab..6b6ada252 100644 --- a/pumpkin/src/command/commands/cmd_kill.rs +++ b/pumpkin/src/command/commands/cmd_kill.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::NamedColor; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::NamedColor; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_entities::EntitiesArgumentConsumer; use crate::command::args::{Arg, ConsumedArgs}; diff --git a/pumpkin/src/command/commands/cmd_list.rs b/pumpkin/src/command/commands/cmd_list.rs index 63a8bb036..918de10cc 100644 --- a/pumpkin/src/command/commands/cmd_list.rs +++ b/pumpkin/src/command/commands/cmd_list.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use async_trait::async_trait; use pumpkin_config::BASIC_CONFIG; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use crate::{ command::{ diff --git a/pumpkin/src/command/commands/cmd_op.rs b/pumpkin/src/command/commands/cmd_op.rs index e317aedfb..91f7a05aa 100644 --- a/pumpkin/src/command/commands/cmd_op.rs +++ b/pumpkin/src/command/commands/cmd_op.rs @@ -9,7 +9,7 @@ use crate::{ }; use async_trait::async_trait; use pumpkin_config::{op::Op, BASIC_CONFIG}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use CommandError::InvalidConsumption; const NAMES: [&str; 1] = ["op"]; diff --git a/pumpkin/src/command/commands/cmd_pumpkin.rs b/pumpkin/src/command/commands/cmd_pumpkin.rs index a60c955e0..a349a1b51 100644 --- a/pumpkin/src/command/commands/cmd_pumpkin.rs +++ b/pumpkin/src/command/commands/cmd_pumpkin.rs @@ -1,8 +1,8 @@ use async_trait::async_trait; -use pumpkin_core::text::click::ClickEvent; -use pumpkin_core::text::hover::HoverEvent; -use pumpkin_core::text::{color::NamedColor, TextComponent}; use pumpkin_protocol::CURRENT_MC_PROTOCOL; +use pumpkin_util::text::click::ClickEvent; +use pumpkin_util::text::hover::HoverEvent; +use pumpkin_util::text::{color::NamedColor, TextComponent}; use std::borrow::Cow; use crate::{ diff --git a/pumpkin/src/command/commands/cmd_say.rs b/pumpkin/src/command/commands/cmd_say.rs index 893fecb8c..efb15af5c 100644 --- a/pumpkin/src/command/commands/cmd_say.rs +++ b/pumpkin/src/command/commands/cmd_say.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::client::play::CSystemChatMessage; +use pumpkin_util::text::TextComponent; use crate::command::{ args::{arg_message::MsgArgConsumer, Arg, ConsumedArgs}, diff --git a/pumpkin/src/command/commands/cmd_seed.rs b/pumpkin/src/command/commands/cmd_seed.rs index 90880f8a7..8e08291c9 100644 --- a/pumpkin/src/command/commands/cmd_seed.rs +++ b/pumpkin/src/command/commands/cmd_seed.rs @@ -2,9 +2,9 @@ use crate::command::{ args::ConsumedArgs, tree::CommandTree, CommandError, CommandExecutor, CommandSender, }; use async_trait::async_trait; -use pumpkin_core::text::click::ClickEvent; -use pumpkin_core::text::hover::HoverEvent; -use pumpkin_core::text::{color::NamedColor, TextComponent}; +use pumpkin_util::text::click::ClickEvent; +use pumpkin_util::text::hover::HoverEvent; +use pumpkin_util::text::{color::NamedColor, TextComponent}; use std::borrow::Cow; const NAMES: [&str; 1] = ["seed"]; diff --git a/pumpkin/src/command/commands/cmd_setblock.rs b/pumpkin/src/command/commands/cmd_setblock.rs index c9eb3a0ef..af85af366 100644 --- a/pumpkin/src/command/commands/cmd_setblock.rs +++ b/pumpkin/src/command/commands/cmd_setblock.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::NamedColor; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::NamedColor; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_block::BlockArgumentConsumer; use crate::command::args::arg_position_block::BlockPosArgumentConsumer; diff --git a/pumpkin/src/command/commands/cmd_stop.rs b/pumpkin/src/command/commands/cmd_stop.rs index c1f3f4f33..59bcc7dc9 100644 --- a/pumpkin/src/command/commands/cmd_stop.rs +++ b/pumpkin/src/command/commands/cmd_stop.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::NamedColor; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::NamedColor; +use pumpkin_util::text::TextComponent; use crate::command::args::ConsumedArgs; use crate::command::tree::CommandTree; diff --git a/pumpkin/src/command/commands/cmd_teleport.rs b/pumpkin/src/command/commands/cmd_teleport.rs index d5f535f14..c11eb4f63 100644 --- a/pumpkin/src/command/commands/cmd_teleport.rs +++ b/pumpkin/src/command/commands/cmd_teleport.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::math::vector3::Vector3; -use pumpkin_core::text::TextComponent; +use pumpkin_util::math::vector3::Vector3; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_entities::EntitiesArgumentConsumer; use crate::command::args::arg_entity::EntityArgumentConsumer; diff --git a/pumpkin/src/command/commands/cmd_time.rs b/pumpkin/src/command/commands/cmd_time.rs index 411dfd672..a67bd7dab 100644 --- a/pumpkin/src/command/commands/cmd_time.rs +++ b/pumpkin/src/command/commands/cmd_time.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; -use pumpkin_core::text::color::{Color, NamedColor}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::color::{Color, NamedColor}; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_bounded_num::BoundedNumArgumentConsumer; use crate::command::args::FindArgDefaultName; diff --git a/pumpkin/src/command/commands/cmd_transfer.rs b/pumpkin/src/command/commands/cmd_transfer.rs index 504739206..eedd9a02c 100644 --- a/pumpkin/src/command/commands/cmd_transfer.rs +++ b/pumpkin/src/command/commands/cmd_transfer.rs @@ -1,8 +1,8 @@ use async_trait::async_trait; -use pumpkin_core::text::color::{Color, NamedColor}; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::client::play::CTransfer; use pumpkin_protocol::codec::var_int::VarInt; +use pumpkin_util::text::color::{Color, NamedColor}; +use pumpkin_util::text::TextComponent; use crate::command::args::arg_bounded_num::BoundedNumArgumentConsumer; use crate::command::args::arg_players::PlayersArgumentConsumer; diff --git a/pumpkin/src/command/commands/cmd_worldborder.rs b/pumpkin/src/command/commands/cmd_worldborder.rs index 7ee3dbae2..c0f47997f 100644 --- a/pumpkin/src/command/commands/cmd_worldborder.rs +++ b/pumpkin/src/command/commands/cmd_worldborder.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use pumpkin_core::{ +use pumpkin_util::{ math::vector2::Vector2, text::{ color::{Color, NamedColor}, diff --git a/pumpkin/src/command/dispatcher.rs b/pumpkin/src/command/dispatcher.rs index 09151bd3c..a1d99c3bb 100644 --- a/pumpkin/src/command/dispatcher.rs +++ b/pumpkin/src/command/dispatcher.rs @@ -1,6 +1,6 @@ -use pumpkin_core::permission::PermissionLvl; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::client::play::CommandSuggestion; +use pumpkin_util::permission::PermissionLvl; +use pumpkin_util::text::TextComponent; use super::args::ConsumedArgs; @@ -11,7 +11,7 @@ use crate::command::tree::{Command, CommandTree, NodeType, RawArgs}; use crate::command::CommandSender; use crate::error::PumpkinError; use crate::server::Server; -use pumpkin_core::text::color::{Color, NamedColor}; +use pumpkin_util::text::color::{Color, NamedColor}; use std::collections::{HashMap, HashSet}; #[derive(Debug)] @@ -72,7 +72,7 @@ impl CommandDispatcher { sender .send_message( TextComponent::text(err) - .color_named(pumpkin_core::text::color::NamedColor::Red), + .color_named(pumpkin_util::text::color::NamedColor::Red), ) .await; } @@ -321,7 +321,7 @@ impl CommandDispatcher { #[cfg(test)] mod test { use crate::command::{default_dispatcher, tree::CommandTree}; - use pumpkin_core::permission::PermissionLvl; + use pumpkin_util::permission::PermissionLvl; #[test] fn test_dynamic_command() { let mut dispatcher = default_dispatcher(); diff --git a/pumpkin/src/command/mod.rs b/pumpkin/src/command/mod.rs index aa1fa56d1..313492111 100644 --- a/pumpkin/src/command/mod.rs +++ b/pumpkin/src/command/mod.rs @@ -14,9 +14,9 @@ use commands::{ cmd_op, cmd_pumpkin, cmd_say, cmd_setblock, cmd_stop, cmd_teleport, cmd_time, cmd_worldborder, }; use dispatcher::CommandError; -use pumpkin_core::math::vector3::Vector3; -use pumpkin_core::permission::PermissionLvl; -use pumpkin_core::text::TextComponent; +use pumpkin_util::math::vector3::Vector3; +use pumpkin_util::permission::PermissionLvl; +use pumpkin_util::text::TextComponent; pub mod args; pub mod client_cmd_suggestions; diff --git a/pumpkin/src/entity/ai/path/mod.rs b/pumpkin/src/entity/ai/path/mod.rs index 2329b78ce..7804869df 100644 --- a/pumpkin/src/entity/ai/path/mod.rs +++ b/pumpkin/src/entity/ai/path/mod.rs @@ -1,5 +1,5 @@ -use pumpkin_core::math::vector3::Vector3; use pumpkin_protocol::client::play::CUpdateEntityPos; +use pumpkin_util::math::vector3::Vector3; use crate::entity::living::LivingEntity; diff --git a/pumpkin/src/entity/living.rs b/pumpkin/src/entity/living.rs index 19a1bcb6e..f3c608ef7 100644 --- a/pumpkin/src/entity/living.rs +++ b/pumpkin/src/entity/living.rs @@ -1,10 +1,10 @@ use std::sync::atomic::AtomicI32; use crossbeam::atomic::AtomicCell; -use pumpkin_core::math::vector3::Vector3; use pumpkin_entity::EntityId; use pumpkin_inventory::{Container, EmptyContainer}; use pumpkin_protocol::client::play::{CDamageEvent, CEntityStatus, CSetEntityMetadata, Metadata}; +use pumpkin_util::math::vector3::Vector3; use tokio::sync::Mutex; use super::Entity; diff --git a/pumpkin/src/entity/mob/mod.rs b/pumpkin/src/entity/mob/mod.rs index 82b93a94e..eb0442cea 100644 --- a/pumpkin/src/entity/mob/mod.rs +++ b/pumpkin/src/entity/mob/mod.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use pumpkin_core::math::vector3::Vector3; use pumpkin_entity::entity_type::EntityType; +use pumpkin_util::math::vector3::Vector3; use tokio::sync::Mutex; use uuid::Uuid; use zombie::Zombie; diff --git a/pumpkin/src/entity/mob/zombie.rs b/pumpkin/src/entity/mob/zombie.rs index 554efdd43..6b903e43d 100644 --- a/pumpkin/src/entity/mob/zombie.rs +++ b/pumpkin/src/entity/mob/zombie.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use pumpkin_core::math::vector3::Vector3; use pumpkin_entity::entity_type::EntityType; +use pumpkin_util::math::vector3::Vector3; use uuid::Uuid; use crate::{ diff --git a/pumpkin/src/entity/mod.rs b/pumpkin/src/entity/mod.rs index 052d18c13..6e46b193e 100644 --- a/pumpkin/src/entity/mod.rs +++ b/pumpkin/src/entity/mod.rs @@ -2,7 +2,12 @@ use core::f32; use std::sync::{atomic::AtomicBool, Arc}; use crossbeam::atomic::AtomicCell; -use pumpkin_core::math::{ +use pumpkin_entity::{entity_type::EntityType, pose::EntityPose, EntityId}; +use pumpkin_protocol::{ + client::play::{CHeadRot, CSetEntityMetadata, CTeleportEntity, CUpdateEntityRot, Metadata}, + codec::var_int::VarInt, +}; +use pumpkin_util::math::{ boundingbox::{BoundingBox, BoundingBoxSize}, get_section_cord, position::WorldPosition, @@ -10,11 +15,6 @@ use pumpkin_core::math::{ vector3::Vector3, wrap_degrees, }; -use pumpkin_entity::{entity_type::EntityType, pose::EntityPose, EntityId}; -use pumpkin_protocol::{ - client::play::{CHeadRot, CSetEntityMetadata, CTeleportEntity, CUpdateEntityRot, Metadata}, - codec::var_int::VarInt, -}; use crate::world::World; diff --git a/pumpkin/src/entity/player.rs b/pumpkin/src/entity/player.rs index 399c174ba..b9d6fd397 100644 --- a/pumpkin/src/entity/player.rs +++ b/pumpkin/src/entity/player.rs @@ -9,17 +9,6 @@ use std::{ use crossbeam::atomic::AtomicCell; use pumpkin_config::{ADVANCED_CONFIG, BASIC_CONFIG}; -use pumpkin_core::{ - math::{ - boundingbox::{BoundingBox, BoundingBoxSize}, - position::WorldPosition, - vector2::Vector2, - vector3::Vector3, - }, - permission::PermissionLvl, - text::TextComponent, - GameMode, -}; use pumpkin_entity::{entity_type::EntityType, EntityId}; use pumpkin_inventory::player::PlayerInventory; use pumpkin_macros::sound; @@ -47,6 +36,17 @@ use pumpkin_protocol::{ client::play::{CSetEntityMetadata, Metadata}, server::play::{SClickContainer, SKeepAlive}, }; +use pumpkin_util::{ + math::{ + boundingbox::{BoundingBox, BoundingBoxSize}, + position::WorldPosition, + vector2::Vector2, + vector3::Vector3, + }, + permission::PermissionLvl, + text::TextComponent, + GameMode, +}; use pumpkin_world::{ cylindrical_chunk_iterator::Cylindrical, item::{ diff --git a/pumpkin/src/main.rs b/pumpkin/src/main.rs index fb18b1772..b92fb69e5 100644 --- a/pumpkin/src/main.rs +++ b/pumpkin/src/main.rs @@ -48,8 +48,8 @@ use std::sync::Arc; use crate::server::CURRENT_MC_VERSION; use pumpkin_config::{ADVANCED_CONFIG, BASIC_CONFIG}; -use pumpkin_core::text::{color::NamedColor, TextComponent}; use pumpkin_protocol::CURRENT_MC_PROTOCOL; +use pumpkin_util::text::{color::NamedColor, TextComponent}; use std::time::Instant; // Setup some tokens to allow us to identify which event is for which socket. diff --git a/pumpkin/src/net/combat.rs b/pumpkin/src/net/combat.rs index 12cb0a90f..8ec29a85e 100644 --- a/pumpkin/src/net/combat.rs +++ b/pumpkin/src/net/combat.rs @@ -1,12 +1,12 @@ use std::f32::consts::PI; -use pumpkin_core::math::vector3::Vector3; use pumpkin_macros::{particle, sound}; use pumpkin_protocol::{ client::play::{CEntityVelocity, CParticle}, codec::var_int::VarInt, SoundCategory, }; +use pumpkin_util::math::vector3::Vector3; use pumpkin_world::item::ItemStack; use crate::{ diff --git a/pumpkin/src/net/container.rs b/pumpkin/src/net/container.rs index 7132de477..6aa84b892 100644 --- a/pumpkin/src/net/container.rs +++ b/pumpkin/src/net/container.rs @@ -1,7 +1,5 @@ use crate::entity::player::Player; use crate::server::Server; -use pumpkin_core::text::TextComponent; -use pumpkin_core::GameMode; use pumpkin_inventory::container_click::{ Click, ClickType, KeyClick, MouseClick, MouseDragState, MouseDragType, }; @@ -15,6 +13,8 @@ use pumpkin_protocol::client::play::{ use pumpkin_protocol::codec::slot::Slot; use pumpkin_protocol::codec::var_int::VarInt; use pumpkin_protocol::server::play::SClickContainer; +use pumpkin_util::text::TextComponent; +use pumpkin_util::GameMode; use pumpkin_world::item::item_registry::Item; use pumpkin_world::item::ItemStack; use std::sync::Arc; diff --git a/pumpkin/src/net/mod.rs b/pumpkin/src/net/mod.rs index 36d890dce..4bf4166fa 100644 --- a/pumpkin/src/net/mod.rs +++ b/pumpkin/src/net/mod.rs @@ -15,7 +15,6 @@ use crate::{ use crossbeam::atomic::AtomicCell; use pumpkin_config::networking::compression::CompressionInfo; -use pumpkin_core::{text::TextComponent, ProfileAction}; use pumpkin_protocol::{ bytebuf::{packet_id::Packet, ReadingError}, client::{config::CConfigDisconnect, login::CLoginDisconnect, play::CPlayDisconnect}, @@ -36,6 +35,7 @@ use pumpkin_protocol::{ ClientPacket, CompressionLevel, CompressionThreshold, ConnectionState, Property, RawPacket, ServerPacket, }; +use pumpkin_util::{text::TextComponent, ProfileAction}; use serde::Deserialize; use sha1::Digest; use sha2::Sha256; diff --git a/pumpkin/src/net/packet/login.rs b/pumpkin/src/net/packet/login.rs index d7ac97e06..3fb61ce9e 100644 --- a/pumpkin/src/net/packet/login.rs +++ b/pumpkin/src/net/packet/login.rs @@ -1,7 +1,6 @@ use std::sync::LazyLock; use pumpkin_config::{ADVANCED_CONFIG, BASIC_CONFIG}; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::{ client::{ config::{CConfigAddResourcePack, CConfigServerLinks, CKnownPacks}, @@ -11,6 +10,7 @@ use pumpkin_protocol::{ server::login::{SEncryptionResponse, SLoginCookieResponse, SLoginPluginResponse, SLoginStart}, ConnectionState, KnownPack, Label, Link, LinkType, }; +use pumpkin_util::text::TextComponent; use uuid::Uuid; use crate::{ diff --git a/pumpkin/src/net/packet/play.rs b/pumpkin/src/net/packet/play.rs index d36fb25ae..68231dbd6 100644 --- a/pumpkin/src/net/packet/play.rs +++ b/pumpkin/src/net/packet/play.rs @@ -12,12 +12,6 @@ use crate::{ world::player_chunker, }; use pumpkin_config::ADVANCED_CONFIG; -use pumpkin_core::math::{boundingbox::BoundingBox, position::WorldPosition}; -use pumpkin_core::{ - math::{vector3::Vector3, wrap_degrees}, - text::TextComponent, - GameMode, -}; use pumpkin_entity::entity_type::EntityType; use pumpkin_inventory::player::PlayerInventory; use pumpkin_inventory::InventoryError; @@ -41,6 +35,12 @@ use pumpkin_protocol::{ SPlayerRotation, SSetCreativeSlot, SSetHeldItem, SSwingArm, SUseItemOn, Status, }, }; +use pumpkin_util::math::{boundingbox::BoundingBox, position::WorldPosition}; +use pumpkin_util::{ + math::{vector3::Vector3, wrap_degrees}, + text::TextComponent, + GameMode, +}; use pumpkin_world::block::block_registry::Block; use pumpkin_world::item::item_registry::get_item_by_id; use pumpkin_world::item::ItemStack; diff --git a/pumpkin/src/server/mod.rs b/pumpkin/src/server/mod.rs index 44d94de94..1282b3979 100644 --- a/pumpkin/src/server/mod.rs +++ b/pumpkin/src/server/mod.rs @@ -2,11 +2,6 @@ use connection_cache::{CachedBranding, CachedStatus}; use crossbeam::atomic::AtomicCell; use key_store::KeyStore; use pumpkin_config::BASIC_CONFIG; -use pumpkin_core::math::boundingbox::{BoundingBox, BoundingBoxSize}; -use pumpkin_core::math::position::WorldPosition; -use pumpkin_core::math::vector2::Vector2; -use pumpkin_core::math::vector3::Vector3; -use pumpkin_core::GameMode; use pumpkin_entity::entity_type::EntityType; use pumpkin_entity::EntityId; use pumpkin_inventory::drag_handler::DragHandler; @@ -14,6 +9,11 @@ use pumpkin_inventory::{Container, OpenContainer}; use pumpkin_protocol::client::login::CEncryptionRequest; use pumpkin_protocol::{client::config::CPluginMessage, ClientPacket}; use pumpkin_registry::{DimensionType, Registry}; +use pumpkin_util::math::boundingbox::{BoundingBox, BoundingBoxSize}; +use pumpkin_util::math::position::WorldPosition; +use pumpkin_util::math::vector2::Vector2; +use pumpkin_util::math::vector3::Vector3; +use pumpkin_util::GameMode; use pumpkin_world::block::block_registry::Block; use pumpkin_world::dimension::Dimension; use pumpkin_world::entity::entity_registry::get_entity_by_id; diff --git a/pumpkin/src/world/bossbar.rs b/pumpkin/src/world/bossbar.rs index cd51a2fa1..a87763f05 100644 --- a/pumpkin/src/world/bossbar.rs +++ b/pumpkin/src/world/bossbar.rs @@ -1,6 +1,6 @@ use crate::entity::player::Player; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::client::play::{BosseventAction, CBossEvent}; +use pumpkin_util::text::TextComponent; use uuid::Uuid; #[derive(Clone, PartialEq)] diff --git a/pumpkin/src/world/custom_bossbar.rs b/pumpkin/src/world/custom_bossbar.rs index b801063d3..a5466c104 100644 --- a/pumpkin/src/world/custom_bossbar.rs +++ b/pumpkin/src/world/custom_bossbar.rs @@ -2,7 +2,7 @@ use crate::command::args::GetCloned; use crate::entity::player::Player; use crate::server::Server; use crate::world::bossbar::{Bossbar, BossbarColor, BossbarDivisions}; -use pumpkin_core::text::TextComponent; +use pumpkin_util::text::TextComponent; use std::collections::HashMap; use std::sync::Arc; use thiserror::Error; diff --git a/pumpkin/src/world/mod.rs b/pumpkin/src/world/mod.rs index afb6a346e..687749c23 100644 --- a/pumpkin/src/world/mod.rs +++ b/pumpkin/src/world/mod.rs @@ -11,9 +11,6 @@ use crate::{ }; use level_time::LevelTime; use pumpkin_config::BasicConfiguration; -use pumpkin_core::math::vector2::Vector2; -use pumpkin_core::math::{position::WorldPosition, vector3::Vector3}; -use pumpkin_core::text::{color::NamedColor, TextComponent}; use pumpkin_entity::{entity_type::EntityType, pose::EntityPose, EntityId}; use pumpkin_protocol::{ client::play::CLevelEvent, @@ -31,6 +28,9 @@ use pumpkin_protocol::{ ClientPacket, }; use pumpkin_registry::DimensionType; +use pumpkin_util::math::vector2::Vector2; +use pumpkin_util::math::{position::WorldPosition, vector3::Vector3}; +use pumpkin_util::text::{color::NamedColor, TextComponent}; use pumpkin_world::chunk::ChunkData; use pumpkin_world::level::Level; use pumpkin_world::{ diff --git a/pumpkin/src/world/player_chunker.rs b/pumpkin/src/world/player_chunker.rs index 43ff67d17..48cd326b9 100644 --- a/pumpkin/src/world/player_chunker.rs +++ b/pumpkin/src/world/player_chunker.rs @@ -1,11 +1,11 @@ use std::{num::NonZeroU8, sync::Arc}; use pumpkin_config::BASIC_CONFIG; -use pumpkin_core::{ +use pumpkin_protocol::client::play::{CCenterChunk, CUnloadChunk}; +use pumpkin_util::{ math::{get_section_cord, position::WorldPosition, vector3::Vector3}, GameMode, }; -use pumpkin_protocol::client::play::{CCenterChunk, CUnloadChunk}; use pumpkin_world::cylindrical_chunk_iterator::Cylindrical; use crate::entity::player::Player; diff --git a/pumpkin/src/world/scoreboard.rs b/pumpkin/src/world/scoreboard.rs index 525829574..9502cc8a6 100644 --- a/pumpkin/src/world/scoreboard.rs +++ b/pumpkin/src/world/scoreboard.rs @@ -1,11 +1,11 @@ use std::collections::HashMap; -use pumpkin_core::text::TextComponent; use pumpkin_protocol::{ client::play::{CDisplayObjective, CUpdateObjectives, CUpdateScore, RenderType}, codec::var_int::VarInt, NumberFormat, }; +use pumpkin_util::text::TextComponent; use super::World;