diff --git a/crates/horizon-client/examples/block_transform_fixture.rs b/crates/horizon-client/examples/block_transform_fixture.rs index 686ad8c42..01d92a047 100644 --- a/crates/horizon-client/examples/block_transform_fixture.rs +++ b/crates/horizon-client/examples/block_transform_fixture.rs @@ -53,7 +53,10 @@ impl Around for Column { fn main() -> horizon_client::Result<()> { let args: Vec = std::env::args().collect(); - let root = Path::new(args.get(1).ok_or("usage: block_transform_fixture RESOURCES INPUT OUTPUT")?); + let root = Path::new( + args.get(1) + .ok_or("usage: block_transform_fixture RESOURCES INPUT OUTPUT")?, + ); let input = fs::read_to_string(args.get(2).ok_or("missing INPUT")?)?; let items = Items::catalog(root)?; let assets = Assets::load(root)?; diff --git a/crates/horizon-client/examples/cauldron_fixture.rs b/crates/horizon-client/examples/cauldron_fixture.rs index e111782fb..9f238396d 100644 --- a/crates/horizon-client/examples/cauldron_fixture.rs +++ b/crates/horizon-client/examples/cauldron_fixture.rs @@ -72,7 +72,10 @@ fn describe(state: &BlockState) -> String { fn main() -> horizon_client::Result<()> { let args: Vec = std::env::args().collect(); - let root = Path::new(args.get(1).ok_or("usage: cauldron_fixture RESOURCES INPUT OUTPUT")?); + let root = Path::new( + args.get(1) + .ok_or("usage: cauldron_fixture RESOURCES INPUT OUTPUT")?, + ); let input = fs::read_to_string(args.get(2).ok_or("missing INPUT")?)?; let items = Items::catalog(root)?; let recipes = Recipes::load(root, &items)?; @@ -129,7 +132,11 @@ fn main() -> horizon_client::Result<()> { .map(|s| format!("{i}={}", canon_stack(Some(s)))) }) .collect(); - out += &format!("{kind}\t{}\t{}\n", stand.events.join(";"), inventory.join(" ")); + out += &format!( + "{kind}\t{}\t{}\n", + stand.events.join(";"), + inventory.join(" ") + ); } fs::write(args.get(3).ok_or("missing OUTPUT")?, out)?; Ok(()) diff --git a/crates/horizon-client/src/block_transform.rs b/crates/horizon-client/src/block_transform.rs index fb94c2532..92f1455e9 100644 --- a/crates/horizon-client/src/block_transform.rs +++ b/crates/horizon-client/src/block_transform.rs @@ -60,12 +60,19 @@ fn predicate(value: &Value) -> Option { Some(match value["type"].as_str()? { "minecraft:matching_blocks" => Predicate::Blocks(match &value["blocks"] { Value::String(s) => vec![s.clone()], - Value::Array(a) => a.iter().filter_map(|b| b.as_str().map(str::to_owned)).collect(), + Value::Array(a) => a + .iter() + .filter_map(|b| b.as_str().map(str::to_owned)) + .collect(), _ => return None, }), "minecraft:matching_block_tag" => { let o = value["offset"].as_array(); - let at = |i: usize| o.and_then(|o| o.get(i)).and_then(Value::as_i64).unwrap_or(0) as i32; + let at = |i: usize| { + o.and_then(|o| o.get(i)) + .and_then(Value::as_i64) + .unwrap_or(0) as i32 + }; Predicate::Tag { tag: value["tag"].as_str()?.to_owned(), offset: [at(0), at(1), at(2)], @@ -94,7 +101,10 @@ fn provider(value: &Value, registry: &BlockRegistry) -> Option { Some("minecraft:rule_based") => { let mut rules = Vec::new(); for rule in value["rules"].as_array()? { - rules.push((predicate(&rule["if_true"])?, provider(&rule["then"], registry)?)); + rules.push(( + predicate(&rule["if_true"])?, + provider(&rule["then"], registry)?, + )); } Some(Provider::Rules(rules)) } diff --git a/crates/horizon-client/src/cauldron.rs b/crates/horizon-client/src/cauldron.rs index a2b48168a..9fbe1179f 100644 --- a/crates/horizon-client/src/cauldron.rs +++ b/crates/horizon-client/src/cauldron.rs @@ -89,12 +89,17 @@ fn filled(player: &mut dyn Player, new: ItemStack, limit_creative: bool) { /// `LayeredCauldronBlock.lowerFillLevel`. fn lowered(cauldron: &BlockState) -> BlockState { - let level: u8 = cauldron.properties.get("level").and_then(|l| l.parse().ok()).unwrap_or(1); + let level: u8 = cauldron + .properties + .get("level") + .and_then(|l| l.parse().ok()) + .unwrap_or(1); if level <= 1 { state("minecraft:cauldron", None) } else { let mut next = cauldron.clone(); - next.properties.insert("level".into(), (level - 1).to_string()); + next.properties + .insert("level".into(), (level - 1).to_string()); next } } @@ -108,8 +113,22 @@ fn changed(block: BlockState, sound: Option<&'static str>) -> Interaction { } const COLORS: [&str; 16] = [ - "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", - "purple", "blue", "brown", "green", "red", "black", + "white", + "orange", + "magenta", + "light_blue", + "yellow", + "lime", + "pink", + "gray", + "light_gray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black", ]; /// The cauldron interaction of the held item (`useItemOn`); the hand stack is @@ -131,7 +150,11 @@ pub fn interact( "minecraft:powder_snow_cauldron" => "powder_snow", _ => return pass(), }; - let level: u8 = cauldron.properties.get("level").and_then(|l| l.parse().ok()).unwrap_or(0); + let level: u8 = cauldron + .properties + .get("level") + .and_then(|l| l.parse().ok()) + .unwrap_or(0); let item = &*held.item; let water_potion = held.data().and_then(|d| d.potion.as_deref()) == Some("minecraft:water"); // Dispatcher.get: tags first, then the item map. diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 52b0eb3a2..2fc27c703 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5508,16 +5508,15 @@ impl Game<'_> { } impl Around for Column<'_> { fn state(&self, o: [i32; 3]) -> horizon_world::chunk::BlockState { - let id = self - .world - .block(self.pos[0] + o[0], self.pos[1] + o[1], self.pos[2] + o[2]); - self.registry - .state(id) - .cloned() - .unwrap_or_else(|| horizon_world::chunk::BlockState { + let id = + self.world + .block(self.pos[0] + o[0], self.pos[1] + o[1], self.pos[2] + o[2]); + self.registry.state(id).cloned().unwrap_or_else(|| { + horizon_world::chunk::BlockState { name: "minecraft:air".into(), properties: Default::default(), - }) + } + }) } } let Some(id) = self @@ -5543,13 +5542,11 @@ impl Game<'_> { registry, pos, }; - let Some((_, t, state)) = self.res.transformers.apply( - &self.res.items, - registry, - &id, - face_name, - &around, - ) else { + let Some((_, t, state)) = + self.res + .transformers + .apply(&self.res.items, registry, &id, face_name, &around) + else { return Ok(false); }; (state, t.sound.clone(), t.loot.clone(), t.damage) @@ -5723,8 +5720,12 @@ impl Game<'_> { && let Ok(state) = registry.resolve(&waxed) { self.level_set(hit.pos, state)?; - self.audio - .play("minecraft:item.honeycomb.wax_on", Some(at(hit.pos)), 1.0, 1.0); + self.audio.play( + "minecraft:item.honeycomb.wax_on", + Some(at(hit.pos)), + 1.0, + 1.0, + ); if !self.creative { self.consume_held(); } @@ -7719,8 +7720,7 @@ pub fn run() -> Result<()> { let items = Items::load(&root, assets.registry, &facts)?; eprintln!("load items: {:.2}s", started.elapsed().as_secs_f32()); let recipes = Recipes::load(&root, &items)?; - let transformers = - horizon_client::block_transform::Transformers::load(&root, assets.registry)?; + let transformers = horizon_client::block_transform::Transformers::load(&root, assets.registry)?; let biomes = Arc::new(Biomes::load(&root)?); let environment = Environment::load(&root)?; eprintln!("load biomes+env: {:.2}s", started.elapsed().as_secs_f32()); diff --git a/crates/horizon-client/src/items.rs b/crates/horizon-client/src/items.rs index d7b75440e..c34c296d0 100644 --- a/crates/horizon-client/src/items.rs +++ b/crates/horizon-client/src/items.rs @@ -376,9 +376,7 @@ impl Items { .map(str::to_owned), jukebox_song: c["minecraft:jukebox_playable"].as_str().map(str::to_owned), dye: c["minecraft:dye"].as_str().map(str::to_owned), - block_transformer: c["minecraft:block_transformer"] - .as_str() - .map(str::to_owned), + block_transformer: c["minecraft:block_transformer"].as_str().map(str::to_owned), crafting_remainder: CRAFT_REMAINDERS .iter() .find(|(item, _)| *item == name)