Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Utilize formspec prepend"

Browse source 
This reverts commit ea0c2e9568.
This commit is contained in:
Wuzzy 2019-03-07 12:42:08 +01:00
parent 26c9150591
commit a84f7935fa
21 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt
View file

@ -1,3 +1,4 @@
mcl_init
mesecons
mcl_sounds
mcl_tnt

1
mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
View file

@ -13,6 +13,7 @@ local setup_dispenser = function(pos)
-- Set formspec and inventory
local form = "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;crafting_inventory_9_slots.png]"..
mcl_vars.inventory_header..
"image[3,-0.2;5,0.75;mcl_dispensers_fnt_dispenser.png]"..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..

1
mods/ITEMS/REDSTONE/mcl_droppers/depends.txt
View file

@ -1,3 +1,4 @@
mcl_init
mesecons
mcl_util
doc?

1
mods/ITEMS/REDSTONE/mcl_droppers/init.lua
View file

@ -13,6 +13,7 @@ local setup_dropper = function(pos)
-- Set formspec and inventory
local form = "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;crafting_inventory_9_slots.png]"..
mcl_vars.inventory_header..
"image[3,-0.2;5,0.75;mcl_droppers_fnt_dropper.png]"..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..

1
mods/ITEMS/mcl_anvils/depends.txt
View file

@ -1,3 +1,4 @@
mcl_init
mcl_sounds
mcl_core?
screwdriver?

1
mods/ITEMS/mcl_anvils/init.lua
View file

@ -15,6 +15,7 @@ local function get_anvil_formspec(set_name)
end
return "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;mcl_anvils_inventory.png]"..
mcl_vars.inventory_header..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..
"list[context;input;1,2.5;1,1;]"..

2
mods/ITEMS/mcl_beds/functions.lua
View file

@ -196,7 +196,7 @@ end
local function update_formspecs(finished)
local ges = #minetest.get_connected_players()
local form_n = "size[8,15;true]no_prepend[]"
local form_n = "size[8,15;true]"
local all_in_bed = ges == player_in_bed
local night_skip = is_night_skip_enabled()
local button_leave = "button_exit[2,12;4,0.75;leave;Leave bed]"

1
mods/ITEMS/mcl_chests/depends.txt
View file

@ -1,3 +1,4 @@
mcl_init
mcl_core
mcl_sounds
mcl_end

5
mods/ITEMS/mcl_chests/init.lua
View file

@ -170,6 +170,7 @@ minetest.register_node("mcl_chests:"..basename, {
minetest.show_formspec(clicker:get_player_name(),
"mcl_chests:"..formspec_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z,
"size[9,8.75]"..
mcl_vars.inventory_header..
"background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]"..
"image[0,-0.2;5,0.75;mcl_chests_fnt_chest.png]"..
"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]"..
@ -292,6 +293,7 @@ minetest.register_node("mcl_chests:"..basename.."_left", {
"mcl_chests:"..formspec_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z,
"size[9,11.5]"..
"background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]"..
mcl_vars.inventory_header..
"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]"..
"list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,3.5;9,3;]"..
"list[current_player;main;0,7.5;9,3;9]"..
@ -413,6 +415,7 @@ minetest.register_node("mcl_chests:"..basename.."_right", {
"size[9,11.5]"..
"background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]"..
mcl_vars.inventory_header..
"list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,0.5;9,3;]"..
"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]"..
"list[current_player;main;0,7.5;9,3;9]"..
@ -615,6 +618,7 @@ minetest.register_node("mcl_chests:ender_chest", {
local meta = minetest.get_meta(pos)
meta:set_string("formspec",
"size[9,8.75]"..
mcl_vars.inventory_header..
"background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]"..
"image[0,-0.2;5,0.75;mcl_chests_fnt_ender_chest.png]"..
"list[current_player;enderchest;0,0.5;9,3;]"..
@ -709,6 +713,7 @@ for color, desc in pairs(boxtypes) do
local meta = minetest.get_meta(pos)
meta:set_string("formspec",
"size[9,8.75]"..
mcl_vars.inventory_header..
"background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]"..
"image[0,-0.2;5,0.75;mcl_chests_fnt_shulker_box.png]"..
"list[current_name;main;0,0.5;9,3;]"..

1
mods/ITEMS/mcl_crafting_table/depends.txt
View file

@ -1 +1,2 @@
mcl_init
mcl_sounds

1
mods/ITEMS/mcl_crafting_table/init.lua
View file

@ -14,6 +14,7 @@ minetest.register_node("mcl_crafting_table:crafting_table", {
local form = "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_workbench.png]"..
mcl_vars.inventory_header..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..
"list[current_player;craft;1.75,0.5;3,3;]"..

1
mods/ITEMS/mcl_furnaces/depends.txt
View file

@ -1,3 +1,4 @@
mcl_init
mcl_core
mcl_sounds
mcl_craftguide

2
mods/ITEMS/mcl_furnaces/init.lua
View file

@ -6,6 +6,7 @@
local function active_formspec(fuel_percent, item_percent)
return "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]"..
mcl_vars.inventory_header..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..
"list[current_name;src;2.75,0.5;1,1;]"..
@ -28,6 +29,7 @@ end
local inactive_formspec = "size[9,8.75]"..
"background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]"..
mcl_vars.inventory_header..
"list[current_player;main;0,4.5;9,3;9]"..
"list[current_player;main;0,7.74;9,1;]"..
"list[current_name;src;2.75,0.5;1,1;]"..

1
mods/ITEMS/mcl_hoppers/init.lua
View file

@ -6,6 +6,7 @@ local chest = minetest.get_content_id("mcl_chests:chest")
local mcl_hoppers_formspec =
"size[9,7]"..
"background[-0.19,-0.25;9.41,10.48;mcl_hoppers_inventory.png]"..
mcl_vars.inventory_header..
"list[current_name;main;2,0.5;5,1;]"..
"list[current_player;main;0,2.5;9,3;9]"..
"list[current_player;main;0,5.74;9,1;]"..