Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 29 insertions, 0 deletions

diff --git a/Minecraft.World/BaseAttributeMap.h b/Minecraft.World/BaseAttributeMap.h
new file mode 100644
index 00000000..928975b8
--- /dev/null
+++ b/Minecraft.World/BaseAttributeMap.h
@@ -0,0 +1,29 @@
+#pragma once
+
+class ModifiableAttributeInstance;
+
+class BaseAttributeMap
+{
+protected:
+	//unordered_map<Attribute *, AttributeInstance *> attributesByObject;
+#ifdef __ORBIS__
+	unordered_map<eATTRIBUTE_ID, AttributeInstance *, std::hash<int> > attributesById;
+#else
+	unordered_map<eATTRIBUTE_ID, AttributeInstance *> attributesById;
+#endif
+
+public :
+	virtual ~BaseAttributeMap();
+
+	virtual AttributeInstance *getInstance(Attribute *attribute);
+	virtual AttributeInstance *getInstance(eATTRIBUTE_ID name);
+
+	virtual AttributeInstance *registerAttribute(Attribute *attribute) = 0;
+
+	virtual void getAttributes(vector<AttributeInstance *>& atts);
+	virtual void onAttributeModified(ModifiableAttributeInstance *attributeInstance);
+
+	// 4J: Changed these into specialised functions for adding/removing the modifiers of an item (it's cleaner)
+	virtual void removeItemModifiers(shared_ptr<ItemInstance> item);
+	virtual void addItemModifiers(shared_ptr<ItemInstance> item);
+};
\ No newline at end of file