diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs index 7ee50af..6229016 100644 --- a/crates/resource/src/block_types.rs +++ b/crates/resource/src/block_types.rs @@ -107,8 +107,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "acacia_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([168, 90, 50]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("acacia"), }, @@ -467,8 +467,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "bamboo_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([193, 173, 80]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("bamboo"), }, @@ -737,8 +737,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "birch_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([192, 175, 121]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("birch"), }, @@ -1747,8 +1747,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "cherry_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([226, 178, 172]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("cherry"), }, @@ -2337,8 +2337,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "crimson_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([101, 48, 70]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("crimson"), }, @@ -2747,8 +2747,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "dark_oak_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([66, 43, 20]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("dark_oak"), }, @@ -4537,8 +4537,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "jungle_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([160, 115, 80]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("jungle"), }, @@ -5487,8 +5487,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "mangrove_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([117, 54, 48]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("mangrove"), }, @@ -6017,8 +6017,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "oak_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([162, 130, 78]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("oak"), }, @@ -8167,8 +8167,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([162, 130, 78]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("oak"), }, @@ -8597,8 +8597,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "spruce_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([114, 84, 48]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("spruce"), }, @@ -9417,8 +9417,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[ "warped_sign", ConstBlockType { block_color: BlockColor { - flags: make_bitflags!(BlockFlag::{Opaque}), - color: Color([43, 104, 99]), + flags: make_bitflags!(BlockFlag::{}), + color: Color([0, 0, 0]), }, sign_material: Some("warped"), }, diff --git a/resource/blocks.json b/resource/blocks.json index ee052bd..f8b0165 100644 --- a/resource/blocks.json +++ b/resource/blocks.json @@ -26,7 +26,7 @@ "acacia_sapling": {}, "acacia_sign": { "sign_material": "acacia", - "texture": "acacia_planks" + "texture": null }, "acacia_slab": { "texture": "acacia_planks" @@ -114,7 +114,7 @@ "bamboo_sapling": null, "bamboo_sign": { "sign_material": "bamboo", - "texture": "bamboo_planks" + "texture": null }, "bamboo_slab": { "texture": "bamboo_planks" @@ -185,7 +185,7 @@ "birch_sapling": {}, "birch_sign": { "sign_material": "birch", - "texture": "birch_planks" + "texture": null }, "birch_slab": { "texture": "birch_planks" @@ -377,7 +377,7 @@ "cherry_sapling": null, "cherry_sign": { "sign_material": "cherry", - "texture": "cherry_planks" + "texture": null }, "cherry_slab": { "texture": "cherry_planks" @@ -496,7 +496,7 @@ "crimson_roots": {}, "crimson_sign": { "sign_material": "crimson", - "texture": "crimson_planks" + "texture": null }, "crimson_slab": { "texture": "crimson_planks" @@ -589,7 +589,7 @@ "dark_oak_sapling": {}, "dark_oak_sign": { "sign_material": "dark_oak", - "texture": "dark_oak_planks" + "texture": null }, "dark_oak_slab": { "texture": "dark_oak_planks" @@ -921,7 +921,7 @@ "jungle_sapling": {}, "jungle_sign": { "sign_material": "jungle", - "texture": "jungle_planks" + "texture": null }, "jungle_slab": { "texture": "jungle_planks" @@ -1095,7 +1095,7 @@ }, "mangrove_sign": { "sign_material": "mangrove", - "texture": "mangrove_planks" + "texture": null }, "mangrove_slab": { "texture": "mangrove_planks" @@ -1218,7 +1218,7 @@ "oak_sapling": {}, "oak_sign": { "sign_material": "oak", - "texture": "oak_planks" + "texture": null }, "oak_slab": { "texture": "oak_planks" @@ -1671,7 +1671,7 @@ "shulker_box": {}, "sign": { "sign_material": "oak", - "texture": "oak_planks" + "texture": null }, "skeleton_skull": null, "skeleton_wall_skull": null, @@ -1764,7 +1764,7 @@ "spruce_sapling": {}, "spruce_sign": { "sign_material": "spruce", - "texture": "spruce_planks" + "texture": null }, "spruce_slab": { "texture": "spruce_planks" @@ -1961,7 +1961,7 @@ "warped_roots": {}, "warped_sign": { "sign_material": "warped", - "texture": "warped_planks" + "texture": null }, "warped_slab": { "texture": "warped_planks" diff --git a/src/core/common.rs b/src/core/common.rs index d961ea9..ca6f424 100644 --- a/src/core/common.rs +++ b/src/core/common.rs @@ -22,7 +22,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(0); +pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1); /// MinedMap map tile data version number /// @@ -34,7 +34,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(0); +pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1); /// MinedMap mipmap data version number ///