X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fscriptapi.cpp;h=a18c144d3b8837e6cfc802ab2c9db4898725cc73;hb=4503b03b26b48b546ce3837120f149cd696692a2;hp=b37c50bc072613b7da79ff900a9bb576e0d1090e;hpb=62164d955ce739e87165bb90b1439807aca5ca55;p=dragonfireclient.git

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index b37c50bc0..a18c144d3 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -37,6 +37,7 @@ extern "C" {
 #include "content_sao.h" // For LuaEntitySAO
 #include "tooldef.h"
 #include "nodedef.h"
+#include "craftdef.h"
 
 /*
 TODO:
@@ -122,25 +123,79 @@ class StackUnroller
 	}
 };
 
-v3f readFloatPos(lua_State *L, int index)
+static v3f readFloatPos(lua_State *L, int index)
 {
 	v3f pos;
-	lua_pushvalue(L, index); // Push pos
-	luaL_checktype(L, -1, LUA_TTABLE);
-	lua_getfield(L, -1, "x");
+	luaL_checktype(L, index, LUA_TTABLE);
+	lua_getfield(L, index, "x");
 	pos.X = lua_tonumber(L, -1);
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "y");
+	lua_getfield(L, index, "y");
 	pos.Y = lua_tonumber(L, -1);
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "z");
+	lua_getfield(L, index, "z");
 	pos.Z = lua_tonumber(L, -1);
 	lua_pop(L, 1);
-	lua_pop(L, 1); // Pop pos
 	pos *= BS; // Scale to internal format
 	return pos;
 }
 
+static void pushpos(lua_State *L, v3s16 p)
+{
+	lua_newtable(L);
+	lua_pushnumber(L, p.X);
+	lua_setfield(L, -2, "x");
+	lua_pushnumber(L, p.Y);
+	lua_setfield(L, -2, "y");
+	lua_pushnumber(L, p.Z);
+	lua_setfield(L, -2, "z");
+}
+
+static v3s16 readpos(lua_State *L, int index)
+{
+	v3s16 p;
+	lua_getfield(L, index, "x");
+	p.X = lua_tonumber(L, -1);
+	lua_getfield(L, index, "y");
+	p.Y = lua_tonumber(L, -1);
+	lua_getfield(L, index, "z");
+	p.Z = lua_tonumber(L, -1);
+	return p;
+}
+
+static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
+{
+	lua_newtable(L);
+	lua_pushstring(L, ndef->get(n).name.c_str());
+	lua_setfield(L, -2, "name");
+	lua_pushnumber(L, n.getParam1());
+	lua_setfield(L, -2, "param1");
+	lua_pushnumber(L, n.getParam2());
+	lua_setfield(L, -2, "param2");
+}
+
+static MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
+{
+	lua_getfield(L, index, "name");
+	const char *name = lua_tostring(L, -1);
+	lua_pop(L, 1);
+	u8 param1;
+	lua_getfield(L, index, "param1");
+	if(lua_isnil(L, -1))
+		param1 = 0;
+	else
+		param1 = lua_tonumber(L, -1);
+	lua_pop(L, 1);
+	u8 param2;
+	lua_getfield(L, index, "param2");
+	if(lua_isnil(L, -1))
+		param2 = 0;
+	else
+		param2 = lua_tonumber(L, -1);
+	lua_pop(L, 1);
+	return MapNode(ndef, name, param1, param2);
+}
+
 /*
 	Global functions
 */
@@ -179,52 +234,6 @@ static int l_register_entity(lua_State *L)
 	return 0; /* number of results */
 }
 
