From 17856f5c3e5d12fb8fe8b901a06ffb4c33176232 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Thu, 3 Jan 2019 18:44:33 -0500
Subject: [PATCH] Added id_crafting_table

---
 src/inc/block.hpp            |   2 ++
 src/inc/face.hpp             |  13 ++++++++++++-
 src/inc/image.hpp            |   6 ++++++
 tex/crafting_table_front.png | Bin 0 -> 407 bytes
 tex/crafting_table_side.png  | Bin 0 -> 386 bytes
 tex/crafting_table_top.png   | Bin 0 -> 550 bytes
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 tex/crafting_table_front.png
 create mode 100755 tex/crafting_table_side.png
 create mode 100755 tex/crafting_table_top.png

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index 65a6ad9..a850592 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -127,6 +127,8 @@ enum block_id
 
 	id_reeds,
 
+	id_crafting_table,
+
 	id_null
 };
 
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index f27684e..573ea3c 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -58,6 +58,15 @@ face_info* make_face_info_caps(float top, float bottom, float side)
 	return new face_info(top, bottom, side, side, side, side);
 }
 
+// Generates a face_info* that uses side_1 for the front and back faces, 
+// side_2 for the left and right faces, uses bottom for the bottom face, and
+// top for the top face.
+
+face_info* make_face_info_bench(float top, float bottom, float side_1, float side_2)
+{
+	return new face_info(top, bottom, side_2, side_2, side_1, side_1);
+}
+
 // This function fills up block_face_info with a face_info* object for each
 // block_id. Call this function after calling load_block_texture_array, 
 // because this function uses block_name_to_layer as a lookup table.
@@ -188,6 +197,8 @@ void load_block_face_info_array()
 
 		make_face_info_all(block_name_to_layer.at("brick")),
 
-		make_face_info_all(block_name_to_layer.at("reeds"))
+		make_face_info_all(block_name_to_layer.at("reeds")),
+
+		make_face_info_bench(block_name_to_layer.at("crafting_table_top"), block_name_to_layer.at("oak_planks"), block_name_to_layer.at("crafting_table_front"), block_name_to_layer.at("crafting_table_side"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index 6b8a157..24374f2 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -25,6 +25,12 @@ std::vector<std::string> all_tex =
 
 	"cobblestone",
 
+	"crafting_table_front",
+
+	"crafting_table_side",
+
+	"crafting_table_top",
+
 	"dandelion",
 
 	"diamond_ore",
diff --git a/tex/crafting_table_front.png b/tex/crafting_table_front.png
new file mode 100755
index 0000000000000000000000000000000000000000..11986a46e1cccc8ca4551f85eb2830698e17e915
GIT binary patch
literal 407
zcmV;I0cie-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004ANkl<Zc-noF
zy-Gtt5QS3;QNfTX{tyibL6M+h5EG0d7J@&GSVV;svC&QlVxyf8V5yajkC5B>Aop!n
zzQwcd<OVOC?C#9$nVGYb+<bA;eZHO>G-`8h_;l)SHkMqsvEcXEzTf)>+|BXBVfc3K
z2ECSFL4Bp*F9Y@vW7nD?Q1+MZRtQ?JmP}?P$y9KEx$SYXSMwkUEY41Ous_<VxYcq#
z09zm!&8`fTP6hID@!@JWtcCza9MV7pw88n~u5Bu~z1XxG035N(5J*5;OViXNNfP(i
z>--Ur9StCm9w63$GoJ{K+tu+E;N*hl!Oz5RTl77)0)jEdPCcVqkWPHW7!AY@M8Jh|
zDQ|`dD2aIm`qSGVHkUoH%}h@O4TQBy(Gw7p(co)v5T=qfu0Y^9`7#>7E`rfPQu!jG
z|I8fxH;M9Vz|4Ok?(w<5A7+3(0kI$ZS*LF1<Og-!5#f4Bfq(!2002ovPDHLkV1g61
Bx(omS

literal 0
HcmV?d00001

diff --git a/tex/crafting_table_side.png b/tex/crafting_table_side.png
new file mode 100755
index 0000000000000000000000000000000000000000..1c678b4c0a2315f338640c88f3dd60e1d2d957d2
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003=Nkl<Zc-nQ7
zy-Gtt5QS3;Q9&_^KLo`P1PLmF7%^Jd`O}C+R7epU?SvpU+W7#MTG{vrxt$Mk-{#6U
zaF*G-H^sTLcXoDW&e_@8^1^iS^KliS(^@LVuNTGr&RWs$tk@dg-`6k#XKQ@;8Gqgt
zqe0g!Xs^%PVZfTi_+^s>s{Y>J3qjkPji|DUBpp26>>JLHTLyx_>f(%n_1VEjhy(aS
zf^v0LpmjRXo~H<+1Z-|K>$ZVa0%+j-emn{q2$2SWgD-<#uq2RxP@8xQR2R2A&%@el
zz`xfa(m)wGOl9oD^{(-^nQ*)-I}oQV%j_Wb`S#HGi-L6WR~`~nRUn|*s7FKO#f)x2
zoV*rbZgwhYAb1@T4Sq+bp*q%gAkcxRBy*qy<v~)*<wuvig-MgB{mNVL9N&f~fgfuE
g{67B6UOSqTf2TbXD$?u9e*gdg07*qoM6N<$g0z9MYXATM

literal 0
HcmV?d00001

diff --git a/tex/crafting_table_top.png b/tex/crafting_table_top.png
new file mode 100755
index 0000000000000000000000000000000000000000..5cd53a54bfa92e0515ef839552d6a9ef71d94ab1
GIT binary patch
literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005)Nkl<Zc-nPS
zSuaCT5bl#iP@%esrS0vKXc22kY13M3OKHU#@g%J+miiS!@E~5)QX(RjHhA#o#{GtK
zdK>XDIWu$Se6xK=XRRqGh`y|Zgl;vIu`NU!Q){eX9VbKw<Naijaz}IIRgCnyH(Vr7
z+Yx%+8I-oqX{N99Reobp6X}5ZdA3aM#%j7*57O;MkS^DH`Mgf{(ZkLF>ss;H4D@lj
z#FcOb$b7dIrg*o5CY!C4=uxD=9`{;UkNX{b0t9c6Tvx3xrI+0yx=Ho(WoEI1vMZf5
z(`A=s0|5S9Iw}F+=L&!V<2u#Hm(UR~;4#r@qLuZD_If&sH8TjRKx=;h5SZ{QG}CRT
z@wPhFAyX~23=EL5CJVPID&Q6vV1I<2^8rr*?6(>SfU=t*-iWq^I&<aE5Mf*_briLL
zM-o8wV?#nmyO@XELM}Z@hm$^@_;i<z#?XRh3!()Kmci74%Nc+SAPTaIX^X+(#PA|6
zBkTEtf3|=%ioP=o?ewP31liz6Aano=fcxz*`y~@W3INRZI5~ic<5!9ZCGOxytWPl&
zwg6tc8mjmL=vvxdB?FY*2(b>fg4!Otf%3=m1ttOjB0dv_ij_gcCLT9`%0`Tcms`NM
o)PB{N+eA?{3r?+wFRlIN-zVDKhlDB9a{vGU07*qoM6N<$f_q~6J^%m!

literal 0
HcmV?d00001