resource: update block types and biomes for 1.21.4

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased] - ReleaseDate
 
+- Added support for Minecraft 1.21.4 block types
+- Added support for Minecraft 1.21.4 Pale Garden biome
+
 ## [2.2.0] - 2024-06-23
 
 ### Added

crates/resource/src/biomes.rs

@@ -188,6 +188,13 @@ pub const BIOMES: &[(&str, Biome)] = {
 		("old_growth_birch_forest", Biome::new(0_60, 0_60)),
 		("old_growth_pine_taiga", Biome::new(0_30, 0_80)),
 		("old_growth_spruce_taiga", Biome::new(0_25, 0_80)),
+		(
+			"pale_garden",
+			Biome::new(0_70, 0_80)
+				.water([118, 136, 157])
+				.foliage([135, 141, 118])
+				.grass([119, 130, 114]),
+		),
 		("plains", Biome::new(0_80, 0_40)),
 		("river", Biome::new(0_50, 0_50)),
 		("savanna", Biome::new(2_00, 0_00)),

crates/resource/src/block_types.rs

@@ -1868,7 +1868,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([47, 23, 28]),
+				color: Color([45, 22, 27]),
 			},
 			sign_material: None,
 		},
@@ -1903,6 +1903,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"chiseled_resin_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([200, 84, 24]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"chiseled_sandstone",
 		ConstBlockType {
@@ -1973,6 +1983,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"closed_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"coal_block",
 		ConstBlockType {
@@ -2283,6 +2303,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"creaking_heart",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 59, 54]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"creeper_head",
 		ConstBlockType {
@@ -6253,6 +6283,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"open_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"orange_banner",
 		ConstBlockType {
@@ -6523,6 +6563,206 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"pale_hanging_moss",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_moss_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 112, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_moss_carpet",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 112, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_button",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 208, 206]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_fence",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_fence_gate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_hanging_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_leaves",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([116, 121, 114]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_log",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 189, 187]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_planks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_pressure_plate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_sapling",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 105, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 220, 218]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_wall_hanging_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{WallSign}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_wall_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{WallSign}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_wood",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([87, 77, 75]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"pearlescent_froglight",
 		ConstBlockType {
@@ -7213,6 +7453,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_closed_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 98, 101]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_cornflower",
 		ConstBlockType {
@@ -7333,6 +7583,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_open_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([133, 124, 127]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_orange_tulip",
 		ConstBlockType {
@@ -7353,6 +7613,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_pale_oak_sapling",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 105, 99]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_pink_tulip",
 		ConstBlockType {
@@ -8193,6 +8463,66 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"resin_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([217, 99, 25]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_wall",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_clump",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"respawn_anchor",
 		ConstBlockType {
@@ -9173,6 +9503,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"stripped_pale_oak_log",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 226, 225]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"stripped_pale_oak_wood",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([245, 238, 236]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"stripped_spruce_log",
 		ConstBlockType {

resource/blocks.json

@@ -416,6 +416,7 @@
 	"chiseled_red_sandstone": {
 		"texture": "red_sandstone_top"
 	},
+	"chiseled_resin_bricks": {},
 	"chiseled_sandstone": {
 		"texture": "sandstone_top"
 	},
@@ -427,6 +428,7 @@
 	"chorus_flower": {},
 	"chorus_plant": {},
 	"clay": {},
+	"closed_eyeblossom": null,
 	"coal_block": {},
 	"coal_ore": {},
 	"coarse_dirt": {},
@@ -482,6 +484,9 @@
 	"crafting_table": {
 		"texture": "crafting_table_top"
 	},
+	"creaking_heart": {
+		"texture": "creaking_heart_top"
+	},
 	"creeper_head": null,
 	"creeper_wall_head": null,
 	"crimson_button": null,
@@ -1269,6 +1274,7 @@
 	"ochre_froglight": {
 		"texture": "ochre_froglight_top"
 	},
+	"open_eyeblossom": null,
 	"orange_banner": null,
 	"orange_bed": null,
 	"orange_candle": null,
@@ -1308,6 +1314,56 @@
 	},
 	"packed_ice": {},
 	"packed_mud": {},
+	"pale_hanging_moss": null,
+	"pale_moss_block": {},
+	"pale_moss_carpet": {},
+	"pale_oak_button": null,
+	"pale_oak_door": {
+		"texture": "pale_oak_door_top"
+	},
+	"pale_oak_fence": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_fence_gate": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_hanging_sign": {
+		"sign_material": "pale_oak",
+		"texture": null
+	},
+	"pale_oak_leaves": {},
+	"pale_oak_log": {
+		"texture": "pale_oak_log_top"
+	},
+	"pale_oak_planks": {},
+	"pale_oak_pressure_plate": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_sapling": {},
+	"pale_oak_sign": {
+		"sign_material": "pale_oak",
+		"texture": null
+	},
+	"pale_oak_slab": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_stairs": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_trapdoor": {},
+	"pale_oak_wall_hanging_sign": {
+		"sign_material": "pale_oak",
+		"texture": null,
+		"wall_sign": true
+	},
+	"pale_oak_wall_sign": {
+		"sign_material": "pale_oak",
+		"texture": null,
+		"wall_sign": true
+	},
+	"pale_oak_wood": {
+		"texture": "pale_oak_log"
+	},
 	"pearlescent_froglight": {
 		"texture": "pearlescent_froglight_top"
 	},
@@ -1463,6 +1519,9 @@
 	"potted_cherry_sapling": {
 		"texture": "cherry_sapling"
 	},
+	"potted_closed_eyeblossom": {
+		"texture": "closed_eyeblossom"
+	},
 	"potted_cornflower": {
 		"texture": "cornflower"
 	},
@@ -1500,12 +1559,18 @@
 	"potted_oak_sapling": {
 		"texture": "oak_sapling"
 	},
+	"potted_open_eyeblossom": {
+		"texture": "open_eyeblossom"
+	},
 	"potted_orange_tulip": {
 		"texture": "orange_tulip"
 	},
 	"potted_oxeye_daisy": {
 		"texture": "oxeye_daisy"
 	},
+	"potted_pale_oak_sapling": {
+		"texture": "pale_oak_sapling"
+	},
 	"potted_pink_tulip": {
 		"texture": "pink_tulip"
 	},
@@ -1668,6 +1733,18 @@
 	"repeating_command_block": {
 		"texture": "repeating_command_block_front"
 	},
+	"resin_block": {},
+	"resin_brick_slab": {
+		"texture": "resin_bricks"
+	},
+	"resin_brick_stairs": {
+		"texture": "resin_bricks"
+	},
+	"resin_brick_wall": {
+		"texture": "resin_bricks"
+	},
+	"resin_bricks": {},
+	"resin_clump": null,
 	"respawn_anchor": {
 		"texture": "respawn_anchor_top"
 	},
@@ -1903,6 +1980,12 @@
 	"stripped_oak_wood": {
 		"texture": "stripped_oak_log"
 	},
+	"stripped_pale_oak_log": {
+		"texture": "stripped_pale_oak_log_top"
+	},
+	"stripped_pale_oak_wood": {
+		"texture": "stripped_pale_oak_log"
+	},
 	"stripped_spruce_log": {
 		"texture": "stripped_spruce_log_top"
 	},

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(2);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
 
 /// 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(2);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
 
 /// MinedMap mipmap data version number
 ///