From 59c22bf022d676a8cf942f0b4d4f7090aa8844b1 Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 10 Apr 2020 09:33:14 -0700 Subject: [PATCH] furnace: Add default.get_furnace_formspec() to reduce code duplication. This deprecates default.get_furnace_active_formspec() and default.get_furnace_inactive_formspec(). --- mods/default/furnace.lua | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index 3c4ac9c8..f113d2c8 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -7,14 +7,22 @@ local S = default.get_translator -- Formspecs -- -function default.get_furnace_active_formspec(fuel_percent, item_percent) +function default.get_furnace_formspec(fuel_percent, item_percent) + local furnace_image + -- active furnace + if fuel_percent then + furnace_image = "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. + (fuel_percent)..":default_furnace_fire_fg.png]".. + "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:".. + (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]" + else + furnace_image = "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. + "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]" + end return "size[8,8.5]".. "list[context;src;2.75,0.5;1,1;]".. "list[context;fuel;2.75,2.5;1,1;]".. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. - (fuel_percent)..":default_furnace_fire_fg.png]".. - "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:".. - (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. + furnace_image.. "list[context;dst;4.75,0.96;2,2;]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. @@ -27,22 +35,12 @@ function default.get_furnace_active_formspec(fuel_percent, item_percent) default.get_hotbar_bg(0, 4.25) end +function default.get_furnace_active_formspec(fuel_percent, item_percent) + return default.get_furnace_formspec(fuel_percent, item_percent) +end + function default.get_furnace_inactive_formspec() - return "size[8,8.5]".. - "list[context;src;2.75,0.5;1,1;]".. - "list[context;fuel;2.75,2.5;1,1;]".. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. - "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]".. - "list[context;dst;4.75,0.96;2,2;]".. - "list[current_player;main;0,4.25;8,1;]".. - "list[current_player;main;0,5.5;8,3;8]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]".. - default.get_hotbar_bg(0, 4.25) + return default.get_furnace_formspec() end --