run clang-format to order includes, fix include ordering errors

.clang-format

@@ -1,4 +1,4 @@
 BasedOnStyle: Google
 IndentWidth: 4
 AccessModifierOffset: -4
-SortIncludes: false # FIXME: https://github.com/4jcraft/4jcraft/issues/225
+# SortIncludes: false # FIXME: https://github.com/4jcraft/4jcraft/issues/225

targets/4J.Input/4J_Input.cpp

@@ -1,11 +1,14 @@
 #include "4J_Input.h"
-#include "../4J.Common/4J_InputActions.h"
+
 #include <SDL2/SDL.h>
 #include <math.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
 #include <string>
 
+#include "../4J.Common/4J_InputActions.h"
+
 C_4JInput InputManager;
 
 static const int KEY_COUNT = SDL_NUM_SCANCODES;

targets/4J.Profile/4J_Profile.cpp

@@ -1,9 +1,11 @@
 #include "4J_Profile.h"
-#include "../4J.Common/4J_ProfileConstants.h"
+
-#include "../4J.Input/4J_Input.h"
 #include <cstdio>
 #include <cstring>
 
+#include "../4J.Common/4J_ProfileConstants.h"
+#include "../4J.Input/4J_Input.h"
+
 C_4JProfile ProfileManager;
 
 namespace {

targets/4J.Render/4J_Render.cpp

@@ -1,6 +1,7 @@
-#include "gl3_loader.h"
 #include "4J_Render.h"
 
+#include "gl3_loader.h"
+
 // undefine macros from header to avoid argument mismatch
 #undef glGenTextures
 #undef glDeleteTextures
@@ -21,18 +22,18 @@
 #include "stb_image.h"
 
 #define GLM_FORCE_RADIANS
+#include <dlfcn.h>
+#include <pthread.h>
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
-
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
-#include <cassert>
 #include <unordered_map>
 #include <vector>
-#include <pthread.h>
-#include <dlfcn.h>
 
 C4JRender RenderManager;
 

targets/4J.Render/4J_Render.h

@@ -3,12 +3,12 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include "../platform/IPlatformRender.h"
+#include "gl3_loader.h"
-
+// NOTE: gl3_loader.h must be included before these two
-#ifdef __linux__
 #include <GL/gl.h>
 #include <GL/glu.h>
-#endif
+
+#include "../platform/IPlatformRender.h"
 
 class C4JRender : public IPlatformRender {
 public:

targets/4J.Render/gl3_loader.h

@@ -5,6 +5,7 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <SDL2/SDL.h>
+
 #include <cstdio>
 #ifndef GL_ARRAY_BUFFER
 #define GL_ARRAY_BUFFER 0x8892

targets/4J.Render/stb_image.h

@@ -628,11 +628,11 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char* obuffer, int olen,
 #define STBI_NO_ZLIB
 #endif
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>  // ptrdiff_t on osx
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
 #include <math.h>  // ldexp, pow

targets/4J.Storage/4J_Storage.cpp

@@ -1,7 +1,8 @@
 #include "4J_Storage.h"
+
 #include <cstring>
-#include <vector>
 #include <string>
+#include <vector>
 
 C4JStorage StorageManager;
 

targets/Minecraft.Client/Common/App_structs.h

@@ -3,12 +3,13 @@
 #include <cstdint>
 
 #include "4J.Storage/4J_Storage.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/App_Defines.h"
+#include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 typedef struct {
     wchar_t* wchFilename;

targets/Minecraft.Client/Common/Consoles_App.cpp

@@ -1,70 +1,71 @@
-#include "minecraft/world/item/crafting/Recipy.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
+#include "console_helpers/PathHelper.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/world/level/Level.h"
+#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
-#include "minecraft/world/Container.h"
-#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
-#include "minecraft/world/level/tile/entity/SignTileEntity.h"
-#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
-#include "console_helpers/PathHelper.h"
-#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/server/level/GameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "minecraft/stats/StatsCounter.h"
+#include "minecraft/world/Container.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/item/crafting/Recipy.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
+#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
+#include "minecraft/world/level/tile/entity/SignTileEntity.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
-#include "console_helpers/PlatformTime.h"
-#include "Minecraft_Macros.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "minecraft/world/level/LevelSettings.h"
-#include "minecraft/client/User.h"
 #include <cstring>
-#include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "console_helpers/compression.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "console_helpers/StringHelpers.h"
 
 #include "4J_Input.h"
-#include "minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
+#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
+#include "Minecraft_Macros.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "java/InputOutputStream/InputOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 #if defined(__linux__)
 #include <unistd.h>
+
 #include <climits>
 #endif
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-
-#include <thread>
 #include <chrono>
+#include <thread>
+
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
 
 // CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;

targets/Minecraft.Client/Common/Consoles_App.h

@@ -3,29 +3,25 @@
 #include <cstdint>
 #include <mutex>
 
-#include "4J.Storage/4J_Storage.h"
 #include "4J.Profile/4J_Profile.h"
+#include "4J.Storage/4J_Storage.h"
 
 // using namespace std;
 
+#include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-
-#include "minecraft/network/packet/DisconnectPacket.h"
-
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "minecraft/world/entity/item/MinecartHopper.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-#include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/world/entity/item/MinecartHopper.h"
 
 typedef struct _JoinFromInviteData {
     std::uint32_t dwUserIndex;       // dwUserIndex

targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp

@@ -1,4 +1,5 @@
 #include "Consoles_SoundEngine.h"
+
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
 
 bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {

targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp

@@ -1,29 +1,30 @@
-#include <ctype.h>
+#include "SoundEngine.h"
+
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+
 #include <cmath>
 #include <cstdlib>
+#include <filesystem>
 #include <initializer_list>
 #include <memory>
 #include <vector>
 
-#include "SoundEngine.h"
-#include <filesystem>
-#include "console_helpers/PathHelper.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/C4JThread.h"
-#include "minecraft/world/entity/Mob.h"
+#include "console_helpers/PathHelper.h"
 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 #if defined(__linux__)
 #define STB_VORBIS_HEADER_ONLY
@@ -57,8 +58,8 @@ int strcasecmp(const char* a, const char* b) {
 #undef FALSE
 #endif
 #if defined(_WINDOWS64)
-#include "Minecraft.Client/Windows64/Windows64_App.h"
 #include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
+#include "Minecraft.Client/Windows64/Windows64_App.h"
 #endif
 
 // ASSETS

targets/Minecraft.Client/Common/src/Audio/SoundEngine.h

@@ -7,11 +7,11 @@ class Random;
 using namespace std;
 #include <string>
 
-#include "minecraft/sounds/SoundTypes.h"
-#include "miniaudio.h"
 #include "Minecraft.Client/Common/App_Defines.h"
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "miniaudio.h"
 
 constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
 constexpr float SFX_3D_MAX_DISTANCE = 16.0f;

targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp

@@ -1,13 +1,14 @@
+#include "ColourTable.h"
+
+#include <cstring>
 #include <utility>
 #include <vector>
-#include <cstring>
 
-#include "ColourTable.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 

targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp

@@ -1,6 +1,7 @@
 #include "ConsoleGameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+
 #include "Minecraft.Client/Common/src/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 
 class ClientConnection;

targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp

@@ -1,17 +1,18 @@
+#include "DLCAudioFile.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <unordered_map>
 
-#include "DLCManager.h"
-#include "DLCAudioFile.h"
 #include "4J.Render/4J_Render.h"
 #include "4J_Storage.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"

targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp

@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCCapeFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 

targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp

@@ -1,11 +1,12 @@
-#include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "minecraft/client/Minecraft.h"
+
-#include "minecraft/client/skins/TexturePackRepository.h"
+#include "DLCManager.h"
-#include "minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 
 DLCColourTableFile::DLCColourTableFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_ColourTable, path) {

targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp

@@ -1,6 +1,7 @@
+#include "DLCFile.h"
+
 #include <sstream>
 
-#include "DLCFile.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 

targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp

@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCGameRulesFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
 
 DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path)

targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp

@@ -1,9 +1,10 @@
+#include "DLCGameRulesHeader.h"
+
 #include <string>
 
 #include "DLCManager.h"
-#include "DLCGameRulesHeader.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 

targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp

@@ -1,7 +1,8 @@
-#include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_LocalisationData, path) {

targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp

@@ -1,19 +1,20 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include <cassert>
-#include <algorithm>
 #include "DLCManager.h"
-#include "DLCPack.h"
+
-#include "DLCFile.h"
+#include <algorithm>
-#include "console_helpers/StringHelpers.h"
+#include <cassert>
-#include "console_helpers/PortableFileIO.h"
-#include "Minecraft.Client/Common/src/UI/UIController.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include <cstring>
-#include <limits>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <limits>
+
+#include "DLCFile.h"
+#include "DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/UIController.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 
 // 4jcraft, this is the size of wchar_t on disk
 // the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16

targets/Minecraft.Client/Common/src/DLC/DLCManager.h

@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 #include <cstdint>
-#include <vector>
 #include <string>
+#include <vector>
 class DLCPack;
 class DLCSkinFile;
 

targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp

@@ -1,27 +1,29 @@
+#include "DLCPack.h"
+
 #include <wchar.h>
+
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
-#include "DLCPack.h"
+#include "4J_Profile.h"
-#include "DLCSkinFile.h"
+#include "DLCAudioFile.h"
 #include "DLCCapeFile.h"
-#include "DLCTextureFile.h"
+#include "DLCColourTableFile.h"
-#include "DLCUIDataFile.h"
-#include "DLCLocalisationFile.h"
 #include "DLCGameRulesFile.h"
 #include "DLCGameRulesHeader.h"
-#include "DLCAudioFile.h"
+#include "DLCLocalisationFile.h"
-#include "DLCColourTableFile.h"
+#include "DLCSkinFile.h"
-#include "console_helpers/StringHelpers.h"
+#include "DLCTextureFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "DLCUIDataFile.h"
-#include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/StringHelpers.h"
 
 DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
     m_dataPath = L"";

targets/Minecraft.Client/Common/src/DLC/DLCPack.h

@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "DLCManager.h"
 #include "4J.Common/4J_Compat.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 
 class DLCFile;

targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp

@@ -1,15 +1,16 @@
+#include "DLCSkinFile.h"
+
 #include <wchar.h>
 
-#include "DLCManager.h"
-#include "DLCSkinFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "4J.Render/4J_Render.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {

targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h

@@ -5,9 +5,9 @@
 #include <vector>
 
 #include "DLCFile.h"
-#include "minecraft/client/model/HumanoidModel.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/client/model/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile {
 private:

targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp

@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCTextureFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 
 DLCTextureFile::DLCTextureFile(const std::wstring& path)

targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp

@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCUIDataFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 

targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h

@@ -1,32 +1,25 @@
 #pragma once
 #include "ConsoleGameRulesConstants.h"
-
 #include "GameRuleManager.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"

targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp

@@ -1,17 +1,17 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "console_helpers/compression.h"
-#include "console_helpers/StringHelpers.h"
-#include "java/File.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 
+#include "ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "java/File.h"
+
 const wchar_t* GameRuleManager::wchTagNameA[] = {
     L"",                   // eGameRuleType_Root
     L"MapOptions",         // eGameRuleType_LevelGenerationOptions

targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h

@@ -1,9 +1,9 @@
 #pragma once
 ////using namespace std;
 
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 
 class LevelGenerationOptions;
 class RootGameRulesDefinition;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp

@@ -1,21 +1,22 @@
+#include "ApplySchematicRuleDefinition.h"
+
 #include <algorithm>
 #include <cmath>
 
-#include "console_helpers/StringHelpers.h"
-#include "ApplySchematicRuleDefinition.h"
-#include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
-#include "minecraft/world/phys/AABB.h"
+#include "LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.Client/include/NetTypes.h"
+#include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
     LevelGenerationOptions* levelGenOptions) {

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h

@@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <optional>
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "ConsoleSchematicFile.h"
-#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
 class AABB;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp

@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "BiomeOverride.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 BiomeOverride::BiomeOverride() {

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h

@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
 class BiomeOverride : public GameRuleDefinition {
 private:

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp

@@ -1,8 +1,9 @@
+#include "ConsoleGenerateStructure.h"
+
 #include <wchar.h>
+
 #include <algorithm>
 
-#include "ConsoleGenerateStructure.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
@@ -11,11 +12,12 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
     m_x = m_y = m_z = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h

@@ -2,10 +2,10 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 class Level;
 class Random;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp

@@ -1,13 +1,21 @@
+#include "ConsoleSchematicFile.h"
+
 #include <assert.h>
 #include <string.h>
-#include <vector>
+
 #include <algorithm>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
-#include "ConsoleSchematicFile.h"
-#include "console_helpers/compression.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/compression.h"
+#include "java/Class.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/ItemFrame.h"
@@ -19,12 +27,6 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Class.h"
-#include "java/InputOutputStream/DataInputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/DoubleTag.h"
 #include "nbt/IntTag.h"

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h

@@ -5,6 +5,7 @@
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <ranges>

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp

@@ -1,23 +1,22 @@
-#include <fstream>
+#include "LevelGenerationOptions.h"
+
 #include <filesystem>
+#include <fstream>
 #include <unordered_set>
 
+#include "4J_Storage.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/stdafx.h"
-
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/Pos.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "LevelGenerationOptions.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-
-#include "4J_Storage.h"
 
 JustGrSource::JustGrSource() {
     m_displayName = L"Default_DisplayName";

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h

@@ -5,11 +5,10 @@
 
 #include <cstdint>
 
-#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp

@@ -1,7 +1,8 @@
+#include "LevelGenerators.h"
+
 #include <algorithm>
 
 #include "LevelGenerationOptions.h"
-#include "LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 
 LevelGenerators::LevelGenerators() {}

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp

@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "StartFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 StartFeature::StartFeature() {

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h

@@ -3,9 +3,9 @@
 
 #include <string>
 
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 
 class StartFeature : public GameRuleDefinition {
 private:

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp

@@ -1,11 +1,12 @@
 #include "XboxStructureActionGenerateBox.h"
-#include "console_helpers/StringHelpers.h"
+
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {
     m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp

@@ -1,11 +1,12 @@
 #include "XboxStructureActionPlaceBlock.h"
-#include "console_helpers/StringHelpers.h"
+
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {
     m_x = m_y = m_z = m_tile = m_data = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp

@@ -1,12 +1,14 @@
+#include "XboxStructureActionPlaceContainer.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "console_helpers/StringHelpers.h"
-#include "XboxStructureActionPlaceContainer.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h

@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 
-#include "XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "XboxStructureActionPlaceBlock.h"
 
 class AddItemRuleDefinition;
 class StructurePiece;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp

@@ -1,15 +1,17 @@
+#include "XboxStructureActionPlaceSpawner.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "XboxStructureActionPlaceSpawner.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {
     m_tile = Tile::mobSpawner_Id;

targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h

@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "XboxStructureActionPlaceBlock.h"
 
 class StructurePiece;
 class Level;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp

@@ -1,4 +1,5 @@
 #include "LevelRules.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
 
 LevelRules::LevelRules() {}

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp

@@ -1,18 +1,19 @@
+#include "AddEnchantmentRuleDefinition.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"
-#include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentCategory.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {
     m_enchantmentId = m_enchantmentLevel = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp

@@ -1,15 +1,16 @@
+#include "AddItemRuleDefinition.h"
+
 #include <algorithm>
 
-#include "console_helpers/StringHelpers.h"
-#include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 AddItemRuleDefinition::AddItemRuleDefinition() {
     m_itemId = m_quantity = m_auxValue = m_dataTag = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp

@@ -1,13 +1,14 @@
-#include "console_helpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "minecraft/network/Connection.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition() {
     m_itemId = 0;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp

@@ -1,15 +1,16 @@
+#include "CompleteAllRuleDefinition.h"
+
 #include <memory>
 #include <unordered_map>
 #include <utility>
 
-#include "CompleteAllRuleDefinition.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 
 void CompleteAllRuleDefinition::getChildren(

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp

@@ -1,17 +1,19 @@
+#include "CompoundGameRuleDefinition.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include "console_helpers/StringHelpers.h"
-#include "CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
+#include "console_helpers/StringHelpers.h"
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
     m_lastRuleStatusChanged = nullptr;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp

@@ -1,19 +1,21 @@
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+
 #include <assert.h>
 #include <wchar.h>
+
 #include <format>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 class Connection;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h

@@ -1,13 +1,13 @@
 #pragma once
 // using namespace std;
-#include <unordered_map>
-#include <string>
 #include <format>
 #include <memory>
+#include <string>
+#include <unordered_map>
 
-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class GameRule;
 class LevelRuleset;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp

@@ -1,8 +1,9 @@
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "LevelRuleset.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 
 class AABB;
 

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp

@@ -1,10 +1,11 @@
+#include "NamedAreaRuleDefinition.h"
+
 #include <wchar.h>
 
-#include "NamedAreaRuleDefinition.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition() {

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h

@@ -3,8 +3,8 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/phys/AABB.h"
 
 class NamedAreaRuleDefinition : public GameRuleDefinition {
 private:

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp

@@ -1,17 +1,19 @@
+#include "UpdatePlayerRuleDefinition.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "UpdatePlayerRuleDefinition.h"
-#include "minecraft/Pos.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/Pos.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodData.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
     m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp

@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition() {

targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h

@@ -4,8 +4,8 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "minecraft/Pos.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/Pos.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition {
 private:

targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp

@@ -1,12 +1,14 @@
 
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"

targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h

@@ -2,9 +2,10 @@
 // using namespace std;
 
 #include <stdint.h>
-#include <unordered_map>
+
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 class CompoundTag;
 class GameRuleDefinition;

targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h

@@ -1,6 +1,7 @@
 #pragma once
 // using namespace std;
 #include <vector>
+
 #include "GameRule.h"
 
 class GameRuleDefinition;

targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp

@@ -1,8 +1,8 @@
 
-#include <utility>
-
 #include "WstringLookup.h"
 
+#include <utility>
+
 WstringLookup::WstringLookup() { numIDs = 0; }
 
 std::wstring WstringLookup::lookup(unsigned int id) {

targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp

@@ -1,6 +1,7 @@
+#include "LeaderboardInterface.h"
+
 #include <assert.h>
 
-#include "LeaderboardInterface.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 
 LeaderboardInterface::LeaderboardInterface(LeaderboardManager* man) {

targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "LeaderboardManager.h"
 #include "4J.Common/4J_Compat.h"
+#include "LeaderboardManager.h"
 
 // 4J-JEV: Simple interface for handling ReadStat failures.
 class LeaderboardInterface {

targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp

@@ -1,9 +1,10 @@
-#include "console_helpers/StringHelpers.h"
 #include "LeaderboardManager.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 
 const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {
     L"Friends", L"MyScore", L"TopRank"};

targets/Minecraft.Client/Common/src/Leaderboards/base64.h

@@ -7,6 +7,7 @@
 #define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
 
 #include <stddef.h>
+
 #include <string>
 
 #if __cplusplus >= 201703L

targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp

@@ -1,7 +1,8 @@
+#include "StringTable.h"
+
 #include <ranges>
 #include <utility>
 
-#include "StringTable.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"

targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp

@@ -1,42 +1,40 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "GameNetworkManager.h"
 
-#include <thread>
 #include <chrono>
-#include <fstream>
 #include <filesystem>
+#include <fstream>
+#include <thread>
 
-#include "console_helpers/StringHelpers.h"
+#include "4J_Input.h"
-#include "minecraft/world/phys/AABB.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "minecraft/world/phys/Vec3.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "Socket.h"
+#include "console_helpers/StringHelpers.h"
 #include "console_helpers/ThreadName.h"
-#include "minecraft/world/entity/Entity.h"
+#include "console_helpers/compression.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/item/crafting/FireworksRecipe.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/User.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/PlayerList.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/world/entity/Entity.h"
-#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/world/item/crafting/FireworksRecipe.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/network/packet/DisconnectPacket.h"
-#include "console_helpers/compression.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/world/phys/AABB.h"
-
+#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "GameNetworkManager.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-#include "4J_Input.h"
 
 // Global instance
 CGameNetworkManager g_NetworkManager;

targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h

@@ -4,10 +4,10 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
+#include "console_helpers/C4JThread.h"
 
 class ClientConnection;
 class Minecraft;

targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 class Socket;
 
 // This is the platform independent interface for dealing with players within a

targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp

@@ -3,8 +3,8 @@
 #include <limits.h>
 
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/System.h"
 
 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {

targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h

@@ -1,10 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <string>
 
-#include "NetworkPlayerInterface.h"
 #include "4J.Common/4J_Compat.h"
+#include "NetworkPlayerInterface.h"
 
 class IQNetPlayer;
 class Socket;

targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h

@@ -4,12 +4,12 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
+#include "console_helpers/C4JThread.h"
 
 class ClientConnection;
 class Minecraft;

targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp

@@ -1,14 +1,16 @@
+#include "PlatformNetworkManagerStub.h"
+
 #include <string.h>
 #include <wchar.h>
+
 #include <compare>
 
-#include "Socket.h"
-#include "NetworkPlayerQNet.h"
-#include "PlatformNetworkManagerStub.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "NetworkPlayerQNet.h"
+#include "Socket.h"
 #include "console_helpers/C4JThread.h"
 
 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;

targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h

@@ -1,17 +1,17 @@
 #pragma once
 #include <stdint.h>
 // using namespace std;
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "console_helpers/C4JThread.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
-#include "4J.Common/4J_Compat.h"
+#include "console_helpers/C4JThread.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 class C4JThread;
 class CGameNetworkManager;

targets/Minecraft.Client/Common/src/Network/SessionInfo.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/include/NetTypes.h"
+
 // A struct that we store in the QoS data when we are hosting the session. Max
 // size 1020 bytes.
 typedef struct _GameSessionData {

targets/Minecraft.Client/Common/src/Network/Socket.cpp

@@ -1,17 +1,18 @@
-#include <stdio.h>
-#include <thread>
-#include <chrono>
-#include <vector>
-
 #include "Socket.h"
+
+#include <stdio.h>
+
+#include <chrono>
+#include <thread>
+#include <vector>
 // 4jcraft TODO
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "minecraft/server/network/ServerConnection.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "minecraft/server/network/ServerConnection.h"
 
 class SocketAddress {};
 

targets/Minecraft.Client/Common/src/Network/Socket.h

@@ -3,18 +3,18 @@
 #include <cstdint>
 #include <format>
 #ifndef __linux__
-#include <xrnm.h>
 #include <qnet.h>
+#include <xrnm.h>
 #endif
 #include <mutex>
 #include <queue>
 
-#include "java/InputOutputStream/InputStream.h"
+#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
-#include "java/InputOutputStream/OutputStream.h"
+#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "console_helpers/C4JThread.h"   // 4jcraft TODO
 #include "console_helpers/ThreadName.h"  // 4jcraft TODO
-#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
+#include "java/InputOutputStream/InputStream.h"
-#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "java/InputOutputStream/OutputStream.h"
 
 class INetworkPlayer;
 

targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp

@@ -1,6 +1,7 @@
 #include "TrialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h"
+
 #include "Minecraft.Client/Common/src/Trial/TrialMode.h"
+#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 
 class ClientConnection;

targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp

@@ -1,10 +1,11 @@
+#include "AreaConstraint.h"
+
 #include <memory>
 
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "AreaConstraint.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "minecraft/world/phys/Vec3.h"
 
 AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0,

targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp

@@ -1,18 +1,19 @@
+#include "ChangeStateConstraint.h"
+
 #include <memory>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "ChangeStateConstraint.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/PlayerInfoPacket.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
 ChangeStateConstraint::ChangeStateConstraint(

targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp

@@ -1,6 +1,7 @@
 #include "InputConstraint.h"
-#include "4J_Input.h"
+
 #include "4J.Common/4J_InputActions.h"
+#include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
 
 bool InputConstraint::isMappingConstrained(int iPad, int mapping) {

targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "TutorialConstraint.h"
 #include "AreaConstraint.h"
 #include "ChangeStateConstraint.h"
 #include "InputConstraint.h"
+#include "TutorialConstraint.h"

targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp

@@ -1,19 +1,18 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "FullTutorial.h"
 
 #include "4J.Common/4J_InputActions.h"
-
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
-#include "FullTutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
 
 FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
     : Tutorial(iPad, true) {

targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp

@@ -1,9 +1,10 @@
-#include "minecraft/client/Minecraft.h"
-#include "FullTutorial.h"
 #include "FullTutorialMode.h"
+
+#include "FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "minecraft/client/Minecraft.h"
 
 class ClientConnection;
 

targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp

@@ -1,11 +1,12 @@
+#include "AreaHint.h"
+
 #include <memory>
 
+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "AreaHint.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
 #include "minecraft/world/phys/Vec3.h"
 
 AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial,

targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"
 #include "minecraft/world/phys/AABB.h"
 
 class AABB;

targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp

@@ -1,10 +1,11 @@
 
+#include "DiggerItemHint.h"
+
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "DiggerItemHint.h"
 
 DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial,
                                int descriptionId, int items[],

targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp

@@ -1,6 +1,7 @@
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "LookAtEntityHint.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial,
                                    int descriptionId, int titleId,