From d4d25eee44b4576e757926c42d70fad21a8d8a29 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 25 Feb 2021 02:49:07 -0500 Subject: [PATCH] update homedecor, ilights, led_marquee, nixie_tubes, and simple_streetlights --- mods/homedecor_books/init.lua | 2 +- mods/homedecor_lighting/init.lua | 5 ++++- mods/ilights/init.lua | 5 ++++- mods/led_marquee/init.lua | 7 ++++++- mods/nixie_tubes/init.lua | 7 ++++++- mods/simple_streetlights/simple.lua | 5 ++++- mods/technic/machines/.switching_station.lua.swp | Bin 1024 -> 0 bytes 7 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 mods/technic/machines/.switching_station.lua.swp diff --git a/mods/homedecor_books/init.lua b/mods/homedecor_books/init.lua index 28dd0cbb..59ed57b4 100644 --- a/mods/homedecor_books/init.lua +++ b/mods/homedecor_books/init.lua @@ -27,7 +27,7 @@ for _, c in ipairs(bookcolors) do local color, hue = unpack(c) local function book_dig(pos, node, digger) - if minetest.is_protected(pos, digger:get_player_name()) then return end + if not digger or minetest.is_protected(pos, digger:get_player_name()) then return end local meta = minetest.get_meta(pos) local data = minetest.serialize({ title = meta:get_string("title") or "", diff --git a/mods/homedecor_lighting/init.lua b/mods/homedecor_lighting/init.lua index 9a1cf7d4..ab473868 100644 --- a/mods/homedecor_lighting/init.lua +++ b/mods/homedecor_lighting/init.lua @@ -162,7 +162,10 @@ if minetest.get_modpath("digilines") then if puncher:get_player_control().sneak then local name = puncher:get_player_name() player_last_clicked[name] = pos - local form = "field[channel;Channel;]" + local form = "formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel;]" minetest.show_formspec(name, "homedecor:lamp_set_channel", form) end end diff --git a/mods/ilights/init.lua b/mods/ilights/init.lua index fe75d4c8..d8e8316b 100644 --- a/mods/ilights/init.lua +++ b/mods/ilights/init.lua @@ -141,7 +141,10 @@ if minetest.get_modpath("digilines") then local name = puncher:get_player_name() player_last_clicked[name] = pos local meta = minetest.get_meta(pos) - local form = "field[channel;Channel;]" + local form = "formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel;]" minetest.show_formspec(name, "ilights:set_channel", form) end end diff --git a/mods/led_marquee/init.lua b/mods/led_marquee/init.lua index 0f529e74..02afc440 100644 --- a/mods/led_marquee/init.lua +++ b/mods/led_marquee/init.lua @@ -103,7 +103,12 @@ local char_to_color = { -- the following functions based on the so-named ones in Jeija's digilines mod local reset_meta = function(pos) - minetest.get_meta(pos):set_string("formspec", "field[channel;Channel;${channel}]") + minetest.get_meta(pos):set_string("formspec", + "formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel;${channel}]" + ) end local on_digiline_receive_std = function(pos, node, channel, msg) diff --git a/mods/nixie_tubes/init.lua b/mods/nixie_tubes/init.lua index 3d710693..c11c22a7 100644 --- a/mods/nixie_tubes/init.lua +++ b/mods/nixie_tubes/init.lua @@ -34,7 +34,12 @@ local tube_cbox = { -- the following functions based on the so-named ones in Jeija's digilines mod local reset_meta = function(pos) - minetest.get_meta(pos):set_string("formspec", "field[channel;Channel;${channel}]") + minetest.get_meta(pos):set_string("formspec", + "formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel;${channel}]" + ) end local on_digiline_receive_std = function(pos, node, channel, msg) diff --git a/mods/simple_streetlights/simple.lua b/mods/simple_streetlights/simple.lua index bf659bb0..7ae984d3 100644 --- a/mods/simple_streetlights/simple.lua +++ b/mods/simple_streetlights/simple.lua @@ -41,7 +41,10 @@ if enable_digilines then function ilights.digiline_on_use(itemstack, user, pointed_thing) if user and user:get_player_control().sneak then local name = user:get_player_name() - local form = "field[channel;Set a channel for future streetlights;]" + local form ="formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel for future streetlights;]" minetest.show_formspec(name, "simple_streetlights:set_channel", form) end end diff --git a/mods/technic/machines/.switching_station.lua.swp b/mods/technic/machines/.switching_station.lua.swp deleted file mode 100644 index cef066ca764fabad1412baf79576d06fe2be838b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmeH@%?ZOW425&;7G0om5A7J8!N|5q1eOez($e+1RxbU?C4oQ}ur7Lf55eOLX8|e4 zYk%oBGrtbq9RyWj