From 1a3602d6516f9b53a2be586db0d0207701d95466 Mon Sep 17 00:00:00 2001 From: mazes 80 <1608580+mazes-80@users.noreply.github.com> Date: Thu, 23 Feb 2023 13:38:40 +0100 Subject: [PATCH 1/5] Code: remove private functions from global scope --- lua/api.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/api.lua b/lua/api.lua index fb4a850..14d1818 100755 --- a/lua/api.lua +++ b/lua/api.lua @@ -45,7 +45,7 @@ drawers.drawer_formspec = "size[9,6.7]" .. drawers.get_upgrade_slots_bg(2, 0.5) -- construct drawer -function drawers.drawer_on_construct(pos) +local drawer_on_construct = function(pos) local node = core.get_node(pos) local ndef = core.registered_nodes[node.name] local drawerType = ndef.groups.drawer @@ -84,7 +84,7 @@ function drawers.drawer_on_construct(pos) end -- destruct drawer -function drawers.drawer_on_destruct(pos) +local drawer_on_destruct = function(pos) drawers.remove_visuals(pos) -- clean up visual cache @@ -94,7 +94,7 @@ function drawers.drawer_on_destruct(pos) end -- drop all items -function drawers.drawer_on_dig(pos, node, player) +local drawer_on_dig = function(pos, node, player) local drawerType = 1 if core.registered_nodes[node.name] then drawerType = core.registered_nodes[node.name].groups.drawer @@ -145,7 +145,7 @@ function drawers.drawer_on_dig(pos, node, player) core.node_dig(pos, node, player) end -function drawers.drawer_allow_metadata_inventory_put(pos, listname, index, stack, player) +local drawer_allow_metadata_inventory_put = function(pos, listname, index, stack, player) if core.is_protected(pos,player:get_player_name()) then core.record_protection_violation(pos,player:get_player_name()) return 0 @@ -162,14 +162,14 @@ function drawers.drawer_allow_metadata_inventory_put(pos, listname, index, stack return 1 end -function drawers.add_drawer_upgrade(pos, listname, index, stack, player) +local add_drawer_upgrade = function(pos, listname, index, stack, player) -- only do anything if adding to upgrades if listname ~= "upgrades" then return end drawers.update_drawer_upgrades(pos) end -function drawers.remove_drawer_upgrade(pos, listname, index, stack, player) +local remove_drawer_upgrade = function(pos, listname, index, stack, player) -- only do anything if adding to upgrades if listname ~= "upgrades" then return end @@ -291,13 +291,13 @@ function drawers.register_drawer(name, def) def.drawer_stack_max_factor = def.drawer_stack_max_factor or 24 -- events - def.on_construct = drawers.drawer_on_construct - def.on_destruct = drawers.drawer_on_destruct - def.on_dig = drawers.drawer_on_dig - def.allow_metadata_inventory_put = drawers.drawer_allow_metadata_inventory_put - def.allow_metadata_inventory_take = drawers.drawer_allow_metadata_inventory_put - def.on_metadata_inventory_put = drawers.add_drawer_upgrade - def.on_metadata_inventory_take = drawers.remove_drawer_upgrade + def.on_construct = drawer_on_construct + def.on_destruct = drawer_on_destruct + def.on_dig = drawer_on_dig + def.allow_metadata_inventory_put = drawer_allow_metadata_inventory_put + def.allow_metadata_inventory_take = drawer_allow_metadata_inventory_put + def.on_metadata_inventory_put = add_drawer_upgrade + def.on_metadata_inventory_take = remove_drawer_upgrade if minetest.get_modpath("screwdriver") and screwdriver then def.on_rotate = def.on_rotate or screwdriver.disallow From 80b4f6608116a53255c09ad971112a7bc8ad68cf Mon Sep 17 00:00:00 2001 From: mazes-80 <1608580+mazes-80@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:26:35 +0100 Subject: [PATCH 2/5] Shared drawers: new feature --- lua/api.lua | 39 ++++++++++++++++++++++++++++++++++++--- lua/visual.lua | 8 +++++--- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/lua/api.lua b/lua/api.lua index 14d1818..b677fb4 100755 --- a/lua/api.lua +++ b/lua/api.lua @@ -35,7 +35,8 @@ drawers.node_box_simple = { {-0.4375, -0.5, -0.5, 0.4375, -0.4375, -0.4375}, } -drawers.drawer_formspec = "size[9,6.7]" .. +local drawers_formspec_data = {} +local drawer_formspec = "size[9,6.7]" .. "list[context;upgrades;2,0.5;5,1;]" .. drawers.inventory_list(2.5) .. "listring[context;upgrades]" .. @@ -44,6 +45,18 @@ drawers.drawer_formspec = "size[9,6.7]" .. drawers.gui_slots .. drawers.get_upgrade_slots_bg(2, 0.5) +drawers.get_drawer_formspec = function(pos) + local shared + if minetest.get_meta(pos):get_string("shared") == "true" then + shared = "true" + else + shared = "false" + end + + return drawer_formspec .. + "checkbox[3.5,2;shared;" .. S("Shared") .. ";" .. shared .. "]" +end + -- construct drawer local drawer_on_construct = function(pos) local node = core.get_node(pos) @@ -78,9 +91,18 @@ local drawer_on_construct = function(pos) -- create drawer upgrade inventory meta:get_inventory():set_size("upgrades", 5) +end - -- set the formspec - meta:set_string("formspec", drawers.drawer_formspec) +-- show formspec on right click +local drawer_on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + if not clicker:is_player() then + return + end + local pname = clicker:get_player_name() + if not minetest.is_protected(pos, pname) then + drawers_formspec_data[pname] = pos + minetest.show_formspec(pname, "drawers:drawer", drawers.get_drawer_formspec(pos)) + end end -- destruct drawer @@ -292,6 +314,7 @@ function drawers.register_drawer(name, def) -- events def.on_construct = drawer_on_construct + def.on_rightclick = drawer_on_rightclick def.on_destruct = drawer_on_destruct def.on_dig = drawer_on_dig def.allow_metadata_inventory_put = drawer_allow_metadata_inventory_put @@ -425,3 +448,13 @@ function drawers.register_drawer_upgrade(name, def) end end +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= "drawers:drawer" then return end + local pname = player:get_player_name() + local pos = drawers_formspec_data[pname] + if pos and fields.shared then + local meta = minetest.get_meta(pos) + meta:set_string("shared", fields.shared) + end + drawers_formspec_data[pname] = nil +end) diff --git a/lua/visual.lua b/lua/visual.lua index 0e42f60..5285f7a 100755 --- a/lua/visual.lua +++ b/lua/visual.lua @@ -151,7 +151,8 @@ core.register_entity("drawers:visual", { end, on_rightclick = function(self, clicker) - if core.is_protected(self.drawer_pos, clicker:get_player_name()) then + if core.is_protected(self.drawer_pos, clicker:get_player_name()) and + minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" then core.record_protection_violation(self.drawer_pos, clicker:get_player_name()) return end @@ -214,7 +215,8 @@ core.register_entity("drawers:visual", { return end local add_stack = not puncher:get_player_control().sneak - if core.is_protected(self.drawer_pos, puncher:get_player_name()) then + if core.is_protected(self.drawer_pos, puncher:get_player_name()) and + minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" then core.record_protection_violation(self.drawer_pos, puncher:get_player_name()) return end @@ -442,7 +444,7 @@ core.register_lbm({ -- create drawer upgrade inventory meta:get_inventory():set_size("upgrades", 5) -- set the formspec - meta:set_string("formspec", drawers.drawer_formspec) + meta:set_string("formspec", drawers.get_drawer_formspec(pos)) -- count the drawer visuals local drawerType = core.registered_nodes[node.name].groups.drawer From 008aac928e7a2bb9798b2b6d6754b3a8a61188be Mon Sep 17 00:00:00 2001 From: mazes 80 <1608580+mazes-80@users.noreply.github.com> Date: Sat, 18 Feb 2023 01:59:13 +0100 Subject: [PATCH 3/5] Settings: add way to disable sharing drawers --- lua/api.lua | 6 ++++++ lua/visual.lua | 4 ++-- settingtypes.txt | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lua/api.lua b/lua/api.lua index b677fb4..07003ad 100755 --- a/lua/api.lua +++ b/lua/api.lua @@ -35,6 +35,8 @@ drawers.node_box_simple = { {-0.4375, -0.5, -0.5, 0.4375, -0.4375, -0.4375}, } +drawers.shared = minetest.settings:get_bool("drawers.shared", true) + local drawers_formspec_data = {} local drawer_formspec = "size[9,6.7]" .. "list[context;upgrades;2,0.5;5,1;]" .. @@ -46,6 +48,10 @@ local drawer_formspec = "size[9,6.7]" .. drawers.get_upgrade_slots_bg(2, 0.5) drawers.get_drawer_formspec = function(pos) + if not drawers.shared then + return drawers.drawer_formspec + end + local shared if minetest.get_meta(pos):get_string("shared") == "true" then shared = "true" diff --git a/lua/visual.lua b/lua/visual.lua index 5285f7a..c7007ca 100755 --- a/lua/visual.lua +++ b/lua/visual.lua @@ -152,7 +152,7 @@ core.register_entity("drawers:visual", { on_rightclick = function(self, clicker) if core.is_protected(self.drawer_pos, clicker:get_player_name()) and - minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" then + ( not drawers.shared or minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" ) then core.record_protection_violation(self.drawer_pos, clicker:get_player_name()) return end @@ -216,7 +216,7 @@ core.register_entity("drawers:visual", { end local add_stack = not puncher:get_player_control().sneak if core.is_protected(self.drawer_pos, puncher:get_player_name()) and - minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" then + ( not drawers.shared or minetest.get_meta(self.drawer_pos):get_string("shared") ~= "true" ) then core.record_protection_violation(self.drawer_pos, puncher:get_player_name()) return end diff --git a/settingtypes.txt b/settingtypes.txt index e69de29..b6f5611 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -0,0 +1 @@ +drawers.shared (Enable sharing drawers) bool true From dcec13abc94d4169fa7c0aeb2eca28723770dd8d Mon Sep 17 00:00:00 2001 From: mazes 80 <1608580+mazes-80@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:12:38 +0100 Subject: [PATCH 4/5] Locales: update --- locale/drawers.be.tr | 5 +++-- locale/drawers.cs.tr | 5 +++-- locale/drawers.de.tr | 5 +++-- locale/drawers.el.tr | 5 +++-- locale/drawers.eo.tr | 5 +++-- locale/drawers.es.tr | 3 ++- locale/drawers.et.tr | 5 +++-- locale/drawers.fr.tr | 9 +++++---- locale/drawers.id.tr | 5 +++-- locale/drawers.it.tr | 5 +++-- locale/drawers.ms.tr | 5 +++-- locale/drawers.nb.tr | 5 +++-- locale/drawers.nl.tr | 5 +++-- locale/drawers.pl.tr | 5 +++-- locale/drawers.pt.tr | 5 +++-- locale/drawers.pt_BR.tr | 5 +++-- locale/drawers.ru.tr | 5 +++-- locale/drawers.sv.tr | 5 +++-- locale/drawers.tr.tr | 5 +++-- locale/drawers.zh_CN.tr | 5 +++-- locale/template.txt | 5 +++-- 21 files changed, 64 insertions(+), 43 deletions(-) diff --git a/locale/drawers.be.tr b/locale/drawers.be.tr index 8baecb4..dfb6b09 100644 --- a/locale/drawers.be.tr +++ b/locale/drawers.be.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 шуфляда @1 Drawers (1x2)=@1 шуфляды (1x2) @1 Drawers (2x2)=@1 шуфляды (2x2) -Empty=Пустая +Wooden=Драўляны Drawer Controller=Кантролер шуфляды Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Мадэрнізацыя смарагдавай ш Mithril Drawer Upgrade (x13)=Мадэрнізацыя смарагдавай шуфляды (x13) Wooden Trim=Драўлянае аздабленне Drawer Upgrade Template=Шаблон мадэрнізацыі шуфляды -Wooden=Драўляны +Empty=Пустая diff --git a/locale/drawers.cs.tr b/locale/drawers.cs.tr index 7db5087..6539257 100644 --- a/locale/drawers.cs.tr +++ b/locale/drawers.cs.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=Šuplík @1 @1 Drawers (1x2)=Šuplíky @1 (1x2) @1 Drawers (2x2)=Šuplíky @1 (2x2) -Empty=Prázdný +Wooden=Dřevěný Drawer Controller= Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Emeraldové vylepšení šuplíku (x13) Mithril Drawer Upgrade (x13)=Emeraldové vylepšení šuplíku (x13) Wooden Trim=Dřevěný Ořez Drawer Upgrade Template=Šablona vylepšení šuplíku -Wooden=Dřevěný +Empty=Prázdný diff --git a/locale/drawers.de.tr b/locale/drawers.de.tr index 6536f78..b88a7e1 100644 --- a/locale/drawers.de.tr +++ b/locale/drawers.de.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1schubfach @1 Drawers (1x2)=@1schubfächer (1×2) @1 Drawers (2x2)=@1schubfächer (2×2) -Empty=Leer +Wooden=Holz Drawer Controller=Schubfach Steuerung Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smaragd-Schubfachverbesserung (×13) Mithril Drawer Upgrade (x13)=Smaragd-Schubfachverbesserung (×13) Wooden Trim=Holzverkleidung Drawer Upgrade Template=Schubfachverbesserungsvorlage -Wooden=Holz +Empty=Leer diff --git a/locale/drawers.el.tr b/locale/drawers.el.tr index 770fbc0..2609250 100644 --- a/locale/drawers.el.tr +++ b/locale/drawers.el.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 συρτάρι @1 Drawers (1x2)=@1 συρτάρια (1x2) @1 Drawers (2x2)=@1 συρτάρια (2x2) -Empty=Κενό +Wooden=Ξύλινο Drawer Controller=Ελεγκτής συρταριού Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Σμαραγδένια αναβάθμιση συρ Mithril Drawer Upgrade (x13)= Wooden Trim= Drawer Upgrade Template= -Wooden=Ξύλινο +Empty=Κενό diff --git a/locale/drawers.eo.tr b/locale/drawers.eo.tr index cffceab..3b6cf73 100644 --- a/locale/drawers.eo.tr +++ b/locale/drawers.eo.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 tirkesto @1 Drawers (1x2)=@1 tirkestoj (1×2) @1 Drawers (2x2)=@1 tirkestoj (2×2) -Empty=Malplena +Wooden=Ligna Drawer Controller=Regilo de tirkesto Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smeralda plibonigo de tirkesto (×13) Mithril Drawer Upgrade (x13)=Smeralda plibonigo de tirkesto (×13) Wooden Trim= Drawer Upgrade Template=Ŝablono por plibonigo de tirkesto -Wooden=Ligna +Empty=Malplena diff --git a/locale/drawers.es.tr b/locale/drawers.es.tr index 156d8bd..97272a4 100644 --- a/locale/drawers.es.tr +++ b/locale/drawers.es.tr @@ -1,4 +1,5 @@ # textdomain: drawers +Shared= @1 Drawer= @1 Drawers (1x2)=@1 Gavetas (x2) @1 Drawers (2x2)=@1 Gavetas (x2) @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Mejora para Gavetas de Esmeralda (x13) Mithril Drawer Upgrade (x13)=Mejora para Gavetas de Esmeralda (x13) Wooden Trim=Recorte De Madera Drawer Upgrade Template=Plantilla de mejoras para gavetas -Wooden=De Madera +Empty=Vacío diff --git a/locale/drawers.et.tr b/locale/drawers.et.tr index b791618..79ee601 100644 --- a/locale/drawers.et.tr +++ b/locale/drawers.et.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 salv @1 Drawers (1x2)=@1 salved (1x2) @1 Drawers (2x2)=@1 salved (2x2) -Empty=Tühi +Wooden=Puidust Drawer Controller=Salve juhtpult Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smaragd salve täiustus (x13) Mithril Drawer Upgrade (x13)=Smaragd salve täiustus (x13) Wooden Trim=Puitliist Drawer Upgrade Template=Salve täiustamise kava -Wooden=Puidust +Empty=Tühi diff --git a/locale/drawers.fr.tr b/locale/drawers.fr.tr index 2c38b0f..a699be5 100644 --- a/locale/drawers.fr.tr +++ b/locale/drawers.fr.tr @@ -1,11 +1,12 @@ # textdomain: drawers +Shared=Partagé @1 Drawer=Tiroir @1 @1 Drawers (1x2)=Tiroirs (1x2) @1 @1 Drawers (2x2)=Tiroirs (2x2) @1 -Empty=Vide +Wooden=En bois Drawer Controller=Contrôleur de Tiroirs -Digiline Channel= -Save= +Digiline Channel=Canal Digilines +Save=Sauvegarder @1 (@2% full)=@1 (@2% plein) @1 @2 (@3% full)=@1 @2 (@3% plein) Acacia Wood=Bois d'acacia @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Amélioration tiroir en émeraude (x13) Mithril Drawer Upgrade (x13)=Amélioration tiroir en émeraude (x13) Wooden Trim=Habillage en bois Drawer Upgrade Template=Amélioration modèle de tiroir -Wooden=En bois +Empty=Vide diff --git a/locale/drawers.id.tr b/locale/drawers.id.tr index 6e839c7..91ecfb9 100644 --- a/locale/drawers.id.tr +++ b/locale/drawers.id.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=Laci @1 @1 Drawers (1x2)=Laci @1 (1x2) @1 Drawers (2x2)=Laci @1 (2x2) -Empty=Kosong +Wooden=Kayu Drawer Controller=Pengendali Laci Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Tingkatkan menjadi Laci Zamrud (x13) Mithril Drawer Upgrade (x13)=Tingkatkan menjadi Laci Zamrud (x13) Wooden Trim=Ukiran Kayu Drawer Upgrade Template=Templat Peningkatan Laci -Wooden=Kayu +Empty=Kosong diff --git a/locale/drawers.it.tr b/locale/drawers.it.tr index 7ca1652..bcd3b8e 100644 --- a/locale/drawers.it.tr +++ b/locale/drawers.it.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Cassetto @1 Drawers (1x2)=@1 Cassetti (1x2) @1 Drawers (2x2)=@1 Cassetti (2x2) -Empty=Vuoto +Wooden=Di legno Drawer Controller= Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Miglioramento di smeraldo della cassettiera (x13) Mithril Drawer Upgrade (x13)=Miglioramento di smeraldo della cassettiera (x13) Wooden Trim=di legno Drawer Upgrade Template=Modello di miglioramento della cassettiera -Wooden=Di legno +Empty=Vuoto diff --git a/locale/drawers.ms.tr b/locale/drawers.ms.tr index 01ae4bf..9e0fba2 100644 --- a/locale/drawers.ms.tr +++ b/locale/drawers.ms.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=Laci @1 @1 Drawers (1x2)=Laci @1 (1x2) @1 Drawers (2x2)=Laci @1 (2x2) -Empty=Kosong +Wooden=Kayu Drawer Controller=Pengawal Laci Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Naik Taraf Laci - Zamrud (x13) Mithril Drawer Upgrade (x13)=Naik Taraf Laci - Zamrud (x13) Wooden Trim=Hiasan Kayu Drawer Upgrade Template=Templat Naik Taraf Laci -Wooden=Kayu +Empty=Kosong diff --git a/locale/drawers.nb.tr b/locale/drawers.nb.tr index 7183b81..45f16ed 100644 --- a/locale/drawers.nb.tr +++ b/locale/drawers.nb.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Skuff @1 Drawers (1x2)=@1 Skuffer (1x2) @1 Drawers (2x2)=@1 Skuffer (2x2) -Empty=Tom +Wooden=Tre Drawer Controller=Skuffekontrollør Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smaragdskuffoppgradering (x13) Mithril Drawer Upgrade (x13)=Smaragdskuffoppgradering (x13) Wooden Trim=Kledning i tre Drawer Upgrade Template=Mal for oppgradering av skuffer -Wooden=Tre +Empty=Tom diff --git a/locale/drawers.nl.tr b/locale/drawers.nl.tr index a76b0db..1dc1c7e 100644 --- a/locale/drawers.nl.tr +++ b/locale/drawers.nl.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Lade @1 Drawers (1x2)=@1 Lades (1x2) @1 Drawers (2x2)=@1 Lades (2x2) -Empty=Leeg +Wooden=Houten Drawer Controller= Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smaragden Lade upgrade (x13) Mithril Drawer Upgrade (x13)=Smaragden Lade upgrade (x13) Wooden Trim=Houten bekleding Drawer Upgrade Template=Lade Upgrade Template -Wooden=Houten +Empty=Leeg diff --git a/locale/drawers.pl.tr b/locale/drawers.pl.tr index dfe234a..473d61f 100644 --- a/locale/drawers.pl.tr +++ b/locale/drawers.pl.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Szuflada @1 Drawers (1x2)=@1 Szuflady (1x2) @1 Drawers (2x2)=@1 Szuflady (2x2) -Empty=Pusta +Wooden=Drewniany Drawer Controller=Kontroler szuflady Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Ulepszenie szmaragdowej szuflady (x13) Mithril Drawer Upgrade (x13)=Ulepszenie szmaragdowej szuflady (x13) Wooden Trim=Drewniane wykończenia Drawer Upgrade Template=Szablon ulepszenia szuflady -Wooden=Drewniany +Empty=Pusta diff --git a/locale/drawers.pt.tr b/locale/drawers.pt.tr index 73a38b7..a6a8c63 100644 --- a/locale/drawers.pt.tr +++ b/locale/drawers.pt.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=Armário @1 @1 Drawers (1x2)=Armários @1 (1x2) @1 Drawers (2x2)=Armários @1 (2x2) -Empty=Vazio +Wooden=Madeira Drawer Controller=Controlador de Armários Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Melhoria de Armário de Esmeralda (x13) Mithril Drawer Upgrade (x13)=Melhoria de Armário de Esmeralda (x13) Wooden Trim=Guarnição de Madeira Drawer Upgrade Template=Modelo de Melhoria de Armário -Wooden=Madeira +Empty=Vazio diff --git a/locale/drawers.pt_BR.tr b/locale/drawers.pt_BR.tr index 73a38b7..a6a8c63 100644 --- a/locale/drawers.pt_BR.tr +++ b/locale/drawers.pt_BR.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=Armário @1 @1 Drawers (1x2)=Armários @1 (1x2) @1 Drawers (2x2)=Armários @1 (2x2) -Empty=Vazio +Wooden=Madeira Drawer Controller=Controlador de Armários Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Melhoria de Armário de Esmeralda (x13) Mithril Drawer Upgrade (x13)=Melhoria de Armário de Esmeralda (x13) Wooden Trim=Guarnição de Madeira Drawer Upgrade Template=Modelo de Melhoria de Armário -Wooden=Madeira +Empty=Vazio diff --git a/locale/drawers.ru.tr b/locale/drawers.ru.tr index c2fe866..e8aab91 100644 --- a/locale/drawers.ru.tr +++ b/locale/drawers.ru.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Ящик @1 Drawers (1x2)=@1 Ящики (1x2) @1 Drawers (2x2)=@1 Ящики (2x2) -Empty=Пусто +Wooden=Деревянный Drawer Controller=Контролер ящика Digiline Channel=Канал digiline Save=Сохранить @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Изумрудное улучшение ящика Mithril Drawer Upgrade (x13)=Мифриловое улучшение ящика (x13) Wooden Trim=Деревянная отделка Drawer Upgrade Template=Шаблон улучшения ящика -Wooden=Деревянный +Empty=Пусто diff --git a/locale/drawers.sv.tr b/locale/drawers.sv.tr index e12ba8e..83d5036 100644 --- a/locale/drawers.sv.tr +++ b/locale/drawers.sv.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1låda @1 Drawers (1x2)=@1lådor (1x2) @1 Drawers (2x2)=@1lådor (2x2) -Empty=Tom +Wooden=Trä Drawer Controller=Lådkontroll Digiline Channel=Digilinekanal Save=Spara @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Smaragdlådeuppgradering (x13) Mithril Drawer Upgrade (x13)=Mithrillådeuppgradering (x13) Wooden Trim=Trätrim Drawer Upgrade Template=Lådeuppgraderingsmall -Wooden=Trä +Empty=Tom diff --git a/locale/drawers.tr.tr b/locale/drawers.tr.tr index bbcfb55..99722a4 100644 --- a/locale/drawers.tr.tr +++ b/locale/drawers.tr.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer=@1 Çekmece @1 Drawers (1x2)=@1 Çekmece (1x2) @1 Drawers (2x2)=@1 Çekmece (2x2) -Empty=Boş +Wooden=Ahşap Drawer Controller=Çekmece Denetleyicisi Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)=Zümrüt Çekmece Yükseltme (x13) Mithril Drawer Upgrade (x13)=Zümrüt Çekmece Yükseltme (x13) Wooden Trim=Ahşap Döşeme Drawer Upgrade Template=Çekmece Yükseltme Şablonu -Wooden=Ahşap +Empty=Boş diff --git a/locale/drawers.zh_CN.tr b/locale/drawers.zh_CN.tr index 61f6f4f..fd6bb43 100644 --- a/locale/drawers.zh_CN.tr +++ b/locale/drawers.zh_CN.tr @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer= @1 Drawers (1x2)= @1 Drawers (2x2)= -Empty=空的 +Wooden=木制 Drawer Controller= Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)= Mithril Drawer Upgrade (x13)= Wooden Trim= Drawer Upgrade Template= -Wooden=木制 +Empty=空的 diff --git a/locale/template.txt b/locale/template.txt index 879054d..f251ab2 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,8 +1,9 @@ # textdomain: drawers +Shared= @1 Drawer= @1 Drawers (1x2)= @1 Drawers (2x2)= -Empty= +Wooden= Drawer Controller= Digiline Channel= Save= @@ -25,4 +26,4 @@ Emerald Drawer Upgrade (x13)= Mithril Drawer Upgrade (x13)= Wooden Trim= Drawer Upgrade Template= -Wooden= +Empty= From b8573266f18a0a1bdbfcc4e7a960117c7c7c4afd Mon Sep 17 00:00:00 2001 From: mazes 80 <1608580+mazes-80@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:58:44 +0200 Subject: [PATCH 5/5] Shared: tweak checkbox offset --- lua/api.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/api.lua b/lua/api.lua index 07003ad..5a2eb63 100755 --- a/lua/api.lua +++ b/lua/api.lua @@ -60,7 +60,7 @@ drawers.get_drawer_formspec = function(pos) end return drawer_formspec .. - "checkbox[3.5,2;shared;" .. S("Shared") .. ";" .. shared .. "]" + "checkbox[3.5,1.5;shared;" .. S("Shared") .. ";" .. shared .. "]" end -- construct drawer