mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
Fix leftover merge issues
This commit is contained in:
EightFactorial
parent
c66f59e8f7
commit
ec5e4adca0
4 changed files with 57 additions and 235 deletions
269
Cargo.lock
generated
269
Cargo.lock
generated
|
|
@ -219,11 +219,11 @@ dependencies = [
|
|||
"azalea-registry",
|
||||
"azalea-world",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_log",
|
||||
"bevy_tasks 0.15.0",
|
||||
"bevy_tasks",
|
||||
"criterion",
|
||||
"derive_more 1.0.0",
|
||||
"derive_more",
|
||||
"futures",
|
||||
"futures-lite",
|
||||
"nohash-hasher",
|
||||
|
|
@ -284,7 +284,7 @@ dependencies = [
|
|||
"azalea-buf",
|
||||
"azalea-chat",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"parking_lot",
|
||||
]
|
||||
|
||||
|
|
@ -341,11 +341,11 @@ dependencies = [
|
|||
"azalea-registry",
|
||||
"azalea-world",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_log",
|
||||
"bevy_tasks 0.15.0",
|
||||
"bevy_tasks",
|
||||
"bevy_time",
|
||||
"derive_more 1.0.0",
|
||||
"derive_more",
|
||||
"minecraft_folder_path",
|
||||
"parking_lot",
|
||||
"regex",
|
||||
|
|
@ -363,7 +363,7 @@ version = "0.10.3+mc1.21.3"
|
|||
dependencies = [
|
||||
"azalea-buf",
|
||||
"azalea-registry",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"nohash-hasher",
|
||||
"num-traits",
|
||||
"serde",
|
||||
|
|
@ -400,8 +400,8 @@ dependencies = [
|
|||
"azalea-registry",
|
||||
"azalea-world",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"derive_more 1.0.0",
|
||||
"bevy_ecs",
|
||||
"derive_more",
|
||||
"enum-as-inner",
|
||||
"nohash-hasher",
|
||||
"parking_lot",
|
||||
|
|
@ -452,8 +452,9 @@ dependencies = [
|
|||
"azalea-registry",
|
||||
"azalea-world",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_time",
|
||||
"parking_lot",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
|
|
@ -475,7 +476,7 @@ dependencies = [
|
|||
"azalea-protocol-macros",
|
||||
"azalea-registry",
|
||||
"azalea-world",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bytes",
|
||||
"flate2",
|
||||
"futures",
|
||||
|
|
@ -530,18 +531,15 @@ dependencies = [
|
|||
"azalea-client",
|
||||
"azalea-core",
|
||||
"azalea-registry",
|
||||
"bevy_ecs 0.13.2",
|
||||
"bevy_ecs",
|
||||
"criterion",
|
||||
"derive_more 0.99.18",
|
||||
"derive_more",
|
||||
"nohash-hasher",
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
"rustc-hash 2.0.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 1.0.69",
|
||||
"simdnbt",
|
||||
"thiserror 2.0.3",
|
||||
"tracing",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -578,13 +576,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "652574e4c10efcfa70f98036709dd5b67e5cb8d46c58087ef48c2ac6b62df9da"
|
||||
dependencies = [
|
||||
"bevy_derive",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_reflect 0.15.0",
|
||||
"bevy_tasks 0.15.0",
|
||||
"bevy_utils 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_reflect",
|
||||
"bevy_tasks",
|
||||
"bevy_utils",
|
||||
"console_error_panic_hook",
|
||||
"ctrlc",
|
||||
"derive_more 1.0.0",
|
||||
"derive_more",
|
||||
"downcast-rs",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
|
|
@ -596,45 +594,25 @@ version = "0.15.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e141b7eda52a23bb88740b37a291e26394524cb9ee3b034c7014669671fc2bb5"
|
||||
dependencies = [
|
||||
"bevy_macro_utils 0.15.0",
|
||||
"bevy_macro_utils",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ecs"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"bevy_ecs_macros 0.13.2",
|
||||
"bevy_ptr 0.13.2",
|
||||
"bevy_reflect 0.13.2",
|
||||
"bevy_tasks 0.13.2",
|
||||
"bevy_utils 0.13.2",
|
||||
"downcast-rs",
|
||||
"fixedbitset 0.4.2",
|
||||
"rustc-hash 1.1.0",
|
||||
"serde",
|
||||
"thiserror 1.0.69",
|
||||
"thread_local",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ecs"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb4c4b60d2a712c6d5cbe610bac7ecf0838fc56a095fd5b15f30230873e84f15"
|
||||
dependencies = [
|
||||
"bevy_ecs_macros 0.15.0",
|
||||
"bevy_ptr 0.15.0",
|
||||
"bevy_reflect 0.15.0",
|
||||
"bevy_tasks 0.15.0",
|
||||
"bevy_utils 0.15.0",
|
||||
"bevy_ecs_macros",
|
||||
"bevy_ptr",
|
||||
"bevy_reflect",
|
||||
"bevy_tasks",
|
||||
"bevy_utils",
|
||||
"bitflags",
|
||||
"concurrent-queue",
|
||||
"derive_more 1.0.0",
|
||||
"derive_more",
|
||||
"disqualified",
|
||||
"fixedbitset 0.5.7",
|
||||
"nonmax",
|
||||
|
|
@ -642,25 +620,13 @@ dependencies = [
|
|||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ecs_macros"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b"
|
||||
dependencies = [
|
||||
"bevy_macro_utils 0.13.2",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ecs_macros"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb4296b3254b8bd29769f6a4512731b2e6c4b163343ca18b72316927315b6096"
|
||||
dependencies = [
|
||||
"bevy_macro_utils 0.15.0",
|
||||
"bevy_macro_utils",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
|
|
@ -674,27 +640,14 @@ checksum = "1a0bdb42b00ac3752f0d6f531fbda8abf313603157a7b3163da8529412119a0a"
|
|||
dependencies = [
|
||||
"android_log-sys",
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_utils 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_utils",
|
||||
"tracing-log",
|
||||
"tracing-oslog",
|
||||
"tracing-subscriber",
|
||||
"tracing-wasm",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_macro_utils"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb270c98a96243b29465139ed10bda2f675d00a11904f6588a5f7fc4774119c7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc-hash 1.1.0",
|
||||
"syn",
|
||||
"toml_edit 0.21.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_macro_utils"
|
||||
version = "0.15.0"
|
||||
|
|
@ -704,36 +657,15 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"toml_edit 0.22.22",
|
||||
"toml_edit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ptr"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268"
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ptr"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af9e30b40fb3f0a80a658419f670f2de1e743efcaca1952c43cdcc923287944"
|
||||
|
||||
[[package]]
|
||||
name = "bevy_reflect"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b"
|
||||
dependencies = [
|
||||
"bevy_ptr 0.13.2",
|
||||
"bevy_reflect_derive 0.13.2",
|
||||
"bevy_utils 0.13.2",
|
||||
"downcast-rs",
|
||||
"erased-serde",
|
||||
"serde",
|
||||
"thiserror 1.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_reflect"
|
||||
version = "0.15.0"
|
||||
|
|
@ -741,10 +673,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "52a37e2ae5ed62df4a0e3f958076effe280b39bc81fe878587350897a89332a2"
|
||||
dependencies = [
|
||||
"assert_type_match",
|
||||
"bevy_ptr 0.15.0",
|
||||
"bevy_reflect_derive 0.15.0",
|
||||
"bevy_utils 0.15.0",
|
||||
"derive_more 1.0.0",
|
||||
"bevy_ptr",
|
||||
"bevy_reflect_derive",
|
||||
"bevy_utils",
|
||||
"derive_more",
|
||||
"disqualified",
|
||||
"downcast-rs",
|
||||
"erased-serde",
|
||||
|
|
@ -753,46 +685,19 @@ dependencies = [
|
|||
"smol_str",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_reflect_derive"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac"
|
||||
dependencies = [
|
||||
"bevy_macro_utils 0.13.2",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_reflect_derive"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94c683fc68c75fc26f90bb1e529590095380d7cec66f6610dbe6b93d9fd26f94"
|
||||
dependencies = [
|
||||
"bevy_macro_utils 0.15.0",
|
||||
"bevy_macro_utils",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_tasks"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f07fcc4969b357de143509925b39c9a2c56eaa8750828d97f319ca9ed41897cb"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-executor",
|
||||
"async-task",
|
||||
"concurrent-queue",
|
||||
"futures-lite",
|
||||
"wasm-bindgen-futures",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_tasks"
|
||||
version = "0.15.0"
|
||||
|
|
@ -815,31 +720,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "291b6993b899c04554fc034ebb9e0d7fde9cb9b2fb58dcd912bfa6247abdedbb"
|
||||
dependencies = [
|
||||
"bevy_app",
|
||||
"bevy_ecs 0.15.0",
|
||||
"bevy_reflect 0.15.0",
|
||||
"bevy_utils 0.15.0",
|
||||
"bevy_ecs",
|
||||
"bevy_reflect",
|
||||
"bevy_utils",
|
||||
"crossbeam-channel",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_utils"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bevy_utils_proc_macros 0.13.2",
|
||||
"getrandom",
|
||||
"hashbrown 0.14.5",
|
||||
"nonmax",
|
||||
"petgraph",
|
||||
"smallvec",
|
||||
"thiserror 1.0.69",
|
||||
"tracing",
|
||||
"uuid",
|
||||
"web-time 0.2.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_utils"
|
||||
version = "0.15.0"
|
||||
|
|
@ -847,23 +733,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "a0a48bad33c385a7818b7683a16c8b5c6930eded05cd3f176264fc1f5acea473"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bevy_utils_proc_macros 0.15.0",
|
||||
"bevy_utils_proc_macros",
|
||||
"getrandom",
|
||||
"hashbrown 0.14.5",
|
||||
"thread_local",
|
||||
"tracing",
|
||||
"web-time 1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_utils_proc_macros"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"web-time",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1115,12 +990,6 @@ dependencies = [
|
|||
"tiny-keccak",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
|
||||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.16"
|
||||
|
|
@ -1252,19 +1121,6 @@ dependencies = [
|
|||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "0.99.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
|
||||
dependencies = [
|
||||
"convert_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc_version",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "1.0.0"
|
||||
|
|
@ -2448,7 +2304,7 @@ dependencies = [
|
|||
"thiserror 2.0.3",
|
||||
"tinyvec",
|
||||
"tracing",
|
||||
"web-time 1.1.0",
|
||||
"web-time",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2722,7 +2578,7 @@ version = "1.10.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
|
||||
dependencies = [
|
||||
"web-time 1.1.0",
|
||||
"web-time",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2930,9 +2786,6 @@ name = "smallvec"
|
|||
version = "1.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smol_str"
|
||||
|
|
@ -3191,17 +3044,6 @@ version = "0.6.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.21.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"toml_datetime",
|
||||
"winnow 0.5.40",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.22.22"
|
||||
|
|
@ -3210,7 +3052,7 @@ checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
|
|||
dependencies = [
|
||||
"indexmap",
|
||||
"toml_datetime",
|
||||
"winnow 0.6.20",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3566,16 +3408,6 @@ dependencies = [
|
|||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "web-time"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "web-time"
|
||||
version = "1.1.0"
|
||||
|
|
@ -3738,15 +3570,6 @@ version = "0.52.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.5.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.6.20"
|
||||
|
|
|
|||
|
|
@ -19,3 +19,4 @@ azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
|
|||
azalea-world = { path = "../azalea-world", version = "0.10.0" }
|
||||
bevy_app = { workspace = true }
|
||||
bevy_ecs = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -17,17 +17,14 @@ azalea-core = { path = "../azalea-core", version = "0.10.0", features = [
|
|||
"bevy_ecs",
|
||||
] }
|
||||
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
|
||||
bevy_ecs = "0.13.0"
|
||||
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
|
||||
tracing = "0.1.40"
|
||||
nohash-hasher = "0.2.0"
|
||||
once_cell = "1.19.0"
|
||||
parking_lot = "^0.12.3"
|
||||
thiserror = "1.0.61"
|
||||
uuid = "1.9.1"
|
||||
serde_json = "1.0.120"
|
||||
serde = "1.0.203"
|
||||
rustc-hash = "2.0.0"
|
||||
bevy_ecs = { workspace = true }
|
||||
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
|
||||
nohash-hasher = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
rustc-hash = { workspace = true }
|
||||
simdnbt = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
|
||||
[[bench]]
|
||||
name = "chunks"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
[toolchain]
|
||||
channel = "nightly"
|
||||
channel = "nightly-2024-11-11"
|
||||
# channel = "nightly"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue