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

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

1 files changed, 36 insertions, 3 deletions

diff --git a/Minecraft.World/EnchantmentTableEntity.cpp b/Minecraft.World/EnchantmentTableEntity.cpp
index 31da3c49..15131aa2 100644
--- a/Minecraft.World/EnchantmentTableEntity.cpp
+++ b/Minecraft.World/EnchantmentTableEntity.cpp
@@ -10,15 +10,16 @@ EnchantmentTableEntity::EnchantmentTableEntity()
 	random = new Random();
 
 	time = 0;
-    flip = 0.0f;
+	flip = 0.0f;
 	oFlip = 0.0f;
 	flipT = 0.0f;
 	flipA = 0.0f;
-    open = 0.0f;
+	open = 0.0f;
 	oOpen = 0.0f;
-    rot = 0.0f;
+	rot = 0.0f;
 	oRot = 0.0f;
 	tRot = 0.0f;
+	name = L"";
 }
 
 EnchantmentTableEntity::~EnchantmentTableEntity()
@@ -26,6 +27,18 @@ EnchantmentTableEntity::~EnchantmentTableEntity()
 	delete random;
 }
 
+void EnchantmentTableEntity::save(CompoundTag *base)
+{
+	TileEntity::save(base);
+	if (hasCustomName()) base->putString(L"CustomName", name);
+}
+
+void EnchantmentTableEntity::load(CompoundTag *base)
+{
+	TileEntity::load(base);
+	if (base->contains(L"CustomName")) name = base->getString(L"CustomName");
+}
+
 void EnchantmentTableEntity::tick()
 {
 	TileEntity::tick();
@@ -89,6 +102,26 @@ void EnchantmentTableEntity::tick()
 	flip = flip + flipA;
 }
 
+wstring EnchantmentTableEntity::getName()
+{
+	return hasCustomName() ? name : app.GetString(IDS_ENCHANT);
+}
+
+wstring EnchantmentTableEntity::getCustomName()
+{
+	return hasCustomName() ? name : L"";
+}
+
+bool EnchantmentTableEntity::hasCustomName()
+{
+	return !name.empty();
+}
+
+void EnchantmentTableEntity::setCustomName(const wstring &name)
+{
+	this->name = name;
+}
+
 shared_ptr<TileEntity> EnchantmentTableEntity::clone()
 {
 	shared_ptr<EnchantmentTableEntity> result = shared_ptr<EnchantmentTableEntity>( new EnchantmentTableEntity() );