test

14 files changed, 140 insertions, 17 deletions

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index accbb1a87..ccd74a18f 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -169,10 +169,12 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 	}
 	push_groups(L, i.groups);
 	lua_setfield(L, -2, "groups");
+	lua_newtable(L);
 	push_soundspec(L, i.sound_place);
-	lua_setfield(L, -2, "sound_place");
+	lua_setfield(L, -2, "place");
 	push_soundspec(L, i.sound_place_failed);
-	lua_setfield(L, -2, "sound_place_failed");
+	lua_setfield(L, -2, "place_failed");
+	lua_setfield(L, -2, "sounds");
 	lua_pushstring(L, i.node_placement_prediction.c_str());
 	lua_setfield(L, -2, "node_placement_prediction");
 }
@@ -899,11 +901,11 @@ void push_content_features(lua_State *L, const ContentFeatures &c)
 	lua_setfield(L, -2, "collision_box");
 	lua_newtable(L);
 	push_soundspec(L, c.sound_footstep);
-	lua_setfield(L, -2, "sound_footstep");
+	lua_setfield(L, -2, "footstep");
 	push_soundspec(L, c.sound_dig);
-	lua_setfield(L, -2, "sound_dig");
+	lua_setfield(L, -2, "dig");
 	push_soundspec(L, c.sound_dug);
