From a637107a4e81be88938d68df4deae50e68cf2cd8 Mon Sep 17 00:00:00 2001 From: raymoo Date: Tue, 18 Apr 2017 16:30:27 -0700 Subject: Allow overriding tool capabilities through itemstack metadata This makes it possible to modify the tool capabilities of individual itemstacks by calling a method on itemstack metadata references. --- src/script/lua_api/l_itemstackmeta.cpp | 15 +++++++++++++++ src/script/lua_api/l_itemstackmeta.h | 11 +++++++++++ 2 files changed, 26 insertions(+) (limited to 'src/script/lua_api') diff --git a/src/script/lua_api/l_itemstackmeta.cpp b/src/script/lua_api/l_itemstackmeta.cpp index c37a82116..3cbc3d0f7 100644 --- a/src/script/lua_api/l_itemstackmeta.cpp +++ b/src/script/lua_api/l_itemstackmeta.cpp @@ -50,6 +50,20 @@ void ItemStackMetaRef::reportMetadataChange() } // Exported functions +int ItemStackMetaRef::l_set_tool_capabilities(lua_State *L) +{ + ItemStackMetaRef *metaref = checkobject(L, 1); + if (lua_isnoneornil(L, 2)) { + metaref->clearToolCapabilities(); + } else if (lua_istable(L, 2)) { + ToolCapabilities caps = read_tool_capabilities(L, 2); + metaref->setToolCapabilities(caps); + } else { + luaL_typerror(L, 2, "table or nil"); + } + + return 0; +} // garbage collector int ItemStackMetaRef::gc_object(lua_State *L) { @@ -116,5 +130,6 @@ const luaL_Reg ItemStackMetaRef::methods[] = { luamethod(MetaDataRef, to_table), luamethod(MetaDataRef, from_table), luamethod(MetaDataRef, equals), + luamethod(ItemStackMetaRef, set_tool_capabilities), {0,0} }; diff --git a/src/script/lua_api/l_itemstackmeta.h b/src/script/lua_api/l_itemstackmeta.h index 241f04c4c..46c40ab30 100644 --- a/src/script/lua_api/l_itemstackmeta.h +++ b/src/script/lua_api/l_itemstackmeta.h @@ -40,7 +40,18 @@ private: virtual void reportMetadataChange(); + void setToolCapabilities(const ToolCapabilities &caps) + { + istack->metadata.setToolCapabilities(caps); + } + + void clearToolCapabilities() + { + istack->metadata.clearToolCapabilities(); + } + // Exported functions + static int l_set_tool_capabilities(lua_State *L); // garbage collector static int gc_object(lua_State *L); -- cgit v1.2.3