#include "database-sqlite3.h"
#include "serialization.h"
#include "guiscalingfilter.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "game.h"
extern gui::IGUIEnvironment* guienv;
#include "clientenvironment.h"
#include "clientsimpleobject.h"
#include "clientmap.h"
-#include "clientscripting.h"
+#include "scripting_client.h"
#include "mapblock_mesh.h"
#include "event.h"
#include "collision.h"
#include "settings.h"
#include "mapblock.h" // For getNodeBlockPos
#include "map.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "log.h"
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)
#include "nodedef.h"
#include "remoteplayer.h"
#include "server.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "genericobject.h"
std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
#include "mg_schematic.h"
#include "nodedef.h"
#include "profiler.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "serverobject.h"
#include "settings.h"
#include "environment.h"
#include "collision.h"
#include "serverobject.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "daynightratio.h"
#include "emerge.h"
#include "version.h"
#include "minimap.h"
#include "mapblock_mesh.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "sound.h"
#include "filesys.h"
#include "gettime.h"
#include "gettext.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "porting.h"
#include "settings.h"
#include "client.h"
#include "inventorymanager.h"
#include "log.h"
#include "serverenvironment.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "serverobject.h"
#include "settings.h"
#include "craftdef.h"
#include "database.h"
#include "database-dummy.h"
#include "database-sqlite3.h"
-#include "script/serverscripting.h"
+#include "script/scripting_server.h"
#include <deque>
#include <queue>
#if USE_LEVELDB
#include "server.h"
#include "util/strfnd.h"
#include "network/clientopcodes.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "util/serialize.h"
#include "util/srp.h"
#include "tileanimation.h"
#include "nodedef.h"
#include "player.h"
#include "rollback_interface.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "settings.h"
#include "tool.h"
#include "version.h"
# Used by server and client
set(common_SCRIPT_SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/serverscripting.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
${common_SCRIPT_COMMON_SRCS}
${common_SCRIPT_CPP_API_SRCS}
${common_SCRIPT_LUA_API_SRCS}
# Used by client only
set(client_SCRIPT_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/scripting_mainmenu.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/clientscripting.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/scripting_client.cpp
${client_SCRIPT_COMMON_SRCS}
${client_SCRIPT_CPP_API_SRCS}
${client_SCRIPT_LUA_API_SRCS}
+++ /dev/null
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "clientscripting.h"
-#include "client.h"
-#include "cpp_api/s_internal.h"
-#include "lua_api/l_client.h"
-#include "lua_api/l_env.h"
-#include "lua_api/l_minimap.h"
-#include "lua_api/l_storage.h"
-#include "lua_api/l_sound.h"
-#include "lua_api/l_util.h"
-#include "lua_api/l_item.h"
-#include "lua_api/l_nodemeta.h"
-#include "lua_api/l_localplayer.h"
-
-ClientScripting::ClientScripting(Client *client):
- ScriptApiBase()
-{
- setGameDef(client);
-
- SCRIPTAPI_PRECHECKHEADER
-
- // Security is mandatory client side
- initializeSecurityClient();
-
- lua_getglobal(L, "core");
- int top = lua_gettop(L);
-
- lua_newtable(L);
- lua_setfield(L, -2, "ui");
-
- InitializeModApi(L, top);
- lua_pop(L, 1);
-
- LuaMinimap::create(L, client->getMinimap());
-
- // Push builtin initialization type
- lua_pushstring(L, "client");
- lua_setglobal(L, "INIT");
-
- infostream << "SCRIPTAPI: Initialized client game modules" << std::endl;
-}
-
-void ClientScripting::InitializeModApi(lua_State *L, int top)
-{
- ModApiUtil::InitializeClient(L, top);
- ModApiClient::Initialize(L, top);
- ModApiStorage::Initialize(L, top);
- ModApiEnvMod::InitializeClient(L, top);
-
- LuaItemStack::Register(L);
- StorageRef::Register(L);
- LuaMinimap::Register(L);
- NodeMetaRef::RegisterClient(L);
- LuaLocalPlayer::Register(L);
-}
-
-void ClientScripting::on_client_ready(LocalPlayer *localplayer)
-{
- lua_State *L = getStack();
- LuaLocalPlayer::create(L, localplayer);
-}
+++ /dev/null
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef CLIENT_SCRIPTING_H_
-#define CLIENT_SCRIPTING_H_
-
-#include "cpp_api/s_base.h"
-#include "cpp_api/s_client.h"
-#include "cpp_api/s_security.h"
-
-class Client;
-class LocalPlayer;
-class ClientScripting:
- virtual public ScriptApiBase,
- public ScriptApiSecurity,
- public ScriptApiClient
-{
-public:
- ClientScripting(Client *client);
- void on_client_ready(LocalPlayer *localplayer);
-
-private:
- virtual void InitializeModApi(lua_State *L, int top);
-};
-#endif
#include "lua_api/l_vmanip.h"
#include "common/c_converter.h"
#include "common/c_content.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "environment.h"
#include "server.h"
#include "nodedef.h"
#include "content_sao.h"
#include "server.h"
#include "hud.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
struct EnumString es_HudElementType[] =
{
--- /dev/null
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "scripting_client.h"
+#include "client.h"
+#include "cpp_api/s_internal.h"
+#include "lua_api/l_client.h"
+#include "lua_api/l_env.h"
+#include "lua_api/l_minimap.h"
+#include "lua_api/l_storage.h"
+#include "lua_api/l_sound.h"
+#include "lua_api/l_util.h"
+#include "lua_api/l_item.h"
+#include "lua_api/l_nodemeta.h"
+#include "lua_api/l_localplayer.h"
+
+ClientScripting::ClientScripting(Client *client):
+ ScriptApiBase()
+{
+ setGameDef(client);
+
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Security is mandatory client side
+ initializeSecurityClient();
+
+ lua_getglobal(L, "core");
+ int top = lua_gettop(L);
+
+ lua_newtable(L);
+ lua_setfield(L, -2, "ui");
+
+ InitializeModApi(L, top);
+ lua_pop(L, 1);
+
+ LuaMinimap::create(L, client->getMinimap());
+
+ // Push builtin initialization type
+ lua_pushstring(L, "client");
+ lua_setglobal(L, "INIT");
+
+ infostream << "SCRIPTAPI: Initialized client game modules" << std::endl;
+}
+
+void ClientScripting::InitializeModApi(lua_State *L, int top)
+{
+ ModApiUtil::InitializeClient(L, top);
+ ModApiClient::Initialize(L, top);
+ ModApiStorage::Initialize(L, top);
+ ModApiEnvMod::InitializeClient(L, top);
+
+ LuaItemStack::Register(L);
+ StorageRef::Register(L);
+ LuaMinimap::Register(L);
+ NodeMetaRef::RegisterClient(L);
+ LuaLocalPlayer::Register(L);
+}
+
+void ClientScripting::on_client_ready(LocalPlayer *localplayer)
+{
+ lua_State *L = getStack();
+ LuaLocalPlayer::create(L, localplayer);
+}
--- /dev/null
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef CLIENT_SCRIPTING_H_
+#define CLIENT_SCRIPTING_H_
+
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_client.h"
+#include "cpp_api/s_security.h"
+
+class Client;
+class LocalPlayer;
+class ClientScripting:
+ virtual public ScriptApiBase,
+ public ScriptApiSecurity,
+ public ScriptApiClient
+{
+public:
+ ClientScripting(Client *client);
+ void on_client_ready(LocalPlayer *localplayer);
+
+private:
+ virtual void InitializeModApi(lua_State *L, int top);
+};
+#endif
--- /dev/null
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "scripting_server.h"
+#include "server.h"
+#include "log.h"
+#include "settings.h"
+#include "cpp_api/s_internal.h"
+#include "lua_api/l_areastore.h"
+#include "lua_api/l_base.h"
+#include "lua_api/l_craft.h"
+#include "lua_api/l_env.h"
+#include "lua_api/l_inventory.h"
+#include "lua_api/l_item.h"
+#include "lua_api/l_itemstackmeta.h"
+#include "lua_api/l_mapgen.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_particles.h"
+#include "lua_api/l_rollback.h"
+#include "lua_api/l_server.h"
+#include "lua_api/l_util.h"
+#include "lua_api/l_vmanip.h"
+#include "lua_api/l_settings.h"
+#include "lua_api/l_http.h"
+#include "lua_api/l_storage.h"
+
+extern "C" {
+#include "lualib.h"
+}
+
+ServerScripting::ServerScripting(Server* server)
+{
+ setGameDef(server);
+
+ // setEnv(env) is called by ScriptApiEnv::initializeEnvironment()
+ // once the environment has been created
+
+ SCRIPTAPI_PRECHECKHEADER
+
+ if (g_settings->getBool("secure.enable_security")) {
+ initializeSecurity();
+ }
+
+ lua_getglobal(L, "core");
+ int top = lua_gettop(L);
+
+ lua_newtable(L);
+ lua_setfield(L, -2, "object_refs");
+
+ lua_newtable(L);
+ lua_setfield(L, -2, "luaentities");
+
+ // Initialize our lua_api modules
+ InitializeModApi(L, top);
+ lua_pop(L, 1);
+
+ // Push builtin initialization type
+ lua_pushstring(L, "game");
+ lua_setglobal(L, "INIT");
+
+ infostream << "SCRIPTAPI: Initialized game modules" << std::endl;
+}
+
+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);
+ LuaAreaStore::Register(L);
+ LuaItemStack::Register(L);
+ LuaPerlinNoise::Register(L);
+ LuaPerlinNoiseMap::Register(L);
+ LuaPseudoRandom::Register(L);
+ LuaPcgRandom::Register(L);
+ LuaSecureRandom::Register(L);
+ LuaVoxelManip::Register(L);
+ NodeMetaRef::Register(L);
+ NodeTimerRef::Register(L);
+ ObjectRef::Register(L);
+ LuaSettings::Register(L);
+ StorageRef::Register(L);
+}
+
+void log_deprecated(const std::string &message)
+{
+ log_deprecated(NULL, message);
+}
--- /dev/null
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef SERVER_SCRIPTING_H_
+#define SERVER_SCRIPTING_H_
+
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_entity.h"
+#include "cpp_api/s_env.h"
+#include "cpp_api/s_inventory.h"
+#include "cpp_api/s_node.h"
+#include "cpp_api/s_player.h"
+#include "cpp_api/s_server.h"
+#include "cpp_api/s_security.h"
+
+/*****************************************************************************/
+/* Scripting <-> Server Game Interface */
+/*****************************************************************************/
+
+class ServerScripting:
+ virtual public ScriptApiBase,
+ public ScriptApiDetached,
+ public ScriptApiEntity,
+ public ScriptApiEnv,
+ public ScriptApiNode,
+ public ScriptApiPlayer,
+ public ScriptApiServer,
+ public ScriptApiSecurity
+{
+public:
+ ServerScripting(Server* server);
+
+ // use ScriptApiBase::loadMod() to load mods
+
+private:
+ void InitializeModApi(lua_State *L, int top);
+};
+
+void log_deprecated(const std::string &message);
+
+#endif /* SCRIPTING_GAME_H_ */
+++ /dev/null
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "serverscripting.h"
-#include "server.h"
-#include "log.h"
-#include "settings.h"
-#include "cpp_api/s_internal.h"
-#include "lua_api/l_areastore.h"
-#include "lua_api/l_base.h"
-#include "lua_api/l_craft.h"
-#include "lua_api/l_env.h"
-#include "lua_api/l_inventory.h"
-#include "lua_api/l_item.h"
-#include "lua_api/l_itemstackmeta.h"
-#include "lua_api/l_mapgen.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_particles.h"
-#include "lua_api/l_rollback.h"
-#include "lua_api/l_server.h"
-#include "lua_api/l_util.h"
-#include "lua_api/l_vmanip.h"
-#include "lua_api/l_settings.h"
-#include "lua_api/l_http.h"
-#include "lua_api/l_storage.h"
-
-extern "C" {
-#include "lualib.h"
-}
-
-ServerScripting::ServerScripting(Server* server)
-{
- setGameDef(server);
-
- // setEnv(env) is called by ScriptApiEnv::initializeEnvironment()
- // once the environment has been created
-
- SCRIPTAPI_PRECHECKHEADER
-
- if (g_settings->getBool("secure.enable_security")) {
- initializeSecurity();
- }
-
- lua_getglobal(L, "core");
- int top = lua_gettop(L);
-
- lua_newtable(L);
- lua_setfield(L, -2, "object_refs");
-
- lua_newtable(L);
- lua_setfield(L, -2, "luaentities");
-
- // Initialize our lua_api modules
- InitializeModApi(L, top);
- lua_pop(L, 1);
-
- // Push builtin initialization type
- lua_pushstring(L, "game");
- lua_setglobal(L, "INIT");
-
- infostream << "SCRIPTAPI: Initialized game modules" << std::endl;
-}
-
-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);
- LuaAreaStore::Register(L);
- LuaItemStack::Register(L);
- LuaPerlinNoise::Register(L);
- LuaPerlinNoiseMap::Register(L);
- LuaPseudoRandom::Register(L);
- LuaPcgRandom::Register(L);
- LuaSecureRandom::Register(L);
- LuaVoxelManip::Register(L);
- NodeMetaRef::Register(L);
- NodeTimerRef::Register(L);
- ObjectRef::Register(L);
- LuaSettings::Register(L);
- StorageRef::Register(L);
-}
-
-void log_deprecated(const std::string &message)
-{
- log_deprecated(NULL, message);
-}
+++ /dev/null
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef SERVER_SCRIPTING_H_
-#define SERVER_SCRIPTING_H_
-
-#include "cpp_api/s_base.h"
-#include "cpp_api/s_entity.h"
-#include "cpp_api/s_env.h"
-#include "cpp_api/s_inventory.h"
-#include "cpp_api/s_node.h"
-#include "cpp_api/s_player.h"
-#include "cpp_api/s_server.h"
-#include "cpp_api/s_security.h"
-
-/*****************************************************************************/
-/* Scripting <-> Server Game Interface */
-/*****************************************************************************/
-
-class ServerScripting:
- virtual public ScriptApiBase,
- public ScriptApiDetached,
- public ScriptApiEntity,
- public ScriptApiEnv,
- public ScriptApiNode,
- public ScriptApiPlayer,
- public ScriptApiServer,
- public ScriptApiSecurity
-{
-public:
- ServerScripting(Server* server);
-
- // use ScriptApiBase::loadMod() to load mods
-
-private:
- void InitializeModApi(lua_State *L, int top);
-};
-
-void log_deprecated(const std::string &message);
-
-#endif /* SCRIPTING_GAME_H_ */
#include "settings.h"
#include "profiler.h"
#include "log.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "nodedef.h"
#include "itemdef.h"
#include "craftdef.h"
#include "profiler.h"
#include "raycast.h"
#include "remoteplayer.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "voxelalgorithms.h"
#include "util/serialize.h"