Create pumpkin-core, and move pumpkin-text

Cargo.lock

@@ -1203,11 +1203,11 @@ dependencies = [
  "num-bigint",
  "num-derive",
  "num-traits",
+ "pumpkin-core",
  "pumpkin-entity",
  "pumpkin-inventory",
  "pumpkin-protocol",
  "pumpkin-registry",
- "pumpkin-text",
  "pumpkin-world",
  "rand",
  "rayon",
@@ -1225,6 +1225,15 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "pumpkin-core"
+version = "0.1.0"
+dependencies = [
+ "fastnbt",
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "pumpkin-entity"
 version = "0.1.0"
@@ -1264,8 +1273,8 @@ dependencies = [
  "log",
  "num-derive",
  "num-traits",
+ "pumpkin-core",
  "pumpkin-macros",
- "pumpkin-text",
  "pumpkin-world",
  "serde",
  "serde_json",
@@ -1280,20 +1289,11 @@ version = "0.1.0"
 dependencies = [
  "fastnbt",
  "fastsnbt",
+ "pumpkin-core",
  "pumpkin-protocol",
- "pumpkin-text",
  "serde",
 ]
 
-[[package]]
-name = "pumpkin-text"
-version = "0.1.0"
-dependencies = [
- "fastnbt",
- "serde",
- "uuid",
-]
-
 [[package]]
 name = "pumpkin-world"
 version = "0.1.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = [ "pumpkin-entity", "pumpkin-inventory", "pumpkin-macros/", "pumpkin-protocol/", "pumpkin-registry/", "pumpkin-world", "pumpkin/" ]
+members = [ "pumpkin-core", "pumpkin-entity", "pumpkin-inventory", "pumpkin-macros/", "pumpkin-protocol/", "pumpkin-registry/", "pumpkin-world", "pumpkin/"]
 
 [workspace.package]
 version = "0.1.0"

pumpkin-core/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pumpkin-text"
+name = "pumpkin-core"
 version.workspace = true
 edition.workspace = true
 

pumpkin-core/src/lib.rs

@@ -0,0 +1 @@
+pub mod text;

pumpkin-core/src/text/hover.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use serde::{Deserialize, Serialize};
 
-use crate::Text;
+use super::Text;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "action", content = "contents", rename_all = "snake_case")]

pumpkin-core/src/text/style.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use super::{
     click::ClickEvent,
     color::{self, Color},
     hover::HoverEvent,

pumpkin-protocol/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 [dependencies]
 pumpkin-macros = { path = "../pumpkin-macros" }
 pumpkin-world =  { path = "../pumpkin-world" }
-pumpkin-text = { path = "../pumpkin-text" }
+pumpkin-core = { path = "../pumpkin-core" }
 
 bytes = "1.7"
 

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

@@ -1,5 +1,5 @@
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 use crate::uuid::UUID;

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

@@ -1,5 +1,5 @@
+use pumpkin_core::text::TextComponent;
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
 use serde::Serialize;
 
 #[derive(Serialize)]

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

@@ -1,5 +1,5 @@
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 use crate::VarInt;

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

@@ -1,5 +1,5 @@
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 use crate::VarInt;

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

@@ -1,5 +1,5 @@
+use pumpkin_core::text::TextComponent;
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
 use serde::Serialize;
 
 #[derive(Serialize)]

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

@@ -1,7 +1,7 @@
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::FromPrimitive;
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 use crate::{bytebuf::ByteBuffer, uuid::UUID, BitSet, ClientPacket, VarInt};

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

@@ -1,5 +1,5 @@
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 #[derive(Serialize)]

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

@@ -1,5 +1,5 @@
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use serde::Serialize;
 
 #[derive(Serialize)]

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

@@ -1,5 +1,5 @@
+use pumpkin_core::text::TextComponent;
 use pumpkin_macros::packet;
-use pumpkin_text::TextComponent;
 use serde::Serialize;
 
 #[derive(Serialize)]

pumpkin-protocol/src/slot.rs

@@ -1,7 +1,7 @@
 use crate::VarInt;
 use pumpkin_world::item::Item;
 use serde::{
-    de::{self, SeqAccess, Visitor},
+    de::{self, SeqAccess},
     Deserialize,
 };
 
@@ -21,8 +21,8 @@ impl<'de> Deserialize<'de> for Slot {
     where
         D: de::Deserializer<'de>,
     {
-        struct VarIntVisitor;
+        struct Visitor;
-        impl<'de> Visitor<'de> for VarIntVisitor {
+        impl<'de> de::Visitor<'de> for Visitor {
             type Value = Slot;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -72,9 +72,10 @@ impl<'de> Deserialize<'de> for Slot {
             }
         }
 
-        deserializer.deserialize_seq(VarIntVisitor)
+        deserializer.deserialize_seq(Visitor)
     }
 }
+
 impl Slot {
     pub fn to_item(self) -> Option<Item> {
         let item_id = self.item_id?.0.try_into().unwrap();

pumpkin-registry/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 
 [dependencies]
 pumpkin-protocol = { path = "../pumpkin-protocol"}
-pumpkin-text = { path = "../pumpkin-text"}
+pumpkin-core = { path = "../pumpkin-core"}
 
 # nbt
 fastnbt = { git = "https://github.com/owengage/fastnbt.git" }

pumpkin-registry/src/chat_type.rs

@@ -1,4 +1,4 @@
-use pumpkin_text::style::Style;
+use pumpkin_core::text::style::Style;
 use serde::Serialize;
 
 #[derive(Debug, Clone, Serialize)]

pumpkin/Cargo.toml

@@ -13,7 +13,7 @@ dhat-heap = ["dhat"]
 dhat = { version = "0.3.3", optional = true }
 
 # pumpkin
-pumpkin-text = { path = "../pumpkin-text" }
+pumpkin-core = { path = "../pumpkin-core"}
 pumpkin-inventory = { path = "../pumpkin-inventory"}
 pumpkin-world = { path = "../pumpkin-world"}
 pumpkin-entity = { path = "../pumpkin-entity"}

pumpkin/src/client/client_packet.rs

@@ -13,7 +13,7 @@ use pumpkin_protocol::{
     },
     ConnectionState, KnownPack, CURRENT_MC_PROTOCOL,
 };
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use rsa::Pkcs1v15Encrypt;
 use sha1::{Digest, Sha1};
 

pumpkin/src/client/mod.rs

@@ -36,7 +36,7 @@ use pumpkin_protocol::{
     },
     ClientPacket, ConnectionState, PacketError, RawPacket, ServerPacket,
 };
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 
 use std::io::Read;
 use thiserror::Error;

pumpkin/src/client/player_packet.rs

@@ -22,7 +22,7 @@ use pumpkin_protocol::{
         SUseItemOn, Status,
     },
 };
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use pumpkin_world::block::BlockFace;
 use pumpkin_world::global_registry;
 

pumpkin/src/commands/cmd_gamemode.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use num_traits::FromPrimitive;
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 
 use crate::commands::arg_player::{consume_arg_player, parse_arg_player};
 

pumpkin/src/commands/cmd_help.rs

@@ -3,7 +3,7 @@ use crate::commands::dispatcher::{CommandDispatcher, InvalidTreeError};
 use crate::commands::tree::{CommandTree, ConsumedArgs, RawArgs};
 use crate::commands::tree_builder::argument;
 use crate::commands::{dispatcher_init, CommandSender, DISPATCHER};
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 
 pub(crate) const NAME: &str = "help";
 pub(crate) const ALIAS: &str = "?";

pumpkin/src/commands/cmd_pumpkin.rs

@@ -1,6 +1,6 @@
 use crate::server::CURRENT_MC_VERSION;
+use pumpkin_core::text::{color::NamedColor, TextComponent};
 use pumpkin_protocol::CURRENT_MC_PROTOCOL;
-use pumpkin_text::{color::NamedColor, TextComponent};
 
 use crate::commands::tree::CommandTree;
 

pumpkin/src/commands/mod.rs

@@ -1,4 +1,4 @@
-use pumpkin_text::TextComponent;
+use pumpkin_core::text::TextComponent;
 use std::collections::HashMap;
 use std::sync::OnceLock;
 
@@ -86,7 +86,7 @@ pub fn handle_command(sender: &mut CommandSender, cmd: &str) {
 
     if let Err(err) = dispatcher.dispatch(sender, cmd) {
         sender.send_message(
-            TextComponent::text(&err).color_named(pumpkin_text::color::NamedColor::Red),
+            TextComponent::text(&err).color_named(pumpkin_core::text::color::NamedColor::Red),
         )
     }
 }