From 2818d3f2244d2146a5cdb61cd41f6561c514f97c Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Tue, 25 Apr 2017 13:38:08 -0400
Subject: Rename Scripting API files for consistency

---
 src/client.cpp                      |   2 +-
 src/clientenvironment.cpp           |   2 +-
 src/content_abm.cpp                 |   2 +-
 src/content_sao.cpp                 |   2 +-
 src/emerge.cpp                      |   2 +-
 src/environment.cpp                 |   2 +-
 src/game.cpp                        |   2 +-
 src/guiFormSpecMenu.cpp             |   2 +-
 src/inventorymanager.cpp            |   2 +-
 src/map.cpp                         |   2 +-
 src/network/clientpackethandler.cpp |   2 +-
 src/network/serverpackethandler.cpp |   2 +-
 src/script/CMakeLists.txt           |   4 +-
 src/script/clientscripting.cpp      |  80 ------------------------
 src/script/clientscripting.h        |  42 -------------
 src/script/lua_api/l_env.cpp        |   2 +-
 src/script/lua_api/l_object.cpp     |   2 +-
 src/script/scripting_client.cpp     |  80 ++++++++++++++++++++++++
 src/script/scripting_client.h       |  42 +++++++++++++
 src/script/scripting_server.cpp     | 119 ++++++++++++++++++++++++++++++++++++
 src/script/scripting_server.h       |  57 +++++++++++++++++
 src/script/serverscripting.cpp      | 119 ------------------------------------
 src/script/serverscripting.h        |  57 -----------------
 src/server.cpp                      |   2 +-
 src/serverenvironment.cpp           |   2 +-
 25 files changed, 316 insertions(+), 316 deletions(-)
 delete mode 100644 src/script/clientscripting.cpp
 delete mode 100644 src/script/clientscripting.h
 create mode 100644 src/script/scripting_client.cpp
 create mode 100644 src/script/scripting_client.h
 create mode 100644 src/script/scripting_server.cpp
 create mode 100644 src/script/scripting_server.h
 delete mode 100644 src/script/serverscripting.cpp
 delete mode 100644 src/script/serverscripting.h

(limited to 'src')

diff --git a/src/client.cpp b/src/client.cpp
index 94c808a57..19fe9b0ba 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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;
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 4a8bbb066..cc75fd2d6 100644
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 1e175c64f..162f93364 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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)
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index caf6dcbab..81c6902f5 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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;
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 4c3a83f7e..d24971e44 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/environment.cpp b/src/environment.cpp
index c1aeeec60..4e782db81 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/game.cpp b/src/game.cpp
index 31a48531c..97dc8c064 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "version.h"
 #include "minimap.h"
 #include "mapblock_mesh.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
 
 #include "sound.h"
 
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 5861e9a81..14d576f8f 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 6ebc2994b..c976bd037 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/map.cpp b/src/map.cpp
index c148c51f1..9e8823f84 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 42c49be3c..772ffe905 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index c284cb6c8..5b026bbdb 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index c96ccc816..bebe2f037 100644
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(lua_api)
 
 # 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}
@@ -13,7 +13,7 @@ set(common_SCRIPT_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}
diff --git a/src/script/clientscripting.cpp b/src/script/clientscripting.cpp
deleted file mode 100644
index ba3f910c0..000000000
--- a/src/script/clientscripting.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-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);
-}
diff --git a/src/script/clientscripting.h b/src/script/clientscripting.h
deleted file mode 100644
index df94e8b71..000000000
--- a/src/script/clientscripting.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-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
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 75b07fa37..85791f90b 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 95e977f9e..9668f76f7 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "server.h"
 #include "hud.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 
 struct EnumString es_HudElementType[] =
 {
diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp
new file mode 100644
index 000000000..8ff5abcc4
--- /dev/null
+++ b/src/script/scripting_client.cpp
@@ -0,0 +1,80 @@
+/*
+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);
+}
diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h
new file mode 100644
index 000000000..df94e8b71
--- /dev/null
+++ b/src/script/scripting_client.h
@@ -0,0 +1,42 @@
+/*
+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
diff --git a/src/script/scripting_server.cpp b/src/script/scripting_server.cpp
new file mode 100644
index 000000000..ce56fcf19
--- /dev/null
+++ b/src/script/scripting_server.cpp
@@ -0,0 +1,119 @@
+/*
+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);
+}
diff --git a/src/script/scripting_server.h b/src/script/scripting_server.h
new file mode 100644
index 000000000..fd97ea40b
--- /dev/null
+++ b/src/script/scripting_server.h
@@ -0,0 +1,57 @@
+/*
+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_ */
diff --git a/src/script/serverscripting.cpp b/src/script/serverscripting.cpp
deleted file mode 100644
index 215b2cfd7..000000000
--- a/src/script/serverscripting.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-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);
-}
diff --git a/src/script/serverscripting.h b/src/script/serverscripting.h
deleted file mode 100644
index fd97ea40b..000000000
--- a/src/script/serverscripting.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-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_ */
diff --git a/src/server.cpp b/src/server.cpp
index 4c7e60286..2edf83947 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index c0dc0e0ea..4d2c87a4d 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
-- 
cgit v1.2.3