From fab2c492c4cfe8e0fbca2c62c0de45744436481f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Tue, 11 Apr 2017 19:16:50 -0400 Subject: [PATCH] pipeworks has button on/off, button label, and button "base" cached used them wherever possible --- technic/machines/other/injector.lua | 8 ++--- technic/machines/register/battery_box.lua | 8 ++--- technic/machines/register/generator.lua | 40 +++++++++++----------- technic/machines/register/machine_base.lua | 24 ++++++------- technic_chests/register.lua | 4 +-- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index b23ac3e..b34dd79 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -66,13 +66,13 @@ local function set_injector_formspec(meta) "listring[]".. fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label ) end diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index 234ef9c..7238d6d 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -79,8 +79,8 @@ local function add_on_off_buttons(meta, ltier, charge_percent) "image_button[3,2.0;1,0.6", "split_src_stacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } ).."label[3.9,2.01;Allow splitting incoming 'charge' stacks from tubes]".. fs_helpers.cycling_button( @@ -88,8 +88,8 @@ local function add_on_off_buttons(meta, ltier, charge_percent) "image_button[3,2.5;1,0.6", "split_dst_stacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } ).."label[3.9,2.51;Allow splitting incoming 'discharge' stacks]" end diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua index b1a8980..9062d09 100644 --- a/technic/machines/register/generator.lua +++ b/technic/machines/register/generator.lua @@ -88,13 +88,13 @@ function technic.register_generator(data) if ltier ~= "lv" then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", "size[8, 9]".. @@ -135,13 +135,13 @@ function technic.register_generator(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", generator_formspec..form_buttons) local inv = meta:get_inventory() @@ -164,13 +164,13 @@ function technic.register_generator(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", generator_formspec..form_buttons) end, @@ -229,13 +229,13 @@ function technic.register_generator(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", "size[8, 9]".. @@ -258,13 +258,13 @@ function technic.register_generator(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end local burn_totaltime = meta:get_int("burn_totaltime") or 0 diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index 571622d..0c6a6b3 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -168,13 +168,13 @@ function technic.register_base_machine(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("infotext", machine_desc:format(tier)) @@ -202,13 +202,13 @@ function technic.register_base_machine(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", formspec..form_buttons) end, @@ -246,13 +246,13 @@ function technic.register_base_machine(data) if not string.find(node.name, ":lv_") then form_buttons = fs_helpers.cycling_button( meta, - "image_button[0,4.3;1,0.6", + pipeworks.button_base, "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_on } - ).."label[0.9,4.31;Allow splitting incoming stacks from tubes]" + )..pipeworks.button_label end meta:set_string("formspec", formspec..form_buttons) end, diff --git a/technic_chests/register.lua b/technic_chests/register.lua index b697bfd..dde7116 100644 --- a/technic_chests/register.lua +++ b/technic_chests/register.lua @@ -90,8 +90,8 @@ local function set_formspec(pos, data, page) "image_button[0,0.35;1,0.6", "splitstacks", { - {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, - {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"} + pipeworks.button_off, + pipeworks.button_off } )..allow_label