mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 06:16:04 +00:00
Code Issues Projects Releases Packages Activity

fix not compiling

Browse source
This commit is contained in:
mat 2023-08-27 03:39:58 -05:00
parent db1b1a05ef
commit 6f9ffccde3
24 changed files with 499 additions and 433 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

708
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

1
Cargo.toml
View file

@ -16,6 +16,7 @@ members = [
"azalea-physics",
"azalea-registry",
]
resolver = "2"
[profile.release]
debug = true

20
azalea-auth/Cargo.toml
View file

@ -11,19 +11,19 @@ version = "0.6.0"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" }
chrono = { version = "0.4.22", default-features = false }
log = "0.4.17"
num-bigint = "0.4.3"
reqwest = { version = "0.11.12", default-features = false, features = [
chrono = { version = "0.4.26", default-features = false }
log = "0.4.20"
num-bigint = "0.4.4"
reqwest = { version = "0.11.20", default-features = false, features = [
"json",
"rustls-tls",
] }
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.93"
thiserror = "1.0.37"
tokio = { version = "1.24.2", features = ["fs"] }
uuid = { version = "^1.1.2", features = ["serde"] }
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
thiserror = "1.0.47"
tokio = { version = "1.32.0", features = ["fs"] }
uuid = { version = "^1.4.1", features = ["serde"] }
[dev-dependencies]
env_logger = "0.9.3"
tokio = { version = "1.24.2", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }

6
azalea-block/azalea-block-macros/Cargo.toml
View file

@ -12,6 +12,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "1.0.39"
quote = "1.0.18"
syn = "1.0.95"
proc-macro2 = "1.0.66"
quote = "1.0.33"
syn = "1.0.109"

8
azalea-buf/Cargo.toml
View file

@ -11,11 +11,11 @@ version = "0.6.0"
[dependencies]
azalea-buf-macros = {path = "./azalea-buf-macros", version = "^0.6.0" }
byteorder = "^1.4.3"
log = "0.4.17"
log = "0.4.20"
serde_json = {version = "^1.0", optional = true}
thiserror = "1.0.37"
tokio = {version = "^1.24.2", features = ["io-util", "net", "macros"]}
uuid = "^1.1.2"
thiserror = "1.0.47"
tokio = {version = "^1.32.0", features = ["io-util", "net", "macros"]}
uuid = "^1.4.1"
[features]
serde_json = ["dep:serde_json"]

6
azalea-buf/azalea-buf-macros/Cargo.toml
View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "^1.0.36"
quote = "^1.0.10"
syn = {version = "^1.0.82", features = ["extra-traits"]}
proc-macro2 = "^1.0.66"
quote = "^1.0.33"
syn = {version = "^1.0.109", features = ["extra-traits"]}

1
azalea-buf/src/lib.rs
View file

@ -2,7 +2,6 @@
#![feature(min_specialization)]
// these two are necessary for thiserror backtraces
#![feature(error_generic_member_access)]
#![feature(provide_any)]
mod definitions;
mod read;

8
azalea-chat/Cargo.toml
View file

@ -16,7 +16,7 @@ azalea-buf = { path = "../azalea-buf", features = [
"serde_json",
], version = "^0.6.0", optional = true }
azalea-language = { path = "../azalea-language", version = "^0.6.0" }
log = "0.4.17"
once_cell = "1.16.0"
serde = { version = "^1.0.152", features = ["derive"] }
serde_json = "^1.0.93"
log = "0.4.20"
once_cell = "1.18.0"
serde = { version = "^1.0.188", features = ["derive"] }
serde_json = "^1.0.105"

28
azalea-client/Cargo.toml
View file

@ -9,8 +9,8 @@ version = "0.6.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.59"
async-trait = "0.1.58"
anyhow = "1.0.75"
async-trait = "0.1.73"
azalea-auth = { path = "../azalea-auth", version = "0.6.0" }
azalea-block = { path = "../azalea-block", version = "0.6.0" }
azalea-chat = { path = "../azalea-chat", version = "0.6.0" }
@ -20,19 +20,19 @@ azalea-physics = { path = "../azalea-physics", version = "0.6.0" }
azalea-protocol = { path = "../azalea-protocol", version = "0.6.0" }
azalea-registry = { path = "../azalea-registry", version = "0.6.0" }
azalea-world = { path = "../azalea-world", version = "0.6.0" }
bevy_app = "0.10.0"
bevy_ecs = "0.10.0"
bevy_log = "0.10.0"
bevy_tasks = "0.10.0"
bevy_time = "0.10.0"
bevy_app = "0.10.1"
bevy_ecs = "0.10.1"
bevy_log = "0.10.1"
bevy_tasks = "0.10.1"
bevy_time = "0.10.1"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.25"
log = "0.4.17"
futures = "0.3.28"
log = "0.4.20"
nohash-hasher = "0.2.0"
once_cell = "1.16.0"
once_cell = "1.18.0"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
regex = "1.7.0"
thiserror = "^1.0.34"
tokio = { version = "^1.24.2", features = ["sync"] }
regex = "1.9.4"
thiserror = "^1.0.47"
tokio = { version = "^1.32.0", features = ["sync"] }
typemap_rev = "0.3.0"
uuid = "^1.1.2"
uuid = "^1.4.1"

1
azalea-client/src/lib.rs
View file

@ -5,7 +5,6 @@
//! [`azalea_protocol`]: https://crates.io/crates/azalea-protocol
//! [`azalea`]: https://crates.io/crates/azalea
#![feature(provide_any)]
#![allow(incomplete_features)]
#![feature(trait_upcasting)]
#![feature(error_generic_member_access)]

13
azalea-client/src/packet_handling.rs
View file

@ -330,9 +330,10 @@ fn process_packet_events(ecs: &mut World) {
> = SystemState::new(ecs);
let mut query = system_state.get_mut(ecs);
let Ok((mut local_player, mut physics, mut position, mut last_sent_position)) =
query.get_mut(player_entity) else {
continue;
};
query.get_mut(player_entity)
else {
continue;
};
let delta_movement = physics.delta;
@ -693,7 +694,7 @@ fn process_packet_events(ecs: &mut World) {
}
Action::UpdateGameMode(v) => {
for update in v {
if let Some(mut info) = tab_list.get_mut(&update.uuid) {
if let Some(info) = tab_list.get_mut(&update.uuid) {
info.gamemode = update.gamemode;
update_player_events.send(UpdatePlayerEvent {
@ -707,7 +708,7 @@ fn process_packet_events(ecs: &mut World) {
}
Action::UpdateLatency(v) => {
for update in v {
if let Some(mut info) = tab_list.get_mut(&update.uuid) {
if let Some(info) = tab_list.get_mut(&update.uuid) {
info.latency = update.latency;
update_player_events.send(UpdatePlayerEvent {
@ -721,7 +722,7 @@ fn process_packet_events(ecs: &mut World) {
}
Action::UpdateDisplayName(v) => {
for update in v {
if let Some(mut info) = tab_list.get_mut(&update.uuid) {
if let Some(info) = tab_list.get_mut(&update.uuid) {
info.display_name = update.display_name.clone();
update_player_events.send(UpdatePlayerEvent {

8
azalea-core/Cargo.toml
View file

@ -12,10 +12,10 @@ version = "0.6.0"
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
azalea-chat = { path = "../azalea-chat", version = "^0.6.0" }
azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" }
bevy_ecs = { version = "0.10.0", default-features = false, optional = true }
serde = {version = "^1.0.152", optional = true}
uuid = "^1.1.2"
bevy_ecs = { version = "0.10.1", default-features = false, optional = true }
serde = {version = "^1.0.188", optional = true}
uuid = "^1.4.1"
[features]
bevy_ecs = ["dep:bevy_ecs"]
serde = ["dep:serde"]
serde = ["dep:serde"]

10
azalea-crypto/Cargo.toml
View file

@ -9,14 +9,14 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-crypto"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
aes = "0.8.1"
aes = "0.8.3"
azalea-buf = {path = "../azalea-buf", version = "^0.6.0" }
cfb8 = "0.8.1"
num-bigint = "^0.4.3"
rand = {version = "^0.8.4", features = ["getrandom"]}
num-bigint = "^0.4.4"
rand = {version = "^0.8.5", features = ["getrandom"]}
rsa_public_encrypt_pkcs1 = "0.4.0"
sha-1 = "^0.10.0"
uuid = "^1.1.2"
sha-1 = "^0.10.1"
uuid = "^1.4.1"
[dev-dependencies]
criterion = {version = "^0.4.0", features = ["html_reports"]}

6
azalea-language/Cargo.toml
View file

@ -9,7 +9,7 @@ version = "0.6.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
once_cell = "1.16.0"
serde = "^1.0.152"
serde_json = "^1.0.93"
once_cell = "1.18.0"
serde = "^1.0.188"
serde_json = "^1.0.105"
# tokio = {version = "^1.21.2", features = ["fs"]}

8
azalea-nbt/Cargo.toml
View file

@ -12,11 +12,11 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-nbt"
ahash = { version = "^0.8.3" }
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
byteorder = "^1.4.3"
flate2 = "^1.0.25"
log = "0.4.17"
flate2 = "^1.0.27"
log = "0.4.20"
num-derive = "^0.3.3"
num-traits = "^0.2.15"
serde = { version = "1.0.152", features = ["derive"], optional = true }
num-traits = "^0.2.16"
serde = { version = "1.0.188", features = ["derive"], optional = true }
[dev-dependencies]
criterion = {version = "^0.4.0", features = ["html_reports"]}

10
azalea-physics/Cargo.toml
View file

@ -13,11 +13,11 @@ azalea-block = { path = "../azalea-block", version = "^0.6.0" }
azalea-core = { path = "../azalea-core", version = "^0.6.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.6.0" }
azalea-world = { path = "../azalea-world", version = "^0.6.0" }
bevy_app = "0.10.0"
bevy_ecs = "0.10.0"
once_cell = "1.16.0"
bevy_app = "0.10.1"
bevy_ecs = "0.10.1"
once_cell = "1.18.0"
parking_lot = "^0.12.1"
[dev-dependencies]
bevy_time = "0.10.0"
uuid = "^1.1.2"
bevy_time = "0.10.1"
uuid = "^1.4.1"

36
azalea-protocol/Cargo.toml
View file

@ -9,11 +9,11 @@ version = "0.6.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
async-compression = { version = "^0.3.8", features = [
async-compression = { version = "^0.3.15", features = [
"tokio",
"zlib",
], optional = true }
async-recursion = "1.0.0"
async-recursion = "1.0.4"
azalea-auth = { path = "../azalea-auth", version = "^0.6.0" }
azalea-block = { path = "../azalea-block", default-features = false, version = "^0.6.0" }
azalea-brigadier = { path = "../azalea-brigadier", version = "^0.6.0", features = [
@ -31,22 +31,22 @@ azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0", features = [
azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "^0.6.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.6.0" }
azalea-world = { path = "../azalea-world", version = "^0.6.0" }
bevy_ecs = { version = "0.10.0", default-features = false }
bevy_ecs = { version = "0.10.1", default-features = false }
byteorder = "^1.4.3"
bytes = "^1.1.0"
flate2 = "1.0.25"
futures = "0.3.24"
futures-util = "0.3.24"
log = "0.4.17"
serde = { version = "1.0.152", features = ["serde_derive"] }
serde_json = "^1.0.93"
thiserror = "1.0.37"
tokio = { version = "^1.24.2", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.4", features = ["codec"] }
bytes = "^1.4.0"
flate2 = "1.0.27"
futures = "0.3.28"
futures-util = "0.3.28"
log = "0.4.20"
serde = { version = "1.0.188", features = ["serde_derive"] }
serde_json = "^1.0.105"
thiserror = "1.0.47"
tokio = { version = "^1.32.0", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.8", features = ["codec"] }
trust-dns-resolver = { version = "^0.22.0", default-features = false, features = [
"tokio-runtime",
] }
uuid = "1.1.2"
uuid = "1.4.1"
[features]
connecting = []
@ -55,7 +55,7 @@ packets = ["connecting", "dep:async-compression", "dep:azalea-core"]
strict_registry = ["packets"]
[dev-dependencies]
anyhow = "^1.0.65"
tracing = "^0.1.36"
tracing-subscriber = "^0.3.15"
once_cell = "1.17.0"
anyhow = "^1.0.75"
tracing = "^0.1.37"
tracing-subscriber = "^0.3.17"
once_cell = "1.18.0"

6
azalea-protocol/azalea-protocol-macros/Cargo.toml
View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "^1.0.36"
quote = "^1.0.10"
syn = "^1.0.82"
proc-macro2 = "^1.0.66"
quote = "^1.0.33"
syn = "^1.0.109"

1
azalea-protocol/src/lib.rs
View file

@ -11,7 +11,6 @@
// these two are necessary for thiserror backtraces
#![feature(error_generic_member_access)]
#![feature(provide_any)]
use std::{fmt::Display, net::SocketAddr, str::FromStr};

2
azalea-registry/Cargo.toml
View file

@ -12,7 +12,7 @@ version = "0.6.0"
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
azalea-registry-macros = { path = "./azalea-registry-macros", version = "^0.6.0" }
enum-as-inner = "0.5.1"
serde = { version = "1.0.155", optional = true }
serde = { version = "1.0.188", optional = true }
[features]
serde = ["dep:serde", "azalea-registry-macros/serde"]

6
azalea-registry/azalea-registry-macros/Cargo.toml
View file

@ -12,9 +12,9 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "1.0.39"
quote = "1.0.18"
syn = "1.0.95"
proc-macro2 = "1.0.66"
quote = "1.0.33"
syn = "1.0.109"
[features]
serde = []

12
azalea-world/Cargo.toml
View file

@ -17,16 +17,16 @@ azalea-core = { path = "../azalea-core", version = "^0.6.0", features = [
] }
azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.6.0" }
bevy_app = "0.10.0"
bevy_ecs = "0.10.0"
bevy_app = "0.10.1"
bevy_ecs = "0.10.1"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
enum-as-inner = "0.5.1"
log = "0.4.17"
log = "0.4.20"
nohash-hasher = "0.2.0"
once_cell = "1.16.0"
once_cell = "1.18.0"
parking_lot = "^0.12.1"
thiserror = "1.0.34"
uuid = "1.1.2"
thiserror = "1.0.47"
uuid = "1.4.1"
[profile.release]
lto = true

1
azalea-world/src/lib.rs
View file

@ -1,7 +1,6 @@
#![doc = include_str!("../README.md")]
#![feature(int_roundings)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]
mod bit_storage;
mod chunk_storage;

26
azalea/Cargo.toml
View file

@ -12,8 +12,8 @@ pre-release-replacements = [
]
[dependencies]
anyhow = "^1.0.65"
async-trait = "0.1.58"
anyhow = "^1.0.75"
async-trait = "0.1.73"
azalea-block = { version = "0.6.0", path = "../azalea-block" }
azalea-chat = { version = "0.6.0", path = "../azalea-chat" }
azalea-client = { version = "0.6.0", path = "../azalea-client" }
@ -22,17 +22,17 @@ azalea-physics = { version = "0.6.0", path = "../azalea-physics" }
azalea-protocol = { version = "0.6.0", path = "../azalea-protocol" }
azalea-registry = { version = "0.6.0", path = "../azalea-registry" }
azalea-world = { version = "0.6.0", path = "../azalea-world" }
bevy_app = "0.10.0"
bevy_ecs = "0.10.0"
bevy_tasks = "0.10.0"
bevy_app = "0.10.1"
bevy_ecs = "0.10.1"
bevy_tasks = "0.10.1"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.25"
futures-lite = "1.12.0"
log = "0.4.17"
futures = "0.3.28"
futures-lite = "1.13.0"
log = "0.4.20"
nohash-hasher = "0.2.0"
num-traits = "0.2.15"
num-traits = "0.2.16"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
priority-queue = "1.3.0"
thiserror = "^1.0.37"
tokio = "^1.24.2"
uuid = "1.2.2"
priority-queue = "1.3.2"
thiserror = "^1.0.47"
tokio = "^1.32.0"
uuid = "1.4.1"