Improve glass

[oweals/minetest.git] / src / scriptapi.cpp

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 27f46a8acd2665d727b3a6a07c2cda1772c48656..f15b6cd45111a991502ececa49d2f05bad7979e8 100644 (file)
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -35,10 +35,11 @@ extern "C" {
 //#include "luna.h"
 #include "luaentity_common.h"
 #include "content_sao.h" // For LuaEntitySAO
+#include "tooldef.h"
 
 /*
 TODO:
-- Node type definition
+- Node definition
 - Random node triggers
 - Object visual client-side stuff
        - Blink effect
@@ -51,6 +52,7 @@ TODO:
        blockdef.on_inventory_modified
        meta.set("owner", playername)
        meta.get("owner")
+- Item definition
 */
 
 static void stackDump(lua_State *L, std::ostream &o)
@@ -141,8 +143,8 @@ v3f readFloatPos(lua_State *L, int index)
 static int l_register_entity(lua_State *L)
 {
        const char *name = luaL_checkstring(L, 1);
-       luaL_checktype(L, 2, LUA_TTABLE);
        infostream<<"register_entity: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
 
        // Get minetest.registered_entities
        lua_getglobal(L, "minetest");
@@ -196,9 +198,99 @@ static int l_register_globalstep(lua_State *L)
        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)
+{
+       const char *name = luaL_checkstring(L, 1);
+       infostream<<"register_tool: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
+
+       // 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();
+       
+       int table = 2;
+       
+       ToolDefinition def;
+
+       lua_getfield(L, table, "image");
+       if(lua_isstring(L, -1))
+               def.imagename = lua_tostring(L, -1);
+       lua_pop(L, 1);
+       
+       lua_getfield(L, table, "basetime");
+       def.properties.basetime = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dt_weight");
+       def.properties.dt_weight = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dt_crackiness");
+       def.properties.dt_crackiness = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dt_crumbliness");
+       def.properties.dt_crumbliness = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dt_cuttability");
+       def.properties.dt_cuttability = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "basedurability");
+       def.properties.basedurability = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dd_weight");
+       def.properties.dd_weight = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dd_crackiness");
+       def.properties.dd_crackiness = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dd_crumbliness");
+       def.properties.dd_crumbliness = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table, "dd_cuttability");
+       def.properties.dd_cuttability = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+
+       tooldef->registerTool(name, def);
+
+       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},
        {NULL, NULL}
 };
 
@@ -478,7 +570,11 @@ private:
                                <<" itemstring=\""<<itemstring<<"\""<<std::endl;
                // Do it
                std::istringstream is(itemstring, std::ios::binary);
-               InventoryItem *item = InventoryItem::deSerialize(is);
+               ServerEnvironment *env = co->getEnv();
+               assert(env);
+               IGameDef *gamedef = env->getGameDef();
+               InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
+               infostream<<"item="<<env<<std::endl;
                bool fits = co->addToInventory(item);
                // Return
                lua_pushboolean(L, fits);
@@ -557,7 +653,8 @@ const luaL_reg ObjectRef::methods[] = {
 };
 
 // Creates a new anonymous reference if id=0
-static void objectref_get_or_create(lua_State *L, ServerActiveObject *cobj)
+static void objectref_get_or_create(lua_State *L,
+               ServerActiveObject *cobj)
 {
        if(cobj->getId() == 0){
                ObjectRef::create(L, cobj);
@@ -576,6 +673,10 @@ void scriptapi_export(lua_State *L, Server *server)
        assert(lua_checkstack(L, 20));
        infostream<<"scriptapi_export"<<std::endl;
        StackUnroller stack_unroller(L);
+
+       // Store server as light userdata in registry
+       lua_pushlightuserdata(L, server);
+       lua_setfield(L, LUA_REGISTRYINDEX, "minetest_server");
        
        // Register global functions in table minetest
        lua_newtable(L);