diff --git a/CHANGELOG.md b/CHANGELOG.md index d877117..318ee9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] - ReleaseDate +### Added + +- Added support for Minecraft 1.21 block types + ## [2.1.1] - 2024-06-14 ### Fixed diff --git a/README.md b/README.md index efa6573..9a07aed 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds! * Put them on a webserver and view them in your browser! -* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.20 (no mod installation necessary!) +* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21 (no mod installation necessary!) * Illumination layer: the world at night * Fast: create a full map for a huge 3GB savegame in less than 5 minutes in single-threaded operation * Multi-threading support: pass `-j N` to the renderer to use `N` parallel threads for generation diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs index 6229016..cbfe1b7 100644 --- a/crates/resource/src/block_types.rs +++ b/crates/resource/src/block_types.rs @@ -1843,6 +1843,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([184, 100, 73]), + }, + sign_material: None, + }, + ), ( "chiseled_deepslate", ConstBlockType { @@ -1913,6 +1923,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "chiseled_tuff", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([89, 94, 86]), + }, + sign_material: None, + }, + ), + ( + "chiseled_tuff_bricks", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([110, 113, 106]), + }, + sign_material: None, + }, + ), ( "chorus_flower", ConstBlockType { @@ -2123,6 +2153,36 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([156, 86, 57]), + }, + sign_material: None, + }, + ), + ( + "copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([192, 109, 82]), + }, + sign_material: None, + }, + ), + ( + "copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([191, 107, 79]), + }, + sign_material: None, + }, + ), ( "copper_ore", ConstBlockType { @@ -2133,6 +2193,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([190, 106, 79]), + }, + sign_material: None, + }, + ), ( "cornflower", ConstBlockType { @@ -2193,6 +2263,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "crafter", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([112, 98, 99]), + }, + sign_material: None, + }, + ), ( "crafting_table", ConstBlockType { @@ -3533,6 +3613,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "exposed_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([154, 119, 100]), + }, + sign_material: None, + }, + ), ( "exposed_copper", ConstBlockType { @@ -3543,6 +3633,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "exposed_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([135, 107, 89]), + }, + sign_material: None, + }, + ), + ( + "exposed_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([164, 123, 106]), + }, + sign_material: None, + }, + ), + ( + "exposed_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([161, 125, 104]), + }, + sign_material: None, + }, + ), + ( + "exposed_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([161, 125, 104]), + }, + sign_material: None, + }, + ), ( "exposed_cut_copper", ConstBlockType { @@ -4183,6 +4313,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "heavy_core", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([82, 86, 94]), + }, + sign_material: None, + }, + ), ( "heavy_weighted_pressure_plate", ConstBlockType { @@ -6273,6 +6413,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "oxidized_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([83, 161, 132]), + }, + sign_material: None, + }, + ), ( "oxidized_copper", ConstBlockType { @@ -6283,6 +6433,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "oxidized_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([70, 132, 109]), + }, + sign_material: None, + }, + ), + ( + "oxidized_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([82, 160, 132]), + }, + sign_material: None, + }, + ), + ( + "oxidized_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([82, 161, 131]), + }, + sign_material: None, + }, + ), + ( + "oxidized_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([83, 161, 132]), + }, + sign_material: None, + }, + ), ( "oxidized_cut_copper", ConstBlockType { @@ -6863,6 +7053,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "polished_tuff", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([97, 104, 99]), + }, + sign_material: None, + }, + ), + ( + "polished_tuff_slab", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([97, 104, 99]), + }, + sign_material: None, + }, + ), + ( + "polished_tuff_stairs", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([97, 104, 99]), + }, + sign_material: None, + }, + ), + ( + "polished_tuff_wall", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([97, 104, 99]), + }, + sign_material: None, + }, + ), ( "poppy", ConstBlockType { @@ -9153,6 +9383,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "trial_spawner", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([56, 82, 98]), + }, + sign_material: None, + }, + ), ( "tripwire", ConstBlockType { @@ -9223,6 +9463,76 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "tuff_brick_slab", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([98, 102, 95]), + }, + sign_material: None, + }, + ), + ( + "tuff_brick_stairs", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([98, 102, 95]), + }, + sign_material: None, + }, + ), + ( + "tuff_brick_wall", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([98, 102, 95]), + }, + sign_material: None, + }, + ), + ( + "tuff_bricks", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([98, 102, 95]), + }, + sign_material: None, + }, + ), + ( + "tuff_slab", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([108, 109, 102]), + }, + sign_material: None, + }, + ), + ( + "tuff_stairs", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([108, 109, 102]), + }, + sign_material: None, + }, + ), + ( + "tuff_wall", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([108, 109, 102]), + }, + sign_material: None, + }, + ), ( "turtle_egg", ConstBlockType { @@ -9253,6 +9563,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "vault", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([54, 69, 79]), + }, + sign_material: None, + }, + ), ( "verdant_froglight", ConstBlockType { @@ -9513,6 +9833,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([184, 100, 73]), + }, + sign_material: None, + }, + ), ( "waxed_copper_block", ConstBlockType { @@ -9523,6 +9853,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([156, 86, 57]), + }, + sign_material: None, + }, + ), + ( + "waxed_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([192, 109, 82]), + }, + sign_material: None, + }, + ), + ( + "waxed_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([191, 107, 79]), + }, + sign_material: None, + }, + ), + ( + "waxed_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([190, 106, 79]), + }, + sign_material: None, + }, + ), ( "waxed_cut_copper", ConstBlockType { @@ -9553,6 +9923,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_exposed_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([154, 119, 100]), + }, + sign_material: None, + }, + ), ( "waxed_exposed_copper", ConstBlockType { @@ -9563,6 +9943,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_exposed_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([135, 107, 89]), + }, + sign_material: None, + }, + ), + ( + "waxed_exposed_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([164, 123, 106]), + }, + sign_material: None, + }, + ), + ( + "waxed_exposed_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([161, 125, 104]), + }, + sign_material: None, + }, + ), + ( + "waxed_exposed_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([161, 125, 104]), + }, + sign_material: None, + }, + ), ( "waxed_exposed_cut_copper", ConstBlockType { @@ -9593,6 +10013,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_oxidized_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([83, 161, 132]), + }, + sign_material: None, + }, + ), ( "waxed_oxidized_copper", ConstBlockType { @@ -9603,6 +10033,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_oxidized_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([70, 132, 109]), + }, + sign_material: None, + }, + ), + ( + "waxed_oxidized_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([82, 160, 132]), + }, + sign_material: None, + }, + ), + ( + "waxed_oxidized_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([82, 161, 131]), + }, + sign_material: None, + }, + ), + ( + "waxed_oxidized_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([83, 161, 132]), + }, + sign_material: None, + }, + ), ( "waxed_oxidized_cut_copper", ConstBlockType { @@ -9633,6 +10103,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_weathered_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([104, 150, 111]), + }, + sign_material: None, + }, + ), ( "waxed_weathered_copper", ConstBlockType { @@ -9643,6 +10123,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "waxed_weathered_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([92, 126, 99]), + }, + sign_material: None, + }, + ), + ( + "waxed_weathered_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([110, 150, 109]), + }, + sign_material: None, + }, + ), + ( + "waxed_weathered_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([106, 152, 110]), + }, + sign_material: None, + }, + ), + ( + "waxed_weathered_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([108, 153, 110]), + }, + sign_material: None, + }, + ), ( "waxed_weathered_cut_copper", ConstBlockType { @@ -9673,6 +10193,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "weathered_chiseled_copper", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([104, 150, 111]), + }, + sign_material: None, + }, + ), ( "weathered_copper", ConstBlockType { @@ -9683,6 +10213,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ sign_material: None, }, ), + ( + "weathered_copper_bulb", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([92, 126, 99]), + }, + sign_material: None, + }, + ), + ( + "weathered_copper_door", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([110, 150, 109]), + }, + sign_material: None, + }, + ), + ( + "weathered_copper_grate", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([106, 152, 110]), + }, + sign_material: None, + }, + ), + ( + "weathered_copper_trapdoor", + ConstBlockType { + block_color: BlockColor { + flags: make_bitflags!(BlockFlag::{Opaque}), + color: Color([108, 153, 110]), + }, + sign_material: None, + }, + ), ( "weathered_cut_copper", ConstBlockType { diff --git a/resource/blocks.json b/resource/blocks.json index f8b0165..9d70f96 100644 --- a/resource/blocks.json +++ b/resource/blocks.json @@ -408,6 +408,7 @@ "chiseled_bookshelf": { "texture": "chiseled_bookshelf_top" }, + "chiseled_copper": {}, "chiseled_deepslate": {}, "chiseled_nether_bricks": {}, "chiseled_polished_blackstone": {}, @@ -419,6 +420,10 @@ "texture": "sandstone_top" }, "chiseled_stone_bricks": {}, + "chiseled_tuff": {}, + "chiseled_tuff_bricks": { + "texture": "chiseled_tuff_bricks_top" + }, "chorus_flower": {}, "chorus_plant": {}, "clay": {}, @@ -458,13 +463,22 @@ }, "conduit": {}, "copper_block": {}, + "copper_bulb": {}, + "copper_door": { + "texture": "copper_door_top" + }, + "copper_grate": {}, "copper_ore": {}, + "copper_trapdoor": {}, "cornflower": null, "cracked_deepslate_bricks": {}, "cracked_deepslate_tiles": {}, "cracked_nether_bricks": {}, "cracked_polished_blackstone_bricks": {}, "cracked_stone_bricks": {}, + "crafter": { + "texture": "crafter_top" + }, "crafting_table": { "texture": "crafting_table_top" }, @@ -733,7 +747,14 @@ "ender_chest": { "texture": "obsidian" }, + "exposed_chiseled_copper": {}, "exposed_copper": {}, + "exposed_copper_bulb": {}, + "exposed_copper_door": { + "texture": "exposed_copper_door_top" + }, + "exposed_copper_grate": {}, + "exposed_copper_trapdoor": {}, "exposed_cut_copper": {}, "exposed_cut_copper_slab": { "texture": "exposed_cut_copper" @@ -843,6 +864,7 @@ "hay_block": { "texture": "hay_block_top" }, + "heavy_core": {}, "heavy_weighted_pressure_plate": { "texture": "iron_block" }, @@ -1269,7 +1291,14 @@ "orange_wall_banner": null, "orange_wool": {}, "oxeye_daisy": null, + "oxidized_chiseled_copper": {}, "oxidized_copper": {}, + "oxidized_copper_bulb": {}, + "oxidized_copper_door": { + "texture": "oxidized_copper_door_top" + }, + "oxidized_copper_grate": {}, + "oxidized_copper_trapdoor": {}, "oxidized_cut_copper": {}, "oxidized_cut_copper_slab": { "texture": "oxidized_cut_copper" @@ -1390,6 +1419,16 @@ "polished_granite_stairs": { "texture": "polished_granite" }, + "polished_tuff": {}, + "polished_tuff_slab": { + "texture": "polished_tuff" + }, + "polished_tuff_stairs": { + "texture": "polished_tuff" + }, + "polished_tuff_wall": { + "texture": "polished_tuff" + }, "poppy": null, "potatoes": { "texture": "potatoes_stage3" @@ -1912,6 +1951,9 @@ "trapped_chest": { "texture": "oak_planks" }, + "trial_spawner": { + "texture": "trial_spawner_top_inactive" + }, "tripwire": null, "tripwire_hook": null, "tube_coral": null, @@ -1919,9 +1961,31 @@ "tube_coral_fan": null, "tube_coral_wall_fan": null, "tuff": {}, + "tuff_brick_slab": { + "texture": "tuff_bricks" + }, + "tuff_brick_stairs": { + "texture": "tuff_bricks" + }, + "tuff_brick_wall": { + "texture": "tuff_bricks" + }, + "tuff_bricks": {}, + "tuff_slab": { + "texture": "tuff" + }, + "tuff_stairs": { + "texture": "tuff" + }, + "tuff_wall": { + "texture": "tuff" + }, "turtle_egg": {}, "twisting_vines": {}, "twisting_vines_plant": {}, + "vault": { + "texture": "vault_top" + }, "verdant_froglight": { "texture": "verdant_froglight_top" }, @@ -1991,9 +2055,24 @@ "water_cauldron": { "texture": "cauldron_top" }, + "waxed_chiseled_copper": { + "texture": "chiseled_copper" + }, "waxed_copper_block": { "texture": "copper_block" }, + "waxed_copper_bulb": { + "texture": "copper_bulb" + }, + "waxed_copper_door": { + "texture": "copper_door_top" + }, + "waxed_copper_grate": { + "texture": "copper_grate" + }, + "waxed_copper_trapdoor": { + "texture": "copper_trapdoor" + }, "waxed_cut_copper": { "texture": "cut_copper" }, @@ -2003,9 +2082,24 @@ "waxed_cut_copper_stairs": { "texture": "cut_copper" }, + "waxed_exposed_chiseled_copper": { + "texture": "exposed_chiseled_copper" + }, "waxed_exposed_copper": { "texture": "exposed_copper" }, + "waxed_exposed_copper_bulb": { + "texture": "exposed_copper_bulb" + }, + "waxed_exposed_copper_door": { + "texture": "exposed_copper_door_top" + }, + "waxed_exposed_copper_grate": { + "texture": "exposed_copper_grate" + }, + "waxed_exposed_copper_trapdoor": { + "texture": "exposed_copper_trapdoor" + }, "waxed_exposed_cut_copper": { "texture": "exposed_cut_copper" }, @@ -2015,9 +2109,24 @@ "waxed_exposed_cut_copper_stairs": { "texture": "exposed_cut_copper" }, + "waxed_oxidized_chiseled_copper": { + "texture": "oxidized_chiseled_copper" + }, "waxed_oxidized_copper": { "texture": "oxidized_copper" }, + "waxed_oxidized_copper_bulb": { + "texture": "oxidized_copper_bulb" + }, + "waxed_oxidized_copper_door": { + "texture": "oxidized_copper_door_top" + }, + "waxed_oxidized_copper_grate": { + "texture": "oxidized_copper_grate" + }, + "waxed_oxidized_copper_trapdoor": { + "texture": "oxidized_copper_trapdoor" + }, "waxed_oxidized_cut_copper": { "texture": "oxidized_cut_copper" }, @@ -2027,9 +2136,24 @@ "waxed_oxidized_cut_copper_stairs": { "texture": "oxidized_cut_copper" }, + "waxed_weathered_chiseled_copper": { + "texture": "weathered_chiseled_copper" + }, "waxed_weathered_copper": { "texture": "weathered_copper" }, + "waxed_weathered_copper_bulb": { + "texture": "weathered_copper_bulb" + }, + "waxed_weathered_copper_door": { + "texture": "weathered_copper_door_top" + }, + "waxed_weathered_copper_grate": { + "texture": "weathered_copper_grate" + }, + "waxed_weathered_copper_trapdoor": { + "texture": "weathered_copper_trapdoor" + }, "waxed_weathered_cut_copper": { "texture": "weathered_cut_copper" }, @@ -2039,7 +2163,14 @@ "waxed_weathered_cut_copper_stairs": { "texture": "weathered_cut_copper" }, + "weathered_chiseled_copper": {}, "weathered_copper": {}, + "weathered_copper_bulb": {}, + "weathered_copper_door": { + "texture": "weathered_copper_door_top" + }, + "weathered_copper_grate": {}, + "weathered_copper_trapdoor": {}, "weathered_cut_copper": {}, "weathered_cut_copper_slab": { "texture": "weathered_cut_copper" diff --git a/src/core/common.rs b/src/core/common.rs index 9a94496..4241ebc 100644 --- a/src/core/common.rs +++ b/src/core/common.rs @@ -24,7 +24,7 @@ use crate::{ /// /// Increase when the generation of processed regions from region data changes /// (usually because of updated resource data) -pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1); +pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2); /// MinedMap map tile data version number /// @@ -36,7 +36,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0); /// /// Increase when the generation of lightmap tiles from region data changes /// (usually because of updated resource data) -pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1); +pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2); /// MinedMap mipmap data version number ///