-// Register a global step function
-// register_globalstep(function)
-static int l_register_globalstep(lua_State *L)
-{
-	luaL_checktype(L, 1, LUA_TFUNCTION);
-	infostream<<"register_globalstep"<<std::endl;
-
-	lua_getglobal(L, "table");
-	lua_getfield(L, -1, "insert");
-	int table_insert = lua_gettop(L);
-	// Get minetest.registered_globalsteps
-	lua_getglobal(L, "minetest");
-	lua_getfield(L, -1, "registered_globalsteps");
-	luaL_checktype(L, -1, LUA_TTABLE);
-	int registered_globalsteps = lua_gettop(L);
-	// table.insert(registered_globalsteps, func)
-	lua_pushvalue(L, table_insert);
-	lua_pushvalue(L, registered_globalsteps);
-	lua_pushvalue(L, 1); // push function from argument 1
-	// Call insert
-	if(lua_pcall(L, 2, 0, 0))
-		script_error(L, "error: %s\n", lua_tostring(L, -1));
-
-	return 0; /* number of results */
-}
-
-#if 0
-// Clear all registered tools
-// deregister_tools()
-static int l_deregister_tools(lua_State *L)
-{
-	infostream<<"deregister_tools"<<std::endl;
-
-	// Get server from registry
-	lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-	Server *server = (Server*)lua_touserdata(L, -1);
-	// And get the writable tool definition manager from the server
-	IWritableToolDefManager *tooldef =
-			server->getWritableToolDefManager();
-	
-	tooldef->clear();
-
-	return 0; /* number of results */
-}
-#endif
-
 // register_tool(name, {lots of stuff})
 static int l_register_tool(lua_State *L)
 {
@@ -336,16 +345,169 @@ static int l_register_node(lua_State *L)
 		f.tname_inventory = lua_tostring(L, -1);
 	lua_pop(L, 1);
 
+	// TODO: Replace with actual parameter reading
+	// Temporarily set some sane parameters to allow digging
+	f.material.diggability = DIGGABLE_NORMAL;
+	f.material.weight = 0;
+	f.material.crackiness = 0;
+	f.material.crumbliness = 0;
+	f.material.cuttability = 0;
+	f.dug_item = std::string("NodeItem \"")+name+"\" 1";
+
 	nodedef->set(name, f);
 	return 0; /* number of results */
 }
 
