X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fitemdef.h;h=3e302840f9254dbfa7267a71384667f11db874f9;hb=5c89a0e12a1e679180b14bf92bdcdb1614e3982e;hp=01ec4fa2fed37623c606cc472b0553043bc7add7;hpb=072bbba69aa2528c309b76aaec288bdba52e119c;p=dragonfireclient.git

diff --git a/src/itemdef.h b/src/itemdef.h
index 01ec4fa2f..3e302840f 100644
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -18,8 +18,7 @@ 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 <string>
@@ -27,9 +26,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include "itemgroup.h"
 #include "sound.h"
+#include "texture_override.h" // TextureOverride
 class IGameDef;
 class Client;
 struct ToolCapabilities;
+#ifndef SERVER
+#include "client/tile.h"
+struct ItemMesh;
+struct ItemStack;
+#endif
 
 /*
 	Base item definition
@@ -51,12 +56,17 @@ struct ItemDefinition
 	ItemType type;
 	std::string name; // "" = hand
 	std::string description; // Shown in tooltip.
+	std::string short_description;
 
 	/*
 		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;
 
 	/*
@@ -76,6 +86,7 @@ struct ItemDefinition
 	// Server will update the precise end result a moment later.
 	// "" = no prediction
 	std::string node_placement_prediction;
+	u8 place_param2;
 
 	/*
 		Some helpful methods
@@ -94,8 +105,9 @@ 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;
@@ -110,8 +122,15 @@ class IItemDefManager
 	virtual video::ITexture* getInventoryTexture(const std::string &name,
 			Client *client) const=0;
 	// Get item wield mesh
-	virtual scene::IMesh* getWieldMesh(const std::string &name,
+	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, u16 protocol_version)=0;
@@ -120,8 +139,9 @@ class IItemDefManager
 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;
@@ -136,10 +156,14 @@ class IWritableItemDefManager : public IItemDefManager
 	virtual video::ITexture* getInventoryTexture(const std::string &name,
 			Client *client) const=0;
 	// Get item wield mesh
-	virtual scene::IMesh* getWieldMesh(const std::string &name,
+	virtual ItemMesh* getWieldMesh(const std::string &name,
 		Client *client) const=0;
 #endif
 
+	// Replace the textures of registered nodes with the ones specified in
+	// the texture pack's override.txt files
+	virtual void applyTextureOverrides(const std::vector<TextureOverride> &overrides)=0;
+
 	// Remove all registered item and node definitions and aliases
 	// Then re-add the builtin item definitions
 	virtual void clear()=0;
@@ -160,5 +184,3 @@ class IWritableItemDefManager : public IItemDefManager
 };
 
 IWritableItemDefManager* createItemDefManager();
-
-#endif