From 097b4a95f20b3643414a41afcac49440a2142e7e Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 3 Aug 2017 16:01:23 +0200
Subject: [PATCH] Add 3D model by 22i for item frame

---
 mods/ITEMS/itemframes/README.txt              |   7 +-
 mods/ITEMS/itemframes/init.lua                |   7 +-
 .../models/itemframes_itemframe1facedir.obj   | 156 ++++++++++++++++++
 .../textures/itemframe_background.png         | Bin 220 -> 225 bytes
 4 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 mods/ITEMS/itemframes/models/itemframes_itemframe1facedir.obj

diff --git a/mods/ITEMS/itemframes/README.txt b/mods/ITEMS/itemframes/README.txt
index 0e28f1028..d9514a03b 100644
--- a/mods/ITEMS/itemframes/README.txt
+++ b/mods/ITEMS/itemframes/README.txt
@@ -1 +1,6 @@
-This Mod Is by Zeg9
\ No newline at end of file
+This mod is originally by Zeg9, but heavily modified for MineClone 2.
+
+Model created by 22i, licensed under the
+GNU GPLv3 <https://www.gnu.org/licenses/gpl-3.0.html>.
+
+Source: <https://github.com/22i/amc>
diff --git a/mods/ITEMS/itemframes/init.lua b/mods/ITEMS/itemframes/init.lua
index 588cc88fe..03cc052ea 100644
--- a/mods/ITEMS/itemframes/init.lua
+++ b/mods/ITEMS/itemframes/init.lua
@@ -91,10 +91,11 @@ minetest.register_node("itemframes:frame",{
 	description = "Item Frame",
 	_doc_items_longdesc = "Item frames are decorative blocks in which items can be placed.",
 	_doc_items_usagehelp = "Hold any item in your hand and right-click the item frame to place the item into the frame. Rightclick the item frame again to retrieve the item.",
-	drawtype = "nodebox",
+	drawtype = "mesh",
 	is_ground_content = false,
-	node_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
-	selection_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
+	mesh = "itemframes_itemframe1facedir.obj",
+	selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
+	collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
 	tiles = {"itemframe_background.png", "itemframe_background.png", "itemframe_background.png", "itemframe_background.png", "default_wood.png", "itemframe_background.png"},
 	inventory_image = "itemframes_frame.png",
 	wield_image = "itemframes_frame.png",
diff --git a/mods/ITEMS/itemframes/models/itemframes_itemframe1facedir.obj b/mods/ITEMS/itemframes/models/itemframes_itemframe1facedir.obj
new file mode 100644
index 000000000..d0a5b0c5f
--- /dev/null
+++ b/mods/ITEMS/itemframes/models/itemframes_itemframe1facedir.obj
@@ -0,0 +1,156 @@
+# Blender v2.76 (sub 0) OBJ File: 'itemframe1facedir.blend'
+# www.blender.org
+mtllib itemframe1facedir.mtl
+o right.frame_Cube.005
+v -0.313413 -0.313413 0.435326
+v -0.313413 0.313413 0.435326
+v -0.313413 -0.313413 0.498008
+v -0.313413 0.313413 0.498008
+v -0.376095 -0.313413 0.435326
+v -0.376095 0.313413 0.435326
+v -0.376095 -0.313413 0.498008
+v -0.376095 0.313413 0.498008
+vt 0.875000 0.812500
+vt 0.812500 0.812500
+vt 0.812500 0.187500
+vt 0.875000 0.187500
+vt 1.000000 0.812500
+vt 0.937500 0.812500
+vt 0.937500 0.187500
+vt 1.000000 0.187500
+vt -0.000000 0.937500
+vt 0.062500 0.937500
+vt 0.062500 1.000000
+vt -0.000000 1.000000
+vn 1.000000 0.000000 -0.000000
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn -0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 2/1/1 4/2/1 3/3/1 1/4/1
+f 4/1/2 8/2/2 7/3/2 3/4/2
+f 8/5/3 6/6/3 5/7/3 7/8/3
+f 6/1/4 2/2/4 1/3/4 5/4/4
+f 1/9/5 3/10/5 7/11/5 5/12/5
+f 6/9/6 8/10/6 4/11/6 2/12/6
+o left.frame_Cube.004
+v 0.376095 -0.313413 0.435326
+v 0.376095 0.313413 0.435326
+v 0.376095 -0.313413 0.498008
+v 0.376095 0.313413 0.498008
+v 0.313413 -0.313413 0.435326
+v 0.313413 0.313413 0.435326
+v 0.313413 -0.313413 0.498008
+v 0.313413 0.313413 0.498008
+vt 0.875000 0.812500
+vt 0.812500 0.812500
+vt 0.812500 0.187500
+vt 0.875000 0.187500
+vt 1.000000 0.812500
+vt 0.937500 0.812500
+vt 0.937500 0.187500
+vt 1.000000 0.187500
+vt -0.000000 0.937500
+vt 0.062500 0.937500
+vt 0.062500 1.000000
+vt -0.000000 1.000000
+vn 1.000000 0.000000 -0.000000
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 10/13/7 12/14/7 11/15/7 9/16/7
+f 12/13/8 16/14/8 15/15/8 11/16/8
+f 16/17/9 14/18/9 13/19/9 15/20/9
+f 14/13/10 10/14/10 9/15/10 13/16/10
+f 9/21/11 11/22/11 15/23/11 13/24/11
+f 14/21/12 16/22/12 12/23/12 10/24/12
+o lower.frame_Cube.003
+v 0.376095 -0.376095 0.435326
+v 0.376095 -0.313413 0.435326
+v 0.376095 -0.376095 0.498008
+v 0.376095 -0.313413 0.498008
+v -0.376095 -0.376095 0.435326
+v -0.376095 -0.313413 0.435326
+v -0.376095 -0.376095 0.498008
+v -0.376095 -0.313413 0.498008
+vt 0.187500 0.187500
+vt 0.125000 0.187500
+vt 0.125000 0.125000
+vt 0.187500 0.125000
+vt 0.875000 0.187500
+vt 0.875000 0.125000
+vt 0.812500 0.187500
+vt 0.812500 0.125000
+vt 0.875000 0.937500
+vt 0.875000 1.000000
+vt 0.125000 1.000000
+vt 0.125000 0.937500
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn -0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 18/25/13 20/26/13 19/27/13 17/28/13
+f 20/29/14 24/26/14 23/27/14 19/30/14
+f 24/29/15 22/31/15 21/32/15 23/30/15
+f 22/29/16 18/26/16 17/27/16 21/30/16
+f 17/33/17 19/34/17 23/35/17 21/36/17
+f 22/30/18 24/29/18 20/26/18 18/27/18
+o upper.frame_Cube.002
+v 0.376095 0.313413 0.435326
+v 0.376095 0.376095 0.435326
+v 0.376095 0.313413 0.498008
+v 0.376095 0.376095 0.498008
+v -0.376095 0.313413 0.435326
+v -0.376095 0.376095 0.435326
+v -0.376095 0.313413 0.498008
+v -0.376095 0.376095 0.498008
+vt 0.187500 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.812500
+vt 0.187500 0.812500
+vt 0.875000 0.875000
+vt 0.875000 0.812500
+vt 0.812500 0.875000
+vt 0.812500 0.812500
+vt 0.875000 0.937500
+vt 0.875000 1.000000
+vt 0.125000 1.000000
+vt 0.125000 0.937500
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn -0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 26/37/19 28/38/19 27/39/19 25/40/19
+f 28/41/20 32/38/20 31/39/20 27/42/20
+f 32/41/21 30/43/21 29/44/21 31/42/21
+f 30/41/22 26/38/22 25/39/22 29/42/22
+f 25/45/23 27/46/23 31/47/23 29/48/23
+f 30/48/24 32/38/24 28/41/24 26/45/24
+o background_Plane
+v 0.313413 -0.313413 0.466667
+v -0.313413 -0.313413 0.466667
+v 0.313413 0.313413 0.466667
+v -0.313413 0.313413 0.466667
+vt 0.187500 0.187500
+vt 0.812500 0.187500
+vt 0.812500 0.812500
+vt 0.187500 0.812500
+vn -0.000000 0.000000 -1.000000
+usemtl None
+s off
+f 33/49/25 34/50/25 36/51/25 35/52/25
diff --git a/mods/ITEMS/itemframes/textures/itemframe_background.png b/mods/ITEMS/itemframes/textures/itemframe_background.png
index 22c361ee3d3d88d8253ca74c6415e9b3e193f900..d48cf26c54fae9cf4350b041dac5daa5b52c063d 100644
GIT binary patch
delta 155
zcmV;M0A&B%0pS6VPJez$L_t(|0S(464uU`s1<*eq8Y^Z(PguDDCy>Nz8}DFk7Gh;1
zJM@H+=H&?_8A>=OGpu>=Dt!w?=ZmntiI)9E^I>f70qP`8EKo-DOuZg8C9_)`^e4Mb
z41_ixOC({|XB6k&VAd600}uWA89UzD#e$gSYSkF0K=``-0TefDF;rPBvq}H}002ov
JPDHLkV1nb?KT7}r

delta 150
zcmV;H0BQf>0o(zQPJekxL_t(|0Ub`Y0mCp5ykHwn9UdT_!M(W-ub{sPtO*3$=H+jm
zj)2iA%TC7?^0xc6ZCfH2%P6+OoL)%(#x4$3<7ViM;Tu<aEA&s?6dNtegfWUKv5(UC
zQIwT1Vs%Iu`dVKDrp7g43@co_U-$c}sfNhzr{(AmQJXVPArG|(D*ylh07*qoM6N<$
Eg8%MAA^-pY