From 2479019443dfa1a75fa6e74715d23b1fac1a63a8 Mon Sep 17 00:00:00 2001
From: Snowiiii <lilalexmed@proton.me>
Date: Wed, 31 Jul 2024 18:16:09 +0200
Subject: [PATCH] replace crab_nbt with fastnbt

---
 Cargo.lock                           | 55 +++++++++++-----------------
 pumpkin/Cargo.toml                   |  3 +-
 pumpkin/src/protocol/bytebuf/mod.rs  |  8 +++-
 pumpkin/src/protocol/registry/mod.rs |  2 +-
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9a7fea26..6afa0ec08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -129,18 +129,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crab_nbt"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469a8a59b4898974c623174c52d1c47b2e21a19e1f6f849a8046aa9ba03af5cf"
-dependencies = [
- "bytes",
- "cesu8",
- "derive_more",
- "thiserror",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
@@ -195,26 +183,6 @@ dependencies = [
  "powerfmt",
 ]
 
-[[package]]
-name = "derive_more"
-version = "1.0.0-beta.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "1.0.0-beta.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -231,6 +199,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "fastnbt"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d4a73a95dc65551ccd98e1ecd1adb5d1ba5361146963b31f481ca42fc0520a3"
+dependencies = [
+ "byteorder",
+ "cesu8",
+ "serde",
+ "serde_bytes",
+]
+
 [[package]]
 name = "fdeflate"
 version = "0.3.4"
@@ -524,8 +504,8 @@ dependencies = [
  "base64",
  "bytes",
  "cfb8",
- "crab_nbt",
  "crossbeam-channel",
+ "fastnbt",
  "flate2",
  "image",
  "log",
@@ -623,6 +603,15 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.204"
diff --git a/pumpkin/Cargo.toml b/pumpkin/Cargo.toml
index 919da79d6..e2cd8fbab 100644
--- a/pumpkin/Cargo.toml
+++ b/pumpkin/Cargo.toml
@@ -29,6 +29,5 @@ mio = { version = "1.0.1", features = ["os-poll", "net"]}
 crossbeam-channel = "0.5.13"
 uuid = "1.10"
 toml = "0.8.17"
-crab_nbt = "0.1.2"
-
+fastnbt = "2.5.0"
 
diff --git a/pumpkin/src/protocol/bytebuf/mod.rs b/pumpkin/src/protocol/bytebuf/mod.rs
index e391070f8..8ff23a98b 100644
--- a/pumpkin/src/protocol/bytebuf/mod.rs
+++ b/pumpkin/src/protocol/bytebuf/mod.rs
@@ -1,5 +1,5 @@
 use core::str;
-use std::io::{self, Error, ErrorKind, Read};
+use std::io::{self, Error, ErrorKind, Read, Write};
 
 use bytes::{Buf, BufMut, BytesMut};
 
@@ -180,13 +180,17 @@ impl ByteBuffer {
         self.put_list(v, |p, &v| p.put_var_int(v))
     }
 
-    pub fn get_nbt(&mut self) -> Option<crab_nbt::NbtTag> {
+    /* pub fn get_nbt(&mut self) -> Option<crab_nbt::NbtTag> {
         match crab_nbt::NbtTag::deserialize(self.buf()) {
             Ok(v) => Some(v),
             Err(err) => None,
         }
     }
 
+    pub fn put_nbt(&mut self, nbt: NbtTag) {
+        self.buffer.put_slice(&nbt.serialize());
+        } */
+
     pub fn buf(&mut self) -> &mut BytesMut {
         &mut self.buffer
     }
diff --git a/pumpkin/src/protocol/registry/mod.rs b/pumpkin/src/protocol/registry/mod.rs
index bca0f5a3f..d30ad43aa 100644
--- a/pumpkin/src/protocol/registry/mod.rs
+++ b/pumpkin/src/protocol/registry/mod.rs
@@ -34,7 +34,7 @@ struct CodecItem<T> {
 
 pub fn write_single_dimension(out: &mut ByteBuffer, world_min_y: i32, world_height: u32) {
     let dimension = dimensions::overworld(world_min_y, world_height);
-    //  out.put_slice(&crab_nbt::nbt!("", &dimension).unwrap().serialize());
+  //  out.put_nbt(nbt!(dimension))
 }
 
 pub fn write_codec(out: &mut ByteBuffer, world_min_y: i32, world_height: u32) {