nalc/minetest-mod-metatools
1
0
Fork 0
forked from mtcontrib/minetest-mod-metatools
Code Issues Pull Requests Releases Wiki Activity

Fix: Count an inventory slot if >0 (not >1). Add comments.

Browse Source
This commit is contained in:
poikilos 2024-01-03 08:44:04 -05:00
parent f9a64170fb
commit a0fc49e3be
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
init.lua
View File

@ -399,21 +399,21 @@ minetest.register_craftitem("metatools:stick",{
-- local pointedPlayerSAO = player:getplayersao() -- local pointedPlayerSAO = player:getplayersao()
-- local pointedRemotePlayer = player:getplayer() -- local pointedRemotePlayer = player:getplayer()
local inventories = { local inventories = {
["main"] = 32, ["main"] = 32, -- The regular inventory grid
["hand"] = 1, ["hand"] = 1, -- item shown in hand in 3D (?)
["craft"] = 1, ["craft"] = 9, -- the 3x3 area for crafting
["craftpreview"] = 1, ["craftpreview"] = 1, -- you can see but not take from preview
["craftresult"] = 1, ["craftresult"] = 1, -- you take the item from this to craft it
["bag1"] = 1, ["bag1"] = 1, -- For bag itself (bag item placed here enables bag1contents)
["bag1contents"] = 32, ["bag1contents"] = 32, -- The items in the bag
["bag2"] = 1, ["bag2"] = 1,
["bag2contents"] = 32, ["bag2contents"] = 32,
["bag3"] = 1, ["bag3"] = 1,
["bag3contents"] = 32, ["bag3contents"] = 32,
["bag4"] = 1, ["bag4"] = 1,
["bag4contents"] = 32, ["bag4contents"] = 32,
["more_chests:wifi"] = 32, ["more_chests:wifi"] = 32, -- on player since all chests are shared
["enderchest"] = 32 ["enderchest"] = 32 -- legacy, TM Mojang. See wifi instead.
} }
-- NOTE: "hunger" is also an inventory but it is used as a savable variable -- NOTE: "hunger" is also an inventory but it is used as a savable variable
for inv_name, inv_max in pairs(inventories) do for inv_name, inv_max in pairs(inventories) do
@ -423,23 +423,27 @@ minetest.register_craftitem("metatools:stick",{
for y=1,4,1 do for y=1,4,1 do
local sep = "" local sep = ""
local line = "" local line = ""
for x=1,8,1 do local cols = 8
if inv_max == 9 then
cols = 3
end
for x=1,cols,1 do
i = i + 1 -- 1 to 32 i = i + 1 -- 1 to 32
if i > inv_max then if i > inv_max then
break break
end end
line = line .. sep .. inv:get_stack(inv_name, i):get_name() line = line .. sep .. inv:get_stack(inv_name, i):get_name()
if inv:get_stack(inv_name, i):get_count() > 1 then if inv:get_stack(inv_name, i):get_count() > 0 then
line = line .. " " .. inv:get_stack(inv_name, i):get_count() line = line .. " " .. inv:get_stack(inv_name, i):get_count()
inv_count = inv_count + 1 inv_count = inv_count + 1
end end
sep = ", " sep = ", "
end end -- end for column
if i > inv_max then if i > inv_max then
break break
end end
inv_block_text = inv_block_text .. " - " .. line .. "\n" inv_block_text = inv_block_text .. " - " .. line .. "\n"
end end -- end for row (newline)
if inv_count > 0 then if inv_count > 0 then
minetest.chat_send_player( minetest.chat_send_player(
username, username,
@ -450,11 +454,10 @@ minetest.register_craftitem("metatools:stick",{
-- Next get player metadata "3d_armor_inventory" (contains a Lua return statement returning the 3d_armor table for the player) -- Next get player metadata "3d_armor_inventory" (contains a Lua return statement returning the 3d_armor table for the player)
local known_metas = {"3d_armor_inventory", "unified_inventory:bags", "sethome:home"} local known_metas = {"3d_armor_inventory", "unified_inventory:bags", "sethome:home"}
for _, meta_name in pairs(known_metas) do for _, meta_name in pairs(known_metas) do
local attribute_meta = player:get_meta() -- see also 3d_armor init.lua local attribute_meta = player:get_meta() -- see also 3d_armor init.lua
-- Other attributes: local known_metas = {"hbsprint:sprinting", "hbsprint:stamina", "homedecor:player_skin", "hunger_ng:eating_timestamp", "hunger_ng:hunger", "hunger_ng:hunger_bar", "skinsdb:skin_key", "sprinting", "stamina"} -- Other attributes: local known_metas = {"hbsprint:sprinting", "hbsprint:stamina", "homedecor:player_skin", "hunger_ng:eating_timestamp", "hunger_ng:hunger", "hunger_ng:hunger_bar", "skinsdb:skin_key", "sprinting", "stamina"}
local content_lua = attribute_meta:get_string(meta_name) local content_lua = attribute_meta:get_string(meta_name)
if content_lua then if content_lua and content_lua ~= "" then
minetest.chat_send_player( minetest.chat_send_player(
username, username,
" " .. meta_name .. " = " .. content_lua " " .. meta_name .. " = " .. content_lua