From 2b142e9dfee511803e2847565a6f4d6c128c6062 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Thu, 14 Mar 2019 09:46:04 +0100 Subject: [PATCH] Replaced prints by minetest.log and code styling --- deprecation.lua | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/deprecation.lua b/deprecation.lua index 29bbd50..b041f6f 100644 --- a/deprecation.lua +++ b/deprecation.lua @@ -22,7 +22,8 @@ function deprecated_group(deprecated_group, replacement_group) for name, ndef in pairs(minetest.registered_nodes) do if ndef.groups and ndef.groups[deprecated_group] then - minetest.log("warning", string.format('Node %s belongs to deprecated "%s" group which should be replaced with new "%s" group.', + minetest.log("warning", string.format( + 'Node %s belongs to deprecated "%s" group which should be replaced with new "%s" group.', name, deprecated_group, replacement_group)) end end @@ -33,9 +34,10 @@ function deprecated_global_table(deprecated_global_name, replacement_global_name assert(type(replacement_global_name) == 'string', "replacement_global_name should be a string.") assert(deprecated_global_name ~= '', "deprecated_global_name should not be empty.") assert(replacement_global_name ~= '', "replacement_global_name should not be empty.") - assert(rawget(_G, deprecated_global_name) == nil, "replacement global already exists.") + assert(rawget(_G, deprecated_global_name) == nil, "deprecated global does not exist.") if _G[replacement_global_name] == nil then - print('warn_deprecated_functions: Warning, replacement global "'..replacement_global_name..'" does not exists.') + minetest.log('warning', string.format( + 'Replacement global "%s" does not exists.', replacement_global_name)) return end local meta = { @@ -44,15 +46,19 @@ function deprecated_global_table(deprecated_global_name, replacement_global_name __index = function(table, key) local meta = getmetatable(table) local dbg = debug.getinfo(2, "lS") - minetest.log("warning", string.format('Warning: Accessing deprecated "%s" table, "%s" should be used instead (%s:%d).', - meta.deprecated, meta.replacement, (dbg.short_src or 'unknown'), (dbg.currentline or 0))) + minetest.log("warning", string.format( + 'Accessing deprecated "%s" table, "%s" should be used instead (%s:%d).', + meta.deprecated, meta.replacement, (dbg.short_src or 'unknown'), + (dbg.currentline or 0))) return _G[meta.replacement][key] end, __newindex = function(table, key, value) local meta = getmetatable(table) local dbg = debug.getinfo(2, "lS") - minetest.log("warning", string.format('Warning: Accessing deprecated "%s" table, "%s" should be used instead (%s:%d).', - meta.deprecated, meta.replacement, (dbg.short_src or 'unknown'), (dbg.currentline or 0))) + minetest.log("warning", string.format( + 'Accessing deprecated "%s" table, "%s" should be used instead (%s:%d).', + meta.deprecated, meta.replacement, (dbg.short_src or 'unknown'), + (dbg.currentline or 0))) _G[meta.replacement][key]=value end, }