Skip to content

Tallgrass #468

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.

Sign up for GitHub

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

Merged
iceiix merged 4 commits into from
Jan 11, 2021
Merged

Tallgrass #468

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5584b4d
blocks: enable logging block states
iceiix Jan 10, 2021
3c88c8c
blocks: add offset for TallGrass
iceiix Jan 10, 2021
9adb844
blocks: fix TallGrass variant offsets (grass/fern/deadbush block states)
iceiix Jan 10, 2021
7012585
Comment-out block state debugging
iceiix Jan 11, 2021
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
15 changes: 12 additions & 3 deletions blocks/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,9 @@ macro_rules! define_blocks {
let id = *flat_id + offset;
/*
if let Some(vanilla_id) = vanilla_id {
debug!("{} block state = {:?} hierarchical {}:{} offset={}", id, block, vanilla_id >> 4, vanilla_id & 0xF, offset);
println!("{} block state = {:?} hierarchical {}:{} offset={}", id, block, vanilla_id >> 4, vanilla_id & 0xF, offset);
} else {
debug!("{} block state = {:?} hierarchical none, offset={}", id, block, offset);
println!("{} block state = {:?} hierarchical none, offset={}", id, block, offset);
}
*/
if offset as isize > last_offset {
Expand All @@ -446,7 +446,7 @@ macro_rules! define_blocks {
if let Some(vanilla_id) = vanilla_id {
/*
if offset.is_none() {
debug!("(no flat) block state = {:?} hierarchical {}:{}", block, vanilla_id >> 4, vanilla_id & 0xF);
println!("(no flat) block state = {:?} hierarchical {}:{}", block, vanilla_id >> 4, vanilla_id & 0xF);
}
*/

Expand Down Expand Up @@ -968,6 +968,7 @@ define_blocks! {
],
},
data Some(variant.data()),
offset Some(variant.offset()),
material material::NON_SOLID,
model { ("minecraft", variant.as_string() ) },
tint TintType::Grass,
Expand Down Expand Up @@ -7289,6 +7290,14 @@ impl TallGrassVariant {
TallGrassVariant::Fern => 2,
}
}

fn offset(self) -> usize {
match self {
TallGrassVariant::TallGrass => 0,
TallGrassVariant::Fern => 1,
TallGrassVariant::DeadBush => 2,
}
}
}

#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
Expand Down