diff --git a/mods/craftingpack/crafting/formspecs.lua b/mods/craftingpack/crafting/formspecs.lua index 8d02112ba..924019e64 100644 --- a/mods/craftingpack/crafting/formspecs.lua +++ b/mods/craftingpack/crafting/formspecs.lua @@ -1,34 +1,3 @@ -default.furnace_inactive_formspec = - "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. - default.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;]".. - "list[current_name;fuel;2.75,2.5;1,1;]".. - "list[current_name;dst;5.75,1.5;1,1;]".. - "image[2.75,1.5;1,1;crafting_furnace_fire_bg.png" - -function default.get_furnace_active_formspec(pos, percent) - local formspec = - "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. - default.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;]".. - "list[current_name;fuel;2.75,2.5;1,1;]".. - "list[current_name;dst;5.75,1.5;1,1;]".. - "image[2.75,1.5;1,1;crafting_furnace_fire_bg.png^[lowpart:".. - (100-percent)..":default_furnace_fire_fg.png]" - - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - inv:set_size("dst",1) - - return formspec -end - default.chest_formspec = "size[9,9.75]".. "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. diff --git a/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg.png b/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg.png deleted file mode 100644 index 06109a2d4..000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg_on.png b/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg_on.png deleted file mode 100644 index 39f58e739..000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_furnace_fire_bg_on.png and /dev/null differ diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 8a7dd03d6..de9034d76 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1360,13 +1360,15 @@ minetest.register_node("default:chest_right", { }) default.furnace_inactive_formspec = - "size[9,9]".. + "size[9,8.75]".. + "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. default.inventory_header.. - "image[2,2;1,1;default_furnace_fire_bg.png]".. - "list[current_name;fuel;2,3;1,1;]".. - "list[current_name;src;2,1;1,1;]".. - "list[current_name;dst;5,1;2,2;]".. - "list[current_player;main;0,5;9,4;]".. + "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;]".. + "list[current_name;fuel;2.75,2.5;1,1;]".. + "list[current_name;dst;5.75,1.5;1,1;]".. + "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. "listring[current_name;dst]".. "listring[current_player;main]".. "listring[current_name;src]".. @@ -1582,14 +1584,16 @@ minetest.register_abm({ meta:set_string("infotext","Furnace active: "..percent.."%") hacky_swap_node(pos,"default:furnace_active") meta:set_string("formspec", - "size[9,9]".. + "size[9,8.75]".. + "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. default.inventory_header.. - "image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:".. - (100-percent)..":default_furnace_fire_fg.png]".. - "list[current_name;fuel;2,3;1,1;]".. - "list[current_name;src;2,1;1,1;]".. - "list[current_name;dst;5,1;2,2;]".. - "list[current_player;main;0,5;9,4;]".. + "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;]".. + "list[current_name;fuel;2.75,2.5;1,1;]".. + "list[current_name;dst;5.75,1.5;1,1;]".. + "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. + (100-percent)..":default_furnace_fire_fg.png]".. "listring[current_name;dst]".. "listring[current_player;main]".. "listring[current_name;src]".. diff --git a/mods/craftingpack/crafting/textures/crafting_inventory_furnace.png b/mods/default/textures/crafting_inventory_furnace.png similarity index 100% rename from mods/craftingpack/crafting/textures/crafting_inventory_furnace.png rename to mods/default/textures/crafting_inventory_furnace.png diff --git a/mods/craftingpack/crafting/textures/crafting_inventory_furnace_on.png b/mods/default/textures/crafting_inventory_furnace_on.png similarity index 100% rename from mods/craftingpack/crafting/textures/crafting_inventory_furnace_on.png rename to mods/default/textures/crafting_inventory_furnace_on.png