X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fitemdef.h;h=45cff582a218096028f28689c04695bfe66bdee4;hb=7e649f985cf7b08d76366a7998e7c4f5a534c43e;hp=dd20ba353a403476de70da40d7431af6ab80ff1d;hpb=066b0314b14b1c59e7d6c0d35345562e6a0c644c;p=minetest.git diff --git a/src/itemdef.h b/src/itemdef.h index dd20ba353..45cff582a 100644 --- a/src/itemdef.h +++ b/src/itemdef.h @@ -18,16 +18,22 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef ITEMDEF_HEADER -#define ITEMDEF_HEADER +#pragma once #include "irrlichttypes_extrabloated.h" #include #include #include #include "itemgroup.h" +#include "sound.h" class IGameDef; +class Client; struct ToolCapabilities; +#ifndef SERVER +#include "client/tile.h" +struct ItemMesh; +struct ItemStack; +#endif /* Base item definition @@ -54,18 +60,25 @@ struct ItemDefinition Visual properties */ std::string inventory_image; // Optional for nodes, mandatory for tools/craftitems + std::string inventory_overlay; // Overlay of inventory_image. std::string wield_image; // If empty, inventory_image or mesh (only nodes) is used + std::string wield_overlay; // Overlay of wield_image. + std::string palette_image; // If specified, the item will be colorized based on this + video::SColor color; // The fallback color of the node. v3f wield_scale; /* Item stack and interaction properties */ - s16 stack_max; + u16 stack_max; bool usable; bool liquids_pointable; // May be NULL. If non-NULL, deleted by destructor ToolCapabilities *tool_capabilities; ItemGroupList groups; + SimpleSoundSpec sound_place; + SimpleSoundSpec sound_place_failed; + f32 range; // Client shall immediately place this node when player places the item. // Server will update the precise end result a moment later. @@ -80,7 +93,7 @@ struct ItemDefinition ItemDefinition& operator=(const ItemDefinition &def); ~ItemDefinition(); void reset(); - void serialize(std::ostream &os) const; + void serialize(std::ostream &os, u16 protocol_version) const; void deSerialize(std::istream &is); private: void resetInitial(); @@ -89,50 +102,59 @@ struct ItemDefinition class IItemDefManager { public: - IItemDefManager(){} - virtual ~IItemDefManager(){} + IItemDefManager() = default; + + virtual ~IItemDefManager() = default; // Get item definition virtual const ItemDefinition& get(const std::string &name) const=0; // Get alias definition - virtual std::string getAlias(const std::string &name) const=0; + virtual const std::string &getAlias(const std::string &name) const=0; // Get set of all defined item names and aliases - virtual std::set getAll() const=0; + virtual void getAll(std::set &result) const=0; // Check if item is known virtual bool isKnown(const std::string &name) const=0; #ifndef SERVER // Get item inventory texture virtual video::ITexture* getInventoryTexture(const std::string &name, - IGameDef *gamedef) const=0; + Client *client) const=0; // Get item wield mesh - virtual scene::IMesh* getWieldMesh(const std::string &name, - IGameDef *gamedef) const=0; + virtual ItemMesh* getWieldMesh(const std::string &name, + Client *client) const=0; + // Get item palette + virtual Palette* getPalette(const std::string &name, + Client *client) const = 0; + // Returns the base color of an item stack: the color of all + // tiles that do not define their own color. + virtual video::SColor getItemstackColor(const ItemStack &stack, + Client *client) const = 0; #endif - virtual void serialize(std::ostream &os)=0; + virtual void serialize(std::ostream &os, u16 protocol_version)=0; }; class IWritableItemDefManager : public IItemDefManager { public: - IWritableItemDefManager(){} - virtual ~IWritableItemDefManager(){} + IWritableItemDefManager() = default; + + virtual ~IWritableItemDefManager() = default; // Get item definition virtual const ItemDefinition& get(const std::string &name) const=0; // Get alias definition - virtual std::string getAlias(const std::string &name) const=0; + virtual const std::string &getAlias(const std::string &name) const=0; // Get set of all defined item names and aliases - virtual std::set getAll() const=0; + virtual void getAll(std::set &result) const=0; // Check if item is known virtual bool isKnown(const std::string &name) const=0; #ifndef SERVER // Get item inventory texture virtual video::ITexture* getInventoryTexture(const std::string &name, - IGameDef *gamedef) const=0; + Client *client) const=0; // Get item wield mesh - virtual scene::IMesh* getWieldMesh(const std::string &name, - IGameDef *gamedef) const=0; + virtual ItemMesh* getWieldMesh(const std::string &name, + Client *client) const=0; #endif // Remove all registered item and node definitions and aliases @@ -140,13 +162,14 @@ class IWritableItemDefManager : public IItemDefManager virtual void clear()=0; // Register item definition virtual void registerItem(const ItemDefinition &def)=0; + virtual void unregisterItem(const std::string &name)=0; // Set an alias so that items 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 registerAlias(const std::string &name, const std::string &convert_to)=0; - virtual void serialize(std::ostream &os)=0; + virtual void serialize(std::ostream &os, u16 protocol_version)=0; virtual void deSerialize(std::istream &is)=0; // Do stuff asked by threads that can only be done in the main thread @@ -154,5 +177,3 @@ class IWritableItemDefManager : public IItemDefManager }; IWritableItemDefManager* createItemDefManager(); - -#endif