Lint is bitch

[dragonfireclient.git] / src / script / scripting_server.cpp

diff --git a/src/script/scripting_server.cpp b/src/script/scripting_server.cpp
index ce56fcf195aac8b0150ece2837f4830d7223ef25..85411ded460e5f68b885014544f94d068c72219d 100644 (file)
--- a/src/script/scripting_server.cpp
+++ b/src/script/scripting_server.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_areastore.h"
+#include "lua_api/l_auth.h"
 #include "lua_api/l_base.h"
 #include "lua_api/l_craft.h"
 #include "lua_api/l_env.h"
@@ -30,10 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_item.h"
 #include "lua_api/l_itemstackmeta.h"
 #include "lua_api/l_mapgen.h"
+#include "lua_api/l_modchannels.h"
 #include "lua_api/l_nodemeta.h"
 #include "lua_api/l_nodetimer.h"
 #include "lua_api/l_noise.h"
 #include "lua_api/l_object.h"
+#include "lua_api/l_playermeta.h"
 #include "lua_api/l_particles.h"
 #include "lua_api/l_rollback.h"
 #include "lua_api/l_server.h"
@@ -47,7 +50,8 @@ extern "C" {
 #include "lualib.h"
 }
 
-ServerScripting::ServerScripting(Server* server)
+ServerScripting::ServerScripting(Server* server):
+               ScriptApiBase(ScriptingType::Server)
 {
        setGameDef(server);
 
@@ -58,6 +62,10 @@ ServerScripting::ServerScripting(Server* server)
 
        if (g_settings->getBool("secure.enable_security")) {
                initializeSecurity();
+       } else {
+               warningstream << "\\!/ Mod security should never be disabled, as it allows any mod to "
+                               << "access the host machine."
+                               << "Mods should use minetest.request_insecure_environment() instead \\!/" << std::endl;
        }
 
        lua_getglobal(L, "core");
@@ -82,19 +90,6 @@ ServerScripting::ServerScripting(Server* server)
 
 void ServerScripting::InitializeModApi(lua_State *L, int top)
 {
-       // Initialize mod api modules
-       ModApiCraft::Initialize(L, top);
-       ModApiEnvMod::Initialize(L, top);
-       ModApiInventory::Initialize(L, top);
-       ModApiItemMod::Initialize(L, top);
-       ModApiMapgen::Initialize(L, top);
-       ModApiParticles::Initialize(L, top);
-       ModApiRollback::Initialize(L, top);
-       ModApiServer::Initialize(L, top);
-       ModApiUtil::Initialize(L, top);
-       ModApiHttp::Initialize(L, top);
-       ModApiStorage::Initialize(L, top);
-
        // Register reference classes (userdata)
        InvRef::Register(L);
        ItemStackMetaRef::Register(L);
@@ -104,16 +99,29 @@ void ServerScripting::InitializeModApi(lua_State *L, int top)
        LuaPerlinNoiseMap::Register(L);
        LuaPseudoRandom::Register(L);
        LuaPcgRandom::Register(L);
+       LuaRaycast::Register(L);
        LuaSecureRandom::Register(L);
        LuaVoxelManip::Register(L);
        NodeMetaRef::Register(L);
        NodeTimerRef::Register(L);
        ObjectRef::Register(L);
+       PlayerMetaRef::Register(L);
        LuaSettings::Register(L);
        StorageRef::Register(L);
-}
+       ModChannelRef::Register(L);
 
-void log_deprecated(const std::string &message)
-{
-       log_deprecated(NULL, message);
+       // Initialize mod api modules
+       ModApiAuth::Initialize(L, top);
+       ModApiCraft::Initialize(L, top);
+       ModApiEnvMod::Initialize(L, top);
+       ModApiInventory::Initialize(L, top);
+       ModApiItemMod::Initialize(L, top);
+       ModApiMapgen::Initialize(L, top);
+       ModApiParticles::Initialize(L, top);
+       ModApiRollback::Initialize(L, top);
+       ModApiServer::Initialize(L, top);
+       ModApiUtil::Initialize(L, top);
+       ModApiHttp::Initialize(L, top);
+       ModApiStorage::Initialize(L, top);
+       ModApiChannels::Initialize(L, top);
 }