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

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

1 files changed, 13 insertions, 4 deletions

diff --git a/Minecraft.World/EnchantmentTableEntity.h b/Minecraft.World/EnchantmentTableEntity.h
index aa54c812..18ae5b75 100644
--- a/Minecraft.World/EnchantmentTableEntity.h
+++ b/Minecraft.World/EnchantmentTableEntity.h
@@ -10,15 +10,24 @@ public:
 
 public:
 	int time;
-    float flip, oFlip, flipT, flipA;
-    float open, oOpen;
-    float rot, oRot, tRot;
+	float flip, oFlip, flipT, flipA;
+	float open, oOpen;
+	float rot, oRot, tRot;
 private:
 	Random *random;
+	wstring name;
+
 public:
 	EnchantmentTableEntity();
 	~EnchantmentTableEntity();
-    virtual void tick();
+
+	virtual void save(CompoundTag *base);
+	virtual void load(CompoundTag *base);
+	virtual void tick();
+	virtual wstring getName();
+	virtual wstring getCustomName();
+	virtual bool hasCustomName();
+	virtual void setCustomName(const wstring &name);
 
 	// 4J Added
 	virtual shared_ptr<TileEntity> clone();