From 20b804ab74d92998dc700b8b8da8836dc8631737 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 6 Jan 2017 00:03:57 +0100 Subject: [PATCH] Fix furnace formspecs --- mods/craftingpack/crafting/formspecs.lua | 31 ------------------ .../textures/crafting_furnace_fire_bg.png | Bin 233 -> 0 bytes .../textures/crafting_furnace_fire_bg_on.png | Bin 372 -> 0 bytes mods/default/nodes.lua | 30 +++++++++-------- .../textures/crafting_inventory_furnace.png | Bin .../crafting_inventory_furnace_on.png | Bin 6 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 mods/craftingpack/crafting/textures/crafting_furnace_fire_bg.png delete mode 100644 mods/craftingpack/crafting/textures/crafting_furnace_fire_bg_on.png rename mods/{craftingpack/crafting => default}/textures/crafting_inventory_furnace.png (100%) rename mods/{craftingpack/crafting => default}/textures/crafting_inventory_furnace_on.png (100%) diff --git a/mods/craftingpack/crafting/formspecs.lua b/mods/craftingpack/crafting/formspecs.lua index 8d02112ba5..924019e647 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 06109a2d493e3b1f6fa21c780eb9200fbe27b2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p<)L71^VC4M4MP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM z&oalj&JU<2%G1R$#KQk=pCey`0SC+9|EqsUmilg6m?qf6u5atZ$(&QQ&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM z&oalj&JU>Osi%u$h=u>s35I-3hCD2b7cX@A&S}@|;_lx1Lw5f|)-QV)AA4>JEJ|k- zI+}F9s{HMQGjH@;mK50g#XXuSFzG?zuROM&>LT&#zh5?aOxfwrXcuf>!@(ut#3UOr zch>yoAKP@de#-c@{M6(ed%jsWpNY*`EvD-|dUaMLAT+C`Crvp9A N;OXk;vd$@?2>?^xh-Ux* diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 8a7dd03d60..de9034d764 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