From 4d55f9954858404d38c0ace85eaa45a2579e7b64 Mon Sep 17 00:00:00 2001 From: Zweihorn Date: Tue, 21 May 2019 22:55:13 +0200 Subject: [PATCH] Add function mod.get_translator to any mod with serveral lua files M mods/beds/beds.lua M mods/beds/init.lua M mods/carts/cart_entity.lua M mods/carts/init.lua M mods/carts/rails.lua M mods/creative/init.lua M mods/creative/inventory.lua M mods/default/chests.lua M mods/default/craftitems.lua M mods/default/furnace.lua M mods/default/init.lua M mods/default/nodes.lua M mods/default/tools.lua M mods/default/torch.lua M mods/default/trees.lua M mods/farming/api.lua M mods/farming/hoes.lua M mods/farming/init.lua M mods/farming/nodes.lua --- mods/beds/beds.lua | 4 ++-- mods/beds/init.lua | 1 + mods/carts/cart_entity.lua | 5 ++--- mods/carts/init.lua | 5 +++++ mods/carts/rails.lua | 4 ++-- mods/creative/init.lua | 2 +- mods/creative/inventory.lua | 5 ++--- mods/default/chests.lua | 4 ++-- mods/default/craftitems.lua | 4 ++-- mods/default/furnace.lua | 5 ++--- mods/default/init.lua | 4 ++++ mods/default/nodes.lua | 5 ++--- mods/default/tools.lua | 4 ++-- mods/default/torch.lua | 4 ++-- mods/default/trees.lua | 5 ++--- mods/farming/api.lua | 4 ++-- mods/farming/hoes.lua | 4 ++-- mods/farming/init.lua | 9 ++++----- mods/farming/nodes.lua | 5 ++--- 19 files changed, 43 insertions(+), 40 deletions(-) diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index dead76a..276c05e 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -1,7 +1,7 @@ -- beds/beds.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = beds.get_translator -- Fancy shaped bed diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 2848abf..20955f6 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -9,6 +9,7 @@ beds.player = {} beds.bed_position = {} beds.pos = {} beds.spawn = {} +beds.get_translator = S beds.formspec = "size[8,11;true]" .. "no_prepend[]" .. diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua index 7cb3dae..97084ac 100644 --- a/mods/carts/cart_entity.lua +++ b/mods/carts/cart_entity.lua @@ -1,8 +1,7 @@ -- carts/cart_entity.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = carts.get_translator local cart_entity = { initial_properties = { diff --git a/mods/carts/init.lua b/mods/carts/init.lua index fe45303..9e56766 100644 --- a/mods/carts/init.lua +++ b/mods/carts/init.lua @@ -1,7 +1,12 @@ +-- carts/init.lua + +-- Load support for MT game translation. +local S = minetest.get_translator() carts = {} carts.modpath = minetest.get_modpath("carts") carts.railparams = {} +carts.get_translator = S -- Maximal speed of the cart in m/s (min = -1) carts.speed_max = 7 diff --git a/mods/carts/rails.lua b/mods/carts/rails.lua index 6fdb614..8bd2ba1 100644 --- a/mods/carts/rails.lua +++ b/mods/carts/rails.lua @@ -1,7 +1,7 @@ -- carts/rails.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = carts.get_translator carts:register_rail("carts:rail", { description = S("Rail"), diff --git a/mods/creative/init.lua b/mods/creative/init.lua index aba7b4a..a774e21 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -3,8 +3,8 @@ -- Load support for MT game translation. local S = minetest.get_translator() - creative = {} +creative.get_translator = S local function update_sfinv(name) minetest.after(0, function() diff --git a/mods/creative/inventory.lua b/mods/creative/inventory.lua index 81e5143..0840204 100644 --- a/mods/creative/inventory.lua +++ b/mods/creative/inventory.lua @@ -1,8 +1,7 @@ -- creative/inventory.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = creative.get_translator local player_inventory = {} local inventory_cache = {} diff --git a/mods/default/chests.lua b/mods/default/chests.lua index a4e092d..8dbf9d8 100644 --- a/mods/default/chests.lua +++ b/mods/default/chests.lua @@ -1,7 +1,7 @@ default.chest = {} --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = default.get_translator function default.chest.get_chest_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," .. pos.z diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 3eb4ce4..9c3b230 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -1,7 +1,7 @@ -- mods/default/craftitems.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = default.get_translator minetest.register_craftitem("default:stick", { description = S("Stick"), diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index aefdb79..2c9f864 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -1,8 +1,7 @@ -- default/furnace.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = default.get_translator -- -- Formspecs diff --git a/mods/default/init.lua b/mods/default/init.lua index 4782752..4584327 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -3,10 +3,14 @@ -- The API documentation in here was moved into game_api.txt +-- Load support for MT game translation. +local S = minetest.get_translator() + -- Definitions made by this mod that other mods can use too default = {} default.LIGHT_MAX = 14 +default.get_translator = S -- GUI related stuff minetest.register_on_joinplayer(function(player) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index f481b83..a860e2e 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1,8 +1,7 @@ -- mods/default/nodes.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = default.get_translator --[[ Node name convention: diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 75781e2..d792d14 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -1,7 +1,7 @@ -- mods/default/tools.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = default.get_translator -- The hand minetest.register_item(":", { diff --git a/mods/default/torch.lua b/mods/default/torch.lua index 59c73a3..fcdc1fe 100644 --- a/mods/default/torch.lua +++ b/mods/default/torch.lua @@ -1,7 +1,7 @@ -- default/torch.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = default.get_translator local function on_flood(pos, oldnode, newnode) minetest.add_item(pos, ItemStack("default:torch 1")) diff --git a/mods/default/trees.lua b/mods/default/trees.lua index c609817..ad3e3f4 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -1,8 +1,7 @@ -- default/trees.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = default.get_translator local random = math.random diff --git a/mods/farming/api.lua b/mods/farming/api.lua index c221ce3..6c13b11 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -1,7 +1,7 @@ -- farming/api.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = farming.get_translator -- Wear out hoes, place soil -- TODO Ignore group:flower diff --git a/mods/farming/hoes.lua b/mods/farming/hoes.lua index b6bb874..d005f6d 100644 --- a/mods/farming/hoes.lua +++ b/mods/farming/hoes.lua @@ -1,7 +1,7 @@ -- farming/hoes.lua --- Load support for MT game translation. -local S = minetest.get_translator() +-- support for MT game translation. +local S = farming.get_translator farming.register_hoe(":farming:hoe_wood", { description = S("Wooden Hoe"), diff --git a/mods/farming/init.lua b/mods/farming/init.lua index 3548df5..9670a23 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -1,10 +1,13 @@ -- farming/init.lua +-- Load support for MT game translation. +local S = minetest.get_translator() + -- Global farming namespace farming = {} farming.path = minetest.get_modpath("farming") - +farming.get_translator = S -- Load files @@ -13,10 +16,6 @@ dofile(farming.path .. "/nodes.lua") dofile(farming.path .. "/hoes.lua") --- Load support for MT game translation. -local S = minetest.get_translator() - - -- WHEAT farming.register_plant("farming:wheat", { diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index 87d6f35..8cc7647 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -1,8 +1,7 @@ -- farming/nodes.lua --- Load support for MT game translation. -local S = minetest.get_translator() - +-- support for MT game translation. +local S = farming.get_translator minetest.override_item("default:dirt", { soil = {