4 files changed, 228 insertions, 18 deletions
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index c087ca8ef..a3b0d57be 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -391,38 +391,41 @@ void cNBTChunkSerializer::AddFallingBlockEntity(cFallingBlock * a_FallingBlock)
 
 void cNBTChunkSerializer::AddMinecartEntity(cMinecart * a_Minecart)
 {
-	const char * EntityClass = NULL;
-	switch (a_Minecart->GetPayload())
-	{
-		case cMinecart::mpNone:    EntityClass = "MinecartRideable"; break;
-		case cMinecart::mpChest:   EntityClass = "MinecartChest";    break;
-		case cMinecart::mpFurnace: EntityClass = "MinecartFurnace";  break;
-		case cMinecart::mpTNT:     EntityClass = "MinecartTNT";      break;
-		case cMinecart::mpHopper:  EntityClass = "MinecartHopper";   break;
-		default:
-		{
-			ASSERT(!"Unhandled minecart payload type");
-			return;
-		}
-	}  // switch (payload)
-	
 	m_Writer.BeginCompound("");
-		AddBasicEntity(a_Minecart, EntityClass);
+	
 		switch (a_Minecart->GetPayload())
 		{
 			case cMinecart::mpChest:
 			{
+				AddBasicEntity(a_Minecart, "MinecartChest");
 				// Add chest contents into the Items tag:
 				AddMinecartChestContents((cMinecartWithChest *)a_Minecart);
 				break;
 			}
-			
 			case cMinecart::mpFurnace:
 			{
+				AddBasicEntity(a_Minecart, "MinecartFurnace");
 				// TODO: Add "Push" and "Fuel" tags
 				break;
 			}
+			case cMinecart::mpHopper:
+			{
+				AddBasicEntity(a_Minecart, "MinecartHopper");
+				// TODO: Add hopper contents?
+				break;
+			}
+			case cMinecart::mpTNT:
+			{
+				AddBasicEntity(a_Minecart, "MinecartTNT");
+				break;
+			}
+			case cMinecart::mpNone:
+			{
+				AddBasicEntity(a_Minecart, "MinecartRideable");
+				break;
+			}
 		}  // switch (Payload)
+	
 	m_Writer.EndCompound();
 }
 
@@ -650,6 +653,13 @@ void cNBTChunkSerializer::AddHangingEntity(cHangingEntity * a_Hanging)
 		case BLOCK_FACE_YP: m_Writer.AddByte("Dir", (unsigned char)1); break;
 		case BLOCK_FACE_ZM: m_Writer.AddByte("Dir", (unsigned char)0); break;
 		case BLOCK_FACE_ZP: m_Writer.AddByte("Dir", (unsigned char)3); break;
+		
+		case BLOCK_FACE_XM:
+		case BLOCK_FACE_XP:
+		case BLOCK_FACE_NONE:
+		{
+			break;
+		}
 	}
 }
 
