From 8addbc9655f60e0a2673e8df83ebb0d78e2a6aec Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 4 Dec 2011 00:22:34 +0200 Subject: [PATCH] Tool aliases --- data/mods/default/init.lua | 2 ++ data/mods/legacy/init.lua | 14 ++++++++++ src/scriptapi.cpp | 19 +++++++++++++ src/tooldef.cpp | 57 ++++++++++++++++++++++++++++++++------ src/tooldef.h | 5 ++++ 5 files changed, 89 insertions(+), 8 deletions(-) diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index c69d2645..003a0232 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -92,6 +92,8 @@ -- minetest.register_craftitem(name, craftitem definition) -- minetest.register_craft(recipe) -- minetest.register_abm(abm definition) +-- minetest.alias_node(name, convert_to) +-- minetest.alias_tool(name, convert_to) -- minetest.register_globalstep(func(dtime)) -- minetest.register_on_placenode(func(pos, newnode, placer)) -- minetest.register_on_dignode(func(pos, oldnode, digger)) diff --git a/data/mods/legacy/init.lua b/data/mods/legacy/init.lua index a51931e4..6bd5526e 100644 --- a/data/mods/legacy/init.lua +++ b/data/mods/legacy/init.lua @@ -40,6 +40,20 @@ minetest.alias_node("nyancat_rainbow", "default:nyancat_rainbow") minetest.alias_node("sapling", "default:sapling") minetest.alias_node("apple", "default:apple") +minetest.alias_tool("WPick", "default:pick_wood") +minetest.alias_tool("STPick", "default:pick_stone") +minetest.alias_tool("SteelPick", "default:pick_steel") +minetest.alias_tool("MesePick", "default:pick_mese") +minetest.alias_tool("WShovel", "default:shovel_wood") +minetest.alias_tool("STShovel", "default:shovel_stone") +minetest.alias_tool("SteelShovel", "default:shovel_steel") +minetest.alias_tool("WAxe", "default:axe_wood") +minetest.alias_tool("STAxe", "default:axe_stone") +minetest.alias_tool("SteelAxe", "default:axe_steel") +minetest.alias_tool("WSword", "default:sword_wood") +minetest.alias_tool("STSword", "default:sword_stone") +minetest.alias_tool("SteelSword", "default:sword_steel") + --[[ WATER_ALPHA = 160 WATER_VISC = 1 diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index c5574dd8..ab9f8921 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -1140,6 +1140,24 @@ static int l_alias_node(lua_State *L) return 0; /* number of results */ } +// alias_tool(name, convert_to_name) +static int l_alias_tool(lua_State *L) +{ + std::string name = luaL_checkstring(L, 1); + std::string convert_to = luaL_checkstring(L, 2); + + // 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->setAlias(name, convert_to); + + return 0; /* number of results */ +} + // register_craft({output=item, recipe={{item00,item10},{item01,item11}}) static int l_register_craft(lua_State *L) { @@ -1293,6 +1311,7 @@ static const struct luaL_Reg minetest_f [] = { {"register_craft", l_register_craft}, {"register_abm", l_register_abm}, {"alias_node", l_alias_node}, + {"alias_tool", l_alias_tool}, {"setting_get", l_setting_get}, {"setting_getbool", l_setting_getbool}, {"chat_send_all", l_chat_send_all}, diff --git a/src/tooldef.cpp b/src/tooldef.cpp index 45193f46..6733dfff 100644 --- a/src/tooldef.cpp +++ b/src/tooldef.cpp @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include #include "utility.h" +#include ToolDiggingProperties::ToolDiggingProperties(float full_punch_interval_, float a, float b, float c, float d, float e, @@ -92,8 +93,16 @@ public: { clear(); } - virtual const ToolDefinition* getToolDefinition(const std::string &toolname) const + virtual const ToolDefinition* getToolDefinition(const std::string &toolname_) const { + // Convert name according to possible alias + std::string toolname = toolname_; + std::map::const_iterator i; + i = m_aliases.find(toolname); + if(i != m_aliases.end()){ + toolname = i->second; + } + // Get the definition core::map::Node *n; n = m_tool_definitions.find(toolname); if(n == NULL) @@ -124,14 +133,14 @@ public: virtual bool registerTool(std::string toolname, const ToolDefinition &def) { infostream<<"registerTool: registering tool \""<::Node *n; - n = m_tool_definitions.find(toolname); - if(n != NULL){ - errorstream<<"registerTool: registering tool \""<getValue(); } m_tool_definitions.clear(); + m_aliases.clear(); + } + virtual void setAlias(const std::string &name, + const std::string &convert_to) + { + if(getToolDefinition(name) != NULL){ + infostream<<"tdef: not setting alias "< "< "<serialize(tmp_os); os<::const_iterator + i = m_aliases.begin(); i != m_aliases.end(); i++) + { + os<first); + os<second); + } } virtual void deSerialize(std::istream &is) { @@ -180,10 +210,21 @@ public: // Register registerTool(name, def); } + + u16 num_aliases = readU16(is); + if(!is.eof()){ + for(u16 i=0; i m_tool_definitions; + // Aliases for loading legacy crap + std::map m_aliases; }; IWritableToolDefManager* createToolDefManager() diff --git a/src/tooldef.h b/src/tooldef.h index aa4cb693..e28935e4 100644 --- a/src/tooldef.h +++ b/src/tooldef.h @@ -85,6 +85,11 @@ public: virtual bool registerTool(std::string toolname, const ToolDefinition &def)=0; virtual void clear()=0; + // Set an alias so that entries named will load as . + // Alias is not set if has already been defined. + // Alias will be removed if is defined at a later point of time. + virtual void setAlias(const std::string &name, + const std::string &convert_to)=0; virtual void serialize(std::ostream &os)=0; virtual void deSerialize(std::istream &is)=0; -- 2.30.2