Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update inventory and chests

This commit is contained in:
stujones11 2019-05-13 21:25:43 +01:00
parent 33192bd4a1
commit c9d0b5a9c3
4 changed files with 84 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
games/default/files/creative/inventory.lua
View File

@ -1,62 +1,62 @@
local player_inventory = {} local player_inventory = {}
local inventory_cache = {} local inventory_cache = {}
local ofs = {} local ofs_tab = {}
local ofy = {} local ofs_img = {}
local hoch = {}
local bg = {} local bg = {}
local rot = {}
ofs["blocks"] = {x=-0.29, y=-0.25} rot["all"] = "^[transformR270"
ofs["deco"] = {x=0.98, y=-0.25} rot["inv"] = "^[transformR270"
ofs["mese"] = {x=2.23, y=-0.25} rot["blocks"] = ""
ofs["rail"] = {x=3.495, y=-0.25} rot["deco"] = ""
ofs["misc"] = {x=4.75, y=-0.25} rot["mese"] = ""
ofs["all"] = {x=8.99, y=-0.25} rot["rail"] = ""
ofs["food"] = {x=-0.29, y=8.12} rot["misc"] = ""
ofs["tools"] = {x=0.98, y=8.12} rot["food"] = ""
ofs["combat"] = {x=2.23, y=8.12} rot["tools"] = ""
ofs["brew"] = {x=4.78, y=8.12} rot["combat"] = ""
ofs["matr"] = {x=3.495, y=8.12} rot["matr"] = ""
ofs["inv"] = {x=8.99, y=8.12} rot["brew"] = ""
ofy["blocks"] = 0.24 ofs_tab["all"] = "10.05,0.84"
ofy["deco"] = 0.24 ofs_tab["inv"] = "10.05,6.93"
ofy["mese"] = 0.24 ofs_tab["blocks"] = "-0.29,-0.32"
ofy["rail"] = 0.24 ofs_tab["deco"] = "0.74,-0.32"
ofy["misc"] = 0.24 ofs_tab["mese"] = "1.78,-0.32"
ofy["all"] = 0.24 ofs_tab["rail"] = "2.81,-0.32"
ofy["food"] = 0.14 ofs_tab["misc"] = "3.84,-0.32"
ofy["tools"] = 0.14 ofs_tab["food"] = "4.88,-0.32"
ofy["combat"] = 0.14 ofs_tab["tools"] = "5.91,-0.32"
ofy["brew"] = 0.14 ofs_tab["combat"] = "6.94,-0.32"
ofy["matr"] = 0.14 ofs_tab["matr"] = "7.98,-0.32"
ofy["inv"] = 0.14 ofs_tab["brew"] = "9.01,-0.32"
hoch["blocks"] = "" ofs_img["all"] = "10.27,1"
hoch["deco"] = "" ofs_img["inv"] = "10.27,7.15"
hoch["mese"] = "" ofs_img["blocks"] = "-0.15,-0.15"
hoch["rail"] = "" ofs_img["deco"] = "0.88,-0.15"
hoch["misc"] = "" ofs_img["mese"] = "1.92,-0.15"
hoch["all"] = "" ofs_img["rail"] = "2.96,-0.15"
hoch["food"] = "^[transformfy" ofs_img["misc"] = "4,-0.15"
hoch["tools"] = "^[transformfy" ofs_img["food"] = "5.05,-0.15"
hoch["combat"] = "^[transformfy" ofs_img["tools"] = "6.11,-0.15"
hoch["brew"] = "^[transformfy" ofs_img["combat"] = "7.14,-0.15"
hoch["matr"] = "^[transformfy" ofs_img["matr"] = "8.18,-0.15"
hoch["inv"] = "^[transformfy" ofs_img["brew"] = "9.21,-0.15"
bg["inv"] = "creative_inv.png"
bg["blocks"] = "default_grass_side.png" bg["blocks"] = "default_grass_side.png"
bg["deco"] = "default_sapling.png" bg["deco"] = "default_sapling.png"
bg["mese"] = "jeija_lightstone_gray_on.png" bg["mese"] = "jeija_lightstone_gray_on.png"
bg["rail"] = "boats_inventory.png" bg["rail"] = "boats_inventory.png"
bg["misc"] = "bucket_water.png" bg["misc"] = "bucket_water.png"
bg["all"] = "creative_all.png"
bg["food"] = "creative_food.png" bg["food"] = "creative_food.png"
bg["tools"] = "default_tool_diamondpick.png" bg["tools"] = "default_tool_diamondpick.png"
bg["combat"] = "default_tool_steelsword.png" bg["combat"] = "default_tool_steelsword.png"
bg["brew"] = "potions_bottle.png"
bg["matr"] = "default_emerald.png" bg["matr"] = "default_emerald.png"
bg["inv"] = "creative_inv.png" bg["brew"] = "potions_bottle.png"
bg["all"] = "creative_all.png"
local function get_item_list(group) local function get_item_list(group)
local item_list = {} local item_list = {}
@ -121,7 +121,8 @@ function creative.init_creative_inventory(player)
end, end,
on_take = function(inv, listname, index, stack, player2) on_take = function(inv, listname, index, stack, player2)
if stack and stack:get_count() > 0 then if stack and stack:get_count() > 0 then
minetest.log("action", player_name .. " takes " .. stack:get_name().. " from creative inventory") minetest.log("action", player_name.." takes "..
stack:get_name().." from creative inventory")
end end
end, end,
}, player_name) }, player_name)
@ -133,8 +134,8 @@ function creative.update_creative_inventory(player_name, tab_content)
local creative_list = {} local creative_list = {}
local inv = player_inventory[player_name] or local inv = player_inventory[player_name] or
creative.init_creative_inventory(minetest.get_player_by_name(player_name)) creative.init_creative_inventory(minetest.get_player_by_name(player_name))
local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) local player_inv = minetest.get_inventory({type="detached",
name="creative_"..player_name})
local items = inventory_cache[tab_content] or init_creative_cache(tab_content) local items = inventory_cache[tab_content] or init_creative_cache(tab_content)
for name, def in pairs(items) do for name, def in pairs(items) do
@ -169,51 +170,51 @@ local function get_creative_formspec(player_name, start_i, pagenum, page, pagema
pagenum = math.floor(pagenum) or 1 pagenum = math.floor(pagenum) or 1
pagemax = (pagemax and pagemax ~= 0) and pagemax or 1 pagemax = (pagemax and pagemax ~= 0) and pagemax or 1
local slider_height = 4 / pagemax local slider_height = 4 / pagemax
local slider_pos = slider_height * (pagenum - 1) + 2.2 local slider_pos = slider_height * (pagenum - 1) + 2.15
local formspec = "" local formspec = ""
local main_list = "list[detached:creative_" .. player_name .. local main_list = "list[detached:creative_" .. player_name ..
";main;0,1.75;9,5;"..tostring(start_i).."]" ";main;0,1.69;9,5;"..tostring(start_i).."]"
local name = "all" local name = "all"
if page ~= nil then name = page end if page ~= nil then name = page end
if name == "inv" then if name == "inv" then
main_list = "image[-0.2,1.7;11.35,2.33;creative_bg.png]".. main_list = "image[-0.2,1.6;11.35,2.33;creative_bg.png]"..
"image[-0.3,0.15;3,4.3;inventory_armor.png]".. "image[-0.3,0.15;3,4.3;inventory_armor.png]"..
"list[current_player;main;0,3.75;9,3;9]".. "list[current_player;main;0,3.68;9,3;9]"..
"list[detached:"..player_name.."_armor;armor;0.02,1.7;1,1;]".. "list[detached:"..player_name.."_armor;armor;0.02,1.7;1,1;]"..
"list[detached:"..player_name.."_armor;armor;0.02,2.7;1,1;1]".. "list[detached:"..player_name.."_armor;armor;0.02,2.7;1,1;1]"..
"list[detached:"..player_name.."_armor;armor;0.98,1.7;1,1;2]".. "list[detached:"..player_name.."_armor;armor;0.98,1.7;1,1;2]"..
"list[detached:"..player_name.."_armor;armor;0.98,2.7;1,1;3]" "list[detached:"..player_name.."_armor;armor;0.98,2.7;1,1;3]"
end end
local formspec = "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]".. local formspec = "image_button_exit[10.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
"background[-0.19,-0.25;10.5,9.87;inventory_creative.png]".. "background[-0.19,-0.25;11.5,8.5;inventory_creative.png]"..
"bgcolor[#080808BB;true]".. "bgcolor[#080808BB;true]"..
"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]".. "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
"label[-5,-5;"..name.."]".. "label[-5,-5;"..name.."]"..
"image_button[-0.1,0;1,1;"..bg["blocks"]..";build;;;false]".. --build blocks "image_button[-0.16,-0.15;1,1;"..bg["blocks"]..";build;;;false]".. --build blocks
"image_button[1.15,0;1,1;"..bg["deco"]..";deco;;;false]".. --decoration blocks "image_button[0.87,-0.15;1,1;"..bg["deco"]..";deco;;;false]".. --decoration blocks
"image_button[2.415,0;1,1;"..bg["mese"]..";mese;;;false]".. --bluestone "image_button[1.92,-0.15;1,1;"..bg["mese"]..";mese;;;false]".. --bluestone
"image_button[3.693,0;1,1;"..bg["rail"]..";rail;;;false]".. --transportation "image_button[2.96,-0.15;1,1;"..bg["rail"]..";rail;;;false]".. --transportation
"image_button[4.93,0;1,1;"..bg["misc"]..";misc;;;false]".. --miscellaneous "image_button[4,-0.15;1,1;"..bg["misc"]..";misc;;;false]".. --miscellaneous
"image_button[9.19,0;1,1;"..bg["all"]..";default;;;false]".. --search "image[0,0.95;5,0.75;fnt_"..name..".png]"..
"image[0,1;5,0.75;fnt_"..name..".png]".. "list[current_player;main;0,6.955;9,1;]"..main_list..
"list[current_player;main;0,7;9,1;]".. "image_button[9.02,1.69;0.98,0.6;creative_up.png;creative_prev;]"..
main_list.. "image_button[9.02,6.08;0.98,0.6;creative_down.png;creative_next;]"..
"image_button[9.03,1.74;0.85,0.6;creative_up.png;creative_prev;]".. "image_button[5.05,-0.15;1,1;"..bg["food"]..";food;;;false]".. --foodstuff
"image_button[9.03,6.15;0.85,0.6;creative_down.png;creative_next;]".. "image_button[6.1,-0.15;1,1;"..bg["tools"]..";tools;;;false]".. --tools
"image_button[-0.1,8.28;1,1;"..bg["food"]..";food;;;false]".. --foodstuff "image_button[7.15,-0.15;1,1;"..bg["combat"]..";combat;;;false]".. --combat
"image_button[1.15,8.28;1,1;"..bg["tools"]..";tools;;;false]".. --tools "image_button[8.17,-0.15;1,1;"..bg["matr"]..";matr;;;false]".. --materials
"image_button[2.415,8.28;1,1;"..bg["combat"]..";combat;;;false]".. --combat "image_button[9.2,-0.15;1,1;"..bg["brew"]..";brew;;;false]".. --brewing
"image_button[3.693,8.28;1,1;"..bg["matr"]..";matr;;;false]".. --brewing "image_button[10.27,1;1,1;"..bg["all"]..";default;;;false]".. --all items
"image_button[4.93,8.28;1,1;"..bg["brew"]..";brew;;;false]".. --materials "image_button[10.27,7.15;1,1;"..bg["inv"]..";inv;;;false]".. --inventory
"image_button[9.19,8.28;1,1;"..bg["inv"]..";inv;;;false]".. --inventory "list[detached:creative_trash;main;9.02,6.955;1,1;]"..
"list[detached:creative_trash;main;9.02,7.02;1,1;]".. "image["..ofs_tab[name]..";1.45,1.45;creative_active.png"..rot[name].."]"..
"image["..ofs[name].x..", "..ofs[name].y..";1.5,1.44;creative_active.png"..hoch[name].."]".. "image["..ofs_img[name]..";1,1;"..bg[name].."]"..
"image["..(ofs[name].x + 0.17)..", "..(ofs[name].y + ofy[name])..";1,1;"..bg[name].."]".. "image[9.04," .. tostring(slider_pos) .. ";0.93,"..tostring(slider_height) .. ";creative_slider.png]"
"image[9.04," .. tostring(slider_pos) .. ";0.78,"..tostring(slider_height) .. ";creative_slider.png]"
if name == "all" then if name == "all" then
formspec = formspec .. "field_close_on_enter[suche;false]" .. formspec = formspec .. "field_close_on_enter[search;false]"..
"field[5.3,1.3;4,0.75;suche;;]" "field[5.3,1.27;4,0.75;search;;]"..
"image_button[9.02,0.93;1,0.8;creative_search.png;creative_search;;;false]"
end end
if pagenum ~= nil then if pagenum ~= nil then
formspec = formspec .. "p"..tostring(pagenum) formspec = formspec .. "p"..tostring(pagenum)
@ -236,7 +237,7 @@ function creative.register_tab(name, title, items)
local pagemax = math.ceil(inv.size / (5*9)) local pagemax = math.ceil(inv.size / (5*9))
local formspec = get_creative_formspec(player_name, start_i, local formspec = get_creative_formspec(player_name, start_i,
pagenum, name, pagemax) pagenum, name, pagemax)
return sfinv.make_formspec(player, context, formspec, false, "size[10,9.3]") return sfinv.make_formspec(player, context, formspec, false, "size[11,9]")
end, end,
on_enter = function(self, player, context) on_enter = function(self, player, context)
local player_name = player:get_player_name() local player_name = player:get_player_name()
@ -275,10 +276,11 @@ function creative.register_tab(name, title, items)
sfinv.set_page(player, "creative:inv") sfinv.set_page(player, "creative:inv")
elseif fields.brew then elseif fields.brew then
sfinv.set_page(player, "creative:brew") sfinv.set_page(player, "creative:brew")
elseif fields.suche and elseif fields.search and
fields.key_enter_field == "suche" then (fields.creative_search or
fields.key_enter_field == "search") then
inv.start_i = 0 inv.start_i = 0
inv.filter = fields.suche:lower() inv.filter = fields.search:lower()
creative.update_creative_inventory(player_name, items) creative.update_creative_inventory(player_name, items)
sfinv.set_player_inventory_formspec(player, context) sfinv.set_player_inventory_formspec(player, context)
elseif not fields.quit then elseif not fields.quit then
@ -297,7 +299,6 @@ function creative.register_tab(name, title, items)
start_i = 0 start_i = 0
end end
end end
inv.start_i = start_i inv.start_i = start_i
sfinv.set_player_inventory_formspec(player, context) sfinv.set_player_inventory_formspec(player, context)
end end

BIN
games/default/files/creative/textures/creative_active.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 246 B

BIN
games/default/files/creative/textures/inventory_creative.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

43
games/default/files/default/chests.lua
View File

@ -26,20 +26,6 @@ local function get_chest_neighborpos(pos, param2, side)
end end
end end
local function hacky_swap_node(pos,name, param2)
local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos)
if node.name == name then
return
end
node.name = name
node.param2 = param2 or node.param2
local meta0 = meta:to_table()
minetest.set_node(pos,node)
meta = minetest.get_meta(pos)
meta:from_table(meta0)
end
default.chest_formspec = default.chest_formspec =
"size[9,9.75]".. "size[9,9.75]"..
"image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]".. "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
@ -53,27 +39,6 @@ default.chest_formspec =
local chest_inv_size = 4*9 local chest_inv_size = 4*9
local chest_inv_vers = 2 local chest_inv_vers = 2
function default.get_locked_chest_formspec(pos)
local meta = minetest.get_meta(pos)
local inv_v = meta:get_int("chest_inv_ver")
if inv_v and inv_v < chest_inv_vers then
local inv = meta:get_inventory()
inv:set_size("main",chest_inv_size)
meta:set_int("chest_inv_ver",chest_inv_vers)
end
local spos = pos.x .. "," .. pos.y .. "," ..pos.z
local formspec =
"size[9,9.75]"..
"image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
"background[-0.19,-0.25;9.41,10.48;formspec_chest.png]"..
"bgcolor[#080808BB;true]"..
"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
"list[nodemeta:".. spos .. ";main;0,0.5;9,4;]"..
"list[current_player;main;0,5.5;9,3;9]"..
"list[current_player;main;0,8.74;9,1;]"
return formspec
end
minetest.register_abm({ minetest.register_abm({
nodenames = {"default:chest"}, nodenames = {"default:chest"},
interval = 1, interval = 1,
@ -111,7 +76,7 @@ minetest.register_node("default:chest", {
"list[current_player;main;0,7;9,3;9]".. "list[current_player;main;0,7;9,3;9]"..
"list[current_player;main;0,10.5;9,1;]") "list[current_player;main;0,10.5;9,1;]")
meta:set_string("infotext", "Large Chest") meta:set_string("infotext", "Large Chest")
hacky_swap_node(p, "default:chest_left", param2) minetest.swap_node(p, {name="default:chest_left", param2=param2})
local m = minetest.get_meta(p) local m = minetest.get_meta(p)
m:set_string("formspec", m:set_string("formspec",
"size[9,11.5]".. "size[9,11.5]"..
@ -132,7 +97,7 @@ minetest.register_node("default:chest", {
"list[current_player;main;0,7;9,3;9]".. "list[current_player;main;0,7;9,3;9]"..
"list[current_player;main;0,10.5;9,1;]") "list[current_player;main;0,10.5;9,1;]")
meta:set_string("infotext", "Large Chest") meta:set_string("infotext", "Large Chest")
hacky_swap_node(p, "default:chest_right", param2) minetest.swap_node(p, {name="default:chest_right", param2=param2})
local m = minetest.get_meta(p) local m = minetest.get_meta(p)
m:set_string("formspec", m:set_string("formspec",
"size[9,11.5]".. "size[9,11.5]"..
@ -214,7 +179,7 @@ minetest.register_node("default:chest_left", {
"list[current_player;main;0,4;9,3;9]".. "list[current_player;main;0,4;9,3;9]"..
"list[current_player;main;0,7.5.5;9,1;]") "list[current_player;main;0,7.5.5;9,1;]")
meta:set_string("infotext", "Chest") meta:set_string("infotext", "Chest")
hacky_swap_node(p, "default:chest") minetest.swap_node(p, {name="default:chest", param2=param2})
end, end,
after_dig_node = function(pos, oldnode, oldmetadata, digger) after_dig_node = function(pos, oldnode, oldmetadata, digger)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -269,7 +234,7 @@ minetest.register_node("default:chest_right", {
"list[current_player;main;0,4;9,3;9]".. "list[current_player;main;0,4;9,3;9]"..
"list[current_player;main;0,7.5.5;9,1;]") "list[current_player;main;0,7.5.5;9,1;]")
meta:set_string("infotext", "Chest") meta:set_string("infotext", "Chest")
hacky_swap_node(p, "default:chest") minetest.swap_node(p, {name="default:chest", param2=param2})
end, end,
after_dig_node = function(pos, oldnode, oldmetadata, digger) after_dig_node = function(pos, oldnode, oldmetadata, digger)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)