+// register_craft({output=item, recipe={{item00,item10},{item01,item11}})
+static int l_register_craft(lua_State *L)
+{
+	infostream<<"register_craft"<<std::endl;
+	luaL_checktype(L, 1, LUA_TTABLE);
+	int table0 = 1;
+
+	// Get server from registry
+	lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+	Server *server = (Server*)lua_touserdata(L, -1);
+	// And get the writable craft definition manager from the server
+	IWritableCraftDefManager *craftdef =
+			server->getWritableCraftDefManager();
+	
+	std::string output;
+	int width = 0;
+	std::vector<std::string> input;
+
+	lua_getfield(L, table0, "output");
+	luaL_checktype(L, -1, LUA_TSTRING);
+	if(lua_isstring(L, -1))
+		output = lua_tostring(L, -1);
+	lua_pop(L, 1);
+
+	lua_getfield(L, table0, "recipe");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	if(lua_istable(L, -1)){
+		int table1 = lua_gettop(L);
+		lua_pushnil(L);
+		int rowcount = 0;
+		while(lua_next(L, table1) != 0){
+			int colcount = 0;
+			// key at index -2 and value at index -1
+			luaL_checktype(L, -1, LUA_TTABLE);
+			if(lua_istable(L, -1)){
+				int table2 = lua_gettop(L);
+				lua_pushnil(L);
+				while(lua_next(L, table2) != 0){
+					// key at index -2 and value at index -1
+					luaL_checktype(L, -1, LUA_TSTRING);
+					input.push_back(lua_tostring(L, -1));
+					// removes value, keeps key for next iteration
+					lua_pop(L, 1);
+					colcount++;
+				}
+			}
+			if(rowcount == 0){
+				width = colcount;
+			} else {
+				if(colcount != width){
+					script_error(L, "error: %s\n", "Invalid crafting recipe");
+				}
+			}
+			// removes value, keeps key for next iteration
+			lua_pop(L, 1);
+			rowcount++;
+		}
+	}
+	lua_pop(L, 1);
+
+	CraftDefinition def(output, width, input);
+	craftdef->registerCraft(def);
+
+	return 0; /* number of results */
+}
+
+// Register a global step function
+// register_globalstep(function)
+static int l_register_globalstep(lua_State *L)
+{
+	luaL_checktype(L, 1, LUA_TFUNCTION);
+	infostream<<"register_globalstep"<<std::endl;
+
+	lua_getglobal(L, "table");
+	lua_getfield(L, -1, "insert");
+	int table_insert = lua_gettop(L);
+	// Get minetest.registered_globalsteps
+	lua_getglobal(L, "minetest");
+	lua_getfield(L, -1, "registered_globalsteps");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	int registered_globalsteps = lua_gettop(L);
+	// table.insert(registered_globalsteps, func)
+	lua_pushvalue(L, table_insert);
+	lua_pushvalue(L, registered_globalsteps);
+	lua_pushvalue(L, 1); // push function from argument 1
+	// Call insert
+	if(lua_pcall(L, 2, 0, 0))
+		script_error(L, "error: %s\n", lua_tostring(L, -1));
+
+	return 0; /* number of results */
+}
+
+// register_on_placenode(function)
+static int l_register_on_placenode(lua_State *L)
+{
+	luaL_checktype(L, 1, LUA_TFUNCTION);
+	infostream<<"register_on_placenode"<<std::endl;
+
+	lua_getglobal(L, "table");
+	lua_getfield(L, -1, "insert");
+	int table_insert = lua_gettop(L);
+	// Get minetest.registered_on_placenodes
+	lua_getglobal(L, "minetest");
+	lua_getfield(L, -1, "registered_on_placenodes");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	int registered_on_placenodes = lua_gettop(L);
+	// table.insert(registered_on_placenodes, func)
+	lua_pushvalue(L, table_insert);
+	lua_pushvalue(L, registered_on_placenodes);
+	lua_pushvalue(L, 1); // push function from argument 1
+	// Call insert
+	if(lua_pcall(L, 2, 0, 0))
+		script_error(L, "error: %s\n", lua_tostring(L, -1));
+
+	return 0; /* number of results */
+}
+
+// register_on_dignode(function)
+static int l_register_on_dignode(lua_State *L)
+{
+	luaL_checktype(L, 1, LUA_TFUNCTION);
+	infostream<<"register_on_dignode"<<std::endl;
+
+	lua_getglobal(L, "table");
+	lua_getfield(L, -1, "insert");
+	int table_insert = lua_gettop(L);
+	// Get minetest.registered_on_dignodes
+	lua_getglobal(L, "minetest");
+	lua_getfield(L, -1, "registered_on_dignodes");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	int registered_on_dignodes = lua_gettop(L);
+	// table.insert(registered_on_dignodes, func)
+	lua_pushvalue(L, table_insert);
+	lua_pushvalue(L, registered_on_dignodes);
+	lua_pushvalue(L, 1); // push function from argument 1
+	// Call insert
+	if(lua_pcall(L, 2, 0, 0))
+		script_error(L, "error: %s\n", lua_tostring(L, -1));
+
+	return 0; /* number of results */
+}
+
 static const struct luaL_Reg minetest_f [] = {
 	{"register_entity", l_register_entity},
-	{"register_globalstep", l_register_globalstep},
-	//{"deregister_tools", l_deregister_tools},
 	{"register_tool", l_register_tool},
 	{"register_node", l_register_node},
+	{"register_craft", l_register_craft},
+	{"register_globalstep", l_register_globalstep},
+	{"register_on_placenode", l_register_on_placenode},
+	{"register_on_dignode", l_register_on_dignode},
 	{NULL, NULL}
 };
 
@@ -408,9 +570,8 @@ class EnvRef
 	
 	// Exported functions
 
-	// EnvRef:add_node(pos, content)
+	// EnvRef:add_node(pos, node)
 	// pos = {x=num, y=num, z=num}
