chore(Core/Misc): sort includes (#17776)

* chore(Cleanup): sort includes

* fix build

* fix build again

Author: Winfidonarleyan

src/common/Collision/Maps/TileAssembler.cpp

@@ -20,10 +20,10 @@
 #include "MapDefines.h"
 #include "MapTree.h"
 #include "VMapDefinitions.h"
+#include <boost/filesystem.hpp>
 #include <iomanip>
 #include <set>
 #include <sstream>
-#include <boost/filesystem.hpp>
 
 using G3D::Vector3;
 using G3D::AABox;

src/common/Dynamic/ObjectRegistry.h

@@ -20,10 +20,10 @@
 
 #include "Define.h"
 #include <map>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <memory>
 
 /** ObjectRegistry holds all registry item of the same type
  */

src/common/Logging/enuminfo_LogCommon.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LogCommon.h"
 #include "Define.h"
+#include "LogCommon.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 

src/server/apps/authserver/Server/AuthSession.cpp

@@ -28,10 +28,10 @@
 #include "Log.h"
 #include "RealmList.h"
 #include "SecretMgr.h"
+#include "StringConvert.h"
 #include "TOTP.h"
 #include "Timer.h"
 #include "Util.h"
-#include "StringConvert.h"
 #include <boost/lexical_cast.hpp>
 #include <openssl/crypto.h>
 

src/server/apps/worldserver/RemoteAccess/RASession.cpp

@@ -21,8 +21,8 @@
 #include "DatabaseEnv.h"
 #include "Duration.h"
 #include "Log.h"
-#include "SRP6.h"
 #include "MotdMgr.h"
+#include "SRP6.h"
 #include "Util.h"
 #include "World.h"
 #include <boost/asio/buffer.hpp>

src/server/database/Database/DatabaseWorkerPool.cpp

@@ -31,8 +31,8 @@
 #include "SQLOperation.h"
 #include "Transaction.h"
 #include "WorldDatabase.h"
-#include <mysqld_error.h>
 #include <limits>
+#include <mysqld_error.h>
 
 #ifdef ACORE_DEBUG
 #include <boost/stacktrace.hpp>

src/server/game/AI/CreatureAI.cpp

@@ -15,17 +15,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AreaBoundary.h"
 #include "CreatureAI.h"
+#include "AreaBoundary.h"
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "CreatureGroups.h"
 #include "CreatureTextMgr.h"
 #include "Log.h"
 #include "MapReference.h"
 #include "Player.h"
-#include "Vehicle.h"
 #include "ScriptMgr.h"
+#include "Vehicle.h"
 #include "ZoneScript.h"
 
 //Disable CreatureAI when charmed

src/server/game/AI/CreatureAIRegistry.cpp

@@ -18,6 +18,7 @@
 #include "CreatureAIRegistry.h"
 #include "CombatAI.h"
 #include "CreatureAIFactory.h"
+#include "GameObjectAIFactory.h"
 #include "GuardAI.h"
 #include "MovementGenerator.h"
 #include "PassiveAI.h"
@@ -27,7 +28,6 @@
 #include "SmartAI.h"
 #include "TotemAI.h"
 #include "WaypointMovementGenerator.h"
-#include "GameObjectAIFactory.h"
 
 namespace AIRegistry
 {

src/server/game/AI/CreatureAISelector.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Creature.h"
 #include "CreatureAISelector.h"
+#include "Creature.h"
 #include "CreatureAIFactory.h"
 
 #include "MovementGenerator.h"

src/server/game/AI/CreatureAISelector.h

@@ -18,6 +18,8 @@
 #ifndef ACORE_CREATUREAISELECTOR_H
 #define ACORE_CREATUREAISELECTOR_H
 
+#include "Define.h"
+
 class CreatureAI;
 class Creature;
 class MovementGenerator;
@@ -31,4 +33,5 @@ namespace FactorySelector
     AC_GAME_API MovementGenerator* SelectMovementGenerator(Unit* unit);
     AC_GAME_API GameObjectAI* SelectGameObjectAI(GameObject* go);
 }
+
 #endif

src/server/game/AI/GameObjectAIFactory.h

@@ -18,8 +18,9 @@
 #ifndef ACORE_GAMEOBJECTAIFACTORY_H
 #define ACORE_GAMEOBJECTAIFACTORY_H
 
-#include "ObjectRegistry.h"
 #include "FactoryHolder.h"
+#include "GameObjectAI.h"
+#include "ObjectRegistry.h"
 
 typedef FactoryHolder<GameObjectAI, GameObject> GameObjectAICreator;
 

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -21,8 +21,8 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "InstanceScript.h"
 #include "EventMap.h"
+#include "InstanceScript.h"
 #include "TaskScheduler.h"
 
 #define CAST_AI(a, b)   (dynamic_cast<a*>(b))

src/server/game/Addons/AddonMgr.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "AddonMgr.h"
-#include "DatabaseEnv.h"
 #include "CryptoHash.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Timer.h"
 #include <list>

src/server/game/Autobroadcast/AutobroadcastMgr.cpp

@@ -16,10 +16,10 @@
  */
 
 #include "AutobroadcastMgr.h"
-#include "Config.h"
 #include "Chat.h"
-#include "Player.h"
+#include "Config.h"
 #include "GridNotifiers.h"
+#include "Player.h"
 
 AutobroadcastMgr* AutobroadcastMgr::instance()
 {

src/server/game/Battlegrounds/Arena.cpp

@@ -20,11 +20,11 @@
 #include "GroupMgr.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
+#include "Pet.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 #include "World.h"
 #include "WorldSession.h"
-#include "Pet.h"
-#include "ScriptMgr.h"
 //#include "WorldStatePackets.h"
 
 void ArenaScore::AppendToPacket(WorldPacket& data)

src/server/game/Battlegrounds/BattlegroundMgr.h

@@ -23,8 +23,8 @@
 #include "Common.h"
 #include "CreatureAIImpl.h"
 #include "DBCEnums.h"
-#include <unordered_map>
 #include <functional>
+#include <unordered_map>
 
 typedef std::map<uint32, Battleground*> BattlegroundContainer;
 typedef std::set<uint32> BattlegroundClientIdsContainer;

src/server/game/Battlegrounds/Zones/BattlegroundEY.h

@@ -20,8 +20,8 @@
 
 #include "Battleground.h"
 #include "BattlegroundScore.h"
-#include "Language.h"
 #include "EventMap.h"
+#include "Language.h"
 
 enum BG_EY_Events
 {

src/server/game/Chat/Channels/ChannelMgr.cpp

@@ -18,9 +18,9 @@
 #include "ChannelMgr.h"
 #include "Log.h"
 #include "Player.h"
-#include "World.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "World.h"
 
 ChannelMgr::~ChannelMgr()
 {

src/server/game/Conditions/ConditionMgr.cpp

@@ -20,8 +20,8 @@
 #include "GameEventMgr.h"
 #include "InstanceScript.h"
 #include "ObjectMgr.h"
-#include "Player.h"
 #include "Pet.h"
+#include "Player.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"

src/server/game/Conditions/DisableMgr.cpp

@@ -23,9 +23,9 @@
 #include "Player.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "World.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "World.h"
 
 namespace DisableMgr
 {

src/server/game/DataStores/M2Stores.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DBCStores.h"
+#include "M2Stores.h"
 #include "Containers.h"
+#include "DBCStores.h"
 #include "Log.h"
 #include "M2Structure.h"
-#include "M2Stores.h"
 #include "World.h"
 #include <boost/filesystem/path.hpp>
 #include <fstream>

src/server/game/DataStores/M2Structure.h

@@ -18,8 +18,8 @@
 #ifndef ACORE_M2STRUCTURE_H
 #define ACORE_M2STRUCTURE_H
 
-#include <G3D/Vector3.h>
 #include <G3D/AABox.h>
+#include <G3D/Vector3.h>
 
 // Structures for M2 file. Source: https://wowdev.wiki
 #pragma pack(push, 1)

src/server/game/Entities/Creature/GossipDef.cpp

@@ -17,8 +17,8 @@
 
 #include "GossipDef.h"
 #include "Formulas.h"
-#include "ObjectMgr.h"
 #include "Object.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
 #include "QuestDef.h"

src/server/game/Entities/DynamicObject/DynamicObject.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SpellAuraEffects.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
 #include "ObjectAccessor.h"
 #include "Opcodes.h"
 #include "ScriptMgr.h"
+#include "SpellAuraEffects.h"
 #include "Transport.h"
 #include "UpdateMask.h"
 #include "World.h"

src/server/game/Entities/GameObject/GameObject.h

@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "DatabaseEnv.h"
 #include "G3D/Quat.h"
+#include "GameObjectData.h"
 #include "LootMgr.h"
 #include "Object.h"
 #include "SharedDefines.h"
-#include "GameObjectData.h"
 #include "Unit.h"
 #include <array>
 

src/server/game/Entities/Item/Item.cpp

@@ -26,9 +26,9 @@
 #include "ScriptMgr.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "WorldPacket.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "WorldPacket.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {

src/server/game/Entities/Item/enuminfo_Item.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Item.h"
 #include "Define.h"
+#include "Item.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 

src/server/game/Entities/Object/Object.cpp

@@ -38,8 +38,10 @@
 #include "ScriptMgr.h"
 #include "SharedDefines.h"
 #include "SpellAuraEffects.h"
+#include "StringConvert.h"
 #include "TargetedMovementGenerator.h"
 #include "TemporarySummon.h"
+#include "Tokenize.h"
 #include "Totem.h"
 #include "Transport.h"
 #include "UpdateData.h"
@@ -49,8 +51,6 @@
 #include "Vehicle.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue

src/server/game/Entities/Object/Position.cpp

@@ -17,8 +17,8 @@
 
 #include "Position.h"
 #include "ByteBuffer.h"
-#include "GridDefines.h"
 #include "Geometry.h"
+#include "GridDefines.h"
 #include <G3D/g3dmath.h>
 #include <sstream>
 

src/server/game/Entities/Object/Position.h

@@ -18,9 +18,9 @@
 #ifndef ACore_game_Position_h__
 #define ACore_game_Position_h__
 
-#include <cmath>
 #include "Common.h"
 #include "G3D/Vector3.h"
+#include <cmath>
 
 class ByteBuffer;
 

src/server/game/Entities/Player/Player.cpp

@@ -75,7 +75,9 @@
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
+#include "StringConvert.h"
 #include "TicketMgr.h"
+#include "Tokenize.h"
 #include "Transport.h"
 #include "UpdateData.h"
 #include "UpdateFieldFlags.h"
@@ -85,8 +87,6 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue

src/server/game/Entities/Player/Player.h

@@ -37,8 +37,8 @@
 #include "PlayerTaxi.h"
 #include "QuestDef.h"
 #include "SpellAuras.h"
-#include "SpellMgr.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "TradeData.h"
 #include "Unit.h"
 #include "WorldSession.h"