Skip to content

Commit 60ac95d

Browse files
authored
Merge pull request #197 from ferrumc-rs/feature/inventories
LGTM
2 parents 355eb2b + e4531b8 commit 60ac95d

File tree

80 files changed

+265958
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+265958
-258
lines changed

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Cargo.lock
77
config.toml
88
.temp
99

10-
.etc/blockstates.json
11-
1210
.etc/blocks.json
1311

1412
flame.svg
@@ -18,4 +16,9 @@ result
1816
result-*
1917

2018
profile.json.gz
21-
.DS_Store
19+
.DS_Store
20+
21+
world/
22+
whitelist.txt
23+
24+
logs/

Cargo.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ members = [
3636
"src/lib/world",
3737
"src/lib/world_gen",
3838
"src/lib/utils/threadpool",
39+
"src/lib/inventories",
3940
"src/lib/registry",
4041
"src/lib/scheduler",
4142
]
@@ -111,6 +112,7 @@ ferrumc-threadpool = { path = "src/lib/utils/threadpool" }
111112
ferrumc-utils = { path = "src/lib/utils" }
112113
ferrumc-world = { path = "src/lib/world" }
113114
ferrumc-world-gen = { path = "src/lib/world_gen" }
115+
ferrumc-inventories = { path = "src/lib/inventories" }
114116

115117
# Asynchronous
116118
tokio = { version = "1.47.1", features = ["macros", "net", "rt", "sync", "time", "io-util", "test-util"], default-features = false }
@@ -124,17 +126,17 @@ console-subscriber = "0.4.1"
124126

125127
# Concurrency/Parallelism
126128
parking_lot = "0.12.4"
127-
rayon = "1.10.0"
129+
rayon = "1.11.0"
128130
crossbeam-channel = "0.5.15"
129131
rusty_pool = "0.7.0"
130132
crossbeam-queue = "0.3.12"
131133

132134
# Network
133135
reqwest = { version = "0.12.22", features = ["json"] }
134-
ureq = "3.0.12"
136+
ureq = "3.1.0"
135137

136138
# Error handling
137-
thiserror = "2.0.12"
139+
thiserror = "2.0.15"
138140

139141
# Cryptography
140142
rand = "0.9.2"
@@ -148,27 +150,26 @@ serde_json = "1.0.142"
148150
serde_derive = "1.0.219"
149151
serde_yaml_ng = "0.9.36"
150152
base64 = "0.22.1"
151-
bitcode = "0.6.6"
152-
bitcode_derive = "0.6.5"
153-
toml = "0.9.4"
153+
bitcode = "0.6.7"
154+
bitcode_derive = "0.6.7"
155+
toml = "0.9.5"
154156
craftflow-nbt = "2.1.0"
155157
figment = { version = "0.10.19", features = ["toml", "env"] }
156158
simd-json = "0.15.1"
157-
sonic-rs = "0.5.3"
158159

159160
# Bit manipulation
160161
byteorder = "1.5.0"
161162

162163
# Data types
163164
dashmap = "7.0.0-rc2"
164-
uuid = { version = "1.17.0", features = ["v4", "v3", "serde"] }
165+
uuid = { version = "1.18.0", features = ["v4", "v3", "serde"] }
165166
indexmap = { version = "2.10.0", features = ["serde"] }
166167

167168
# Macros
168169
lazy_static = "1.5.0"
169170
quote = "1.0.40"
170-
syn = "2.0.104"
171-
proc-macro2 = "1.0.95"
171+
syn = "2.0.106"
172+
proc-macro2 = "1.0.101"
172173
proc-macro-crate = "3.3.0"
173174
paste = "1.0.15"
174175
maplit = "1.0.2"
@@ -190,7 +191,7 @@ heed = "0.22.0"
190191
moka = "0.12.10"
191192

192193
# CLI
193-
clap = "4.5.42"
194+
clap = "4.5.45"
194195
indicatif = "0.18.0"
195196
colored = "3.0.0"
196197

0 commit comments

Comments
 (0)