1 files changed, 14 insertions, 21 deletions

diff --git a/src/Root.h b/src/Root.h
index 93117389e..84c6a98ec 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -2,8 +2,10 @@
 #pragma once
 
 #include "Protocol/Authenticator.h"
+#include "Protocol/MojangAPI.h"
 #include "HTTPServer/HTTPServer.h"
 #include "Defines.h"
+#include "RankManager.h"
 
 
 
@@ -12,7 +14,6 @@
 // fwd:
 class cThread;
 class cMonsterConfig;
-class cGroupManager;
 class cCraftingRecipes;
 class cFurnaceRecipe;
 class cWebAdmin;
@@ -40,11 +41,12 @@ namespace Json
 class cRoot
 {
 public:
-	static bool m_TerminateEventRaised;
-	
 	static cRoot * Get() { return s_Root; }
 	// tolua_end
 
+	static bool m_TerminateEventRaised;
+
+
 	cRoot(void);
 	~cRoot();
 
@@ -72,12 +74,8 @@ public:
 	/// Writes chunkstats, for each world and totals, to the output callback
 	void LogChunkStats(cCommandOutputCallback & a_Output);
 	
-	int GetPrimaryServerVersion(void) const { return m_PrimaryServerVersion; }  // tolua_export
-	void SetPrimaryServerVersion(int a_Version) { m_PrimaryServerVersion = a_Version; }  // tolua_export
-	
 	cMonsterConfig * GetMonsterConfig(void) { return m_MonsterConfig; }
 
-	cGroupManager *    GetGroupManager   (void) { return m_GroupManager; }     // tolua_export
 	cCraftingRecipes * GetCraftingRecipes(void) { return m_CraftingRecipes; }  // tolua_export
 	cFurnaceRecipe *   GetFurnaceRecipe  (void) { return m_FurnaceRecipe; }    // Exported in ManualBindings.cpp with quite a different signature
 	
@@ -87,6 +85,8 @@ public:
 	cWebAdmin *        GetWebAdmin       (void) { return m_WebAdmin; }         // tolua_export
 	cPluginManager *   GetPluginManager  (void) { return m_PluginManager; }    // tolua_export
 	cAuthenticator &   GetAuthenticator  (void) { return m_Authenticator; }
+	cMojangAPI &       GetMojangAPI      (void) { return m_MojangAPI; }
+	cRankManager &     GetRankManager    (void) { return m_RankManager; }
 
 	/** Queues a console command for execution through the cServer class.
 	The command will be executed in the tick thread
@@ -120,9 +120,6 @@ public:
 	/// Saves all chunks in all worlds
 	void SaveAllChunks(void);  // tolua_export
 	
-	/// Reloads all the groups
-	void ReloadGroups(void);  // tolua_export
-	
 	/// Calls the callback for each player in all worlds
 	bool ForEachPlayer(cPlayerListCallback & a_Callback);  // >> EXPORTED IN MANUALBINDINGS <<
 
@@ -133,15 +130,15 @@ public:
 	
 	/// Sends a chat message to all connected clients (in all worlds)
 	void BroadcastChat       (const AString & a_Message, eMessageType a_ChatPrefix = mtCustom);
-	void BroadcastChatInfo   (const AString & a_Message) { BroadcastChat(a_Message, mtInformation); }
+	void BroadcastChat       (const cCompositeChat & a_Message);
+	void BroadcastChatDeath  (const AString & a_Message) { BroadcastChat(a_Message, mtDeath); }
 	void BroadcastChatFailure(const AString & a_Message) { BroadcastChat(a_Message, mtFailure); }
-	void BroadcastChatSuccess(const AString & a_Message) { BroadcastChat(a_Message, mtSuccess); }
-	void BroadcastChatWarning(const AString & a_Message) { BroadcastChat(a_Message, mtWarning); }
 	void BroadcastChatFatal  (const AString & a_Message) { BroadcastChat(a_Message, mtFailure); }
+	void BroadcastChatInfo   (const AString & a_Message) { BroadcastChat(a_Message, mtInformation); }
 	void BroadcastChatJoin   (const AString & a_Message) { BroadcastChat(a_Message, mtJoin); }
 	void BroadcastChatLeave  (const AString & a_Message) { BroadcastChat(a_Message, mtLeave); }
-	void BroadcastChatDeath  (const AString & a_Message) { BroadcastChat(a_Message, mtDeath); }
-	void BroadcastChat       (const cCompositeChat & a_Message);
+	void BroadcastChatSuccess(const AString & a_Message) { BroadcastChat(a_Message, mtSuccess); }
+	void BroadcastChatWarning(const AString & a_Message) { BroadcastChat(a_Message, mtWarning); }
 	
 	/// Returns the textual description of the protocol version: 49 -> "1.4.4". Provided specifically for Lua API
 	static AString GetProtocolVersionTextFromInt(int a_ProtocolVersionNum);
@@ -170,9 +167,6 @@ private:
 	
 	typedef std::map<AString, cWorld *> WorldMap;
 	typedef std::vector<cCommand> cCommandQueue;
-	
-	/// The version of the protocol that is primary for the server (reported in the server list). All versions are still supported.
-	int m_PrimaryServerVersion;
 
 	cWorld * m_pDefaultWorld;
 	WorldMap m_WorldsByName;
@@ -185,16 +179,15 @@ private:
 	cServer *        m_Server;
 	cMonsterConfig * m_MonsterConfig;
 
-	cGroupManager *    m_GroupManager;
 	cCraftingRecipes * m_CraftingRecipes;
 	cFurnaceRecipe *   m_FurnaceRecipe;
 	cWebAdmin *        m_WebAdmin;
 	cPluginManager *   m_PluginManager;
 	cAuthenticator     m_Authenticator;
+	cMojangAPI         m_MojangAPI;
+	cRankManager       m_RankManager;
 	cHTTPServer        m_HTTPServer;
 
-	cMCLogger *      m_Log;
-
 	bool m_bStop;
 	bool m_bRestart;