Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / script / lua_api / l_base.cpp

diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
index 052f661bbeb1e63131edba965e24ff2807ea1b32..fce6282a59055e1232a3b8daaafcfb0c44929d3b 100644 (file)
--- a/src/script/lua_api/l_base.cpp
+++ b/src/script/lua_api/l_base.cpp
@@ -21,14 +21,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_internal.h"
 #include "cpp_api/s_base.h"
 #include "content/mods.h"
+#include "profiler.h"
 #include "server.h"
+#include <algorithm>
 #include <cmath>
 
 ScriptApiBase *ModApiBase::getScriptApiBase(lua_State *L)
 {
        // Get server from registry
        lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_SCRIPTAPI);
-       ScriptApiBase *sapi_ptr = (ScriptApiBase*) lua_touserdata(L, -1);
+       ScriptApiBase *sapi_ptr;
+#if INDIRECT_SCRIPTAPI_RIDX
+       sapi_ptr = (ScriptApiBase*) *(void**)(lua_touserdata(L, -1));
+#else
+       sapi_ptr = (ScriptApiBase*) lua_touserdata(L, -1);
+#endif
        lua_pop(L, 1);
        return sapi_ptr;
 }
@@ -38,11 +45,21 @@ Server *ModApiBase::getServer(lua_State *L)
        return getScriptApiBase(L)->getServer();
 }
 
+ServerInventoryManager *ModApiBase::getServerInventoryMgr(lua_State *L)
+{
+       return getScriptApiBase(L)->getServer()->getInventoryMgr();
+}
+
 #ifndef SERVER
 Client *ModApiBase::getClient(lua_State *L)
 {
        return getScriptApiBase(L)->getClient();
 }
+
+Game *ModApiBase::getGame(lua_State *L)
+{
+       return getScriptApiBase(L)->getGame();
+}
 #endif
 
 IGameDef *ModApiBase::getGameDef(lua_State *L)
@@ -55,16 +72,18 @@ Environment *ModApiBase::getEnv(lua_State *L)
        return getScriptApiBase(L)->getEnv();
 }
 
+#ifndef SERVER
 GUIEngine *ModApiBase::getGuiEngine(lua_State *L)
 {
        return getScriptApiBase(L)->getGuiEngine();
 }
+#endif
 
 std::string ModApiBase::getCurrentModPath(lua_State *L)
 {
        lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-       const char *current_mod_name = lua_tostring(L, -1);
-       if (!current_mod_name)
+       std::string current_mod_name = readParam<std::string>(L, -1, "");
+       if (current_mod_name.empty())
                return ".";
 
        const ModSpec *mod = getServer(L)->getModSpec(current_mod_name);
@@ -86,19 +105,40 @@ bool ModApiBase::registerFunction(lua_State *L, const char *name,
        return true;
 }
 
-bool ModApiBase::isNaN(lua_State *L, int idx)
+int ModApiBase::l_deprecated_function(lua_State *L, const char *good, const char *bad, lua_CFunction func)
 {
-       return lua_type(L, idx) == LUA_TNUMBER && std::isnan(lua_tonumber(L, idx));
-}
+       thread_local std::vector<u64> deprecated_logged;
 
-/*
- * Read template functions
- */
-template<>
-float ModApiBase::readParam(lua_State *L, int index)
-{
-       if (isNaN(L, index))
-               throw LuaError("NaN value is not allowed.");
+       DeprecatedHandlingMode dep_mode = get_deprecated_handling_mode();
+       if (dep_mode == DeprecatedHandlingMode::Ignore)
+               return func(L);
+
+       u64 start_time = porting::getTimeUs();
+       lua_Debug ar;
+
+       // Get caller name with line and script backtrace
+       FATAL_ERROR_IF(!lua_getstack(L, 1, &ar), "lua_getstack() failed");
+       FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
+
+       // Get backtrace and hash it to reduce the warning flood
+       std::string backtrace = ar.short_src;
+       backtrace.append(":").append(std::to_string(ar.currentline));
+       u64 hash = murmur_hash_64_ua(backtrace.data(), backtrace.length(), 0xBADBABE);
 
-       return (float) luaL_checknumber(L, index);
+       if (std::find(deprecated_logged.begin(), deprecated_logged.end(), hash)
+                       == deprecated_logged.end()) {
+
+               deprecated_logged.emplace_back(hash);
+               warningstream << "Call to deprecated function '"  << bad << "', please use '"
+                       << good << "' at " << backtrace << std::endl;
+
+               if (dep_mode == DeprecatedHandlingMode::Error)
+                       script_error(L, LUA_ERRRUN, NULL, NULL);
+       }
+
+       u64 end_time = porting::getTimeUs();
+       g_profiler->avg("l_deprecated_function", end_time - start_time);
+
+       return func(L);
 }
+