-	lua_setfield(L, -2, "sound_dug");
+	lua_setfield(L, -2, "dug");
 	lua_setfield(L, -2, "sounds");
 	lua_pushboolean(L, c.legacy_facedir_simple);
 	lua_setfield(L, -2, "legacy_facedir_simple");
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 697e5f556..c45bc2c61 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -68,6 +68,7 @@ enum class ScriptingType: u8 {
 class Server;
 #ifndef SERVER
 class Client;
+class Game;
 #endif
 class IGameDef;
 class Environment;
@@ -106,6 +107,7 @@ public:
 	ScriptingType getType() { return m_type; }
 #ifndef SERVER
 	Client* getClient();
+	Game *getGame() { return m_game; }
 #endif
 
 	std::string getOrigin() { return m_last_run_mod; }
@@ -132,6 +134,9 @@ protected:
 	void stackDump(std::ostream &o);
 
 	void setGameDef(IGameDef* gamedef) { m_gamedef = gamedef; }
+#ifndef SERVER
+	void setGame(Game *game) { m_game = game; }
+#endif
 
 	Environment* getEnv() { return m_environment; }
 	void setEnv(Environment* env) { m_environment = env; }
@@ -157,6 +162,7 @@ private:
 	lua_State      *m_luastack = nullptr;
 
 	IGameDef       *m_gamedef = nullptr;
+	Game       *m_game = nullptr;
 	Environment    *m_environment = nullptr;
 	GUIEngine      *m_guiengine = nullptr;
 	ScriptingType  m_type;
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 0d6392c4a..3fe1edf97 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -227,7 +227,6 @@ void ScriptApiSecurity::initializeSecurity()
 
 void ScriptApiSecurity::initializeSecurityClient()
 {
-	return initializeSecurity();
 	static const char *whitelist[] = {
 		"assert",
 		"core",
diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
index 8486fc7bc..d507136bc 100644
--- a/src/script/lua_api/l_base.cpp
+++ b/src/script/lua_api/l_base.cpp
@@ -45,6 +45,11 @@ 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)
diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
index b46b5b567..6a8753004 100644
--- a/src/script/lua_api/l_base.h
+++ b/src/script/lua_api/l_base.h
@@ -32,6 +32,7 @@ extern "C" {
 
 #ifndef SERVER
 class Client;
+class Game;
 #endif
 
 class ScriptApiBase;
@@ -46,10 +47,10 @@ public:
 	static Server*          getServer(lua_State *L);
 	#ifndef SERVER
 	static Client*          getClient(lua_State *L);
+	static Game*        	getGame(lua_State *L);
 	#endif // !SERVER
 
 	static IGameDef*        getGameDef(lua_State *L);
-
 	static Environment*     getEnv(lua_State *L);
 	static GUIEngine*       getGuiEngine(lua_State *L);
 	// When we are not loading the mod, this function returns "."
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index fba182492..1bd74b7c7 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/clientevent.h"
 #include "client/sound.h"
 #include "client/clientenvironment.h"
+#include "client/game.h"
 #include "common/c_content.h"
 #include "common/c_converter.h"
 #include "cpp_api/s_base.h"
@@ -406,6 +407,54 @@ int ModApiClient::l_get_csm_restrictions(lua_State *L)
 	return 1;
 }
 
+// send_damage(damage)
+int ModApiClient::l_send_damage(lua_State *L)
+{
+	u16 damage = luaL_checknumber(L, 1);
+	getClient(L)->sendDamage(damage);
+	return 0;	
+}
+
+// place_node(pos)
+int ModApiClient::l_place_node(lua_State *L)
+{
+	Client *client = getClient(L);
+	v3s16 pos = read_v3s16(L, 1);
+	PointedThing pointed;
+	pointed.type = POINTEDTHING_NODE;
+	pointed.node_abovesurface = pos;
+	pointed.node_undersurface = pos;
+	client->interact(INTERACT_PLACE, pointed);
+	return 0;
+}
+
+// dig_node(pos)
+int ModApiClient::l_dig_node(lua_State *L)
+{
+	Client *client = getClient(L);
+	v3s16 pos = read_v3s16(L, 1);
+	PointedThing pointed;
+	pointed.type = POINTEDTHING_NODE;
+	pointed.node_abovesurface = pos;
+	pointed.node_undersurface = pos;
+	client->interact(INTERACT_START_DIGGING, pointed);
+	client->interact(INTERACT_DIGGING_COMPLETED, pointed);
+	return 0;
+}
+
+// start_dig(pos)
+int ModApiClient::l_start_dig(lua_State *L)
+{
+	Client *client = getClient(L);
+	v3s16 pos = read_v3s16(L, 1);
+	PointedThing pointed;
+	pointed.type = POINTEDTHING_NODE;
+	pointed.node_abovesurface = pos;
+	pointed.node_undersurface = pos;
+	client->interact(INTERACT_START_DIGGING, pointed);
+	return 0;
+}
+
 void ModApiClient::Initialize(lua_State *L, int top)
 {
 	API_FCT(get_current_modname);
@@ -433,4 +482,8 @@ void ModApiClient::Initialize(lua_State *L, int top)
 	API_FCT(get_builtin_path);
 	API_FCT(get_language);
 	API_FCT(get_csm_restrictions);
+	API_FCT(send_damage);
+	API_FCT(place_node);
+	API_FCT(dig_node);
+	API_FCT(start_dig);
 }
diff --git a/src/script/lua_api/l_client.h b/src/script/lua_api/l_client.h
index 6d1f70b1d..83739fab1 100644
--- a/src/script/lua_api/l_client.h
+++ b/src/script/lua_api/l_client.h
@@ -98,7 +98,18 @@ private:
 
 	// get_csm_restrictions()
 	static int l_get_csm_restrictions(lua_State *L);
-
+	
+	// send_damage(damage)
+	static int l_send_damage(lua_State *L);
+	
+	// place_node(pos)
+	static int l_place_node(lua_State *L);
+	
+	// dig_node(pos)
+	static int l_dig_node(lua_State *L);
+	
+	// start_dig(pos)
+	static int l_start_dig(lua_State *L);
 public:
 	static void Initialize(lua_State *L, int top);
 };
diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 0c174feca..99b20b015 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -24,11 +24,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_content.h"
 #include "itemdef.h"
 #include "nodedef.h"
-#include "server.h"
 #include "content_sao.h"
 #include "inventory.h"
 #include "log.h"
-
+#include "script/cpp_api/s_base.h"
+#ifndef SERVER
+#include "client/client.h"
+#include "client/renderingengine.h"
+#include "client/shader.h"
+#endif
 
 // garbage collector
 int LuaItemStack::gc_object(lua_State *L)
@@ -513,9 +517,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 
 	// Get the writable item and node definition managers from the server
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 	NodeDefManager *ndef =
-			getServer(L)->getWritableNodeDefManager();
+			getGameDef(L)->getWritableNodeDefManager();
 
 	// Check if name is defined
 	std::string name;
@@ -563,8 +567,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 					+ itos(MAX_REGISTERED_CONTENT+1)
 					+ ") exceeded (" + name + ")");
 		}
+		
 	}
-
+	
 	return 0; /* number of results */
 }
 
@@ -575,12 +580,12 @@ int ModApiItemMod::l_unregister_item_raw(lua_State *L)
 	std::string name = luaL_checkstring(L, 1);
 
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 
 	// Unregister the node
 	if (idef->get(name).type == ITEM_NODE) {
 		NodeDefManager *ndef =
-			getServer(L)->getWritableNodeDefManager();
+			getGameDef(L)->getWritableNodeDefManager();
 		ndef->removeNode(name);
 	}
 
@@ -598,7 +603,7 @@ int ModApiItemMod::l_register_alias_raw(lua_State *L)
 
 	// Get the writable item definition manager from the server
 	IWritableItemDefManager *idef =
-			getServer(L)->getWritableItemDefManager();
+			getGameDef(L)->getWritableItemDefManager();
 
 	idef->registerAlias(name, convert_to);
 
diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 821b1cb66..3538c4fe4 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -217,6 +217,15 @@ int LuaLocalPlayer::l_get_pos(lua_State *L)
 	return 1;
 }
 
