From 8448c72ba7cdd98204ad0a189555046701e070b6 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sat, 2 Sep 2017 19:28:57 +0200
Subject: [PATCH] Fix awkward torch models

---
 mods/ITEMS/mcl_torches/README.txt             |  5 +-
 mods/ITEMS/mcl_torches/init.lua               |  4 +-
 .../models/mcl_torches_torch_floor.obj        | 47 ++++---------
 .../models/mcl_torches_torch_wall.obj         | 67 +++++--------------
 4 files changed, 33 insertions(+), 90 deletions(-)

diff --git a/mods/ITEMS/mcl_torches/README.txt b/mods/ITEMS/mcl_torches/README.txt
index 17353c823b..a1dd8eb77b 100644
--- a/mods/ITEMS/mcl_torches/README.txt
+++ b/mods/ITEMS/mcl_torches/README.txt
@@ -31,9 +31,8 @@ License:
 ~~~~~~~~
 (c) Copyright BlockMen (2013-2015)
 
-Textures and Meshes/Models:
-CC-BY 3.0 BlockMen
-Note that the models were entirely done from scratch by sofar.
+Models:
+CC-BY 3.0 by 22i
 
 Code:
 Licensed under the GNU LGPL version 2.1 or higher.
diff --git a/mods/ITEMS/mcl_torches/init.lua b/mods/ITEMS/mcl_torches/init.lua
index 742cc0c0b3..c1c1dc62fd 100644
--- a/mods/ITEMS/mcl_torches/init.lua
+++ b/mods/ITEMS/mcl_torches/init.lua
@@ -40,8 +40,8 @@ mcl_torches.register_torch = function(substring, description, doc_items_longdesc
 		drop = itemstring,
 		selection_box = {
 			type = "wallmounted",
-			wall_top = {-1/16, -2/16, -1/16, 1/16, 0.5, 1/16},
-			wall_bottom = {-1/16, -0.5, -1/16, 1/16, 2/16, 1/16},
+			wall_top = {-1/16, -1/16, -1/16, 1/16, 0.5, 1/16},
+			wall_bottom = {-1/16, -0.5, -1/16, 1/16, 1/16, 1/16},
 		},
 		sounds = sounds,
 		node_placement_prediction = "",
diff --git a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj
index e2487efebb..ac4234d3ef 100644
--- a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj
+++ b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_floor.obj
@@ -1,23 +1,14 @@
-# Blender v2.76 (sub 11) OBJ File: 'torch_floor.blend'
+# Blender v2.76 (sub 0) OBJ File: 'torch_on_floor_node.blend'
 # www.blender.org
-mtllib torch_floor.mtl
-o Cube_Cube.001
-v 0.062500 0.062500 -0.062500
-v 0.062500 -0.500000 -0.062500
+o torch_Cube_Cube.001_Cube_Cube.001_Material.001
 v 0.062500 0.062500 0.062500
-v 0.062500 -0.500000 0.062500
+v 0.062500 0.062500 -0.062500
 v -0.062500 0.062500 -0.062500
-v -0.062500 -0.500000 -0.062500
 v -0.062500 0.062500 0.062500
 v -0.062500 -0.500000 0.062500
-v -0.353553 -0.500000 0.353553
-v -0.353553 0.500000 0.353553
-v 0.353553 -0.500000 -0.353553
-v 0.353553 0.500000 -0.353553
-v -0.353553 -0.500000 -0.353553
-v 0.353553 -0.500000 0.353553
-v -0.353553 0.500000 -0.353553
-v 0.353553 0.500000 0.353553
+v 0.062500 -0.500000 0.062500
+v 0.062500 -0.500000 -0.062500
+v -0.062500 -0.500000 -0.062500
 vt 0.562500 0.500000
 vt 0.562500 0.625000
 vt 0.437500 0.625000
@@ -26,25 +17,13 @@ vt 0.437500 0.000000
 vt 0.562500 0.000000
 vt 0.562500 0.125000
 vt 0.437500 0.125000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
 vn 0.000000 1.000000 0.000000
 vn 0.000000 0.000000 -1.000000
 vn 1.000000 0.000000 0.000000
-vn -0.707100 0.000000 -0.707100
-vn -0.707100 -0.000000 0.707100
-g Cube_Cube.001_Cube_Cube.001_Material.001
-usemtl Material.001
-s off
-f 3/1/1 1/2/1 5/3/1 7/4/1
-f 8/5/1 4/6/1 2/7/1 6/8/1
-f 3/2/2 4/6/2 8/5/2 7/3/2
-f 1/3/3 3/2/3 4/6/3 2/5/3
-f 5/2/2 1/3/2 2/5/2 6/6/2
-f 7/3/3 8/5/3 6/6/3 5/2/3
-g Cube_Cube.001_Cube_Cube.001_Material.002
-usemtl Material.002
-f 9/9/4 10/10/4 12/11/4 11/12/4
-f 13/12/5 14/9/5 16/10/5 15/11/5
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/5/1 6/6/1 7/7/1 8/8/1
+f 1/2/2 6/6/2 5/5/2 4/3/2
+f 2/3/3 1/2/3 6/6/3 7/5/3
+f 3/2/2 2/3/2 7/5/2 8/6/2
+f 4/3/3 5/5/3 8/6/3 3/2/3
diff --git a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj
index 57baa9e607..824223e6d4 100644
--- a/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj
+++ b/mods/ITEMS/mcl_torches/models/mcl_torches_torch_wall.obj
@@ -1,31 +1,14 @@
-# Blender v2.76 (sub 11) OBJ File: 'torch_wall.blend'
+# Blender v2.76 (sub 0) OBJ File: 'torch_on_wall_node.blend'
 # www.blender.org
-mtllib torch_wall.mtl
-o Cube_Cube.001
-v 0.062469 -0.195248 0.023570
-v 0.062469 -0.476498 -0.463570
+o torch_wall_Cube_Cube.001_Cube_Cube.001_Material.001
 v 0.062469 -0.303502 0.086070
-v 0.062469 -0.584752 -0.401070
+v 0.062469 -0.195248 0.023570
 v -0.062531 -0.195248 0.023570
-v -0.062531 -0.476498 -0.463570
 v -0.062531 -0.303502 0.086070
 v -0.062531 -0.584752 -0.401070
-v -0.353584 -0.613553 0.022500
-v -0.353584 -0.613553 0.460000
-v 0.353522 0.093553 0.022500
-v 0.353522 0.093553 0.460000
-v -0.353584 0.093553 0.022500
-v 0.353522 -0.613553 0.022500
-v -0.353584 0.093553 0.460000
-v 0.353522 -0.613553 0.460000
-v 0.353553 0.056811 -0.121957
-v 0.353553 -0.224439 -0.609096
-v -0.353553 -0.555561 0.231596
-v -0.353553 -0.836811 -0.255543
-v -0.353553 0.056811 -0.121957
-v -0.353553 -0.224439 -0.609096
-v 0.353553 -0.555561 0.231596
-v 0.353553 -0.836811 -0.255543
+v 0.062469 -0.584752 -0.401070
+v 0.062469 -0.476498 -0.463570
+v -0.062531 -0.476498 -0.463570
 vt 0.562500 0.500000
 vt 0.562500 0.625000
 vt 0.437500 0.625000
@@ -34,31 +17,13 @@ vt 0.437500 0.000000
 vt 0.562500 0.000000
 vt 0.562500 0.125000
 vt 0.437500 0.125000
-vt 0.000000 0.562500
-vt 0.000000 -0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.562500
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vn -0.000000 0.500000 0.866000
-vn -0.000000 0.866000 -0.500000
-vn 1.000000 0.000000 0.000000
-vn -0.707100 0.612400 -0.353600
-vn -0.707100 -0.612400 0.353600
-vn -0.707100 0.707100 -0.000000
-vn -0.707100 -0.707100 -0.000000
-g Cube_Cube.001_Cube_Cube.001_Material.001
-usemtl Material.001
-s off
-f 3/1/1 1/2/1 5/3/1 7/4/1
-f 8/5/1 4/6/1 2/7/1 6/8/1
-f 3/2/2 4/6/2 8/5/2 7/3/2
-f 1/3/3 3/2/3 4/6/3 2/5/3
-f 5/2/2 1/3/2 2/5/2 6/6/2
-f 7/3/3 8/5/3 6/6/3 5/2/3
-f 17/9/4 18/10/4 20/11/4 19/12/4
-f 21/9/5 22/10/5 24/11/5 23/12/5
-g Cube_Cube.001_Cube_Cube.001_Material.002
-usemtl Material.002
-f 9/12/6 10/13/6 12/14/6 11/9/6
-f 13/9/7 14/12/7 16/13/7 15/14/7
+vn 0.000000 0.500000 0.866000
+vn 0.000000 0.866000 -0.500000
+vn 1.000000 -0.000000 0.000000
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/5/1 6/6/1 7/7/1 8/8/1
+f 1/2/2 6/6/2 5/5/2 4/3/2
+f 2/3/3 1/2/3 6/6/3 7/5/3
+f 3/2/2 2/3/2 7/5/2 8/6/2
+f 4/3/3 5/5/3 8/6/3 3/2/3