Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anvil file support (blocks and biomes) #145

Merged
merged 95 commits into from
Dec 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
e453500
Add anvil file support
TerminatorNL Oct 23, 2022
1e24edb
Java part: Biome parsing
TerminatorNL Oct 23, 2022
eb57bad
Rust part: Biome parsing
TerminatorNL Oct 23, 2022
6645942
Rework biome extraction: Spawn rates
TerminatorNL Oct 23, 2022
73cecfe
Rust part: Biome parsing
TerminatorNL Oct 23, 2022
7cbce00
Run formatter
rj00a Oct 23, 2022
a26668c
Adjustments
rj00a Oct 24, 2022
f3c12e1
Unify extracted biomes with valence
TerminatorNL Oct 24, 2022
893d51a
Move biomes into valence_anvil crate
TerminatorNL Oct 28, 2022
f30e482
Require position to be within region
TerminatorNL Oct 29, 2022
4061e43
Merge branch 'valence-rs:main' into anvil
TerminatorNL Oct 29, 2022
da673f3
Refactor everything
TerminatorNL Oct 30, 2022
d1ab1b9
Fix remnant of Result refactor
TerminatorNL Oct 30, 2022
6334a43
Update message at log-in
TerminatorNL Oct 30, 2022
6a2bec7
Cargo fmt
TerminatorNL Oct 30, 2022
146e319
Bump valence_nbt version
rj00a Oct 30, 2022
84c7908
Define valence version
TerminatorNL Oct 30, 2022
4c68b5e
Merge branch 'valence-rs:main' into anvil
TerminatorNL Oct 30, 2022
1c4d204
Merge branch 'main' into anvil
TerminatorNL Nov 1, 2022
e48210c
Merge branch 'valence-rs:main' into anvil
TerminatorNL Nov 2, 2022
b1382e2
Syntax tweaks
rj00a Nov 3, 2022
3379bdd
Fix formatting
rj00a Nov 3, 2022
8db39c7
Fix bug: Palette data wrapping around when palette array and bitmask …
TerminatorNL Nov 4, 2022
e88a44d
Change error implementations to `thiserror` macro derive where possible
TerminatorNL Nov 5, 2022
d13a407
cargo fmt
TerminatorNL Nov 5, 2022
e6a0727
Refactor components. Move from lib.rs to region.rs
TerminatorNL Nov 6, 2022
d0795fd
Allow taking an owned or borrowed value for Biome. Prevents boilerplate.
TerminatorNL Nov 7, 2022
4b11f72
Merge branch 'valence-rs:main' into anvil
TerminatorNL Nov 10, 2022
278ed40
Merge branch 'valence-rs:main' into anvil
TerminatorNL Nov 12, 2022
c1c8283
NONFUNCTIONAL: Benchmark set-up.
TerminatorNL Nov 13, 2022
0c98bf6
Merge branch 'valence-rs:main' into anvil
TerminatorNL Nov 13, 2022
fdcb56b
Add benchmarks to valence_anvil
TerminatorNL Nov 13, 2022
540005d
Merge remote-tracking branch 'origin/anvil' into anvil
TerminatorNL Nov 13, 2022
70bb624
Merge branch 'main' into anvil
rj00a Nov 15, 2022
64458fd
Fix imports
rj00a Nov 15, 2022
65a18cb
Avoid OpenSSL dependency on linux
rj00a Nov 15, 2022
44e404a
Add anvil file support
TerminatorNL Oct 23, 2022
eb5f17b
Java part: Biome parsing
TerminatorNL Oct 23, 2022
c98e61f
Rust part: Biome parsing
TerminatorNL Oct 23, 2022
db20615
Rework biome extraction: Spawn rates
TerminatorNL Oct 23, 2022
e2442b6
Rust part: Biome parsing
TerminatorNL Oct 23, 2022
354e165
Run formatter
rj00a Oct 23, 2022
e850345
Adjustments
rj00a Oct 24, 2022
4f7be79
Unify extracted biomes with valence
TerminatorNL Oct 24, 2022
376c617
Move biomes into valence_anvil crate
TerminatorNL Oct 28, 2022
87262ed
Require position to be within region
TerminatorNL Oct 29, 2022
1bcf605
Refactor everything
TerminatorNL Oct 30, 2022
29f4308
Fix remnant of Result refactor
TerminatorNL Oct 30, 2022
b49fbc3
Update message at log-in
TerminatorNL Oct 30, 2022
5d8c83d
Cargo fmt
TerminatorNL Oct 30, 2022
eb44098
Define valence version
TerminatorNL Oct 30, 2022
4b82557
Syntax tweaks
rj00a Nov 3, 2022
84bf30f
Fix formatting
rj00a Nov 3, 2022
4ca2617
Fix bug: Palette data wrapping around when palette array and bitmask …
TerminatorNL Nov 4, 2022
04657d7
Change error implementations to `thiserror` macro derive where possible
TerminatorNL Nov 5, 2022
3313d31
cargo fmt
TerminatorNL Nov 5, 2022
35cc20b
Refactor components. Move from lib.rs to region.rs
TerminatorNL Nov 6, 2022
5571416
Allow taking an owned or borrowed value for Biome. Prevents boilerplate.
TerminatorNL Nov 7, 2022
834e6a9
NONFUNCTIONAL: Benchmark set-up.
TerminatorNL Nov 13, 2022
1a2873a
Add benchmarks to valence_anvil
TerminatorNL Nov 13, 2022
bb04894
Fix imports
rj00a Nov 15, 2022
4b7f877
Avoid OpenSSL dependency on linux
rj00a Nov 15, 2022
828bb6e
Update valence_anvil
TerminatorNL Dec 1, 2022
8012dca
Merge remote-tracking branch 'origin/anvil' into anvil
TerminatorNL Dec 1, 2022
91808e7
Remove git merge remnant
TerminatorNL Dec 1, 2022
a4877c1
Cleanup tests.
TerminatorNL Dec 4, 2022
2b2224a
Cargo fmt
TerminatorNL Dec 4, 2022
1fcb6b3
Merge branch 'valence-rs:main' into anvil
TerminatorNL Dec 10, 2022
61cdafb
Reformat chunk parsing
TerminatorNL Dec 11, 2022
cfe95b9
Code cleanup: Clippy lints
TerminatorNL Dec 11, 2022
351d6a5
Merge branch 'valence-rs:main' into anvil
TerminatorNL Dec 11, 2022
f54e951
Rustup update + Clippy
TerminatorNL Dec 11, 2022
a33d53b
Merge remote-tracking branch 'origin/anvil' into anvil
TerminatorNL Dec 11, 2022
5ce1a13
Update to new valence API
TerminatorNL Dec 11, 2022
4f57df7
Merge branch 'valence-rs:main' into anvil
TerminatorNL Dec 11, 2022
2a93ef7
Cargo fmt
TerminatorNL Dec 11, 2022
439a734
Merge remote-tracking branch 'origin/anvil' into anvil
TerminatorNL Dec 11, 2022
0882b45
Merge branch 'valence-rs:main' into anvil
TerminatorNL Dec 16, 2022
f4faccf
Reformat Biome parsing to match https://github.com/valence-rs/valence…
TerminatorNL Dec 15, 2022
6af814e
Merge pull request #1 from TerminatorNL/biome_extractor
TerminatorNL Dec 17, 2022
055ec9a
Fix MacOS build requirement by removing borrow
TerminatorNL Dec 17, 2022
8dbbe64
Clean up parser and add particle effect
TerminatorNL Dec 17, 2022
b109ac0
Merge branch 'main' into anvil
TerminatorNL Dec 17, 2022
9d71ab5
Remove async impl (#2)
TerminatorNL Dec 18, 2022
1b54175
Update documentation (and examples)
TerminatorNL Dec 18, 2022
d1f691b
Fix semantics
TerminatorNL Dec 18, 2022
ec7e677
Merge branch 'main' into anvil
rj00a Dec 24, 2022
909104c
Get basic block state loading working
rj00a Dec 25, 2022
f685d58
Add biomes
rj00a Dec 25, 2022
ee46b3f
Clean up asset loading, remove biome generator
rj00a Dec 26, 2022
7728e46
Fix chunk test
rj00a Dec 26, 2022
f5ece9f
Clean up docs and Cargo.toml
rj00a Dec 26, 2022
e071b44
Merge branch 'main' into anvil
rj00a Dec 26, 2022
7db13e7
Fix docs
rj00a Dec 26, 2022
d21be97
Fix lints
rj00a Dec 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Cargo.lock
flamegraph.svg
perf.data
perf.data.old
/valence_anvil/.asset_cache/
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ valence_protocol = { version = "0.1.0", path = "valence_protocol", features = ["
vek = "0.15.8"

[dependencies.tokio]
version = "1.21.1"
version = "1.21.2"
features = ["macros", "rt-multi-thread", "net", "io-util", "sync", "time"]

[dependencies.reqwest]
Expand Down Expand Up @@ -70,6 +70,7 @@ num = "0.4.0"
members = [
"valence_derive",
"valence_nbt",
"valence_anvil",
"valence_protocol",
"valence_spatial_index",
"packet_inspector",
Expand Down
4 changes: 2 additions & 2 deletions examples/terrain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl Config for Game {
let mut in_terrain = false;
let mut depth = 0;

for y in (0..chunk.height()).rev() {
for y in (0..chunk.section_count() * 16).rev() {
let b = terrain_column(
self,
block_x,
Expand All @@ -184,7 +184,7 @@ impl Config for Game {
}

// Add grass
for y in (0..chunk.height()).rev() {
for y in (0..chunk.section_count() * 16).rev() {
if chunk.block_state(x, y, z).is_air()
&& chunk.block_state(x, y - 1, z) == BlockState::GRASS_BLOCK
{
Expand Down
Loading