Version update: 0.3.0

wieldview/init.lua

@@ -6,29 +6,21 @@ if not update_time then
 end
 
 wieldview = {
-	wielded_items = {},
+	wielded_item = {},
 }
 
-wieldview.get_wielded_item_texture = function(self, player)
-	if not player then
-		return nil
-	end
-	local stack = player:get_wielded_item()
-	local item = stack:get_name()
-	if not item then
-		return nil
-	end
-	if not minetest.registered_items[item] then
-		return nil
-	end
-	local texture = minetest.registered_items[item].inventory_image
-	if texture == "" then
-		if not minetest.registered_items[item].tiles then
-			return nil	
+wieldview.get_item_texture = function(self, item)
+	if item ~= "" then
+		if minetest.registered_items[item] then
+			if minetest.registered_items[item].inventory_image ~= "" then
+				return minetest.registered_items[item].inventory_image
+			end
+			if minetest.registered_items[item].tiles then
+				return minetest.registered_items[item].tiles[1]
+			end
 		end
-		texture = minetest.registered_items[item].tiles[1]
 	end
-	return texture
+	return uniskins.default_texture
 end
 
 wieldview.update_wielded_item = function(self, player)
@@ -41,25 +33,21 @@ wieldview.update_wielded_item = function(self, player)
 	if not item then
 		return
 	end
-	if self.wielded_items[name] then
-		if self.wielded_items[name] == item then
+	if self.wielded_item[name] then
+		if self.wielded_item[name] == item then
 			return
 		end
+		uniskins.wielditem[name] = self:get_item_texture(item)
 		uniskins:update_player_visuals(player)
 	end
-	self.wielded_items[name] = item
+	self.wielded_item[name] = item
 end
 
 minetest.register_on_joinplayer(function(player)
-	local texture = uniskins:get_player_skin(name)
-	player:set_properties({
-		visual = "mesh",
-		mesh = "wieldview_character.x",
-		textures = {texture},
-		visual_size = {x=1, y=1},
-	})
+	local name = player:get_player_name()
+	wieldview.wielded_item[name] = ""
 	minetest.after(0, function(player)
-		uniskins:update_player_visuals(player)
+		wieldview:update_wielded_item(player)
 	end, player)
 end)