From b5a6b6a99e5f270a7962011bb4582da8480052de Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 13 Oct 2026 00:35:54 +0200 Subject: [PATCH] Port LegacyStructureFileFix (1493) and run the file fixes of the range in the band harness Co-Authored-By: Claude Sonnet 5.5 --- .../src/datafix/chunk_flatten.rs | 36 +- .../horizon-world/src/datafix/chunk_leaves.rs | 20 +- crates/horizon-world/src/datafix/files.rs | 147 +- .../horizon-world/src/datafix/fixes_flat.rs | 85 +- .../horizon-world/src/datafix/flat_tables.rs | 1203 +++++++++++++---- .../horizon-world/src/datafix/schema_flat.rs | 8 +- .../parity/VanillaDataFixOracle.java | 12 + tools/gen_flat_tables.py | 2 + 8 files changed, 1210 insertions(+), 303 deletions(-) diff --git a/crates/horizon-world/src/datafix/chunk_flatten.rs b/crates/horizon-world/src/datafix/chunk_flatten.rs index 368d698d4..e3c116d93 100644 --- a/crates/horizon-world/src/datafix/chunk_flatten.rs +++ b/crates/horizon-world/src/datafix/chunk_flatten.rs @@ -94,7 +94,10 @@ fn consts() -> &'static Consts { ("minecraft:sapling4", "minecraft:potted_acacia_sapling"), ("minecraft:sapling5", "minecraft:potted_dark_oak_sapling"), ("minecraft:red_mushroom0", "minecraft:potted_red_mushroom"), - ("minecraft:brown_mushroom0", "minecraft:potted_brown_mushroom"), + ( + "minecraft:brown_mushroom0", + "minecraft:potted_brown_mushroom", + ), ("minecraft:deadbush0", "minecraft:potted_dead_bush"), ("minecraft:tallgrass2", "minecraft:potted_fern"), ("minecraft:cactus0", "minecraft:potted_cactus"), @@ -444,8 +447,8 @@ impl Section { if start != end { let shift = 64 - start_bit; let wanted = bits - shift; - storage[end] = ((storage[end] as u64) >> wanted << wanted) as i64 - | (value & mask) >> shift; + storage[end] = + ((storage[end] as u64) >> wanted << wanted) as i64 | (value & mask) >> shift; } } set(&mut section, "BlockStates", Tag::LongArray(storage)); @@ -463,7 +466,12 @@ enum Direction { } fn relative(pos: i64, direction: Direction) -> i64 { - let y = (pos >> 8) + if matches!(direction, Direction::Up) { 1 } else { -1 }; + let y = (pos >> 8) + + if matches!(direction, Direction::Up) { + 1 + } else { + -1 + }; if (0..=255).contains(&y) { pos & 0xFF | y << 8 } else { @@ -583,7 +591,13 @@ fn upgrade_level(level: &Tag) -> Tag { set( &mut out, "TileEntities", - Tag::List(chunk.block_entities.iter().map(|(_, v)| v.clone()).collect()), + Tag::List( + chunk + .block_entities + .iter() + .map(|(_, v)| v.clone()) + .collect(), + ), ); } let mut indices = crate::nbt::Compound::new(); @@ -659,8 +673,16 @@ fn fix_block(chunk: &mut UpgradeChunk, c: &Consts, block: usize, pos: i64, alpha if lower.name == upper.name { let facing = lower.property("facing"); let open = lower.property("open"); - let hinge = if alpha { "left" } else { upper.property("hinge") }; - let powered = if alpha { "false" } else { upper.property("powered") }; + let hinge = if alpha { + "left" + } else { + upper.property("hinge") + }; + let powered = if alpha { + "false" + } else { + upper.property("powered") + }; let name = &lower.name; let lo = c .door diff --git a/crates/horizon-world/src/datafix/chunk_leaves.rs b/crates/horizon-world/src/datafix/chunk_leaves.rs index ffefc7060..9cd2fd3d9 100644 --- a/crates/horizon-world/src/datafix/chunk_leaves.rs +++ b/crates/horizon-world/src/datafix/chunk_leaves.rs @@ -6,7 +6,7 @@ //! emulated here (`IntOpenHashSet` and the key order of an `Int2ObjectOpenHashMap`). use std::collections::{HashMap, HashSet}; -use super::dynamic::{as_int, as_long_stream, as_str, ceillog2, remove, set}; +use super::dynamic::{as_int, as_long_stream, as_str, ceillog2, set}; use crate::nbt::Tag; /// `PackedBitStorage`. @@ -34,7 +34,8 @@ impl Packed { let end = ((index + 1) * self.bits - 1) >> 6; let start_bit = position ^ (start << 6); let value = i64::from(value); - self.data[start] = self.data[start] & !(self.mask << start_bit) | (value & self.mask) << start_bit; + self.data[start] = + self.data[start] & !(self.mask << start_bit) | (value & self.mask) << start_bit; if start != end { let shift = 64 - start_bit; let wanted = self.bits - shift; @@ -51,7 +52,8 @@ impl Packed { return (((self.data[start] as u64) >> start_bit) as i64 & self.mask) as i32; } let shift = 64 - start_bit; - ((((self.data[start] as u64) >> start_bit) as i64 | self.data[end] << shift) & self.mask) as i32 + ((((self.data[start] as u64) >> start_bit) as i64 | self.data[end] << shift) & self.mask) + as i32 } } @@ -250,10 +252,15 @@ impl Section { for i in 0..s.palette.len() { let name = name_of(&s.palette[i]); if leaf_index(&name).is_some() { - let persistent = as_str(s.palette[i].get("Properties").and_then(|p| p.get("decayable"))) - .is_some_and(|d| d == "false"); + let persistent = as_str( + s.palette[i] + .get("Properties") + .and_then(|p| p.get("decayable")), + ) + .is_some_and(|d| d == "false"); s.leaf_ids.insert(i as i32); - s.state_to_id.insert(state_id(&name, persistent, 7), i as i32); + s.state_to_id + .insert(state_id(&name, persistent, 7), i as i32); s.palette[i] = leaf_tag(&name, persistent, 7); } if LOGS.contains(&name.as_str()) { @@ -503,5 +510,4 @@ pub(super) fn trapped_chest_fix(chunk: &mut Tag) { } } } - let _ = remove; } diff --git a/crates/horizon-world/src/datafix/files.rs b/crates/horizon-world/src/datafix/files.rs index 643cd4390..fb0935806 100644 --- a/crates/horizon-world/src/datafix/files.rs +++ b/crates/horizon-world/src/datafix/files.rs @@ -19,7 +19,7 @@ pub const VERSION_NAME: &str = "26.3"; const FILE_FIXER_INTRODUCTION: i32 = 4772; /// The versions of the file fixes, in order. -const FILE_FIXES: [i32; 3] = [4772, 4773, 4899]; +const FILE_FIXES: [i32; 4] = [1493, 4772, 4773, 4899]; fn invalid(message: impl Into) -> io::Error { io::Error::new(io::ErrorKind::InvalidData, message.into()) @@ -381,6 +381,141 @@ fn level_dat_to_saved_data(base: &Path) -> io::Result<()> { write_level(base, content, V) } +/// 1493: `LegacyStructureFileFix`. The structures of `data/*.dat` (1.12) become the +/// `Structures` of the chunks they reach, in the region folders of the old layout. +pub(crate) fn fix_1493(base: &Path) -> io::Result<()> { + use std::collections::{BTreeMap, HashMap}; + const LEGACY_TO_CURRENT: [(&str, &str); 4] = [ + ("Iglu", "Igloo"), + ("TeDP", "Desert_Pyramid"), + ("TeJP", "Jungle_Pyramid"), + ("TeSH", "Swamp_Hut"), + ]; + #[derive(Default)] + struct LegacyData { + starts: HashMap, + indexes: BTreeMap>, + } + let pack = |x: i32, z: i32| i64::from(x) & 0xFFFF_FFFF | (i64::from(z) & 0xFFFF_FFFF) << 32; + let Some(level) = read_level(base, 1493)? else { + return Ok(()); + }; + let overworld_generator = match as_str(level.get("generatorName")).as_deref() { + Some("flat") => "minecraft:flat", + Some("debug_all_block_states") => "minecraft:debug", + _ => "minecraft:noise", + }; + let dimensions: [(&[&str], &str, &str, &str); 3] = [ + ( + &["Monument", "Stronghold", "Mineshaft", "Temple", "Mansion"], + "", + "minecraft:overworld", + overworld_generator, + ), + ( + &["Fortress"], + "DIM-1", + "minecraft:the_nether", + "minecraft:noise", + ), + (&["EndCity"], "DIM1", "minecraft:the_end", "minecraft:noise"), + ]; + for (ids, folder, dimension, generator) in dimensions { + let mut structures: BTreeMap<(i32, i32), LegacyData> = BTreeMap::new(); + for id in ids { + let path = base.join("data").join(format!("{id}.dat")); + let Some(data) = read_saved_data(&path, Ty::SavedStructureFeatureIndices, 1493)? else { + continue; + }; + let Some(Tag::Compound(features)) = data.get("Features") else { + continue; + }; + let values: Vec<(String, Tag)> = features + .iter() + .map(|(k, v)| (k.to_string_lossy(), v.clone())) + .collect(); + for (_, mut value) in super::items::java_hash_order(values, |(k, _)| k.clone()) { + let chunk_x = as_int(value.get("ChunkX"), 0); + let chunk_z = as_int(value.get("ChunkZ"), 0); + let children = super::dynamic::stream(value.get("Children")); + if let Some(first) = children.first() + && let Some(current) = as_str(first.get("id")) + .and_then(|i| LEGACY_TO_CURRENT.iter().find(|(from, _)| *from == i)) + { + set(&mut value, "id", string(current.1)); + } + let Some(feature_id) = as_str(value.get("id")) else { + continue; + }; + structures + .entry((chunk_x, chunk_z)) + .or_default() + .starts + .insert(feature_id.clone(), value); + for nx in chunk_x - 8..=chunk_x + 8 { + for nz in chunk_z - 8..=chunk_z + 8 { + structures + .entry((nx, nz)) + .or_default() + .indexes + .entry(feature_id.clone()) + .or_default() + .push(pack(chunk_x, chunk_z)); + } + } + } + } + if structures.is_empty() { + continue; + } + let region = if folder.is_empty() { + base.join("region") + } else { + base.join(folder).join("region") + }; + upgrade_regions(®ion, |tag| { + let version = as_int(tag.get("DataVersion"), -1); + let x = as_int(tag.get("Level").and_then(|l| l.get("xPos")), 0); + let z = as_int(tag.get("Level").and_then(|l| l.get("zPos")), 0); + let Some(legacy) = structures.get(&(x, z)) else { + return; + }; + let _ = version; + super::update_chunk_to(tag, dimension, Some(generator), 1493); + let mut level = tag + .get("Level") + .cloned() + .unwrap_or_else(super::dynamic::empty_map); + let mut structure = level + .get("Structures") + .cloned() + .filter(|s| matches!(s, Tag::Compound(_))) + .unwrap_or_else(super::dynamic::empty_map); + let mut starts = structure + .get("Starts") + .cloned() + .filter(|s| matches!(s, Tag::Compound(_))) + .unwrap_or_else(super::dynamic::empty_map); + let mut references = structure + .get("References") + .cloned() + .filter(|s| matches!(s, Tag::Compound(_))) + .unwrap_or_else(super::dynamic::empty_map); + for (id, value) in &legacy.starts { + set(&mut starts, id, value.clone()); + } + for (id, indexes) in &legacy.indexes { + set(&mut references, id, Tag::LongArray(indexes.clone())); + } + set(&mut structure, "Starts", starts); + set(&mut structure, "References", references); + set(&mut level, "Structures", structure); + set(tag, "Level", level); + })?; + } + Ok(()) +} + /// 4773: `GeneratedStructuresRenameFileFix`. fn fix_4773(base: &Path) -> io::Result<()> { for ns in subdirectories(&base.join("generated")) { @@ -456,6 +591,7 @@ pub fn fix_world_files(base: &Path) -> io::Result { for version in FILE_FIXES { if version > start && version <= CURRENT { match version { + 1493 => fix_1493(base)?, 4772 => fix_4772(base)?, 4773 => fix_4773(base)?, _ => fix_4899(base)?, @@ -678,10 +814,13 @@ pub fn upgrade_world_data(base: &Path) -> io::Result<()> { /// A world in the layout of before 1.16 (dimension folders in the world folder, /// `playerdata`, `stats`, `advancements`) brought to DataVersion `target` and -/// no further, without the file fixes: the harness checks the data fixes of a -/// range of versions on their own (the vanilla oracle does the same given a -/// target). +/// no further, with the file fixes of that range but not the ones that move the +/// files into the 26.x layout: the harness checks the fixes of a range of +/// versions on their own (the vanilla oracle does the same given a target). pub fn upgrade_band(base: &Path, target: i32) -> io::Result<()> { + if target >= 1493 { + fix_1493(base)?; + } let level = base.join("level.dat"); if let Some(mut root) = read_dat(&level)? { let mut data = root diff --git a/crates/horizon-world/src/datafix/fixes_flat.rs b/crates/horizon-world/src/datafix/fixes_flat.rs index 751bc3659..c55a628ea 100644 --- a/crates/horizon-world/src/datafix/fixes_flat.rs +++ b/crates/horizon-world/src/datafix/fixes_flat.rs @@ -11,7 +11,7 @@ use super::dynamic::{ }; use super::flat_tables as t; use super::schema::{Key, Ty, key}; -use super::{Cx, FixFn, id_is, items, mark_read, reread, reread_as}; +use super::{Cx, FixFn, items, mark_read, reread, reread_as}; use crate::nbt::{Compound, JavaString, Tag}; pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { @@ -63,10 +63,16 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { }) })); out.push((key(1474, 0), |cx| { - legacy_block_rename(cx, &only("minecraft:purple_shulker_box", "minecraft:shulker_box")) + legacy_block_rename( + cx, + &only("minecraft:purple_shulker_box", "minecraft:shulker_box"), + ) })); out.push((key(1474, 0), |cx| { - item_rename(cx, &only("minecraft:purple_shulker_box", "minecraft:shulker_box")) + item_rename( + cx, + &only("minecraft:purple_shulker_box", "minecraft:shulker_box"), + ) })); out.push((key(1475, 0), |cx| { legacy_block_rename( @@ -85,7 +91,10 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { out.push((key(1483, 0), |cx| { item_rename( cx, - &only("minecraft:puffer_fish_spawn_egg", "minecraft:pufferfish_spawn_egg"), + &only( + "minecraft:puffer_fish_spawn_egg", + "minecraft:pufferfish_spawn_egg", + ), ) })); const SEAGRASS: &[(&str, &str)] = &[ @@ -96,7 +105,9 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { out.push((key(1484, 0), |cx| legacy_block_rename(cx, &table(SEAGRASS)))); out.push((key(1484, 0), heightmap_renaming)); out.push((key(1486, 0), |cx| entity_rename(cx, &table(t::COD_SALMON)))); - out.push((key(1486, 0), |cx| item_rename(cx, &table(t::COD_SALMON_EGGS)))); + out.push((key(1486, 0), |cx| { + item_rename(cx, &table(t::COD_SALMON_EGGS)) + })); const PRISMARINE: &[(&str, &str)] = &[ ( "minecraft:prismarine_bricks_slab", @@ -108,7 +119,9 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { ), ]; out.push((key(1487, 0), |cx| item_rename(cx, &table(PRISMARINE)))); - out.push((key(1487, 0), |cx| legacy_block_rename(cx, &table(PRISMARINE)))); + out.push((key(1487, 0), |cx| { + legacy_block_rename(cx, &table(PRISMARINE)) + })); out.push((key(1488, 0), |cx| { legacy_block_rename( cx, @@ -133,13 +146,18 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { &table(&[ ("minecraft:melon_block", "minecraft:melon"), ("minecraft:melon", "minecraft:melon_slice"), - ("minecraft:speckled_melon", "minecraft:glistering_melon_slice"), + ( + "minecraft:speckled_melon", + "minecraft:glistering_melon_slice", + ), ]), ) })); out.push((key(1492, 0), structure_template_rename)); out.push((key(1494, 0), enchantment_names)); - out.push((key(1496, 0), |cx| cx.each(Ty::Chunk, chunk_leaves::leaves_fix))); + out.push((key(1496, 0), |cx| { + cx.each(Ty::Chunk, chunk_leaves::leaves_fix) + })); out.push((key(1500, 0), |cx| { cx.block_entity("DUMMY", |be| set(be, "keepPacked", Tag::Byte(1))) })); @@ -155,9 +173,13 @@ pub(super) fn register(out: &mut Vec<(Key, FixFn)>) { out.push((key(1510, 0), |cx| { rename_names(cx, Ty::Recipe, &table(t::RECIPES_RENAMENING)) })); - out.push((key(1510, 0), |cx| entity_rename(cx, &the_renamening_entities))); + out.push((key(1510, 0), |cx| { + entity_rename(cx, &the_renamening_entities) + })); out.push((key(1510, 0), swim_stats_rename)); - out.push((key(1514, 0), |cx| display_name_to_component(cx, Ty::Objective))); + out.push((key(1514, 0), |cx| { + display_name_to_component(cx, Ty::Objective) + })); out.push((key(1514, 0), |cx| display_name_to_component(cx, Ty::Team))); out.push((key(1514, 0), objective_render_type)); out.push((key(1515, 0), |cx| { @@ -264,12 +286,7 @@ fn the_renamening_items(name: &str) -> Option { ) } -/// `LegacyComponentDataFixUtils.createTextComponentJson`. -fn text_json(text: &str) -> Tag { - let units: Vec = text.encode_utf16().collect(); - Tag::String(JavaString(super::json::text_component_json(&units))) -} - +/// `LegacyComponentDataFixUtils.createTextComponentJson` of a string tag's text. fn text_json_units(text: &JavaString) -> Tag { Tag::String(JavaString(super::json::text_component_json(&text.0))) } @@ -346,7 +363,9 @@ fn entity_block_state(cx: &mut Cx) { remove(e, f); } } - "minecraft:enderman" => block_to_state(e, "carried", "carriedData", "carriedBlockState"), + "minecraft:enderman" => { + block_to_state(e, "carried", "carriedData", "carriedBlockState") + } "minecraft:arrow" | "minecraft:spectral_arrow" => { block_to_state(e, "inTile", "inData", "inBlockState") } @@ -396,7 +415,8 @@ fn block_name_flattening(cx: &mut Cx) { /// `ItemStackTheFlatteningFix.updateItem`. fn update_item(name: &str, data: i32) -> Option<&'static str> { - static MAP: OnceLock<(HashMap<&'static str, &'static str>, Vec<&'static str>)> = OnceLock::new(); + static MAP: OnceLock<(HashMap<&'static str, &'static str>, Vec<&'static str>)> = + OnceLock::new(); let (map, ids) = MAP.get_or_init(|| { let map: HashMap<_, _> = t::ITEM_FLATTENING.iter().copied().collect(); let mut ids: Vec<&str> = t::ITEM_FLATTENING @@ -550,9 +570,7 @@ fn flat_generator_string(options: &str) -> String { to_int(block_string, 0) }; let data_index = name_index + 1; - let data = block_parts - .get(data_index) - .map_or(0, |d| to_int(d, 0)); + let data = block_parts.get(data_index).map_or(0, |d| to_int(d, 0)); let tag = bsd::get_tag(block << 4 | data); let name = as_str(tag.get("Name")).unwrap_or_default(); format!( @@ -579,7 +597,11 @@ fn flat_generator_info(cx: &mut Cx) { return; } if let Some(options) = as_str(l.get("generatorOptions")) { - set(l, "generatorOptions", string(&flat_generator_string(&options))); + set( + l, + "generatorOptions", + string(&flat_generator_string(&options)), + ); } }); } @@ -608,10 +630,7 @@ fn unpack_legacy_key(k: &str) -> Option<(String, String)> { let prefix = &k[..split]; let rest = k[split + 1..].replace('.', ":"); if prefix == "stat.mineBlock" { - return Some(( - "minecraft:mined".to_owned(), - bsd::upgrade_block_name(&rest), - )); + return Some(("minecraft:mined".to_owned(), bsd::upgrade_block_name(&rest))); } if let Some(item_key) = lookup(t::STATS_ITEM_KEYS, prefix) { let new = update_item(&rest, 0).map_or(rest.clone(), str::to_owned); @@ -1068,7 +1087,8 @@ fn flat_options(flat: &str) -> Tag { continue; } let mut options = Vec::new(); - if separated.len() > 1 && separated[1].ends_with(')') && separated[1].len() > 1 { + if separated.len() > 1 && separated[1].ends_with(')') && separated[1].len() > 1 + { let inner = &separated[1][..separated[1].len() - 1]; for part in java_split(inner, " ", 0) { let split = java_split(part, "=", 2); @@ -1105,7 +1125,10 @@ fn flat_options(flat: &str) -> Tag { .into_iter() .map(|(k, v)| (super::dynamic::key(&k), string(&v))) .collect(); - (super::dynamic::key(&name.to_lowercase()), Tag::Compound(options)) + ( + super::dynamic::key(&name.to_lowercase()), + Tag::Compound(options), + ) }) .collect(); Tag::compound([ @@ -1189,9 +1212,3 @@ fn objective_render_type(cx: &mut Cx) { } }); } - -#[allow(dead_code)] -fn unused(_: &Tag) -> bool { - let _ = (text_json, id_is); - false -} diff --git a/crates/horizon-world/src/datafix/flat_tables.rs b/crates/horizon-world/src/datafix/flat_tables.rs index 590a6c795..5fcd442bb 100644 --- a/crates/horizon-world/src/datafix/flat_tables.rs +++ b/crates/horizon-world/src/datafix/flat_tables.rs @@ -1,7 +1,6 @@ //! Lookup tables of the DataFixers of 1.13 (DataVersion 1343 to 1631), copied from vanilla's //! sources by `tools/gen_flat_tables.py`. Do not edit. - /// `ItemStackTheFlatteningFix.MAP`: `id.damage` to the flattened item. pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:stone.0", "minecraft:stone"), @@ -41,7 +40,10 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:sand.0", "minecraft:sand"), ("minecraft:sand.1", "minecraft:red_sand"), ("minecraft:quartz_block.0", "minecraft:quartz_block"), - ("minecraft:quartz_block.1", "minecraft:chiseled_quartz_block"), + ( + "minecraft:quartz_block.1", + "minecraft:chiseled_quartz_block", + ), ("minecraft:quartz_block.2", "minecraft:quartz_pillar"), ("minecraft:anvil.0", "minecraft:anvil"), ("minecraft:anvil.1", "minecraft:chipped_anvil"), @@ -79,55 +81,181 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:carpet.14", "minecraft:red_carpet"), ("minecraft:carpet.15", "minecraft:black_carpet"), ("minecraft:hardened_clay.0", "minecraft:terracotta"), - ("minecraft:stained_hardened_clay.0", "minecraft:white_terracotta"), - ("minecraft:stained_hardened_clay.1", "minecraft:orange_terracotta"), - ("minecraft:stained_hardened_clay.2", "minecraft:magenta_terracotta"), - ("minecraft:stained_hardened_clay.3", "minecraft:light_blue_terracotta"), - ("minecraft:stained_hardened_clay.4", "minecraft:yellow_terracotta"), - ("minecraft:stained_hardened_clay.5", "minecraft:lime_terracotta"), - ("minecraft:stained_hardened_clay.6", "minecraft:pink_terracotta"), - ("minecraft:stained_hardened_clay.7", "minecraft:gray_terracotta"), - ("minecraft:stained_hardened_clay.8", "minecraft:light_gray_terracotta"), - ("minecraft:stained_hardened_clay.9", "minecraft:cyan_terracotta"), - ("minecraft:stained_hardened_clay.10", "minecraft:purple_terracotta"), - ("minecraft:stained_hardened_clay.11", "minecraft:blue_terracotta"), - ("minecraft:stained_hardened_clay.12", "minecraft:brown_terracotta"), - ("minecraft:stained_hardened_clay.13", "minecraft:green_terracotta"), - ("minecraft:stained_hardened_clay.14", "minecraft:red_terracotta"), - ("minecraft:stained_hardened_clay.15", "minecraft:black_terracotta"), - ("minecraft:silver_glazed_terracotta.0", "minecraft:light_gray_glazed_terracotta"), + ( + "minecraft:stained_hardened_clay.0", + "minecraft:white_terracotta", + ), + ( + "minecraft:stained_hardened_clay.1", + "minecraft:orange_terracotta", + ), + ( + "minecraft:stained_hardened_clay.2", + "minecraft:magenta_terracotta", + ), + ( + "minecraft:stained_hardened_clay.3", + "minecraft:light_blue_terracotta", + ), + ( + "minecraft:stained_hardened_clay.4", + "minecraft:yellow_terracotta", + ), + ( + "minecraft:stained_hardened_clay.5", + "minecraft:lime_terracotta", + ), + ( + "minecraft:stained_hardened_clay.6", + "minecraft:pink_terracotta", + ), + ( + "minecraft:stained_hardened_clay.7", + "minecraft:gray_terracotta", + ), + ( + "minecraft:stained_hardened_clay.8", + "minecraft:light_gray_terracotta", + ), + ( + "minecraft:stained_hardened_clay.9", + "minecraft:cyan_terracotta", + ), + ( + "minecraft:stained_hardened_clay.10", + "minecraft:purple_terracotta", + ), + ( + "minecraft:stained_hardened_clay.11", + "minecraft:blue_terracotta", + ), + ( + "minecraft:stained_hardened_clay.12", + "minecraft:brown_terracotta", + ), + ( + "minecraft:stained_hardened_clay.13", + "minecraft:green_terracotta", + ), + ( + "minecraft:stained_hardened_clay.14", + "minecraft:red_terracotta", + ), + ( + "minecraft:stained_hardened_clay.15", + "minecraft:black_terracotta", + ), + ( + "minecraft:silver_glazed_terracotta.0", + "minecraft:light_gray_glazed_terracotta", + ), ("minecraft:stained_glass.0", "minecraft:white_stained_glass"), - ("minecraft:stained_glass.1", "minecraft:orange_stained_glass"), - ("minecraft:stained_glass.2", "minecraft:magenta_stained_glass"), - ("minecraft:stained_glass.3", "minecraft:light_blue_stained_glass"), - ("minecraft:stained_glass.4", "minecraft:yellow_stained_glass"), + ( + "minecraft:stained_glass.1", + "minecraft:orange_stained_glass", + ), + ( + "minecraft:stained_glass.2", + "minecraft:magenta_stained_glass", + ), + ( + "minecraft:stained_glass.3", + "minecraft:light_blue_stained_glass", + ), + ( + "minecraft:stained_glass.4", + "minecraft:yellow_stained_glass", + ), ("minecraft:stained_glass.5", "minecraft:lime_stained_glass"), ("minecraft:stained_glass.6", "minecraft:pink_stained_glass"), ("minecraft:stained_glass.7", "minecraft:gray_stained_glass"), - ("minecraft:stained_glass.8", "minecraft:light_gray_stained_glass"), + ( + "minecraft:stained_glass.8", + "minecraft:light_gray_stained_glass", + ), ("minecraft:stained_glass.9", "minecraft:cyan_stained_glass"), - ("minecraft:stained_glass.10", "minecraft:purple_stained_glass"), + ( + "minecraft:stained_glass.10", + "minecraft:purple_stained_glass", + ), ("minecraft:stained_glass.11", "minecraft:blue_stained_glass"), - ("minecraft:stained_glass.12", "minecraft:brown_stained_glass"), - ("minecraft:stained_glass.13", "minecraft:green_stained_glass"), + ( + "minecraft:stained_glass.12", + "minecraft:brown_stained_glass", + ), + ( + "minecraft:stained_glass.13", + "minecraft:green_stained_glass", + ), ("minecraft:stained_glass.14", "minecraft:red_stained_glass"), - ("minecraft:stained_glass.15", "minecraft:black_stained_glass"), - ("minecraft:stained_glass_pane.0", "minecraft:white_stained_glass_pane"), - ("minecraft:stained_glass_pane.1", "minecraft:orange_stained_glass_pane"), - ("minecraft:stained_glass_pane.2", "minecraft:magenta_stained_glass_pane"), - ("minecraft:stained_glass_pane.3", "minecraft:light_blue_stained_glass_pane"), - ("minecraft:stained_glass_pane.4", "minecraft:yellow_stained_glass_pane"), - ("minecraft:stained_glass_pane.5", "minecraft:lime_stained_glass_pane"), - ("minecraft:stained_glass_pane.6", "minecraft:pink_stained_glass_pane"), - ("minecraft:stained_glass_pane.7", "minecraft:gray_stained_glass_pane"), - ("minecraft:stained_glass_pane.8", "minecraft:light_gray_stained_glass_pane"), - ("minecraft:stained_glass_pane.9", "minecraft:cyan_stained_glass_pane"), - ("minecraft:stained_glass_pane.10", "minecraft:purple_stained_glass_pane"), - ("minecraft:stained_glass_pane.11", "minecraft:blue_stained_glass_pane"), - ("minecraft:stained_glass_pane.12", "minecraft:brown_stained_glass_pane"), - ("minecraft:stained_glass_pane.13", "minecraft:green_stained_glass_pane"), - ("minecraft:stained_glass_pane.14", "minecraft:red_stained_glass_pane"), - ("minecraft:stained_glass_pane.15", "minecraft:black_stained_glass_pane"), + ( + "minecraft:stained_glass.15", + "minecraft:black_stained_glass", + ), + ( + "minecraft:stained_glass_pane.0", + "minecraft:white_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.1", + "minecraft:orange_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.2", + "minecraft:magenta_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.3", + "minecraft:light_blue_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.4", + "minecraft:yellow_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.5", + "minecraft:lime_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.6", + "minecraft:pink_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.7", + "minecraft:gray_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.8", + "minecraft:light_gray_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.9", + "minecraft:cyan_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.10", + "minecraft:purple_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.11", + "minecraft:blue_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.12", + "minecraft:brown_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.13", + "minecraft:green_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.14", + "minecraft:red_stained_glass_pane", + ), + ( + "minecraft:stained_glass_pane.15", + "minecraft:black_stained_glass_pane", + ), ("minecraft:prismarine.0", "minecraft:prismarine"), ("minecraft:prismarine.1", "minecraft:prismarine_bricks"), ("minecraft:prismarine.2", "minecraft:dark_prismarine"), @@ -147,29 +275,83 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:concrete.13", "minecraft:green_concrete"), ("minecraft:concrete.14", "minecraft:red_concrete"), ("minecraft:concrete.15", "minecraft:black_concrete"), - ("minecraft:concrete_powder.0", "minecraft:white_concrete_powder"), - ("minecraft:concrete_powder.1", "minecraft:orange_concrete_powder"), - ("minecraft:concrete_powder.2", "minecraft:magenta_concrete_powder"), - ("minecraft:concrete_powder.3", "minecraft:light_blue_concrete_powder"), - ("minecraft:concrete_powder.4", "minecraft:yellow_concrete_powder"), - ("minecraft:concrete_powder.5", "minecraft:lime_concrete_powder"), - ("minecraft:concrete_powder.6", "minecraft:pink_concrete_powder"), - ("minecraft:concrete_powder.7", "minecraft:gray_concrete_powder"), - ("minecraft:concrete_powder.8", "minecraft:light_gray_concrete_powder"), - ("minecraft:concrete_powder.9", "minecraft:cyan_concrete_powder"), - ("minecraft:concrete_powder.10", "minecraft:purple_concrete_powder"), - ("minecraft:concrete_powder.11", "minecraft:blue_concrete_powder"), - ("minecraft:concrete_powder.12", "minecraft:brown_concrete_powder"), - ("minecraft:concrete_powder.13", "minecraft:green_concrete_powder"), - ("minecraft:concrete_powder.14", "minecraft:red_concrete_powder"), - ("minecraft:concrete_powder.15", "minecraft:black_concrete_powder"), + ( + "minecraft:concrete_powder.0", + "minecraft:white_concrete_powder", + ), + ( + "minecraft:concrete_powder.1", + "minecraft:orange_concrete_powder", + ), + ( + "minecraft:concrete_powder.2", + "minecraft:magenta_concrete_powder", + ), + ( + "minecraft:concrete_powder.3", + "minecraft:light_blue_concrete_powder", + ), + ( + "minecraft:concrete_powder.4", + "minecraft:yellow_concrete_powder", + ), + ( + "minecraft:concrete_powder.5", + "minecraft:lime_concrete_powder", + ), + ( + "minecraft:concrete_powder.6", + "minecraft:pink_concrete_powder", + ), + ( + "minecraft:concrete_powder.7", + "minecraft:gray_concrete_powder", + ), + ( + "minecraft:concrete_powder.8", + "minecraft:light_gray_concrete_powder", + ), + ( + "minecraft:concrete_powder.9", + "minecraft:cyan_concrete_powder", + ), + ( + "minecraft:concrete_powder.10", + "minecraft:purple_concrete_powder", + ), + ( + "minecraft:concrete_powder.11", + "minecraft:blue_concrete_powder", + ), + ( + "minecraft:concrete_powder.12", + "minecraft:brown_concrete_powder", + ), + ( + "minecraft:concrete_powder.13", + "minecraft:green_concrete_powder", + ), + ( + "minecraft:concrete_powder.14", + "minecraft:red_concrete_powder", + ), + ( + "minecraft:concrete_powder.15", + "minecraft:black_concrete_powder", + ), ("minecraft:cobblestone_wall.0", "minecraft:cobblestone_wall"), - ("minecraft:cobblestone_wall.1", "minecraft:mossy_cobblestone_wall"), + ( + "minecraft:cobblestone_wall.1", + "minecraft:mossy_cobblestone_wall", + ), ("minecraft:sandstone.0", "minecraft:sandstone"), ("minecraft:sandstone.1", "minecraft:chiseled_sandstone"), ("minecraft:sandstone.2", "minecraft:cut_sandstone"), ("minecraft:red_sandstone.0", "minecraft:red_sandstone"), - ("minecraft:red_sandstone.1", "minecraft:chiseled_red_sandstone"), + ( + "minecraft:red_sandstone.1", + "minecraft:chiseled_red_sandstone", + ), ("minecraft:red_sandstone.2", "minecraft:cut_red_sandstone"), ("minecraft:stonebrick.0", "minecraft:stone_bricks"), ("minecraft:stonebrick.1", "minecraft:mossy_stone_bricks"), @@ -178,9 +360,18 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:monster_egg.0", "minecraft:infested_stone"), ("minecraft:monster_egg.1", "minecraft:infested_cobblestone"), ("minecraft:monster_egg.2", "minecraft:infested_stone_bricks"), - ("minecraft:monster_egg.3", "minecraft:infested_mossy_stone_bricks"), - ("minecraft:monster_egg.4", "minecraft:infested_cracked_stone_bricks"), - ("minecraft:monster_egg.5", "minecraft:infested_chiseled_stone_bricks"), + ( + "minecraft:monster_egg.3", + "minecraft:infested_mossy_stone_bricks", + ), + ( + "minecraft:monster_egg.4", + "minecraft:infested_cracked_stone_bricks", + ), + ( + "minecraft:monster_egg.5", + "minecraft:infested_chiseled_stone_bricks", + ), ("minecraft:yellow_flower.0", "minecraft:dandelion"), ("minecraft:red_flower.0", "minecraft:poppy"), ("minecraft:red_flower.1", "minecraft:blue_orchid"), @@ -234,7 +425,10 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:skull.4", "minecraft:creeper_head"), ("minecraft:skull.5", "minecraft:dragon_head"), ("minecraft:golden_apple.0", "minecraft:golden_apple"), - ("minecraft:golden_apple.1", "minecraft:enchanted_golden_apple"), + ( + "minecraft:golden_apple.1", + "minecraft:enchanted_golden_apple", + ), ("minecraft:fireworks.0", "minecraft:firework_rocket"), ("minecraft:firework_charge.0", "minecraft:firework_star"), ("minecraft:dye.0", "minecraft:ink_sac"), @@ -253,7 +447,10 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:dye.13", "minecraft:magenta_dye"), ("minecraft:dye.14", "minecraft:orange_dye"), ("minecraft:dye.15", "minecraft:bone_meal"), - ("minecraft:silver_shulker_box.0", "minecraft:light_gray_shulker_box"), + ( + "minecraft:silver_shulker_box.0", + "minecraft:light_gray_shulker_box", + ), ("minecraft:fence.0", "minecraft:oak_fence"), ("minecraft:fence_gate.0", "minecraft:oak_fence_gate"), ("minecraft:wooden_door.0", "minecraft:oak_door"), @@ -262,10 +459,16 @@ pub static ITEM_FLATTENING: &[(&str, &str)] = &[ ("minecraft:pumpkin.0", "minecraft:carved_pumpkin"), ("minecraft:trapdoor.0", "minecraft:oak_trapdoor"), ("minecraft:nether_brick.0", "minecraft:nether_bricks"), - ("minecraft:red_nether_brick.0", "minecraft:red_nether_bricks"), + ( + "minecraft:red_nether_brick.0", + "minecraft:red_nether_bricks", + ), ("minecraft:netherbrick.0", "minecraft:nether_brick"), ("minecraft:wooden_button.0", "minecraft:oak_button"), - ("minecraft:wooden_pressure_plate.0", "minecraft:oak_pressure_plate"), + ( + "minecraft:wooden_pressure_plate.0", + "minecraft:oak_pressure_plate", + ), ("minecraft:noteblock.0", "minecraft:note_block"), ("minecraft:bed.0", "minecraft:white_bed"), ("minecraft:bed.1", "minecraft:orange_bed"), @@ -1047,7 +1250,10 @@ pub static STATS_CUSTOM: &[(&str, &str)] = &[ ("stat.cauldronUsed", "minecraft:use_cauldron"), ("stat.armorCleaned", "minecraft:clean_armor"), ("stat.bannerCleaned", "minecraft:clean_banner"), - ("stat.brewingstandInteraction", "minecraft:interact_with_brewingstand"), + ( + "stat.brewingstandInteraction", + "minecraft:interact_with_brewingstand", + ), ("stat.beaconInteraction", "minecraft:interact_with_beacon"), ("stat.dropperInspected", "minecraft:inspect_dropper"), ("stat.hopperInspected", "minecraft:inspect_hopper"), @@ -1055,12 +1261,18 @@ pub static STATS_CUSTOM: &[(&str, &str)] = &[ ("stat.noteblockPlayed", "minecraft:play_noteblock"), ("stat.noteblockTuned", "minecraft:tune_noteblock"), ("stat.flowerPotted", "minecraft:pot_flower"), - ("stat.trappedChestTriggered", "minecraft:trigger_trapped_chest"), + ( + "stat.trappedChestTriggered", + "minecraft:trigger_trapped_chest", + ), ("stat.enderchestOpened", "minecraft:open_enderchest"), ("stat.itemEnchanted", "minecraft:enchant_item"), ("stat.recordPlayed", "minecraft:play_record"), ("stat.furnaceInteraction", "minecraft:interact_with_furnace"), - ("stat.craftingTableInteraction", "minecraft:interact_with_crafting_table"), + ( + "stat.craftingTableInteraction", + "minecraft:interact_with_crafting_table", + ), ("stat.chestOpened", "minecraft:open_chest"), ("stat.sleepInBed", "minecraft:sleep_in_bed"), ("stat.shulkerBoxOpened", "minecraft:open_shulker_box"), @@ -1128,58 +1340,130 @@ pub static STATS_ENTITIES: &[(&str, &str)] = &[ pub static RECIPES: &[(&str, &str)] = &[ ("minecraft:acacia_wooden_slab", "minecraft:acacia_slab"), ("minecraft:birch_wooden_slab", "minecraft:birch_slab"), - ("minecraft:black_stained_hardened_clay", "minecraft:black_terracotta"), - ("minecraft:blue_stained_hardened_clay", "minecraft:blue_terracotta"), + ( + "minecraft:black_stained_hardened_clay", + "minecraft:black_terracotta", + ), + ( + "minecraft:blue_stained_hardened_clay", + "minecraft:blue_terracotta", + ), ("minecraft:boat", "minecraft:oak_boat"), - ("minecraft:bone_meal_from_block", "minecraft:bone_meal_from_bone_block"), + ( + "minecraft:bone_meal_from_block", + "minecraft:bone_meal_from_bone_block", + ), ("minecraft:bone_meal_from_bone", "minecraft:bone_meal"), ("minecraft:brick_block", "minecraft:bricks"), - ("minecraft:brown_stained_hardened_clay", "minecraft:brown_terracotta"), - ("minecraft:chiseled_stonebrick", "minecraft:chiseled_stone_bricks"), - ("minecraft:cyan_stained_hardened_clay", "minecraft:cyan_terracotta"), + ( + "minecraft:brown_stained_hardened_clay", + "minecraft:brown_terracotta", + ), + ( + "minecraft:chiseled_stonebrick", + "minecraft:chiseled_stone_bricks", + ), + ( + "minecraft:cyan_stained_hardened_clay", + "minecraft:cyan_terracotta", + ), ("minecraft:dark_oak_wooden_slab", "minecraft:dark_oak_slab"), ("minecraft:end_bricks", "minecraft:end_stone_bricks"), ("minecraft:fence_gate", "minecraft:oak_fence_gate"), ("minecraft:fence", "minecraft:oak_fence"), ("minecraft:golden_rail", "minecraft:powered_rail"), - ("minecraft:gold_ingot_from_block", "minecraft:gold_ingot_from_gold_block"), - ("minecraft:gray_stained_hardened_clay", "minecraft:gray_terracotta"), - ("minecraft:green_stained_hardened_clay", "minecraft:green_terracotta"), - ("minecraft:iron_ingot_from_block", "minecraft:iron_ingot_from_iron_block"), + ( + "minecraft:gold_ingot_from_block", + "minecraft:gold_ingot_from_gold_block", + ), + ( + "minecraft:gray_stained_hardened_clay", + "minecraft:gray_terracotta", + ), + ( + "minecraft:green_stained_hardened_clay", + "minecraft:green_terracotta", + ), + ( + "minecraft:iron_ingot_from_block", + "minecraft:iron_ingot_from_iron_block", + ), ("minecraft:jungle_wooden_slab", "minecraft:jungle_slab"), - ("minecraft:light_blue_stained_hardened_clay", "minecraft:light_blue_terracotta"), - ("minecraft:light_gray_stained_hardened_clay", "minecraft:light_gray_terracotta"), - ("minecraft:lime_stained_hardened_clay", "minecraft:lime_terracotta"), + ( + "minecraft:light_blue_stained_hardened_clay", + "minecraft:light_blue_terracotta", + ), + ( + "minecraft:light_gray_stained_hardened_clay", + "minecraft:light_gray_terracotta", + ), + ( + "minecraft:lime_stained_hardened_clay", + "minecraft:lime_terracotta", + ), ("minecraft:lit_pumpkin", "minecraft:jack_o_lantern"), - ("minecraft:magenta_stained_hardened_clay", "minecraft:magenta_terracotta"), + ( + "minecraft:magenta_stained_hardened_clay", + "minecraft:magenta_terracotta", + ), ("minecraft:magma", "minecraft:magma_block"), ("minecraft:melon_block", "minecraft:melon"), ("minecraft:mossy_stonebrick", "minecraft:mossy_stone_bricks"), ("minecraft:noteblock", "minecraft:note_block"), ("minecraft:oak_wooden_slab", "minecraft:oak_slab"), - ("minecraft:orange_stained_hardened_clay", "minecraft:orange_terracotta"), + ( + "minecraft:orange_stained_hardened_clay", + "minecraft:orange_terracotta", + ), ("minecraft:pillar_quartz_block", "minecraft:quartz_pillar"), - ("minecraft:pink_stained_hardened_clay", "minecraft:pink_terracotta"), + ( + "minecraft:pink_stained_hardened_clay", + "minecraft:pink_terracotta", + ), ("minecraft:purple_shulker_box", "minecraft:shulker_box"), - ("minecraft:purple_stained_hardened_clay", "minecraft:purple_terracotta"), + ( + "minecraft:purple_stained_hardened_clay", + "minecraft:purple_terracotta", + ), ("minecraft:red_nether_brick", "minecraft:red_nether_bricks"), - ("minecraft:red_stained_hardened_clay", "minecraft:red_terracotta"), + ( + "minecraft:red_stained_hardened_clay", + "minecraft:red_terracotta", + ), ("minecraft:slime", "minecraft:slime_block"), - ("minecraft:smooth_red_sandstone", "minecraft:cut_red_sandstone"), + ( + "minecraft:smooth_red_sandstone", + "minecraft:cut_red_sandstone", + ), ("minecraft:smooth_sandstone", "minecraft:cut_sandstone"), ("minecraft:snow_layer", "minecraft:snow"), ("minecraft:snow", "minecraft:snow_block"), - ("minecraft:speckled_melon", "minecraft:glistering_melon_slice"), + ( + "minecraft:speckled_melon", + "minecraft:glistering_melon_slice", + ), ("minecraft:spruce_wooden_slab", "minecraft:spruce_slab"), ("minecraft:stonebrick", "minecraft:stone_bricks"), ("minecraft:stone_stairs", "minecraft:cobblestone_stairs"), - ("minecraft:string_to_wool", "minecraft:white_wool_from_string"), + ( + "minecraft:string_to_wool", + "minecraft:white_wool_from_string", + ), ("minecraft:trapdoor", "minecraft:oak_trapdoor"), - ("minecraft:white_stained_hardened_clay", "minecraft:white_terracotta"), + ( + "minecraft:white_stained_hardened_clay", + "minecraft:white_terracotta", + ), ("minecraft:wooden_button", "minecraft:oak_button"), ("minecraft:wooden_door", "minecraft:oak_door"), - ("minecraft:wooden_pressure_plate", "minecraft:oak_pressure_plate"), - ("minecraft:yellow_stained_hardened_clay", "minecraft:yellow_terracotta"), + ( + "minecraft:wooden_pressure_plate", + "minecraft:oak_pressure_plate", + ), + ( + "minecraft:yellow_stained_hardened_clay", + "minecraft:yellow_terracotta", + ), ]; pub static RECIPES_RENAMENING: &[(&str, &str)] = &[ @@ -1192,61 +1476,226 @@ pub static RECIPES_RENAMENING: &[(&str, &str)] = &[ ]; pub static ADVANCEMENTS: &[(&str, &str)] = &[ - ("minecraft:recipes/brewing/speckled_melon", "minecraft:recipes/brewing/glistering_melon_slice"), - ("minecraft:recipes/building_blocks/black_stained_hardened_clay", "minecraft:recipes/building_blocks/black_terracotta"), - ("minecraft:recipes/building_blocks/blue_stained_hardened_clay", "minecraft:recipes/building_blocks/blue_terracotta"), - ("minecraft:recipes/building_blocks/brown_stained_hardened_clay", "minecraft:recipes/building_blocks/brown_terracotta"), - ("minecraft:recipes/building_blocks/cyan_stained_hardened_clay", "minecraft:recipes/building_blocks/cyan_terracotta"), - ("minecraft:recipes/building_blocks/gray_stained_hardened_clay", "minecraft:recipes/building_blocks/gray_terracotta"), - ("minecraft:recipes/building_blocks/green_stained_hardened_clay", "minecraft:recipes/building_blocks/green_terracotta"), - ("minecraft:recipes/building_blocks/light_blue_stained_hardened_clay", "minecraft:recipes/building_blocks/light_blue_terracotta"), - ("minecraft:recipes/building_blocks/light_gray_stained_hardened_clay", "minecraft:recipes/building_blocks/light_gray_terracotta"), - ("minecraft:recipes/building_blocks/lime_stained_hardened_clay", "minecraft:recipes/building_blocks/lime_terracotta"), - ("minecraft:recipes/building_blocks/magenta_stained_hardened_clay", "minecraft:recipes/building_blocks/magenta_terracotta"), - ("minecraft:recipes/building_blocks/orange_stained_hardened_clay", "minecraft:recipes/building_blocks/orange_terracotta"), - ("minecraft:recipes/building_blocks/pink_stained_hardened_clay", "minecraft:recipes/building_blocks/pink_terracotta"), - ("minecraft:recipes/building_blocks/purple_stained_hardened_clay", "minecraft:recipes/building_blocks/purple_terracotta"), - ("minecraft:recipes/building_blocks/red_stained_hardened_clay", "minecraft:recipes/building_blocks/red_terracotta"), - ("minecraft:recipes/building_blocks/white_stained_hardened_clay", "minecraft:recipes/building_blocks/white_terracotta"), - ("minecraft:recipes/building_blocks/yellow_stained_hardened_clay", "minecraft:recipes/building_blocks/yellow_terracotta"), - ("minecraft:recipes/building_blocks/acacia_wooden_slab", "minecraft:recipes/building_blocks/acacia_slab"), - ("minecraft:recipes/building_blocks/birch_wooden_slab", "minecraft:recipes/building_blocks/birch_slab"), - ("minecraft:recipes/building_blocks/dark_oak_wooden_slab", "minecraft:recipes/building_blocks/dark_oak_slab"), - ("minecraft:recipes/building_blocks/jungle_wooden_slab", "minecraft:recipes/building_blocks/jungle_slab"), - ("minecraft:recipes/building_blocks/oak_wooden_slab", "minecraft:recipes/building_blocks/oak_slab"), - ("minecraft:recipes/building_blocks/spruce_wooden_slab", "minecraft:recipes/building_blocks/spruce_slab"), - ("minecraft:recipes/building_blocks/brick_block", "minecraft:recipes/building_blocks/bricks"), - ("minecraft:recipes/building_blocks/chiseled_stonebrick", "minecraft:recipes/building_blocks/chiseled_stone_bricks"), - ("minecraft:recipes/building_blocks/end_bricks", "minecraft:recipes/building_blocks/end_stone_bricks"), - ("minecraft:recipes/building_blocks/lit_pumpkin", "minecraft:recipes/building_blocks/jack_o_lantern"), - ("minecraft:recipes/building_blocks/magma", "minecraft:recipes/building_blocks/magma_block"), - ("minecraft:recipes/building_blocks/melon_block", "minecraft:recipes/building_blocks/melon"), - ("minecraft:recipes/building_blocks/mossy_stonebrick", "minecraft:recipes/building_blocks/mossy_stone_bricks"), - ("minecraft:recipes/building_blocks/nether_brick", "minecraft:recipes/building_blocks/nether_bricks"), - ("minecraft:recipes/building_blocks/pillar_quartz_block", "minecraft:recipes/building_blocks/quartz_pillar"), - ("minecraft:recipes/building_blocks/red_nether_brick", "minecraft:recipes/building_blocks/red_nether_bricks"), - ("minecraft:recipes/building_blocks/snow", "minecraft:recipes/building_blocks/snow_block"), - ("minecraft:recipes/building_blocks/smooth_red_sandstone", "minecraft:recipes/building_blocks/cut_red_sandstone"), - ("minecraft:recipes/building_blocks/smooth_sandstone", "minecraft:recipes/building_blocks/cut_sandstone"), - ("minecraft:recipes/building_blocks/stonebrick", "minecraft:recipes/building_blocks/stone_bricks"), - ("minecraft:recipes/building_blocks/stone_stairs", "minecraft:recipes/building_blocks/cobblestone_stairs"), - ("minecraft:recipes/building_blocks/string_to_wool", "minecraft:recipes/building_blocks/white_wool_from_string"), - ("minecraft:recipes/decorations/fence", "minecraft:recipes/decorations/oak_fence"), - ("minecraft:recipes/decorations/purple_shulker_box", "minecraft:recipes/decorations/shulker_box"), - ("minecraft:recipes/decorations/slime", "minecraft:recipes/decorations/slime_block"), - ("minecraft:recipes/decorations/snow_layer", "minecraft:recipes/decorations/snow"), - ("minecraft:recipes/misc/bone_meal_from_block", "minecraft:recipes/misc/bone_meal_from_bone_block"), - ("minecraft:recipes/misc/bone_meal_from_bone", "minecraft:recipes/misc/bone_meal"), - ("minecraft:recipes/misc/gold_ingot_from_block", "minecraft:recipes/misc/gold_ingot_from_gold_block"), - ("minecraft:recipes/misc/iron_ingot_from_block", "minecraft:recipes/misc/iron_ingot_from_iron_block"), - ("minecraft:recipes/redstone/fence_gate", "minecraft:recipes/redstone/oak_fence_gate"), - ("minecraft:recipes/redstone/noteblock", "minecraft:recipes/redstone/note_block"), - ("minecraft:recipes/redstone/trapdoor", "minecraft:recipes/redstone/oak_trapdoor"), - ("minecraft:recipes/redstone/wooden_button", "minecraft:recipes/redstone/oak_button"), - ("minecraft:recipes/redstone/wooden_door", "minecraft:recipes/redstone/oak_door"), - ("minecraft:recipes/redstone/wooden_pressure_plate", "minecraft:recipes/redstone/oak_pressure_plate"), - ("minecraft:recipes/transportation/boat", "minecraft:recipes/transportation/oak_boat"), - ("minecraft:recipes/transportation/golden_rail", "minecraft:recipes/transportation/powered_rail"), + ( + "minecraft:recipes/brewing/speckled_melon", + "minecraft:recipes/brewing/glistering_melon_slice", + ), + ( + "minecraft:recipes/building_blocks/black_stained_hardened_clay", + "minecraft:recipes/building_blocks/black_terracotta", + ), + ( + "minecraft:recipes/building_blocks/blue_stained_hardened_clay", + "minecraft:recipes/building_blocks/blue_terracotta", + ), + ( + "minecraft:recipes/building_blocks/brown_stained_hardened_clay", + "minecraft:recipes/building_blocks/brown_terracotta", + ), + ( + "minecraft:recipes/building_blocks/cyan_stained_hardened_clay", + "minecraft:recipes/building_blocks/cyan_terracotta", + ), + ( + "minecraft:recipes/building_blocks/gray_stained_hardened_clay", + "minecraft:recipes/building_blocks/gray_terracotta", + ), + ( + "minecraft:recipes/building_blocks/green_stained_hardened_clay", + "minecraft:recipes/building_blocks/green_terracotta", + ), + ( + "minecraft:recipes/building_blocks/light_blue_stained_hardened_clay", + "minecraft:recipes/building_blocks/light_blue_terracotta", + ), + ( + "minecraft:recipes/building_blocks/light_gray_stained_hardened_clay", + "minecraft:recipes/building_blocks/light_gray_terracotta", + ), + ( + "minecraft:recipes/building_blocks/lime_stained_hardened_clay", + "minecraft:recipes/building_blocks/lime_terracotta", + ), + ( + "minecraft:recipes/building_blocks/magenta_stained_hardened_clay", + "minecraft:recipes/building_blocks/magenta_terracotta", + ), + ( + "minecraft:recipes/building_blocks/orange_stained_hardened_clay", + "minecraft:recipes/building_blocks/orange_terracotta", + ), + ( + "minecraft:recipes/building_blocks/pink_stained_hardened_clay", + "minecraft:recipes/building_blocks/pink_terracotta", + ), + ( + "minecraft:recipes/building_blocks/purple_stained_hardened_clay", + "minecraft:recipes/building_blocks/purple_terracotta", + ), + ( + "minecraft:recipes/building_blocks/red_stained_hardened_clay", + "minecraft:recipes/building_blocks/red_terracotta", + ), + ( + "minecraft:recipes/building_blocks/white_stained_hardened_clay", + "minecraft:recipes/building_blocks/white_terracotta", + ), + ( + "minecraft:recipes/building_blocks/yellow_stained_hardened_clay", + "minecraft:recipes/building_blocks/yellow_terracotta", + ), + ( + "minecraft:recipes/building_blocks/acacia_wooden_slab", + "minecraft:recipes/building_blocks/acacia_slab", + ), + ( + "minecraft:recipes/building_blocks/birch_wooden_slab", + "minecraft:recipes/building_blocks/birch_slab", + ), + ( + "minecraft:recipes/building_blocks/dark_oak_wooden_slab", + "minecraft:recipes/building_blocks/dark_oak_slab", + ), + ( + "minecraft:recipes/building_blocks/jungle_wooden_slab", + "minecraft:recipes/building_blocks/jungle_slab", + ), + ( + "minecraft:recipes/building_blocks/oak_wooden_slab", + "minecraft:recipes/building_blocks/oak_slab", + ), + ( + "minecraft:recipes/building_blocks/spruce_wooden_slab", + "minecraft:recipes/building_blocks/spruce_slab", + ), + ( + "minecraft:recipes/building_blocks/brick_block", + "minecraft:recipes/building_blocks/bricks", + ), + ( + "minecraft:recipes/building_blocks/chiseled_stonebrick", + "minecraft:recipes/building_blocks/chiseled_stone_bricks", + ), + ( + "minecraft:recipes/building_blocks/end_bricks", + "minecraft:recipes/building_blocks/end_stone_bricks", + ), + ( + "minecraft:recipes/building_blocks/lit_pumpkin", + "minecraft:recipes/building_blocks/jack_o_lantern", + ), + ( + "minecraft:recipes/building_blocks/magma", + "minecraft:recipes/building_blocks/magma_block", + ), + ( + "minecraft:recipes/building_blocks/melon_block", + "minecraft:recipes/building_blocks/melon", + ), + ( + "minecraft:recipes/building_blocks/mossy_stonebrick", + "minecraft:recipes/building_blocks/mossy_stone_bricks", + ), + ( + "minecraft:recipes/building_blocks/nether_brick", + "minecraft:recipes/building_blocks/nether_bricks", + ), + ( + "minecraft:recipes/building_blocks/pillar_quartz_block", + "minecraft:recipes/building_blocks/quartz_pillar", + ), + ( + "minecraft:recipes/building_blocks/red_nether_brick", + "minecraft:recipes/building_blocks/red_nether_bricks", + ), + ( + "minecraft:recipes/building_blocks/snow", + "minecraft:recipes/building_blocks/snow_block", + ), + ( + "minecraft:recipes/building_blocks/smooth_red_sandstone", + "minecraft:recipes/building_blocks/cut_red_sandstone", + ), + ( + "minecraft:recipes/building_blocks/smooth_sandstone", + "minecraft:recipes/building_blocks/cut_sandstone", + ), + ( + "minecraft:recipes/building_blocks/stonebrick", + "minecraft:recipes/building_blocks/stone_bricks", + ), + ( + "minecraft:recipes/building_blocks/stone_stairs", + "minecraft:recipes/building_blocks/cobblestone_stairs", + ), + ( + "minecraft:recipes/building_blocks/string_to_wool", + "minecraft:recipes/building_blocks/white_wool_from_string", + ), + ( + "minecraft:recipes/decorations/fence", + "minecraft:recipes/decorations/oak_fence", + ), + ( + "minecraft:recipes/decorations/purple_shulker_box", + "minecraft:recipes/decorations/shulker_box", + ), + ( + "minecraft:recipes/decorations/slime", + "minecraft:recipes/decorations/slime_block", + ), + ( + "minecraft:recipes/decorations/snow_layer", + "minecraft:recipes/decorations/snow", + ), + ( + "minecraft:recipes/misc/bone_meal_from_block", + "minecraft:recipes/misc/bone_meal_from_bone_block", + ), + ( + "minecraft:recipes/misc/bone_meal_from_bone", + "minecraft:recipes/misc/bone_meal", + ), + ( + "minecraft:recipes/misc/gold_ingot_from_block", + "minecraft:recipes/misc/gold_ingot_from_gold_block", + ), + ( + "minecraft:recipes/misc/iron_ingot_from_block", + "minecraft:recipes/misc/iron_ingot_from_iron_block", + ), + ( + "minecraft:recipes/redstone/fence_gate", + "minecraft:recipes/redstone/oak_fence_gate", + ), + ( + "minecraft:recipes/redstone/noteblock", + "minecraft:recipes/redstone/note_block", + ), + ( + "minecraft:recipes/redstone/trapdoor", + "minecraft:recipes/redstone/oak_trapdoor", + ), + ( + "minecraft:recipes/redstone/wooden_button", + "minecraft:recipes/redstone/oak_button", + ), + ( + "minecraft:recipes/redstone/wooden_door", + "minecraft:recipes/redstone/oak_door", + ), + ( + "minecraft:recipes/redstone/wooden_pressure_plate", + "minecraft:recipes/redstone/oak_pressure_plate", + ), + ( + "minecraft:recipes/transportation/boat", + "minecraft:recipes/transportation/oak_boat", + ), + ( + "minecraft:recipes/transportation/golden_rail", + "minecraft:recipes/transportation/powered_rail", + ), ]; pub static GENERATOR_BIOMES: &[(&str, &str)] = &[ @@ -1333,11 +1782,17 @@ pub static SPAWN_EGGS: &[(&str, &str)] = &[ ("minecraft:cow", "minecraft:cow_spawn_egg"), ("minecraft:creeper", "minecraft:creeper_spawn_egg"), ("minecraft:donkey", "minecraft:donkey_spawn_egg"), - ("minecraft:elder_guardian", "minecraft:elder_guardian_spawn_egg"), + ( + "minecraft:elder_guardian", + "minecraft:elder_guardian_spawn_egg", + ), ("minecraft:ender_dragon", "minecraft:ender_dragon_spawn_egg"), ("minecraft:enderman", "minecraft:enderman_spawn_egg"), ("minecraft:endermite", "minecraft:endermite_spawn_egg"), - ("minecraft:evocation_illager", "minecraft:evocation_illager_spawn_egg"), + ( + "minecraft:evocation_illager", + "minecraft:evocation_illager_spawn_egg", + ), ("minecraft:ghast", "minecraft:ghast_spawn_egg"), ("minecraft:guardian", "minecraft:guardian_spawn_egg"), ("minecraft:horse", "minecraft:horse_spawn_egg"), @@ -1357,7 +1812,10 @@ pub static SPAWN_EGGS: &[(&str, &str)] = &[ ("minecraft:shulker", "minecraft:shulker_spawn_egg"), ("minecraft:silverfish", "minecraft:silverfish_spawn_egg"), ("minecraft:skeleton", "minecraft:skeleton_spawn_egg"), - ("minecraft:skeleton_horse", "minecraft:skeleton_horse_spawn_egg"), + ( + "minecraft:skeleton_horse", + "minecraft:skeleton_horse_spawn_egg", + ), ("minecraft:slime", "minecraft:slime_spawn_egg"), ("minecraft:snow_golem", "minecraft:snow_golem_spawn_egg"), ("minecraft:spider", "minecraft:spider_spawn_egg"), @@ -1366,15 +1824,27 @@ pub static SPAWN_EGGS: &[(&str, &str)] = &[ ("minecraft:turtle", "minecraft:turtle_spawn_egg"), ("minecraft:vex", "minecraft:vex_spawn_egg"), ("minecraft:villager", "minecraft:villager_spawn_egg"), - ("minecraft:vindication_illager", "minecraft:vindication_illager_spawn_egg"), + ( + "minecraft:vindication_illager", + "minecraft:vindication_illager_spawn_egg", + ), ("minecraft:witch", "minecraft:witch_spawn_egg"), ("minecraft:wither", "minecraft:wither_spawn_egg"), - ("minecraft:wither_skeleton", "minecraft:wither_skeleton_spawn_egg"), + ( + "minecraft:wither_skeleton", + "minecraft:wither_skeleton_spawn_egg", + ), ("minecraft:wolf", "minecraft:wolf_spawn_egg"), ("minecraft:zombie", "minecraft:zombie_spawn_egg"), ("minecraft:zombie_horse", "minecraft:zombie_horse_spawn_egg"), - ("minecraft:zombie_pigman", "minecraft:zombie_pigman_spawn_egg"), - ("minecraft:zombie_villager", "minecraft:zombie_villager_spawn_egg"), + ( + "minecraft:zombie_pigman", + "minecraft:zombie_pigman_spawn_egg", + ), + ( + "minecraft:zombie_villager", + "minecraft:zombie_villager_spawn_egg", + ), ]; pub static ENCHANTMENTS: &[(i32, &str)] = &[ @@ -1439,14 +1909,23 @@ pub static CORAL: &[(&str, &str)] = &[ pub static CORAL_FANS: &[(&str, &str)] = &[ ("minecraft:tube_coral_fan", "minecraft:tube_coral_wall_fan"), - ("minecraft:brain_coral_fan", "minecraft:brain_coral_wall_fan"), - ("minecraft:bubble_coral_fan", "minecraft:bubble_coral_wall_fan"), + ( + "minecraft:brain_coral_fan", + "minecraft:brain_coral_wall_fan", + ), + ( + "minecraft:bubble_coral_fan", + "minecraft:bubble_coral_wall_fan", + ), ("minecraft:fire_coral_fan", "minecraft:fire_coral_wall_fan"), ("minecraft:horn_coral_fan", "minecraft:horn_coral_wall_fan"), ]; pub static THE_RENAMENING_ENTITIES: &[(&str, &str)] = &[ - ("minecraft:commandblock_minecart", "minecraft:command_block_minecart"), + ( + "minecraft:commandblock_minecart", + "minecraft:command_block_minecart", + ), ("minecraft:ender_crystal", "minecraft:end_crystal"), ("minecraft:snowman", "minecraft:snow_golem"), ("minecraft:evocation_illager", "minecraft:evoker"), @@ -1469,11 +1948,26 @@ pub static THE_RENAMENING_BLOCKS: &[(&str, &str)] = &[ ("minecraft:acacia_bark", "minecraft:acacia_wood"), ("minecraft:dark_oak_bark", "minecraft:dark_oak_wood"), ("minecraft:stripped_oak_bark", "minecraft:stripped_oak_wood"), - ("minecraft:stripped_spruce_bark", "minecraft:stripped_spruce_wood"), - ("minecraft:stripped_birch_bark", "minecraft:stripped_birch_wood"), - ("minecraft:stripped_jungle_bark", "minecraft:stripped_jungle_wood"), - ("minecraft:stripped_acacia_bark", "minecraft:stripped_acacia_wood"), - ("minecraft:stripped_dark_oak_bark", "minecraft:stripped_dark_oak_wood"), + ( + "minecraft:stripped_spruce_bark", + "minecraft:stripped_spruce_wood", + ), + ( + "minecraft:stripped_birch_bark", + "minecraft:stripped_birch_wood", + ), + ( + "minecraft:stripped_jungle_bark", + "minecraft:stripped_jungle_wood", + ), + ( + "minecraft:stripped_acacia_bark", + "minecraft:stripped_acacia_wood", + ), + ( + "minecraft:stripped_dark_oak_bark", + "minecraft:stripped_dark_oak_wood", + ), ("minecraft:mob_spawner", "minecraft:spawner"), ]; @@ -1483,92 +1977,303 @@ pub static COD_SALMON: &[(&str, &str)] = &[ ]; pub static COD_SALMON_EGGS: &[(&str, &str)] = &[ - ("minecraft:salmon_mob_spawn_egg", "minecraft:salmon_spawn_egg"), + ( + "minecraft:salmon_mob_spawn_egg", + "minecraft:salmon_spawn_egg", + ), ("minecraft:cod_mob_spawn_egg", "minecraft:cod_spawn_egg"), ]; /// `ChunkStructuresTemplateRenameFix.RENAMES`: structure id, child id, template renames. pub static STRUCTURE_TEMPLATE_RENAMES: &[(&str, &str, &[(&str, &str)])] = &[ - ("EndCity", "ECP", &[ - ("second_floor", "second_floor_1"), - ("third_floor", "third_floor_1"), - ("third_floor_c", "third_floor_2"), - ]), - ("Mansion", "WMP", &[ - ("carpet_south", "carpet_south_1"), - ("carpet_west", "carpet_west_1"), - ("indoors_door", "indoors_door_1"), - ("indoors_wall", "indoors_wall_1"), - ]), - ("Igloo", "Iglu", &[ - ("minecraft:igloo/igloo_bottom", "minecraft:igloo/bottom"), - ("minecraft:igloo/igloo_middle", "minecraft:igloo/middle"), - ("minecraft:igloo/igloo_top", "minecraft:igloo/top"), - ]), - ("Ocean_Ruin", "ORP", &[ - ("minecraft:ruin/big_ruin1_brick", "minecraft:underwater_ruin/big_brick_1"), - ("minecraft:ruin/big_ruin2_brick", "minecraft:underwater_ruin/big_brick_2"), - ("minecraft:ruin/big_ruin3_brick", "minecraft:underwater_ruin/big_brick_3"), - ("minecraft:ruin/big_ruin8_brick", "minecraft:underwater_ruin/big_brick_8"), - ("minecraft:ruin/big_ruin1_cracked", "minecraft:underwater_ruin/big_cracked_1"), - ("minecraft:ruin/big_ruin2_cracked", "minecraft:underwater_ruin/big_cracked_2"), - ("minecraft:ruin/big_ruin3_cracked", "minecraft:underwater_ruin/big_cracked_3"), - ("minecraft:ruin/big_ruin8_cracked", "minecraft:underwater_ruin/big_cracked_8"), - ("minecraft:ruin/big_ruin1_mossy", "minecraft:underwater_ruin/big_mossy_1"), - ("minecraft:ruin/big_ruin2_mossy", "minecraft:underwater_ruin/big_mossy_2"), - ("minecraft:ruin/big_ruin3_mossy", "minecraft:underwater_ruin/big_mossy_3"), - ("minecraft:ruin/big_ruin8_mossy", "minecraft:underwater_ruin/big_mossy_8"), - ("minecraft:ruin/big_ruin_warm4", "minecraft:underwater_ruin/big_warm_4"), - ("minecraft:ruin/big_ruin_warm5", "minecraft:underwater_ruin/big_warm_5"), - ("minecraft:ruin/big_ruin_warm6", "minecraft:underwater_ruin/big_warm_6"), - ("minecraft:ruin/big_ruin_warm7", "minecraft:underwater_ruin/big_warm_7"), - ("minecraft:ruin/ruin1_brick", "minecraft:underwater_ruin/brick_1"), - ("minecraft:ruin/ruin2_brick", "minecraft:underwater_ruin/brick_2"), - ("minecraft:ruin/ruin3_brick", "minecraft:underwater_ruin/brick_3"), - ("minecraft:ruin/ruin4_brick", "minecraft:underwater_ruin/brick_4"), - ("minecraft:ruin/ruin5_brick", "minecraft:underwater_ruin/brick_5"), - ("minecraft:ruin/ruin6_brick", "minecraft:underwater_ruin/brick_6"), - ("minecraft:ruin/ruin7_brick", "minecraft:underwater_ruin/brick_7"), - ("minecraft:ruin/ruin8_brick", "minecraft:underwater_ruin/brick_8"), - ("minecraft:ruin/ruin1_cracked", "minecraft:underwater_ruin/cracked_1"), - ("minecraft:ruin/ruin2_cracked", "minecraft:underwater_ruin/cracked_2"), - ("minecraft:ruin/ruin3_cracked", "minecraft:underwater_ruin/cracked_3"), - ("minecraft:ruin/ruin4_cracked", "minecraft:underwater_ruin/cracked_4"), - ("minecraft:ruin/ruin5_cracked", "minecraft:underwater_ruin/cracked_5"), - ("minecraft:ruin/ruin6_cracked", "minecraft:underwater_ruin/cracked_6"), - ("minecraft:ruin/ruin7_cracked", "minecraft:underwater_ruin/cracked_7"), - ("minecraft:ruin/ruin8_cracked", "minecraft:underwater_ruin/cracked_8"), - ("minecraft:ruin/ruin1_mossy", "minecraft:underwater_ruin/mossy_1"), - ("minecraft:ruin/ruin2_mossy", "minecraft:underwater_ruin/mossy_2"), - ("minecraft:ruin/ruin3_mossy", "minecraft:underwater_ruin/mossy_3"), - ("minecraft:ruin/ruin4_mossy", "minecraft:underwater_ruin/mossy_4"), - ("minecraft:ruin/ruin5_mossy", "minecraft:underwater_ruin/mossy_5"), - ("minecraft:ruin/ruin6_mossy", "minecraft:underwater_ruin/mossy_6"), - ("minecraft:ruin/ruin7_mossy", "minecraft:underwater_ruin/mossy_7"), - ("minecraft:ruin/ruin8_mossy", "minecraft:underwater_ruin/mossy_8"), - ("minecraft:ruin/ruin_warm1", "minecraft:underwater_ruin/warm_1"), - ("minecraft:ruin/ruin_warm2", "minecraft:underwater_ruin/warm_2"), - ("minecraft:ruin/ruin_warm3", "minecraft:underwater_ruin/warm_3"), - ("minecraft:ruin/ruin_warm4", "minecraft:underwater_ruin/warm_4"), - ("minecraft:ruin/ruin_warm5", "minecraft:underwater_ruin/warm_5"), - ("minecraft:ruin/ruin_warm6", "minecraft:underwater_ruin/warm_6"), - ("minecraft:ruin/ruin_warm7", "minecraft:underwater_ruin/warm_7"), - ("minecraft:ruin/ruin_warm8", "minecraft:underwater_ruin/warm_8"), - ("minecraft:ruin/big_brick_1", "minecraft:underwater_ruin/big_brick_1"), - ("minecraft:ruin/big_brick_2", "minecraft:underwater_ruin/big_brick_2"), - ("minecraft:ruin/big_brick_3", "minecraft:underwater_ruin/big_brick_3"), - ("minecraft:ruin/big_brick_8", "minecraft:underwater_ruin/big_brick_8"), - ("minecraft:ruin/big_mossy_1", "minecraft:underwater_ruin/big_mossy_1"), - ("minecraft:ruin/big_mossy_2", "minecraft:underwater_ruin/big_mossy_2"), - ("minecraft:ruin/big_mossy_3", "minecraft:underwater_ruin/big_mossy_3"), - ("minecraft:ruin/big_mossy_8", "minecraft:underwater_ruin/big_mossy_8"), - ("minecraft:ruin/big_cracked_1", "minecraft:underwater_ruin/big_cracked_1"), - ("minecraft:ruin/big_cracked_2", "minecraft:underwater_ruin/big_cracked_2"), - ("minecraft:ruin/big_cracked_3", "minecraft:underwater_ruin/big_cracked_3"), - ("minecraft:ruin/big_cracked_8", "minecraft:underwater_ruin/big_cracked_8"), - ("minecraft:ruin/big_warm_4", "minecraft:underwater_ruin/big_warm_4"), - ("minecraft:ruin/big_warm_5", "minecraft:underwater_ruin/big_warm_5"), - ("minecraft:ruin/big_warm_6", "minecraft:underwater_ruin/big_warm_6"), - ("minecraft:ruin/big_warm_7", "minecraft:underwater_ruin/big_warm_7"), - ]), + ( + "EndCity", + "ECP", + &[ + ("second_floor", "second_floor_1"), + ("third_floor", "third_floor_1"), + ("third_floor_c", "third_floor_2"), + ], + ), + ( + "Mansion", + "WMP", + &[ + ("carpet_south", "carpet_south_1"), + ("carpet_west", "carpet_west_1"), + ("indoors_door", "indoors_door_1"), + ("indoors_wall", "indoors_wall_1"), + ], + ), + ( + "Igloo", + "Iglu", + &[ + ("minecraft:igloo/igloo_bottom", "minecraft:igloo/bottom"), + ("minecraft:igloo/igloo_middle", "minecraft:igloo/middle"), + ("minecraft:igloo/igloo_top", "minecraft:igloo/top"), + ], + ), + ( + "Ocean_Ruin", + "ORP", + &[ + ( + "minecraft:ruin/big_ruin1_brick", + "minecraft:underwater_ruin/big_brick_1", + ), + ( + "minecraft:ruin/big_ruin2_brick", + "minecraft:underwater_ruin/big_brick_2", + ), + ( + "minecraft:ruin/big_ruin3_brick", + "minecraft:underwater_ruin/big_brick_3", + ), + ( + "minecraft:ruin/big_ruin8_brick", + "minecraft:underwater_ruin/big_brick_8", + ), + ( + "minecraft:ruin/big_ruin1_cracked", + "minecraft:underwater_ruin/big_cracked_1", + ), + ( + "minecraft:ruin/big_ruin2_cracked", + "minecraft:underwater_ruin/big_cracked_2", + ), + ( + "minecraft:ruin/big_ruin3_cracked", + "minecraft:underwater_ruin/big_cracked_3", + ), + ( + "minecraft:ruin/big_ruin8_cracked", + "minecraft:underwater_ruin/big_cracked_8", + ), + ( + "minecraft:ruin/big_ruin1_mossy", + "minecraft:underwater_ruin/big_mossy_1", + ), + ( + "minecraft:ruin/big_ruin2_mossy", + "minecraft:underwater_ruin/big_mossy_2", + ), + ( + "minecraft:ruin/big_ruin3_mossy", + "minecraft:underwater_ruin/big_mossy_3", + ), + ( + "minecraft:ruin/big_ruin8_mossy", + "minecraft:underwater_ruin/big_mossy_8", + ), + ( + "minecraft:ruin/big_ruin_warm4", + "minecraft:underwater_ruin/big_warm_4", + ), + ( + "minecraft:ruin/big_ruin_warm5", + "minecraft:underwater_ruin/big_warm_5", + ), + ( + "minecraft:ruin/big_ruin_warm6", + "minecraft:underwater_ruin/big_warm_6", + ), + ( + "minecraft:ruin/big_ruin_warm7", + "minecraft:underwater_ruin/big_warm_7", + ), + ( + "minecraft:ruin/ruin1_brick", + "minecraft:underwater_ruin/brick_1", + ), + ( + "minecraft:ruin/ruin2_brick", + "minecraft:underwater_ruin/brick_2", + ), + ( + "minecraft:ruin/ruin3_brick", + "minecraft:underwater_ruin/brick_3", + ), + ( + "minecraft:ruin/ruin4_brick", + "minecraft:underwater_ruin/brick_4", + ), + ( + "minecraft:ruin/ruin5_brick", + "minecraft:underwater_ruin/brick_5", + ), + ( + "minecraft:ruin/ruin6_brick", + "minecraft:underwater_ruin/brick_6", + ), + ( + "minecraft:ruin/ruin7_brick", + "minecraft:underwater_ruin/brick_7", + ), + ( + "minecraft:ruin/ruin8_brick", + "minecraft:underwater_ruin/brick_8", + ), + ( + "minecraft:ruin/ruin1_cracked", + "minecraft:underwater_ruin/cracked_1", + ), + ( + "minecraft:ruin/ruin2_cracked", + "minecraft:underwater_ruin/cracked_2", + ), + ( + "minecraft:ruin/ruin3_cracked", + "minecraft:underwater_ruin/cracked_3", + ), + ( + "minecraft:ruin/ruin4_cracked", + "minecraft:underwater_ruin/cracked_4", + ), + ( + "minecraft:ruin/ruin5_cracked", + "minecraft:underwater_ruin/cracked_5", + ), + ( + "minecraft:ruin/ruin6_cracked", + "minecraft:underwater_ruin/cracked_6", + ), + ( + "minecraft:ruin/ruin7_cracked", + "minecraft:underwater_ruin/cracked_7", + ), + ( + "minecraft:ruin/ruin8_cracked", + "minecraft:underwater_ruin/cracked_8", + ), + ( + "minecraft:ruin/ruin1_mossy", + "minecraft:underwater_ruin/mossy_1", + ), + ( + "minecraft:ruin/ruin2_mossy", + "minecraft:underwater_ruin/mossy_2", + ), + ( + "minecraft:ruin/ruin3_mossy", + "minecraft:underwater_ruin/mossy_3", + ), + ( + "minecraft:ruin/ruin4_mossy", + "minecraft:underwater_ruin/mossy_4", + ), + ( + "minecraft:ruin/ruin5_mossy", + "minecraft:underwater_ruin/mossy_5", + ), + ( + "minecraft:ruin/ruin6_mossy", + "minecraft:underwater_ruin/mossy_6", + ), + ( + "minecraft:ruin/ruin7_mossy", + "minecraft:underwater_ruin/mossy_7", + ), + ( + "minecraft:ruin/ruin8_mossy", + "minecraft:underwater_ruin/mossy_8", + ), + ( + "minecraft:ruin/ruin_warm1", + "minecraft:underwater_ruin/warm_1", + ), + ( + "minecraft:ruin/ruin_warm2", + "minecraft:underwater_ruin/warm_2", + ), + ( + "minecraft:ruin/ruin_warm3", + "minecraft:underwater_ruin/warm_3", + ), + ( + "minecraft:ruin/ruin_warm4", + "minecraft:underwater_ruin/warm_4", + ), + ( + "minecraft:ruin/ruin_warm5", + "minecraft:underwater_ruin/warm_5", + ), + ( + "minecraft:ruin/ruin_warm6", + "minecraft:underwater_ruin/warm_6", + ), + ( + "minecraft:ruin/ruin_warm7", + "minecraft:underwater_ruin/warm_7", + ), + ( + "minecraft:ruin/ruin_warm8", + "minecraft:underwater_ruin/warm_8", + ), + ( + "minecraft:ruin/big_brick_1", + "minecraft:underwater_ruin/big_brick_1", + ), + ( + "minecraft:ruin/big_brick_2", + "minecraft:underwater_ruin/big_brick_2", + ), + ( + "minecraft:ruin/big_brick_3", + "minecraft:underwater_ruin/big_brick_3", + ), + ( + "minecraft:ruin/big_brick_8", + "minecraft:underwater_ruin/big_brick_8", + ), + ( + "minecraft:ruin/big_mossy_1", + "minecraft:underwater_ruin/big_mossy_1", + ), + ( + "minecraft:ruin/big_mossy_2", + "minecraft:underwater_ruin/big_mossy_2", + ), + ( + "minecraft:ruin/big_mossy_3", + "minecraft:underwater_ruin/big_mossy_3", + ), + ( + "minecraft:ruin/big_mossy_8", + "minecraft:underwater_ruin/big_mossy_8", + ), + ( + "minecraft:ruin/big_cracked_1", + "minecraft:underwater_ruin/big_cracked_1", + ), + ( + "minecraft:ruin/big_cracked_2", + "minecraft:underwater_ruin/big_cracked_2", + ), + ( + "minecraft:ruin/big_cracked_3", + "minecraft:underwater_ruin/big_cracked_3", + ), + ( + "minecraft:ruin/big_cracked_8", + "minecraft:underwater_ruin/big_cracked_8", + ), + ( + "minecraft:ruin/big_warm_4", + "minecraft:underwater_ruin/big_warm_4", + ), + ( + "minecraft:ruin/big_warm_5", + "minecraft:underwater_ruin/big_warm_5", + ), + ( + "minecraft:ruin/big_warm_6", + "minecraft:underwater_ruin/big_warm_6", + ), + ( + "minecraft:ruin/big_warm_7", + "minecraft:underwater_ruin/big_warm_7", + ), + ], + ), ]; diff --git a/crates/horizon-world/src/datafix/schema_flat.rs b/crates/horizon-world/src/datafix/schema_flat.rs index 9688da48b..d08aa7d6a 100644 --- a/crates/horizon-world/src/datafix/schema_flat.rs +++ b/crates/horizon-world/src/datafix/schema_flat.rs @@ -45,7 +45,9 @@ impl Walker<'_> { }; match id.as_str() { "minecraft:area_effect_cloud" => self.field(Ty::Particle, v, "Particle"), - "minecraft:arrow" | "minecraft:spectral_arrow" => block(self, v, "inTile", "inBlockState"), + "minecraft:arrow" | "minecraft:spectral_arrow" => { + block(self, v, "inTile", "inBlockState") + } "minecraft:egg" | "minecraft:ender_pearl" | "minecraft:fireball" @@ -95,7 +97,9 @@ impl Walker<'_> { block(self, v, "Block", "BlockState"); self.field(Ty::BlockEntity, v, "TileEntityData"); } - "minecraft:fireworks_rocket" if !renamed => self.field(Ty::ItemStack, v, "FireworksItem"), + "minecraft:fireworks_rocket" if !renamed => { + self.field(Ty::ItemStack, v, "FireworksItem") + } "minecraft:firework_rocket" if renamed => self.field(Ty::ItemStack, v, "FireworksItem"), "minecraft:item" | "minecraft:item_frame" => self.field(Ty::ItemStack, v, "Item"), "minecraft:horse" => { diff --git a/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaDataFixOracle.java b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaDataFixOracle.java index f1c5f92e9..b0c52a6df 100644 --- a/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaDataFixOracle.java +++ b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaDataFixOracle.java @@ -21,6 +21,8 @@ import net.minecraft.server.Bootstrap; import net.minecraft.server.level.ChunkMap; import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.util.datafix.DataFixers; +import net.minecraft.util.filefix.FileFix; +import net.minecraft.util.filefix.FileFixerUpper; import net.minecraft.util.worldupdate.UpgradeProgress; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; @@ -123,6 +125,16 @@ public final class VanillaDataFixOracle { */ private static void band(Path out, int target) throws Exception { var fixer = DataFixers.getDataFixer(); + // The file fixes of the range (1493, LegacyStructureFileFix), as FileFixerUpper runs them + // (in place; the copy-on-write view and the level.dat rewrite are not what is checked). + var fileFixes = FileFixerUpper.class.getDeclaredField("fileFixes"); + fileFixes.setAccessible(true); + for (Object o : (List) fileFixes.get(DataFixers.getFileFixer())) { + FileFix fileFix = (FileFix) o; + if (fileFix.getVersion() <= target) { + fileFix.runFixOperations(out, new UpgradeProgress()); + } + } Path levelFile = out.resolve("level.dat"); if (Files.exists(levelFile)) { CompoundTag root = NbtIo.readCompressed(levelFile, NbtAccounter.unlimitedHeap()); diff --git a/tools/gen_flat_tables.py b/tools/gen_flat_tables.py index 5feb93463..909c23980 100644 --- a/tools/gen_flat_tables.py +++ b/tools/gen_flat_tables.py @@ -7,6 +7,7 @@ data. Run from the repository root; the vanilla sources are the ones under .loc """ import argparse import re +import subprocess import sys from pathlib import Path @@ -137,6 +138,7 @@ def main(): structure_renames(), ] Path(args.out).write_text('\n\n'.join(parts) + '\n') + subprocess.run(['rustfmt', '--edition', '2024', args.out], check=True) print('wrote', args.out)