-	// content = number
 	static int l_add_node(lua_State *L)
 	{
 		infostream<<"EnvRef::l_add_node()"<<std::endl;
@@ -418,26 +579,61 @@ class EnvRef
 		ServerEnvironment *env = o->m_env;
 		if(env == NULL) return 0;
 		// pos
-		v3s16 pos;
-		lua_pushvalue(L, 2); // Push pos
-		luaL_checktype(L, -1, LUA_TTABLE);
-		lua_getfield(L, -1, "x");
-		pos.X = lua_tonumber(L, -1);
-		lua_pop(L, 1);
-		lua_getfield(L, -1, "y");
-		pos.Y = lua_tonumber(L, -1);
-		lua_pop(L, 1);
-		lua_getfield(L, -1, "z");
-		pos.Z = lua_tonumber(L, -1);
-		lua_pop(L, 1);
-		lua_pop(L, 1); // Pop pos
+		v3s16 pos = readpos(L, 2);
 		// content
-		u16 content = 0;
-		lua_pushvalue(L, 3); // Push content
-		content = lua_tonumber(L, -1);
-		lua_pop(L, 1); // Pop content
+		MapNode n = readnode(L, 3, env->getGameDef()->ndef());
 		// Do it
-		env->getMap().addNodeWithEvent(pos, MapNode(content));
+		env->getMap().addNodeWithEvent(pos, n);
+		return 0;
+	}
+
+	// EnvRef:remove_node(pos)
+	// pos = {x=num, y=num, z=num}
+	static int l_remove_node(lua_State *L)
+	{
+		infostream<<"EnvRef::l_remove_node()"<<std::endl;
+		EnvRef *o = checkobject(L, 1);
+		ServerEnvironment *env = o->m_env;
+		if(env == NULL) return 0;
+		// pos
+		v3s16 pos = readpos(L, 2);
+		// Do it
+		env->getMap().removeNodeWithEvent(pos);
+		return 0;
+	}
+
+	// EnvRef:get_node(pos)
+	// pos = {x=num, y=num, z=num}
+	static int l_get_node(lua_State *L)
+	{
+		infostream<<"EnvRef::l_get_node()"<<std::endl;
+		EnvRef *o = checkobject(L, 1);
+		ServerEnvironment *env = o->m_env;
+		if(env == NULL) return 0;
+		// pos
+		v3s16 pos = readpos(L, 2);
+		// Do it
+		MapNode n = env->getMap().getNodeNoEx(pos);
+		// Return node
+		pushnode(L, n, env->getGameDef()->ndef());
+		return 1;
+	}
+
+	// EnvRef:add_luaentity(pos, entityname)
+	// pos = {x=num, y=num, z=num}
+	static int l_add_luaentity(lua_State *L)
+	{
+		infostream<<"EnvRef::l_add_luaentity()"<<std::endl;
+		EnvRef *o = checkobject(L, 1);
+		ServerEnvironment *env = o->m_env;
+		if(env == NULL) return 0;
+		// pos
+		v3f pos = readFloatPos(L, 2);
+		// content
+		const char *name = lua_tostring(L, 3);
+		// Do it
+		ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, "");
+		env->addActiveObject(obj);
 		return 0;
 	}
 
@@ -507,6 +703,9 @@ class EnvRef
 const char EnvRef::className[] = "EnvRef";
 const luaL_reg EnvRef::methods[] = {
 	method(EnvRef, add_node),
+	method(EnvRef, remove_node),
+	method(EnvRef, get_node),
+	method(EnvRef, add_luaentity),
 	{0,0}
 };
 
@@ -752,6 +951,12 @@ void scriptapi_export(lua_State *L, Server *server)
 	lua_newtable(L);
 	lua_setfield(L, -2, "registered_globalsteps");
 
