Added id_beetroots_0 to id_beetroots_3

This commit is contained in:
CobaltXII
2019-01-04 12:46:02 -05:00
parent 45e8a57ea4
commit e2dce631ca
3 changed files with 52 additions and 4 deletions

View File

@@ -175,6 +175,14 @@ enum block_id
id_potatoes_3,
id_beetroots_0,
id_beetroots_1,
id_beetroots_2,
id_beetroots_3,
id_null
};
@@ -350,7 +358,15 @@ std::vector<std::string> block_id_to_string =
"potatoes_2",
"potatoes_3"
"potatoes_3",
"beetroots_0",
"beetroots_1",
"beetroots_2",
"beetroots_3"
};
// Conversion from block_id to std::string (used for in-game text).
@@ -525,7 +541,15 @@ std::vector<std::string> block_id_to_block_name =
"Potatoes",
"Potatoes"
"Potatoes",
"Beetroots",
"Beetroots",
"Beetroots",
"Beetroots"
};
// Returns true if a block is a cross block. Otherwise, returns false.
@@ -587,7 +611,15 @@ inline bool is_crop(block_id id)
id == id_potatoes_2 ||
id == id_potatoes_3
id == id_potatoes_3 ||
id == id_beetroots_0 ||
id == id_beetroots_1 ||
id == id_beetroots_2 ||
id == id_beetroots_3
)
{
return true;

View File

@@ -261,6 +261,14 @@ void load_block_face_info_array()
make_face_info_all(block_name_to_layer.at("potatoes_stage_2")),
make_face_info_all(block_name_to_layer.at("potatoes_stage_3"))
make_face_info_all(block_name_to_layer.at("potatoes_stage_3")),
make_face_info_all(block_name_to_layer.at("beetroots_stage_0")),
make_face_info_all(block_name_to_layer.at("beetroots_stage_1")),
make_face_info_all(block_name_to_layer.at("beetroots_stage_2")),
make_face_info_all(block_name_to_layer.at("beetroots_stage_3"))
};
}

View File

@@ -7,6 +7,14 @@ std::vector<std::string> all_tex =
{
"bedrock",
"beetroots_stage_0",
"beetroots_stage_1",
"beetroots_stage_2",
"beetroots_stage_3",
"birch_leaves",
"birch_log_side",