diff --git a/src/WorldStorage/StatSerializer.cpp b/src/WorldStorage/StatSerializer.cpp
new file mode 100644
index 000000000..74113941c
--- /dev/null
+++ b/src/WorldStorage/StatSerializer.cpp
@@ -0,0 +1,146 @@
+
+// StatSerializer.cpp
+
+
+#include "Globals.h"
+#include "StatSerializer.h"
+
+#include "../Statistics.h"
+
+
+
+
+
+cStatSerializer::cStatSerializer(const AString & a_WorldName, const AString & a_PlayerName, cStatManager * a_Manager)
+	: m_Manager(a_Manager)
+{
+	// Even though stats are shared between worlds, they are (usually) saved
+	// inside the folder of the default world.
+
+	AString StatsPath;
+	Printf(StatsPath, "%s/stats", a_WorldName.c_str());
+
+	m_Path = StatsPath + "/" + a_PlayerName + ".json";
+
+	// Ensure that the directory exists.
+	cFile::CreateFolder(FILE_IO_PREFIX + StatsPath);
+}
+
+
+
+
+
+bool cStatSerializer::Load(void)
+{
+	AString Data = cFile::ReadWholeFile(FILE_IO_PREFIX + m_Path);
+	if (Data.empty())
+	{
+		return false;
+	}
+
+	Json::Value Root;
+	Json::Reader Reader;
+
+	if (Reader.parse(Data, Root, false))
+	{
+		return LoadStatFromJSON(Root);
+	}
+
+	return false;
+}
+
+
+
+
+
+bool cStatSerializer::Save(void)
+{
+	Json::Value Root;
+	SaveStatToJSON(Root);
+
+	cFile File;
+	if (!File.Open(FILE_IO_PREFIX + m_Path, cFile::fmWrite))
+	{
+		return false;
+	}
+
+	Json::StyledWriter Writer;
+	AString JsonData = Writer.write(Root);
+
+	File.Write(JsonData.data(), JsonData.size());
+	File.Close();
+
+	return true;
+}
+
+
+
+
+
+void cStatSerializer::SaveStatToJSON(Json::Value & a_Out)
+{
+	for (unsigned int i = 0; i < (unsigned int)statCount; ++i)
+	{
+		StatValue Value = m_Manager->GetValue((eStatistic) i);
+
+		if (Value != 0)
+		{
+			const AString & StatName = cStatInfo::GetName((eStatistic) i);
+
+			a_Out[StatName] = Value;
+		}
+
+		// TODO 2014-05-11 xdot: Save "progress"
+	}
+}
+
+
+
+
+
+bool cStatSerializer::LoadStatFromJSON(const Json::Value & a_In)
+{
+	m_Manager->Reset();
+
+	for (Json::ValueIterator it = a_In.begin() ; it != a_In.end() ; ++it)
+	{
+		AString StatName = it.key().asString();
+
+		eStatistic StatType = cStatInfo::GetType(StatName);
+
+		if (StatType == statInvalid)
+		{
+			LOGWARNING("Invalid statistic type \"%s\"", StatName.c_str());
+			continue;
+		}
+
+		Json::Value & Node = *it;
+
+		if (Node.isInt())
+		{
+			m_Manager->SetValue(StatType, Node.asInt());
+		}
+		else if (Node.isObject())
+		{
+			StatValue Value = Node.get("value", 0).asInt();
+
+			// TODO 2014-05-11 xdot: Load "progress"
+
+			m_Manager->SetValue(StatType, Value);
+		}
+		else
+		{
+			LOGWARNING("Invalid statistic value for type \"%s\"", StatName.c_str());
+		}
+	}
+
+	return true;
+}
+
+
+
+
+
+
+
+
diff --git a/src/WorldStorage/StatSerializer.h b/src/WorldStorage/StatSerializer.h
new file mode 100644
index 000000000..72f8d74f1
--- /dev/null
+++ b/src/WorldStorage/StatSerializer.h
@@ -0,0 +1,55 @@
+
+// StatSerializer.h
+
+// Declares the cStatSerializer class that is used for saving stats into JSON
+
+
+
+
+
+#pragma once
+
+#include "json/json.h"
+
+
+
+
+
+// fwd:
+class cStatManager;
+
+
+
+
+class cStatSerializer
+{
+public:
+
+	cStatSerializer(const AString & a_WorldName, const AString & a_PlayerName, cStatManager * a_Manager);
+
+	/* Try to load the player statistics. Returns whether the operation was successful or not. */
+	bool Load(void);
+
+	/* Try to save the player statistics. Returns whether the operation was successful or not. */
+	bool Save(void);
+
+
+protected:
+
+	void SaveStatToJSON(Json::Value & a_Out);
+
+	bool LoadStatFromJSON(const Json::Value & a_In);
+
+
+private:
+
+	cStatManager* m_Manager;
+
+	AString m_Path;
+
+
+} ;
+
+
+
+
diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp
index 54eaaca5c..6867ad5bc 100644
--- a/src/WorldStorage/WorldStorage.cpp
+++ b/src/WorldStorage/WorldStorage.cpp
@@ -243,7 +243,6 @@ void cWorldStorage::Execute(void)
 		bool Success;
 		do
 		{
-			Success = false;
 			if (m_ShouldTerminate)
 			{
 				return;