From 05887d53eff09f45ed39326b29f1832a0288fa10 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Thu, 3 Jan 2019 19:36:10 -0500
Subject: [PATCH] Added id_dry_farmland and id_wet_farmland

---
 src/inc/block.hpp    |  16 ++++++++++++++--
 src/inc/face.hpp     |   6 +++++-
 src/inc/image.hpp    |   4 ++++
 tex/farmland_dry.png | Bin 0 -> 258 bytes
 tex/farmland_wet.png | Bin 0 -> 610 bytes
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100755 tex/farmland_dry.png
 create mode 100755 tex/farmland_wet.png

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index 2fc875a..8ba3776 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -139,6 +139,10 @@ enum block_id
 
 	id_melon,
 
+	id_dry_farmland,
+
+	id_wet_farmland,
+
 	id_null
 };
 
@@ -278,7 +282,11 @@ std::vector<std::string> block_id_to_string =
 
 	"jack_o_lantern",
 
-	"melon"
+	"melon",
+
+	"dry_farmland",
+
+	"wet_farmland"
 };
 
 // Conversion from block_id to std::string (used for in-game text).
@@ -417,7 +425,11 @@ std::vector<std::string> block_id_to_block_name =
 
 	"Jack o' Lantern",
 
-	"Melon"
+	"Melon",
+
+	"Dry Farmland",
+
+	"Wet Farmland"
 };
 
 // Returns true if a block is a cross block. Otherwise, returns false.
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index 3c28654..b26d70f 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -225,6 +225,10 @@ void load_block_face_info_array()
 
 		make_face_info_block_food(block_name_to_layer.at("pumpkin_top"), block_name_to_layer.at("pumpkin_face_on"), block_name_to_layer.at("pumpkin_side")),
 
-		make_face_info_cap(block_name_to_layer.at("melon_top"), block_name_to_layer.at("melon_side"))
+		make_face_info_cap(block_name_to_layer.at("melon_top"), block_name_to_layer.at("melon_side")),
+
+		make_face_info_cap(block_name_to_layer.at("farmland_dry"), block_name_to_layer.at("dirt")),
+
+		make_face_info_cap(block_name_to_layer.at("farmland_wet"), block_name_to_layer.at("dirt"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index ff4ede7..8add27a 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -39,6 +39,10 @@ std::vector<std::string> all_tex =
 
 	"emerald_ore",
 
+	"farmland_dry",
+
+	"farmland_wet",
+
 	"furnace_front_off",
 
 	"furnace_front_on",
diff --git a/tex/farmland_dry.png b/tex/farmland_dry.png
new file mode 100755
index 0000000000000000000000000000000000000000..d03a0f493eb9bde8715b5ea99267e072bb9fdb4e
GIT binary patch
literal 258
zcmV+d0sa1oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002VNkl<Zc-n<i
zu@S;B5YrObfQBXw18|o+MsQ1$lENb}3Zt6)LPindD4f{&f4%fp@Oo@xzn(_Dx%cz!
zyv+TxU53_x2^HY-BE|`>anyr{S_(iw1=CeAu%HrJYllt*RIo1w{OAcRRtDN&0%$?f
zsBxVIC4-$@za|q*S@H};b^yPHBoY6Hl;kKoq-%1TJ|mR`A4>9pv#59P{lma@DHC3u
z0}ymt*#VOKobB|1n(4l+KYyqs58hD=oNn?3+^)$iX-4$V8=#u&H`w$keE<Le07*qo
IM6N<$f}H?u0ssI2

literal 0
HcmV?d00001

diff --git a/tex/farmland_wet.png b/tex/farmland_wet.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8d460d517365f7a0f9ba39bed13184f83486c61
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006hNkl<Zc-mc)
z>rWF=5XJY4bX)uGwiU!Dl~PzJ+qc!am4||;K|<A(V2FtCm}p4+^T+w!>*C6XyV<#S
z=A4-`GtTdERh~C8@^e&?9}mm&bTKVY^nAJR$>)J5TeY;bXA{Qe{_T3+_&uwq<vgs2
z^Fo9B*Ik+F!<%MaCTlqjx+=l7gna0gWMjepAFSH@?R#lM(wlP)sq;%e7~h6v!-(T!
z4Qf^s@^U$A4*%~vC3C+CNX>#wgS<FLt%5N~F$e<L_p=h-Ny#HU$E~95HL|i=NobiC
zECOlIy7FB~9a5*ZLuG#D=S=WO&on5=PCaAJN_ocEzVBavw6v_RO6u$&n$~sJ^JIM2
zGC#PTl4T8=tmUPDBPoNMN!3RI$~F`H@F#1BG!9ib1Ot7f!7w(w8QIWUyYoq@dlrmr
zC~2%D_!DOU+L{jOUk2D;$w^BEu9vRJmSzb6?_nH(zS8G7!0=Ye037IDJOl1|rz`l=
zjlTfye;VvAWn`#z69jXl0ow2m0REF^?q3%^^*uR_bWkS*i@E?aHf<$+{K7CaaTjyI
zgnd+y_#7Y@t&3*iq*F94#1H?j>f`J!*|7xV@+1-f7^+hqbu&cxF}du7*#)xL)#YFp
z#)~C0^P38S((!#@*kJC=+1(+|Iq4S6HnLD4(pG9iSX72>yJqdzDq4Jz-nA9rv{w{B
w1`5DpfeJbk3K(4?2pa<4Df>LE%5dJ5KgGm=)dmn44*&oF07*qoM6N<$f}n*V8~^|S

literal 0
HcmV?d00001