+int LuaLocalPlayer::l_set_pos(lua_State *L)
+{
+	LocalPlayer *player = getobject(L, 1);
+	
+	v3f pos = checkFloatPos(L, 2);
+	player->setPosition(pos);
+	return 0;
+}
+
 int LuaLocalPlayer::l_get_movement_acceleration(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
@@ -423,6 +432,7 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
 		luamethod(LuaLocalPlayer, get_key_pressed),
 		luamethod(LuaLocalPlayer, get_breath),
 		luamethod(LuaLocalPlayer, get_pos),
+		luamethod(LuaLocalPlayer, set_pos),
 		luamethod(LuaLocalPlayer, get_movement_acceleration),
 		luamethod(LuaLocalPlayer, get_movement_speed),
 		luamethod(LuaLocalPlayer, get_movement),
diff --git a/src/script/lua_api/l_localplayer.h b/src/script/lua_api/l_localplayer.h
index 01de2ed4e..13d45a7cb 100644
--- a/src/script/lua_api/l_localplayer.h
+++ b/src/script/lua_api/l_localplayer.h
@@ -59,6 +59,7 @@ private:
 	static int l_get_breath(lua_State *L);
 
 	static int l_get_pos(lua_State *L);
+	static int l_set_pos(lua_State *L);
 
 	static int l_get_movement_acceleration(lua_State *L);
 
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 00e849cdf..7e46bb020 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -330,6 +330,24 @@ int ModApiServer::l_kick_player(lua_State *L)
 	return 1;
 }
 
+// redirect_player(name, address, port)
+int ModApiServer::l_redirect_player(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	const char *name = luaL_checkstring(L, 1);
+	const char *address = luaL_checkstring(L, 2);
+	u16 port = luaL_checknumber(L, 3);
+	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
+	if (player == NULL) {
+		lua_pushboolean(L, false); // No such player
+		return 1;
+	}
+	getServer(L)->RedirectPeer(player->getPeerId(), address, port);
+	lua_pushboolean(L, true);
+	return 1;
+}
+
+// remove_player(name)
 int ModApiServer::l_remove_player(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -539,6 +557,7 @@ void ModApiServer::Initialize(lua_State *L, int top)
 	API_FCT(get_ban_description);
 	API_FCT(ban_player);
 	API_FCT(kick_player);
+	API_FCT(redirect_player);
 	API_FCT(remove_player);
 	API_FCT(unban_player_or_ip);
 	API_FCT(notify_authentication_modified);
diff --git a/src/script/lua_api/l_server.h b/src/script/lua_api/l_server.h
index 3aa1785a2..b31fae9f6 100644
--- a/src/script/lua_api/l_server.h
+++ b/src/script/lua_api/l_server.h
@@ -93,6 +93,9 @@ private:
 
 	// kick_player(name, [message]) -> success
 	static int l_kick_player(lua_State *L);
+	
+	// redirect_player(name, address, port) -> success
+	static int l_redirect_player(lua_State *L);
 
 	// remove_player(name)
 	static int l_remove_player(lua_State *L);
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index ae3e5df3d..75cd1dacf 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -523,7 +523,7 @@ void ModApiUtil::InitializeClient(lua_State *L, int top)
 
 	API_FCT(is_yes);
 	API_FCT(is_nan);
-
+	
 	API_FCT(compress);
 	API_FCT(decompress);
 
@@ -532,6 +532,9 @@ void ModApiUtil::InitializeClient(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	
+	LuaSettings::create(L, g_settings, g_settings_path);
+	lua_setfield(L, top, "settings");
 }
 
 void ModApiUtil::InitializeAsync(lua_State *L, int top)
diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp
index 1288b1df7..36065a9d5 100644
--- a/src/script/scripting_client.cpp
+++ b/src/script/scripting_client.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "scripting_client.h"
 #include "client/client.h"
+#include "client/game.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_client.h"
 #include "lua_api/l_env.h"
@@ -35,11 +36,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_nodemeta.h"
 #include "lua_api/l_localplayer.h"
 #include "lua_api/l_camera.h"
+#include "lua_api/l_settings.h"
 
 ClientScripting::ClientScripting(Client *client):
 	ScriptApiBase(ScriptingType::Client)
 {
 	setGameDef(client);
+	setGame(g_game);
 
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -76,7 +79,9 @@ void ClientScripting::InitializeModApi(lua_State *L, int top)
 	LuaLocalPlayer::Register(L);
 	LuaCamera::Register(L);
 	ModChannelRef::Register(L);
+	LuaSettings::Register(L);
 
+	ModApiItemMod::Initialize(L, top);
 	ModApiUtil::InitializeClient(L, top);
 	ModApiClient::Initialize(L, top);
 	ModApiStorage::Initialize(L, top);