diff --git a/README.txt b/README.txt old mode 100644 new mode 100755 diff --git a/depends.txt b/depends.txt old mode 100644 new mode 100755 index 20b7c42..7e882b3 --- a/depends.txt +++ b/depends.txt @@ -1 +1 @@ -unified_inventory? +unified_inventory diff --git a/description.txt b/description.txt old mode 100644 new mode 100755 diff --git a/init.lua b/init.lua old mode 100644 new mode 100755 index e9e4e14..2809673 --- a/init.lua +++ b/init.lua @@ -16,7 +16,15 @@ function inventory_icon.get_inventory_state(inv, listname) end function inventory_icon.replace_icon(name) - return "inventory_icon_"..name + local icon = "" + if name:find("small") then + icon = "inventory_icon_bags_small.png" + elseif name:find("medium") then + icon = "inventory_icon_bags_medium.png" + elseif name:find("large") then + icon = "inventory_icon_bags_large.png" + end + return icon end minetest.register_on_joinplayer(function(player) @@ -60,7 +68,7 @@ minetest.register_on_joinplayer(function(player) scale = { x = 1, y = 1 } local occupied, size = inventory_icon.get_inventory_state(player:get_inventory(), "bag"..i.."contents") text = string.format("%d/%d", occupied, size) - icon = inventory_icon.replace_icon(minetest.registered_items[bag:get_name()].inventory_image) + icon = inventory_icon.replace_icon(bag:get_name()) if occupied >= size then icon = icon .. "^" .. inventory_icon.COLORIZE_STRING end @@ -91,12 +99,11 @@ minetest.register_on_leaveplayer(function(player) inventory_icon.hudids[player:get_player_name()] = nil end) -inventory_icon.timer = 0 -minetest.register_globalstep(function(dtime) - inventory_icon.timer = inventory_icon.timer + dtime - if inventory_icon.timer > 1 then - for playername,hudids in pairs(inventory_icon.hudids) do - local player = minetest.get_player_by_name(playername) +local function tick() + minetest.after(1, tick) + for playername,hudids in pairs(inventory_icon.hudids) do + local player = minetest.get_player_by_name(playername) + if player then local occupied, size = inventory_icon.get_inventory_state(player:get_inventory(), "main") local icon, color if occupied >= size then @@ -120,7 +127,7 @@ minetest.register_globalstep(function(dtime) scale = { x = 1, y = 1 } local occupied, size = inventory_icon.get_inventory_state(player:get_inventory(), "bag"..i.."contents") text = string.format("%d/%d", occupied, size) - icon = inventory_icon.replace_icon(minetest.registered_items[bag:get_name()].inventory_image) + icon = inventory_icon.replace_icon(bag:get_name()) if occupied >= size then icon = icon .. "^" .. inventory_icon.COLORIZE_STRING end @@ -133,6 +140,7 @@ minetest.register_globalstep(function(dtime) end end end - inventory_icon.timer = 0 end -end) +end + +tick() diff --git a/textures/inventory_icon_backpack_free.png b/textures/inventory_icon_backpack_free.png old mode 100644 new mode 100755 index 799f712..b58285d Binary files a/textures/inventory_icon_backpack_free.png and b/textures/inventory_icon_backpack_free.png differ diff --git a/textures/inventory_icon_backpack_full.png b/textures/inventory_icon_backpack_full.png old mode 100644 new mode 100755 index 5b7e3cb..d0edb4e Binary files a/textures/inventory_icon_backpack_full.png and b/textures/inventory_icon_backpack_full.png differ diff --git a/textures/inventory_icon_bags_large.png b/textures/inventory_icon_bags_large.png old mode 100644 new mode 100755 index 21da733..ebe3d91 Binary files a/textures/inventory_icon_bags_large.png and b/textures/inventory_icon_bags_large.png differ diff --git a/textures/inventory_icon_bags_medium.png b/textures/inventory_icon_bags_medium.png old mode 100644 new mode 100755 index 21a08c6..aebd24a Binary files a/textures/inventory_icon_bags_medium.png and b/textures/inventory_icon_bags_medium.png differ diff --git a/textures/inventory_icon_bags_small.png b/textures/inventory_icon_bags_small.png old mode 100644 new mode 100755 index 904d481..fd370d6 Binary files a/textures/inventory_icon_bags_small.png and b/textures/inventory_icon_bags_small.png differ