From 2e10ff961379c1638e614ddb429803ca777f0306 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Thu, 3 Jan 2019 21:36:29 -0500
Subject: [PATCH] Added id_carrots_0 to id_carrots_3 and id_potatoes_0 to
 id_potatoes_3

---
 src/inc/block.hpp | 70 +++++++++++++++++++++++++++++++++++++++++++++--
 src/inc/face.hpp  | 18 +++++++++++-
 src/inc/image.hpp | 16 +++++++++++
 3 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index 4896974..5263bbb 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -159,6 +159,22 @@ enum block_id
 
 	id_wheat_7,
 
+	id_carrots_0,
+
+	id_carrots_1,
+
+	id_carrots_2,
+
+	id_carrots_3,
+
+	id_potatoes_0,
+
+	id_potatoes_1,
+
+	id_potatoes_2,
+
+	id_potatoes_3,
+
 	id_null
 };
 
@@ -318,7 +334,23 @@ std::vector<std::string> block_id_to_string =
 
 	"wheat_6",
 
-	"wheat_7"
+	"wheat_7",
+
+	"carrots_0",
+
+	"carrots_1",
+
+	"carrots_2",
+
+	"carrots_3",
+
+	"potatoes_0",
+
+	"potatoes_1",
+
+	"potatoes_2",
+
+	"potatoes_3"
 };
 
 // Conversion from block_id to std::string (used for in-game text).
@@ -477,7 +509,23 @@ std::vector<std::string> block_id_to_block_name =
 
 	"Wheat",
 
-	"Wheat"
+	"Wheat",
+
+	"Carrots",
+
+	"Carrots",
+
+	"Carrots",
+
+	"Carrots",
+
+	"Potatoes",
+
+	"Potatoes",
+
+	"Potatoes",
+
+	"Potatoes"
 };
 
 // Returns true if a block is a cross block. Otherwise, returns false.
@@ -523,7 +571,23 @@ inline bool is_crop(block_id id)
 
 		id == id_wheat_6 ||
 
-		id == id_wheat_7
+		id == id_wheat_7 ||
+
+		id == id_carrots_0 ||
+
+		id == id_carrots_1 ||
+
+		id == id_carrots_2 ||
+
+		id == id_carrots_3 ||
+
+		id == id_potatoes_0 ||
+
+		id == id_potatoes_1 ||
+
+		id == id_potatoes_2 ||
+
+		id == id_potatoes_3
 	)
 	{
 		return true;
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index 88e7be3..6512d33 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -245,6 +245,22 @@ void load_block_face_info_array()
 
 		make_face_info_all(block_name_to_layer.at("wheat_stage_6")),
 
-		make_face_info_all(block_name_to_layer.at("wheat_stage_7"))
+		make_face_info_all(block_name_to_layer.at("wheat_stage_7")),
+
+		make_face_info_all(block_name_to_layer.at("carrots_stage_0")),
+
+		make_face_info_all(block_name_to_layer.at("carrots_stage_1")),
+
+		make_face_info_all(block_name_to_layer.at("carrots_stage_2")),
+
+		make_face_info_all(block_name_to_layer.at("carrots_stage_3")),
+
+		make_face_info_all(block_name_to_layer.at("potatoes_stage_0")),
+
+		make_face_info_all(block_name_to_layer.at("potatoes_stage_1")),
+
+		make_face_info_all(block_name_to_layer.at("potatoes_stage_2")),
+
+		make_face_info_all(block_name_to_layer.at("potatoes_stage_3"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index 4fd1c23..9d2c925 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -21,6 +21,14 @@ std::vector<std::string> all_tex =
 
 	"brown_mushroom",
 
+	"carrots_stage_0",
+
+	"carrots_stage_1",
+
+	"carrots_stage_2",
+
+	"carrots_stage_3",
+
 	"coal_ore",
 
 	"cobblestone",
@@ -87,6 +95,14 @@ std::vector<std::string> all_tex =
 
 	"oak_planks",
 
+	"potatoes_stage_0",
+	
+	"potatoes_stage_1",
+
+	"potatoes_stage_2",
+
+	"potatoes_stage_3",
+
 	"pumpkin_face_off",
 
 	"pumpkin_face_on",