From 1aac4713a4b00d316f9eb12d6af0fbd2a7cb34e2 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Thu, 19 Sep 2019 12:20:31 +0200
Subject: [PATCH] Simplify mcl_meshhand code

---
 mods/PLAYER/mcl_meshhand/init.lua | 70 ++++++++++++-------------------
 1 file changed, 26 insertions(+), 44 deletions(-)

diff --git a/mods/PLAYER/mcl_meshhand/init.lua b/mods/PLAYER/mcl_meshhand/init.lua
index 2ccbc0b92f..5dc72992b7 100644
--- a/mods/PLAYER/mcl_meshhand/init.lua
+++ b/mods/PLAYER/mcl_meshhand/init.lua
@@ -2,50 +2,20 @@ local has_mcl_skins = minetest.get_modpath("mcl_skins") ~= nil
 
 local def = minetest.registered_items[""]
 
+local list
 -- mcl_skins is enabled
 if has_mcl_skins == true then
-	--generate a node for every skin
-	for _,texture in pairs(mcl_skins.list) do
-		-- This is a fake node that should never be placed in the world
-		minetest.register_node("mcl_meshhand:"..texture, {
-			description = "",
-			tiles = {texture..".png"},
-			inventory_image = "wieldhand.png",
-			visual_scale = 1,
-			wield_scale = {x=1,y=1,z=1},
-			paramtype = "light",
-			drawtype = "mesh",
-			mesh = "mcl_meshhand.b3d",
-			-- Prevent placement
-			node_placement_prediction = "",
-			on_construct = function(pos)
-				minetest.log("error", "[mcl_meshhand] Trying to construct mcl_meshhand:"..texture.." at "..minetest.pos_to_string(pos))
-				minetest.remove_node(pos)
-			end,
-			on_place = function(itemstack, placer, pointed_thing)
-				local spos = "<somewhere>"
-				if pointed_thing.above then
-					spos = minetest.pos_to_string(pointed_thing.above)
-				end
-				minetest.log("error", "[mcl_meshhand] Player tried to place mcl_meshhand:"..texture.." at "..spos)
-				itemstack:set_count(0)
-				return itemstack
-			end,
-			groups = { dig_immediate = 3, not_in_creative_inventory = 1 },
-			range = def.range,
-			})
-	end
-	--change the player's hand to their skin
-	mcl_skins.register_on_set_skin(function(player, skin)
-		local name = player:get_player_name()
-		player:get_inventory():set_stack("hand", 1, "mcl_meshhand:"..skin)
-	end)
-	
---do default skin if no skin mod installed
+	list = mcl_skins.list
 else
-	minetest.register_node("mcl_meshhand:hand", {
+	list = { "hand" }
+end
+
+--generate a node for every skin
+for _,texture in pairs(list) do
+	-- This is a fake node that should never be placed in the world
+	minetest.register_node("mcl_meshhand:"..texture, {
 		description = "",
-		tiles = {"character.png"},
+		tiles = {texture..".png"},
 		inventory_image = "wieldhand.png",
 		visual_scale = 1,
 		wield_scale = {x=1,y=1,z=1},
@@ -55,22 +25,34 @@ else
 		-- Prevent placement
 		node_placement_prediction = "",
 		on_construct = function(pos)
-			minetest.log("error", "[mcl_meshhand] Trying to construct mcl_meshhand:hand at "..minetest.pos_to_string(pos))
+			minetest.log("error", "[mcl_meshhand] Trying to construct mcl_meshhand:"..texture.." at "..minetest.pos_to_string(pos))
 			minetest.remove_node(pos)
 		end,
 		on_place = function(itemstack, placer, pointed_thing)
 			local spos = "<somewhere>"
 			if pointed_thing.above then
-				spos = minetest.pos_to_string(pointed_thing.above )
+				spos = minetest.pos_to_string(pointed_thing.above)
 			end
-			minetest.log("error", "[mcl_meshhand] Player tried to place mcl_meshhand:hand at "..spos)
+			minetest.log("error", "[mcl_meshhand] Player tried to place mcl_meshhand:"..texture.." at "..spos)
 			itemstack:set_count(0)
 			return itemstack
 		end,
+		drop = "",
+		on_drop = function()
+			return ""
+		end,
 		groups = { dig_immediate = 3, not_in_creative_inventory = 1 },
 		range = def.range,
-	})
+		})
+end
 
+if has_mcl_skins == true then
+	--change the player's hand to their skin
+	mcl_skins.register_on_set_skin(function(player, skin)
+		local name = player:get_player_name()
+		player:get_inventory():set_stack("hand", 1, "mcl_meshhand:"..skin)
+	end)
+else
 	minetest.register_on_joinplayer(function(player)
 		player:get_inventory():set_stack("hand", 1, "mcl_meshhand:hand")
 	end)