From 24fff00425d6204fc02032f2105d73d9b4f751f1 Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:13:51 +0100
Subject: [PATCH] Make All Dependencies Workspace Dependencies (#1245)

---
 Cargo.lock                    |  2 +-
 Cargo.toml                    | 61 +++++++++++++++++++++++++++++++++++
 pumpkin-api-macros/Cargo.toml |  4 +--
 pumpkin-config/Cargo.toml     |  4 +--
 pumpkin-data/Cargo.toml       | 20 ++++++------
 pumpkin-inventory/Cargo.toml  | 11 +++----
 pumpkin-macros/Cargo.toml     |  4 +--
 pumpkin-nbt/Cargo.toml        |  4 +--
 pumpkin-protocol/Cargo.toml   | 22 ++++++-------
 pumpkin-registry/Cargo.toml   |  6 ++--
 pumpkin-util/Cargo.toml       | 22 ++++++-------
 pumpkin-world/Cargo.toml      | 54 +++++++++++++++----------------
 pumpkin/Cargo.toml            | 56 ++++++++++++++++----------------
 13 files changed, 164 insertions(+), 106 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 53a3c3553..22a4e4151 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2299,7 +2299,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_json5",
- "sha2 0.10.9",
+ "sha2 0.11.0-rc.3",
  "slotmap",
  "temp-dir",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index ad6698e1f..9ce0f30a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,3 +49,64 @@ serde_json = "1.0"
 
 tempfile = { version = "3.24.0", default-features = false }
 proc-macro-error2 = "2"
+aes = "0.8"
+async-compression = "0.4.36"
+base64 = "0.22.1"
+bitflags = "2.10.0"
+cesu8 = "1.1"
+cfb8 = "0.8"
+colored = "3.0"
+console-subscriber = { version = "0.5.0", default-features = false }
+crc-fast = "1.9.0"
+criterion = { version = "0.8", default-features = false }
+crossbeam-utils = "0.8.21"
+crossfire = "2.1.8"
+dashmap = "6.1"
+ecdsa = "0.16.9"
+enum_dispatch = "0.3.13"
+env_logger = "0.11.8"
+flate2 = "1.1.5"
+heck = "0.5"
+hmac = "=0.13.0-rc.3"
+indexmap = "2.12"
+itertools = "0.14.0"
+libloading = "0.9"
+lru = "0.16.2"
+lz4-java-wrc = "0.2.0"
+md5 = "0.8"
+num-bigint = "0.4"
+num-derive = "0.4"
+num-traits = "0.2"
+num_cpus = "1.17.0"
+p384 = "0.13.1"
+phf = "0.13.1"
+pkcs8 = "=0.11.0-rc.8"
+proc-macro2 = "1.0"
+pumpkin-config = { path = "pumpkin-config" }
+pumpkin-data = { path = "pumpkin-data" }
+pumpkin-inventory = { path = "pumpkin-inventory" }
+pumpkin-macros = { path = "pumpkin-macros" }
+pumpkin-nbt = { path = "pumpkin-nbt" }
+pumpkin-protocol = { path = "pumpkin-protocol" }
+pumpkin-registry = { path = "pumpkin-registry" }
+pumpkin-util = { path = "pumpkin-util" }
+pumpkin-world = { path = "pumpkin-world" }
+quote = "1.0"
+rand = "=0.10.0-rc.5"
+rsa = "=0.10.0-rc.10"
+rustc-hash = "2.1.1"
+rustyline-async = "0.4.7"
+ruzstd = "0.8.2"
+serde_json5 = "0.2.1"
+sha1 = "=0.11.0-rc.3"
+sha2 = "=0.11.0-rc.3"
+signature = "2.2.0"
+simplelog = "0.12.2"
+slotmap = "1.1"
+take_mut = "0.2.2"
+temp-dir = "0.1.16"
+thread_local = "1.1.9"
+time = "0.3"
+tokio-util = "0.7.17"
+toml = "0.9"
+ureq = "3.1.4"
diff --git a/pumpkin-api-macros/Cargo.toml b/pumpkin-api-macros/Cargo.toml
index 020f0f824..602d93a45 100644
--- a/pumpkin-api-macros/Cargo.toml
+++ b/pumpkin-api-macros/Cargo.toml
@@ -8,6 +8,6 @@ proc-macro = true
 
 [dependencies]
 syn .workspace = true
-quote = "1.0"
-proc-macro2 = "1.0"
+quote.workspace = true
+proc-macro2.workspace = true
 proc-macro-error2.workspace = true
diff --git a/pumpkin-config/Cargo.toml b/pumpkin-config/Cargo.toml
index a031537c5..2d9e44b68 100644
--- a/pumpkin-config/Cargo.toml
+++ b/pumpkin-config/Cargo.toml
@@ -4,12 +4,12 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pumpkin-util = { path = "../pumpkin-util" }
+pumpkin-util.workspace = true
 serde.workspace = true
 log.workspace = true
 uuid.workspace = true
 
-toml = "0.9"
+toml.workspace = true
 
 [features]
 # Adds helper to change the config at runtime
diff --git a/pumpkin-data/Cargo.toml b/pumpkin-data/Cargo.toml
index a6f55ddf5..e01dcbfcf 100644
--- a/pumpkin-data/Cargo.toml
+++ b/pumpkin-data/Cargo.toml
@@ -5,24 +5,24 @@ edition.workspace = true
 build = "build/build.rs"
 
 [dependencies]
-phf = { version = "0.13.1", features = ["macros"] }
-pumpkin-util = { path = "../pumpkin-util" }
-pumpkin-nbt = { path = "../pumpkin-nbt" }
+phf = { workspace = true, features = ["macros"] }
+pumpkin-util.workspace = true
+pumpkin-nbt.workspace = true
 
 serde.workspace = true
-crc-fast = "1.9.0"
+crc-fast.workspace = true
 
 [build-dependencies]
-pumpkin-util = { path = "../pumpkin-util" }
-pumpkin-nbt = { path = "../pumpkin-nbt" }
+pumpkin-util.workspace = true
+pumpkin-nbt.workspace = true
 
 serde.workspace = true
 serde_json.workspace = true
 
-serde_json5 = "0.2.1"
-heck = "0.5"
-proc-macro2 = "1.0"
-quote = "1.0"
+serde_json5.workspace = true
+heck.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
 syn.workspace = true
 
 rayon.workspace = true
diff --git a/pumpkin-inventory/Cargo.toml b/pumpkin-inventory/Cargo.toml
index 19df2950b..8ef2bf474 100644
--- a/pumpkin-inventory/Cargo.toml
+++ b/pumpkin-inventory/Cargo.toml
@@ -5,14 +5,13 @@ edition.workspace = true
 rust-version = "1.87"
 
 [dependencies]
-pumpkin-protocol = { path = "../pumpkin-protocol" }
-pumpkin-data = { path = "../pumpkin-data" }
+pumpkin-protocol.workspace = true
+pumpkin-data.workspace = true
 
-pumpkin-world = { path = "../pumpkin-world" }
-pumpkin-util = { path = "../pumpkin-util" }
+pumpkin-world.workspace = true
+pumpkin-util.workspace = true
 
 log.workspace = true
 tokio.workspace = true
 thiserror.workspace = true
-crossbeam-utils = "0.8.21"
-
+crossbeam-utils.workspace = true
diff --git a/pumpkin-macros/Cargo.toml b/pumpkin-macros/Cargo.toml
index f16777ac5..7e1f47de4 100644
--- a/pumpkin-macros/Cargo.toml
+++ b/pumpkin-macros/Cargo.toml
@@ -9,6 +9,6 @@ proc-macro = true
 [dependencies]
 proc-macro-error2.workspace = true
 
-proc-macro2 = "1.0"
-quote = "1.0"
+proc-macro2.workspace = true
+quote.workspace = true
 syn.workspace = true
diff --git a/pumpkin-nbt/Cargo.toml b/pumpkin-nbt/Cargo.toml
index eb51cbf7f..7ea795a80 100644
--- a/pumpkin-nbt/Cargo.toml
+++ b/pumpkin-nbt/Cargo.toml
@@ -8,8 +8,8 @@ serde.workspace = true
 thiserror.workspace = true
 bytes.workspace = true
 
-cesu8 = "1.1"
-flate2 = "1.1"
+cesu8.workspace = true
+flate2.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true
diff --git a/pumpkin-protocol/Cargo.toml b/pumpkin-protocol/Cargo.toml
index d712959fa..ac35762c2 100644
--- a/pumpkin-protocol/Cargo.toml
+++ b/pumpkin-protocol/Cargo.toml
@@ -10,11 +10,11 @@ clientbound = []
 query = []
 
 [dependencies]
-pumpkin-nbt = { path = "../pumpkin-nbt" }
-pumpkin-data = { path = "../pumpkin-data" }
-pumpkin-macros = { path = "../pumpkin-macros" }
-pumpkin-world = { path = "../pumpkin-world" }
-pumpkin-util = { path = "../pumpkin-util" }
+pumpkin-nbt.workspace = true
+pumpkin-data.workspace = true
+pumpkin-macros.workspace = true
+pumpkin-world.workspace = true
+pumpkin-util.workspace = true
 
 uuid.workspace = true
 serde.workspace = true
@@ -23,15 +23,15 @@ tokio.workspace = true
 bytes.workspace = true
 
 # encryption
-aes = "0.8"
-cfb8 = "0.8"
+aes.workspace = true
+cfb8.workspace = true
 
 # compression
-async-compression = { version = "0.4.36", features = ["tokio", "zlib"] }
+async-compression = { workspace = true, features = ["tokio", "zlib"] }
 
-take_mut = "0.2.2"
-bitflags = "2.10.0"
+take_mut.workspace = true
+bitflags.workspace = true
 
 [dev-dependencies]
 # Validate correctness
-flate2 = "1.1.5"
+flate2.workspace = true
diff --git a/pumpkin-registry/Cargo.toml b/pumpkin-registry/Cargo.toml
index 8f627dec5..fb3f41731 100644
--- a/pumpkin-registry/Cargo.toml
+++ b/pumpkin-registry/Cargo.toml
@@ -4,10 +4,10 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pumpkin-protocol = { path = "../pumpkin-protocol" }
-pumpkin-util = { path = "../pumpkin-util" }
+pumpkin-protocol.workspace = true
+pumpkin-util.workspace = true
 
-indexmap = { version = "2.12", features = ["serde"] }
+indexmap = { workspace = true, features = ["serde"] }
 
 serde.workspace = true
 serde_json.workspace = true
diff --git a/pumpkin-util/Cargo.toml b/pumpkin-util/Cargo.toml
index c1e88b5cd..4ceaa578c 100644
--- a/pumpkin-util/Cargo.toml
+++ b/pumpkin-util/Cargo.toml
@@ -4,26 +4,26 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pumpkin-nbt = { path = "../pumpkin-nbt" }
+pumpkin-nbt.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 bytes.workspace = true
 
-num-derive = "0.4"
-num-traits = "0.2"
+num-derive.workspace = true
+num-traits.workspace = true
 
-colored = "3.0"
-md5 = "0.8"
-quote = "1.0"
+colored.workspace = true
+md5.workspace = true
+quote.workspace = true
 syn.workspace = true
-proc-macro2 = "1.0"
-enum_dispatch = "0.3.13"
+proc-macro2.workspace = true
+enum_dispatch.workspace = true
 
 uuid.workspace = true
 tokio = { workspace = true, features = [
     "sync",
 ] }
-base64 = "0.22.1"
-p384 = { version = "0.13.1", features = ["ecdsa"] }
+base64.workspace = true
+p384 = { workspace = true, features = ["ecdsa"] }
 thiserror.workspace = true
-ecdsa = "0.16.9"
+ecdsa.workspace = true
diff --git a/pumpkin-world/Cargo.toml b/pumpkin-world/Cargo.toml
index 6c7cac224..fc44bccd1 100644
--- a/pumpkin-world/Cargo.toml
+++ b/pumpkin-world/Cargo.toml
@@ -5,10 +5,10 @@ edition.workspace = true
 rust-version = "1.89"
 
 [dependencies]
-pumpkin-nbt = { path = "../pumpkin-nbt" }
-pumpkin-util = { path = "../pumpkin-util" }
-pumpkin-config = { path = "../pumpkin-config" }
-pumpkin-data = { path = "../pumpkin-data" }
+pumpkin-nbt.workspace = true
+pumpkin-util.workspace = true
+pumpkin-config.workspace = true
+pumpkin-data.workspace = true
 
 futures.workspace = true
 
@@ -31,41 +31,41 @@ serde_json.workspace = true
 log.workspace = true
 crossbeam.workspace = true
 
-num-derive = "0.4"
-sha2 = "0.10"
-bitflags = "2.10.0"
+num-derive.workspace = true
+sha2.workspace = true
+bitflags.workspace = true
 
-dashmap = "6.1"
+dashmap.workspace = true
 
-num-traits = "0.2"
+num-traits.workspace = true
 
 # Compression
-flate2 = "1.1"
-lz4-java-wrc = "0.2.0"
-ruzstd = "0.8.2"
+flate2.workspace = true
+lz4-java-wrc.workspace = true
+ruzstd.workspace = true
 
-itertools = "0.14.0"
-enum_dispatch = "0.3"
+itertools.workspace = true
+enum_dispatch.workspace = true
 
-thread_local = "1.1.9"
-lru = "0.16.2"
+thread_local.workspace = true
+lru.workspace = true
 
-tokio-util = { version = "0.7.17", features = ["rt"] }
-rand = "=0.10.0-rc.5"
-num_cpus = "1.17.0"
-rustc-hash = "2.1.1"
-slotmap = "1.1"
-crossfire = "2.1.8"
+tokio-util = { workspace = true, features = ["rt"] }
+rand.workspace = true
+num_cpus.workspace = true
+rustc-hash.workspace = true
+slotmap.workspace = true
+crossfire.workspace = true
 
 [dev-dependencies]
-criterion = { version = "0.8", default-features = false, features = ["html_reports", "async_tokio"] }
-temp-dir = "0.1.16"
+criterion = { workspace = true, features = ["html_reports", "async_tokio"] }
+temp-dir.workspace = true
 # Print log info inside tests when needed
-env_logger = "0.11.8"
+env_logger.workspace = true
 # Allows us to modify the config
-pumpkin-config = { path = "../pumpkin-config", features = ["test_helper"] }
+pumpkin-config = { workspace = true, features = ["test_helper"] }
 # Deserialize NaN and Inf
-serde_json5 = "0.2.1"
+serde_json5.workspace = true
 
 [[bench]]
 name = "chunk"
diff --git a/pumpkin/Cargo.toml b/pumpkin/Cargo.toml
index dba8ae68e..e4f964e4b 100644
--- a/pumpkin/Cargo.toml
+++ b/pumpkin/Cargo.toml
@@ -17,15 +17,15 @@ doctest = false
 
 [dependencies]
 # pumpkin
-pumpkin-util = { path = "../pumpkin-util" }
-pumpkin-nbt = { path = "../pumpkin-nbt" }
-pumpkin-config = { path = "../pumpkin-config" }
-pumpkin-inventory = { path = "../pumpkin-inventory" }
-pumpkin-world = { path = "../pumpkin-world" }
-pumpkin-data = { path = "../pumpkin-data" }
-pumpkin-protocol = { path = "../pumpkin-protocol" }
-pumpkin-registry = { path = "../pumpkin-registry" }
-pumpkin-macros = { path = "../pumpkin-macros" }
+pumpkin-util.workspace = true
+pumpkin-nbt.workspace = true
+pumpkin-config.workspace = true
+pumpkin-inventory.workspace = true
+pumpkin-world.workspace = true
+pumpkin-data.workspace = true
+pumpkin-protocol.workspace = true
+pumpkin-registry.workspace = true
+pumpkin-macros.workspace = true
 
 log.workspace = true
 crossbeam.workspace = true
@@ -50,47 +50,45 @@ serde_json.workspace = true
 
 bytes.workspace = true
 
-rand = "=0.10.0-rc.5"
+rand.workspace = true
 
-num-bigint = "0.4"
+num-bigint.workspace = true
 
 # Console line reading
-rustyline-async = "0.4.7"
+rustyline-async.workspace = true
 
 # encryption
-rsa = { version = "=0.10.0-rc.10", features = ["sha1"] }
-pkcs8 = "=0.11.0-rc.8"
+rsa = { workspace = true, features = ["sha1"] }
+pkcs8.workspace = true
 
 # authentication
-ureq = { version = "3.1.4", features = [
-    "json",
-] }
+ureq = { workspace = true, features = ["json"] }
 
 
-sha1 = "=0.11.0-rc.3"
+sha1.workspace = true
 
 # velocity en
-hmac = "=0.13.0-rc.3"
-sha2 = "=0.11.0-rc.3"
+hmac.workspace = true
+sha2.workspace = true
 
-base64 = "0.22.1"
+base64.workspace = true
 
 # logging
-simplelog = { version = "0.12.2", features = ["ansi_term"] }
+simplelog = { workspace = true, features = ["ansi_term"] }
 
 # Remove time in favor of chrono?
-time = { version = "0.3", features = ["parsing", "macros"] }
+time = { workspace = true, features = ["parsing", "macros"] }
 
 # plugins
-libloading = "0.9"
-rustc-hash = "2.1.1"
+libloading.workspace = true
+rustc-hash.workspace = true
 
 # Task handling
-tokio-util = { version = "0.7.17", features = ["rt"] }
+tokio-util = { workspace = true, features = ["rt"] }
 
-flate2 = "1.1.5"
-console-subscriber = { version = "0.5.0", default-features= false, optional = true }
-signature = "2.2.0"
+flate2.workspace = true
+console-subscriber = { workspace = true, optional = true }
+signature.workspace = true
 [dev-dependencies]
 tempfile.workspace = true