From e2dce631caa96d6b9a3e1bbc49c5ffc6d3b06fb1 Mon Sep 17 00:00:00 2001 From: CobaltXII Date: Fri, 4 Jan 2019 12:46:02 -0500 Subject: [PATCH] Added id_beetroots_0 to id_beetroots_3 --- src/inc/block.hpp | 38 +++++++++++++++++++++++++++++++++++--- src/inc/face.hpp | 10 +++++++++- src/inc/image.hpp | 8 ++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/inc/block.hpp b/src/inc/block.hpp index 5263bbb..fdc2228 100644 --- a/src/inc/block.hpp +++ b/src/inc/block.hpp @@ -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 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 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; diff --git a/src/inc/face.hpp b/src/inc/face.hpp index 6512d33..989bfe4 100644 --- a/src/inc/face.hpp +++ b/src/inc/face.hpp @@ -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")) }; } \ No newline at end of file diff --git a/src/inc/image.hpp b/src/inc/image.hpp index 9d2c925..5eafb77 100644 --- a/src/inc/image.hpp +++ b/src/inc/image.hpp @@ -7,6 +7,14 @@ std::vector all_tex = { "bedrock", + "beetroots_stage_0", + + "beetroots_stage_1", + + "beetroots_stage_2", + + "beetroots_stage_3", + "birch_leaves", "birch_log_side",