Skip to content

Commit

Permalink
rename pumpkin-core to pumpkin-util
Browse files Browse the repository at this point in the history
I see that there is an confusion between the pumpkin-core crate,  People often think that this is the most important one
  • Loading branch information
Snowiiii committed Jan 9, 2025
1 parent 4494432 commit ee48505
Show file tree
Hide file tree
Showing 148 changed files with 208 additions and 208 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resolver = "2"
members = [
"pumpkin-config",
"pumpkin-core",
"pumpkin-util",
"pumpkin-entity",
"pumpkin-inventory",
"pumpkin-macros/",
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-config/src/commands.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::PermissionLvl;
use pumpkin_util::PermissionLvl;
use serde::{Deserialize, Serialize};

#[derive(Deserialize, Serialize)]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-config/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-config/src/networking/auth.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::ProfileAction;
use pumpkin_util::ProfileAction;
use serde::{Deserialize, Serialize};

#[derive(Deserialize, Serialize)]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-config/src/op.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::permission::PermissionLvl;
use pumpkin_util::permission::PermissionLvl;
use serde::{Deserialize, Serialize};
use uuid::Uuid;

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-inventory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-inventory/src/open_container.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/config/c_add_resource_pack.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/bossevent_action.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::VarInt;
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

pub enum BosseventAction {
Add {
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_actionbar.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_block_destroy_stage.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_util::math::position::WorldPosition;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_block_event.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_util::math::position::WorldPosition;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_block_update.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_util::math::position::WorldPosition;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_combat_death.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_command_suggestions.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_damage_event.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_level_event.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_login.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_util::math::position::WorldPosition;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_open_screen.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_particle.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_play_disconnect.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_player_chat_message.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_player_position.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_respawn.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_set_title.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_subtitle.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_system_chat_message.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_teleport_entity.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_update_entity_pos.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_update_objectives.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_update_score.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/client/play/c_worldevent.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_util::math::position::WorldPosition;

use pumpkin_macros::client_packet;
use serde::Serialize;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/server/play/s_interact.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/server/play/s_pick_item.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/server/play/s_player_action.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use pumpkin_core::math::position::WorldPosition;
use pumpkin_macros::server_packet;
use pumpkin_util::math::position::WorldPosition;

use crate::VarInt;

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/server/play/s_player_position.rs
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/src/server/play/s_use_item_on.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-registry/src/chat_type.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-core/Cargo.toml → pumpkin-util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "pumpkin-core"
name = "pumpkin-util"
version.workspace = true
edition.workspace = true

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pumpkin-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-world/src/block/mod.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 4 additions & 4 deletions pumpkin-world/src/chunk/anvil.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -135,7 +135,7 @@ impl ChunkReader for AnvilChunkFormat {
fn read_chunk(
&self,
save_file: &LevelFolder,
at: &pumpkin_core::math::vector2::Vector2<i32>,
at: &pumpkin_util::math::vector2::Vector2<i32>,
) -> Result<super::ChunkData, ChunkReadingError> {
let region = (at.x >> 5, at.z >> 5);

Expand Down Expand Up @@ -219,7 +219,7 @@ impl ChunkWriter for AnvilChunkFormat {
&self,
chunk_data: &ChunkData,
level_folder: &LevelFolder,
at: &pumpkin_core::math::vector2::Vector2<i32>,
at: &pumpkin_util::math::vector2::Vector2<i32>,
) -> Result<(), super::ChunkWritingError> {
let region = (at.x >> 5, at.z >> 5);

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion pumpkin-world/src/chunk/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pumpkin-world/src/coordinates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading

0 comments on commit ee48505

Please sign in to comment.