+	lua_newtable(L);
+	lua_setfield(L, -2, "registered_on_placenodes");
+
+	lua_newtable(L);
+	lua_setfield(L, -2, "registered_on_dignodes");
+
 	lua_newtable(L);
 	lua_setfield(L, -2, "object_refs");
 
@@ -867,7 +1072,7 @@ void scriptapi_environment_step(lua_State *L, float dtime)
 {
 	realitycheck(L);
 	assert(lua_checkstack(L, 20));
-	//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
+	//infostream<<"scriptapi_environment_step"<<std::endl;
 	StackUnroller stack_unroller(L);
 
 	// Get minetest.registered_globalsteps
@@ -888,6 +1093,72 @@ void scriptapi_environment_step(lua_State *L, float dtime)
 	}
 }
 
+void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode)
+{
+	realitycheck(L);
+	assert(lua_checkstack(L, 20));
+	//infostream<<"scriptapi_environment_on_placenode"<<std::endl;
+	StackUnroller stack_unroller(L);
+
+	// Get server from registry
+	lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+	Server *server = (Server*)lua_touserdata(L, -1);
+	// And get the writable node definition manager from the server
+	IWritableNodeDefManager *ndef =
+			server->getWritableNodeDefManager();
+	
+	// Get minetest.registered_on_placenodes
+	lua_getglobal(L, "minetest");
+	lua_getfield(L, -1, "registered_on_placenodes");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	int table = lua_gettop(L);
+	// Foreach
+	lua_pushnil(L);
+	while(lua_next(L, table) != 0){
+		// key at index -2 and value at index -1
+		luaL_checktype(L, -1, LUA_TFUNCTION);
+		// Call function
+		pushpos(L, p);
+		pushnode(L, newnode, ndef);
+		if(lua_pcall(L, 2, 0, 0))
+			script_error(L, "error: %s\n", lua_tostring(L, -1));
+		// value removed, keep key for next iteration
+	}
+}
+
+void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode)
+{
+	realitycheck(L);
+	assert(lua_checkstack(L, 20));
+	//infostream<<"scriptapi_environment_on_dignode"<<std::endl;
+	StackUnroller stack_unroller(L);
+
+	// Get server from registry
+	lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+	Server *server = (Server*)lua_touserdata(L, -1);
+	// And get the writable node definition manager from the server
+	IWritableNodeDefManager *ndef =
+			server->getWritableNodeDefManager();
+	
+	// Get minetest.registered_on_dignodes
+	lua_getglobal(L, "minetest");
+	lua_getfield(L, -1, "registered_on_dignodes");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	int table = lua_gettop(L);
+	// Foreach
+	lua_pushnil(L);
+	while(lua_next(L, table) != 0){
+		// key at index -2 and value at index -1
+		luaL_checktype(L, -1, LUA_TFUNCTION);
+		// Call function
+		pushpos(L, p);
+		pushnode(L, oldnode, ndef);
+		if(lua_pcall(L, 2, 0, 0))
+			script_error(L, "error: %s\n", lua_tostring(L, -1));
+		// value removed, keep key for next iteration
+	}
+}
+
 /*
 	luaentity
 */
@@ -1066,6 +1337,8 @@ void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime)
 	// State: object is at top of stack
 	// Get step function
 	lua_getfield(L, -1, "on_step");
+	if(lua_isnil(L, -1))
+		return;
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	lua_pushnumber(L, dtime); // dtime
@@ -1089,6 +1362,8 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id,
 	// State: object is at top of stack
 	// Get function
 	lua_getfield(L, -1, "on_punch");
+	if(lua_isnil(L, -1))
+		return;
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	objectref_get_or_create(L, puncher); // Clicker reference
@@ -1112,6 +1387,8 @@ void scriptapi_luaentity_rightclick(lua_State *L, u16 id,
 	// State: object is at top of stack
 	// Get function
 	lua_getfield(L, -1, "on_rightclick");
+	if(lua_isnil(L, -1))
+		return;
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	objectref_get_or_create(L, clicker); // Clicker reference