mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-26 04:21:07 +01:00
replace deprecated "current_name" by "context" for inventory location
This commit is contained in:
parent
4324e97db0
commit
a896d7f5e4
7 changed files with 30 additions and 30 deletions
|
@ -19,9 +19,9 @@ local function setup_dispenser(pos)
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
||||||
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dispenser"))).."]"..
|
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dispenser"))).."]"..
|
||||||
"list[current_name;main;3,0.5;3,3;]"..
|
"list[context;main;3,0.5;3,3;]"..
|
||||||
mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
|
mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
|
||||||
"listring[current_name;main]"..
|
"listring[context;main]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("formspec", form)
|
meta:set_string("formspec", form)
|
||||||
|
|
|
@ -20,9 +20,9 @@ local function setup_dropper(pos)
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
||||||
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
|
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
|
||||||
"list[current_name;main;3,0.5;3,3;]"..
|
"list[context;main;3,0.5;3,3;]"..
|
||||||
mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
|
mcl_formspec.get_itemslot_bg(3,0.5,3,3)..
|
||||||
"listring[current_name;main]"..
|
"listring[context;main]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("formspec", form)
|
meta:set_string("formspec", form)
|
||||||
|
|
|
@ -19,8 +19,8 @@ local function setup_dropper(pos)
|
||||||
"list[current_player;main;0,4.5;9,3;9]"..
|
"list[current_player;main;0,4.5;9,3;9]"..
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
|
"label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]"..
|
||||||
"list[current_name;main;3,0.5;3,3;]"..
|
"list[context;main;3,0.5;3,3;]"..
|
||||||
"listring[current_name;main]"..
|
"listring[context;main]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("formspec", form)
|
meta:set_string("formspec", form)
|
||||||
|
|
|
@ -10,9 +10,9 @@ local function active_brewing_formspec(fuel_percent, brew_percent)
|
||||||
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
||||||
"list[current_player;main;0,7.75;9,1;]"..
|
"list[current_player;main;0,7.75;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
|
||||||
"list[current_name;fuel;0.5,1.75;1,1;]"..
|
"list[context;fuel;0.5,1.75;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
|
mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
|
||||||
"list[current_name;input;2.75,0.5;1,1;]"..
|
"list[context;input;2.75,0.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
||||||
"list[context;stand;4.5,2.5;1,1;]"..
|
"list[context;stand;4.5,2.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
|
mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
|
||||||
|
@ -28,8 +28,8 @@ local function active_brewing_formspec(fuel_percent, brew_percent)
|
||||||
(brew_percent)..":mcl_brewing_bubbles_active.png]"..
|
(brew_percent)..":mcl_brewing_bubbles_active.png]"..
|
||||||
|
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;fuel]"..
|
"listring[context;fuel]"..
|
||||||
"listring[current_name;input]"..
|
"listring[context;input]"..
|
||||||
"listring[context;stand]"
|
"listring[context;stand]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -41,9 +41,9 @@ local brewing_formspec = "size[9,8.75]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
||||||
"list[current_player;main;0,7.75;9,1;]"..
|
"list[current_player;main;0,7.75;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.75,9,1)..
|
||||||
"list[current_name;fuel;0.5,1.75;1,1;]"..
|
"list[context;fuel;0.5,1.75;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
|
mcl_formspec.get_itemslot_bg(0.5,1.75,1,1).."image[0.5,1.75;1,1;mcl_brewing_fuel_bg.png]"..
|
||||||
"list[current_name;input;2.75,0.5;1,1;]"..
|
"list[context;input;2.75,0.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
||||||
"list[context;stand;4.5,2.5;1,1;]"..
|
"list[context;stand;4.5,2.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
|
mcl_formspec.get_itemslot_bg(4.5,2.5,1,1).."image[4.5,2.5;1,1;mcl_brewing_bottle_bg.png]"..
|
||||||
|
@ -56,8 +56,8 @@ local brewing_formspec = "size[9,8.75]"..
|
||||||
"image[2.76,1.4;1,2.15;mcl_brewing_bubbles.png]"..
|
"image[2.76,1.4;1,2.15;mcl_brewing_bubbles.png]"..
|
||||||
|
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;fuel]"..
|
"listring[context;fuel]"..
|
||||||
"listring[current_name;input]"..
|
"listring[context;input]"..
|
||||||
"listring[context;stand]"
|
"listring[context;stand]"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1108,14 +1108,14 @@ local function formspec_shulker_box(name)
|
||||||
end
|
end
|
||||||
return "size[9,8.75]"..
|
return "size[9,8.75]"..
|
||||||
"label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]"..
|
"label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]"..
|
||||||
"list[current_name;main;0,0.5;9,3;]"..
|
"list[context;main;0,0.5;9,3;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,0.5,9,3)..
|
mcl_formspec.get_itemslot_bg(0,0.5,9,3)..
|
||||||
"label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
|
"label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
|
||||||
"list[current_player;main;0,4.5;9,3;9]"..
|
"list[current_player;main;0,4.5;9,3;9]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
mcl_formspec.get_itemslot_bg(0,4.5,9,3)..
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
||||||
"listring[current_name;main]"..
|
"listring[context;main]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -15,11 +15,11 @@ local function active_formspec(fuel_percent, item_percent)
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
||||||
"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
|
"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
|
||||||
"list[current_name;src;2.75,0.5;1,1;]"..
|
"list[context;src;2.75,0.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
||||||
"list[current_name;fuel;2.75,2.5;1,1;]"..
|
"list[context;fuel;2.75,2.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
|
||||||
"list[current_name;dst;5.75,1.5;1,1;]"..
|
"list[context;dst;5.75,1.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
|
mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
|
||||||
"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
|
"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
|
||||||
(100-fuel_percent)..":default_furnace_fire_fg.png]"..
|
(100-fuel_percent)..":default_furnace_fire_fg.png]"..
|
||||||
|
@ -29,11 +29,11 @@ local function active_formspec(fuel_percent, item_percent)
|
||||||
-- TODO: Add it back when the Minetest bug is fixed.
|
-- TODO: Add it back when the Minetest bug is fixed.
|
||||||
--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
|
--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
|
||||||
--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
|
--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
|
||||||
"listring[current_name;dst]"..
|
"listring[context;dst]"..
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;src]"..
|
"listring[context;src]"..
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;fuel]"..
|
"listring[context;fuel]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -44,11 +44,11 @@ local inactive_formspec = "size[9,8.75]"..
|
||||||
"list[current_player;main;0,7.74;9,1;]"..
|
"list[current_player;main;0,7.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,7.74,9,1)..
|
||||||
"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
|
"label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]"..
|
||||||
"list[current_name;src;2.75,0.5;1,1;]"..
|
"list[context;src;2.75,0.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,0.5,1,1)..
|
||||||
"list[current_name;fuel;2.75,2.5;1,1;]"..
|
"list[context;fuel;2.75,2.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
|
mcl_formspec.get_itemslot_bg(2.75,2.5,1,1)..
|
||||||
"list[current_name;dst;5.75,1.5;1,1;]"..
|
"list[context;dst;5.75,1.5;1,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
|
mcl_formspec.get_itemslot_bg(5.75,1.5,1,1)..
|
||||||
"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
|
"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
|
||||||
"image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]"..
|
"image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]"..
|
||||||
|
@ -56,11 +56,11 @@ local inactive_formspec = "size[9,8.75]"..
|
||||||
-- TODO: Add it back when the Minetest bug is fixed.
|
-- TODO: Add it back when the Minetest bug is fixed.
|
||||||
--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
|
--"image_button[8,0;1,1;craftguide_book.png;craftguide;]"..
|
||||||
--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
|
--"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]"..
|
||||||
"listring[current_name;dst]"..
|
"listring[context;dst]"..
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;src]"..
|
"listring[context;src]"..
|
||||||
"listring[current_player;main]"..
|
"listring[current_player;main]"..
|
||||||
"listring[current_name;fuel]"..
|
"listring[context;fuel]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
|
|
||||||
local receive_fields = function(pos, formname, fields, sender)
|
local receive_fields = function(pos, formname, fields, sender)
|
||||||
|
|
|
@ -5,14 +5,14 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
local mcl_hoppers_formspec =
|
local mcl_hoppers_formspec =
|
||||||
"size[9,7]"..
|
"size[9,7]"..
|
||||||
"label[2,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Hopper"))).."]"..
|
"label[2,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Hopper"))).."]"..
|
||||||
"list[current_name;main;2,0.5;5,1;]"..
|
"list[context;main;2,0.5;5,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(2,0.5,5,1)..
|
mcl_formspec.get_itemslot_bg(2,0.5,5,1)..
|
||||||
"label[0,2;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
|
"label[0,2;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]"..
|
||||||
"list[current_player;main;0,2.5;9,3;9]"..
|
"list[current_player;main;0,2.5;9,3;9]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,2.5,9,3)..
|
mcl_formspec.get_itemslot_bg(0,2.5,9,3)..
|
||||||
"list[current_player;main;0,5.74;9,1;]"..
|
"list[current_player;main;0,5.74;9,1;]"..
|
||||||
mcl_formspec.get_itemslot_bg(0,5.74,9,1)..
|
mcl_formspec.get_itemslot_bg(0,5.74,9,1)..
|
||||||
"listring[current_name;main]"..
|
"listring[context;main]"..
|
||||||
"listring[current_player;main]"
|
"listring[current_player;main]"
|
||||||
|
|
||||||
-- Downwards hopper (base definition)
|
-- Downwards hopper (base definition)
|
||||||
|
|
Loading…
Reference in a new issue