From 825e081793270ad20d7437b468a5d9a0889b88f7 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Fri, 4 Jan 2019 12:53:11 -0500
Subject: [PATCH] Added id_oak_sapling and id_birch_sapling

---
 src/inc/block.hpp | 22 +++++++++++++++++++---
 src/inc/face.hpp  |  6 +++++-
 src/inc/image.hpp |  4 ++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index fdc2228..5109527 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -183,6 +183,10 @@ enum block_id
 
 	id_beetroots_3,
 
+	id_oak_sapling,
+
+	id_birch_sapling,
+
 	id_null
 };
 
@@ -366,7 +370,11 @@ std::vector<std::string> block_id_to_string =
 
 	"beetroots_2",
 
-	"beetroots_3"
+	"beetroots_3",
+
+	"oak_sapling",
+
+	"birch_sapling"
 };
 
 // Conversion from block_id to std::string (used for in-game text).
@@ -549,7 +557,11 @@ std::vector<std::string> block_id_to_block_name =
 
 	"Beetroots",
 
-	"Beetroots"
+	"Beetroots",
+
+	"Oak Sapling",
+
+	"Birch Sapling"
 };
 
 // Returns true if a block is a cross block. Otherwise, returns false.
@@ -566,7 +578,11 @@ inline bool is_cross(block_id id)
 
 		id == id_brown_mushroom ||
 
-		id == id_reeds
+		id == id_reeds ||
+
+		id == id_oak_sapling || 
+
+		id == id_birch_sapling
 	)
 	{
 		return true;
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index 989bfe4..04f2de9 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -269,6 +269,10 @@ void load_block_face_info_array()
 
 		make_face_info_all(block_name_to_layer.at("beetroots_stage_2")),
 
-		make_face_info_all(block_name_to_layer.at("beetroots_stage_3"))
+		make_face_info_all(block_name_to_layer.at("beetroots_stage_3")),
+
+		make_face_info_all(block_name_to_layer.at("sapling_oak")),
+
+		make_face_info_all(block_name_to_layer.at("sapling_birch"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index 5eafb77..385a8b0 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -137,6 +137,10 @@ std::vector<std::string> all_tex =
 
 	"stone_slab_top",
 
+	"sapling_birch",
+
+	"sapling_oak",
+
 	"stone",
 
 	"water_0",