format the whole repo (again)

2026-05-17 19:13:09 +00:00 · 2026-04-01 18:17:44 -05:00 · 2026-04-01 18:17:44 -05:00 · f1118bf007
parent 3d173c384d
commit f1118bf007
934 changed files with 21368 additions and 20452 deletions
--- a/targets/4J.Input/4J_Input.cpp
+++ b/targets/4J.Input/4J_Input.cpp
@ -1,9 +1,6 @@
 #include "4J_Input.h"

 #include <SDL2/SDL.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_gamecontroller.h>
 #include <SDL2/SDL_joystick.h>
@ -13,6 +10,10 @@
 #include <SDL2/SDL_stdinc.h>
 #include <SDL2/SDL_video.h>
 #include <SDL2/begin_code.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <string>

 #include "../4J.Common/4J_InputActions.h"
--- a/targets/4J.Profile/4J_Profile.h
+++ b/targets/4J.Profile/4J_Profile.h
@ -5,7 +5,6 @@

 #include "../4J.Common/4J_Compat.h"
 #include "../platform/IPlatformProfile.h"
-#include "../4J.Common/4J_Compat.h"
 #include "../platform/PlatformTypes.h"

 #define TITLEID_MINECRAFT 0x584111F7
--- a/targets/4J.Render/4J_Render.cpp
+++ b/targets/4J.Render/4J_Render.cpp
@ -1,12 +1,12 @@
 #include "4J_Render.h"

-#include "gl3_loader.h"
 #include "../platform/PlatformTypes.h"
 #include "SDL.h"
 #include "SDL_error.h"
 #include "SDL_events.h"
 #include "SDL_stdinc.h"
 #include "SDL_video.h"
+#include "gl3_loader.h"

 // undefine macros from header to avoid argument mismatch
 #undef glGenTextures
@ -30,15 +30,16 @@
 #define GLM_FORCE_RADIANS
 #include <dlfcn.h>
 #include <pthread.h>
+
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
-#include <cstdio>
-#include <cstring>
 #include <unordered_map>
-#include <vector>
-#include <cmath>
 #include <utility>
+#include <vector>

 C4JRender RenderManager;

--- a/targets/4J.Render/4J_Render.h
+++ b/targets/4J.Render/4J_Render.h
@ -4,6 +4,7 @@
 // NOTE: gl3_loader.h must be included before these two
 #include <GL/gl.h>
 #include <GL/glu.h>
+
 #include <cstdint>
 #include <cstdlib>

--- a/targets/4J.Storage/4J_Storage.cpp
+++ b/targets/4J.Storage/4J_Storage.cpp
@ -1,6 +1,7 @@
 #include "4J_Storage.h"

 #include <stdlib.h>
+
 #include <cstring>
 #include <string>
 #include <vector>
--- a/targets/4J.Storage/4J_Storage.h
+++ b/targets/4J.Storage/4J_Storage.h
@ -8,7 +8,6 @@

 #include "../4J.Common/4J_Compat.h"
 #include "../platform/IPlatformStorage.h"
-#include "../4J.Common/4J_Compat.h"

 class C4JStringTable;

--- a/targets/Minecraft.Client/Common/Consoles_App.cpp
+++ b/targets/Minecraft.Client/Common/Consoles_App.cpp
@ -1,17 +1,5 @@
-#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/renderer/GameRenderer.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/stats/StatsCounter.h"
-#include "minecraft/world/Container.h"
-#include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/item/crafting/Recipy.h"
-#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
+#include "Common/Consoles_App.h"
+
 #include "4J.Common/4J_Compat.h"
 #include "4J.Common/4J_InputActions.h"
 #include "4J_Profile.h"
@ -20,7 +8,6 @@
 #include "Common/App_Defines.h"
 #include "Common/App_enums.h"
 #include "Common/App_structs.h"
-#include "Common/Consoles_App.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
@ -37,17 +24,31 @@
 #include "Minecraft.Client/include/NetTypes.h"
 #include "SkinBox.h"
 #include "XboxStubs.h"
+#include "console_helpers/PathHelper.h"
 #include "java/Class.h"
 #include "java/File.h"
 #include "java/Random.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/EntityRenderer.h"
 #include "minecraft/client/skins/TexturePack.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/stats/StatsCounter.h"
+#include "minecraft/world/Container.h"
 #include "minecraft/world/entity/item/MinecartHopper.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/item/crafting/Recipy.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
 #include "strings.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
@ -58,15 +59,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <cstring>
+
 #include <chrono>
-#include <thread>
 #include <compare>
 #include <cstdint>
+#include <cstring>
 #include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
+#include <thread>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@ -77,6 +79,7 @@
 #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/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
 #include "Minecraft_Macros.h"
 #include "console_helpers/PlatformTime.h"
 #include "console_helpers/StringHelpers.h"
@ -88,7 +91,6 @@
 #include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/server/PlayerList.h"
 #include "minecraft/server/level/ServerPlayer.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"

 class BeaconTileEntity;
 class BrewingStandTileEntity;
--- a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
+++ b/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
@ -4,10 +4,10 @@
 #include <utility>
 #include <vector>

+#include "Common/App_enums.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
-#include "Common/App_enums.h"

 std::unordered_map<std::wstring, eMinecraftColour>
    ColourTable::s_colourNamesMap;
--- a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
@ -8,9 +8,9 @@
 #include "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/XboxStubs.h"
-#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
--- a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp
@ -1,8 +1,8 @@
 #include "DLCCapeFile.h"

 #include "DLCManager.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"

 DLCCapeFile::DLCCapeFile(const std::wstring& path)
    : DLCFile(DLCManager::e_DLCType_Cape, path) {}
--- a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
@ -2,11 +2,11 @@

 #include "DLCManager.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"
-#include "Minecraft.Client/Common/src/DLC/DLCFile.h"

 DLCColourTableFile::DLCColourTableFile(const std::wstring& path)
    : DLCFile(DLCManager::e_DLCType_ColourTable, path) {
--- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
@ -3,9 +3,9 @@
 #include <string>

 #include "DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"

 class StringTable;

--- a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp
@ -1,8 +1,8 @@
 #include "DLCLocalisationFile.h"

 #include "DLCManager.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.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) {
--- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@ -1,28 +1,29 @@
 #include "DLCManager.h"

 #include <wchar.h>
+
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <limits>
-#include <cstdio>
 #include <sstream>
 #include <unordered_map>
 #include <utility>

+#include "4J_Profile.h"
+#include "4J_Storage.h"
 #include "DLCFile.h"
 #include "DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "console_helpers/PortableFileIO.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/skins/TexturePackRepository.h"
-#include "4J_Profile.h"
-#include "4J_Storage.h"
-#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "strings.h"

 // 4jcraft, this is the size of wchar_t on disk
--- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
@ -1,6 +1,7 @@
 #include "DLCPack.h"

 #include <wchar.h>
+
 #include <algorithm>
 #include <sstream>
 #include <utility>
@ -16,12 +17,12 @@
 #include "DLCUIDataFile.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/DLCSkinFile.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"
-#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
-#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"

 DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
    m_dataPath = L"";
--- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
@ -1,14 +1,14 @@
 #include "DLCSkinFile.h"

-#include <wchar.h>
 #include <string.h>
+#include <wchar.h>

 #include "4J_Render.h"
 #include "DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/SkinBox.h"
 #include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/Common/src/DLC/DLCFile.h"

 DLCSkinFile::DLCSkinFile(const std::wstring& path)
    : DLCFile(DLCManager::e_DLCType_Skin, path) {
--- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
@ -8,7 +8,6 @@
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/include/SkinBox.h"
 #include "minecraft/client/model/HumanoidModel.h"
-#include "Minecraft.Client/Common/src/DLC/DLCManager.h"

 class DLCSkinFile : public DLCFile {
 private:
--- a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h
@ -4,7 +4,6 @@

 #include "DLCFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
-#include "Minecraft.Client/Common/src/DLC/DLCManager.h"

 class DLCTextureFile : public DLCFile {
 private:
--- a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp
@ -1,8 +1,8 @@
 #include "DLCUIDataFile.h"

 #include "DLCManager.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"

 DLCUIDataFile::DLCUIDataFile(const std::wstring& path)
    : DLCFile(DLCManager::e_DLCType_UIData, path) {
--- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
@ -2,6 +2,7 @@

 #include <assert.h>
 #include <string.h>
+
 #include <cstdint>
 #include <utility>
 #include <vector>
@ -9,18 +10,18 @@
 #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 "console_helpers/compression.h"
-#include "java/File.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.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/Localisation/StringTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/compression.h"
+#include "java/File.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
--- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
@ -2,14 +2,15 @@
 ////using namespace std;

 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <unordered_map>

 #include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 class LevelGenerationOptions;
 class RootGameRulesDefinition;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@ -5,6 +5,7 @@

 #include "ConsoleSchematicFile.h"
 #include "LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/StringHelpers.h"
@ -13,7 +14,6 @@
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
    LevelGenerationOptions* levelGenOptions) {
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <optional>
 #include <string>

--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
@ -1,10 +1,10 @@
 #include "BiomeOverride.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 BiomeOverride::BiomeOverride() {
    m_tile = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@ -1,8 +1,10 @@
 #include "ConsoleGenerateStructure.h"

 #include <wchar.h>
+
 #include <algorithm>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
@ -16,7 +18,6 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
    m_x = m_y = m_z = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
@ -2,12 +2,14 @@

 #include <assert.h>
 #include <string.h>
+
 #include <algorithm>
 #include <string>
 #include <unordered_map>
 #include <vector>

 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "console_helpers/compression.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/DataInputStream.h"
@ -29,7 +31,6 @@
 #include "nbt/ListTag.h"
 #include "nbt/NbtIo.h"
 #include "nbt/Tag.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"

 ConsoleSchematicFile::ConsoleSchematicFile() {
    m_xSize = m_ySize = m_zSize = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
@ -6,6 +6,7 @@

 #include <stdint.h>
 #include <string.h>
+
 #include <format>
 #include <memory>
 #include <ranges>
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@ -2,20 +2,18 @@

 #include <limits.h>
 #include <wchar.h>
+
 #include <filesystem>
 #include <fstream>
 #include <unordered_set>
 #include <utility>

-#include "4J_Storage.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/Pos.h"
 #include "4J_Profile.h"
+#include "4J_Storage.h"
 #include "Common/App_enums.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
@ -23,12 +21,15 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.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"
 #include "java/File.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/Pos.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
@ -9,10 +9,10 @@
 #include <vector>

 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 class ApplySchematicRuleDefinition;
 class LevelChunk;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
@ -1,10 +1,10 @@
 #include "StartFeature.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 StartFeature::StartFeature() {
    m_chunkX = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@ -1,12 +1,12 @@
 #include "XboxStructureActionGenerateBox.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.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/level/levelgen/structure/StructurePiece.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {
    m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@ -1,12 +1,12 @@
 #include "XboxStructureActionPlaceBlock.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.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/level/levelgen/structure/StructurePiece.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"

 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {
    m_x = m_y = m_z = m_tile = m_data = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
@ -1,8 +1,11 @@
 #include "XboxStructureActionPlaceContainer.h"

 #include <wchar.h>
+
 #include <memory>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/StringHelpers.h"
@ -12,8 +15,6 @@
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"

 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
    m_tile = Tile::chest_Id;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
@ -1,16 +1,17 @@
 #include "XboxStructureActionPlaceSpawner.h"

 #include <wchar.h>
+
 #include <memory>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.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 "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"

 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {
    m_tile = Tile::mobSpawner_Id;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@ -3,6 +3,8 @@
 #include <algorithm>
 #include <vector>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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"
@ -12,8 +14,6 @@
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentCategory.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {
    m_enchantmentId = m_enchantmentLevel = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@ -3,14 +3,14 @@
 #include <algorithm>

 #include "AddEnchantmentRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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 "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 AddItemRuleDefinition::AddItemRuleDefinition() {
    m_itemId = m_quantity = m_auxValue = m_dataTag = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@ -1,15 +1,15 @@
 #include "CollectItemRuleDefinition.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.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"
 #include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"

 CollectItemRuleDefinition::CollectItemRuleDefinition() {
    m_itemId = 0;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@ -4,13 +4,13 @@
 #include <unordered_map>
 #include <utility>

+#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"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 void CompleteAllRuleDefinition::getChildren(
    std::vector<GameRuleDefinition*>* children) {
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@ -1,20 +1,21 @@
 #include "CompoundGameRuleDefinition.h"

 #include <wchar.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "console_helpers/StringHelpers.h"

 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
    m_lastRuleStatusChanged = nullptr;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@ -2,6 +2,7 @@

 #include <assert.h>
 #include <wchar.h>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
@ -1,9 +1,9 @@
 #include "LevelRuleset.h"

-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"

 class AABB;

--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@ -2,11 +2,11 @@

 #include <wchar.h>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 NamedAreaRuleDefinition::NamedAreaRuleDefinition() {
    m_name = L"";
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@ -1,9 +1,12 @@
 #include "UpdatePlayerRuleDefinition.h"

 #include <wchar.h>
+
 #include <memory>

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.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"
@ -11,8 +14,6 @@
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodData.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
    m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@ -1,10 +1,10 @@
 #include "UseTileRuleDefinition.h"

+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.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.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 UseTileRuleDefinition::UseTileRuleDefinition() {
    m_tileId = -1;
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
@ -2,6 +2,7 @@
 // using namespace std;

 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
--- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
@ -1,38 +1,17 @@
 #include "GameNetworkManager.h"

 #include <assert.h>
+
+#include <algorithm>
 #include <chrono>
+#include <compare>
 #include <filesystem>
 #include <fstream>
-#include <thread>
-#include <algorithm>
-#include <compare>
 #include <memory>
+#include <thread>
 #include <vector>

 #include "4J_Input.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-#include "Socket.h"
-#include "console_helpers/StringHelpers.h"
-#include "console_helpers/ThreadName.h"
-#include "console_helpers/compression.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/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/world/entity/Entity.h"
-#include "minecraft/world/item/crafting/FireworksRecipe.h"
-#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "4J_Profile.h"
 #include "4J_Render.h"
 #include "4J_Storage.h"
@ -44,14 +23,36 @@
 #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Socket.h"
 #include "XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/ThreadName.h"
+#include "console_helpers/compression.h"
 #include "java/File.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/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/network/Connection.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/network/packet/PreLoginPacket.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/world/entity/Entity.h"
+#include "minecraft/world/item/crafting/FireworksRecipe.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "strings.h"

--- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
+++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
@ -1,19 +1,19 @@
 #pragma once
 #include <stdint.h>
 // using namespace std;
-#include <vector>
 #include <format>
 #include <string>
+#include <vector>
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h"
+#include "Minecraft.Client/include/NetTypes.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
 #include "console_helpers/C4JThread.h"
-#include "4J.Common/4J_Compat.h"
-#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h"
-#include "Minecraft.Client/include/NetTypes.h"

 class ClientConnection;
 class Minecraft;
--- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
@ -2,16 +2,17 @@

 #include <string.h>
 #include <wchar.h>
+
 #include <compare>

 #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 "Minecraft.Client/include/NetTypes.h"
 #include "NetworkPlayerQNet.h"
 #include "Socket.h"
 #include "console_helpers/C4JThread.h"
-#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
-#include "Minecraft.Client/include/NetTypes.h"

 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;

--- a/targets/Minecraft.Client/Common/src/Network/Socket.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/Socket.cpp
@ -1,6 +1,7 @@
 #include "Socket.h"

 #include <stdio.h>
+
 #include <chrono>
 #include <thread>
 #include <vector>
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
@ -2,11 +2,11 @@

 #include <memory>

+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"

 AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0,
                               double z0, double x1, double y1, double z1,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
@ -3,6 +3,7 @@
 #include <memory>

 #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"
@ -14,7 +15,6 @@
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"

 ChangeStateConstraint::ChangeStateConstraint(
    Tutorial* tutorial, eTutorial_State targetState,
--- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
@ -4,11 +4,10 @@
 #include <vector>

 #include "4J.Common/4J_InputActions.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h"
@ -28,6 +27,7 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "minecraft/world/item/crafting/Recipy.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/tile/Tile.h"
--- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h
@ -1,6 +1,6 @@
 #pragma once
-#include "Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Tutorial.h"

 #define FULL_TUTORIAL_PROGRESS_2_X_2_Crafting 1
 #define FULL_TUTORIAL_PROGRESS_3_X_3_Crafting 2
--- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
@ -1,9 +1,9 @@
 #include "FullTutorialMode.h"

 #include "FullTutorial.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "minecraft/client/Minecraft.h"

 class ClientConnection;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
@ -2,13 +2,13 @@

 #include <memory>

+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.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/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial,
                   eTutorial_State displayState, eTutorial_State completeState,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
@ -3,8 +3,8 @@

 #include <memory>

-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/item/ItemInstance.h"
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h
@ -1,7 +1,7 @@
 #pragma once

-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"

 class DiggerItem;
 class Level;
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
@ -1,7 +1,7 @@
 #include "LookAtEntityHint.h"

-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
@ -2,10 +2,10 @@

 #include <vector>

-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "minecraft/world/item/Item.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "minecraft/world/item/Item.h"

 LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial,
                               int tiles[], unsigned int tilesLength,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
@ -2,10 +2,10 @@

 #include <memory>

-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "minecraft/world/item/ItemInstance.h"

 TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[],
                           unsigned int itemsLength)
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
@ -3,8 +3,8 @@
 #include <vector>

 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
@ -5,13 +5,13 @@

 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/level/material/Material.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 ChoiceTask::ChoiceTask(
    Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
@ -2,8 +2,8 @@

 #include <memory>

-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/item/ItemInstance.h"

 class Tutorial;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
@ -9,10 +9,10 @@
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

 class Tutorial;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
@ -1,11 +1,12 @@
 #include "CraftTask.h"

 #include <wchar.h>
+
 #include <memory>
 #include <string>

-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/item/ItemInstance.h"

 class Tutorial;
 class TutorialConstraint;
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
@ -1,7 +1,7 @@
 #include "FullTutorialActiveTask.h"

-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 FullTutorialActiveTask::FullTutorialActiveTask(
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
@ -2,11 +2,11 @@

 #include <memory>

+#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 class Tutorial;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
@ -7,12 +7,12 @@

 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/level/material/Material.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

 InfoTask::InfoTask(Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
                   bool requiresUserInput /*= false*/, int iMapping /*= 0*/)
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h
@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "TutorialTask.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

 class Tutorial;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
@ -2,9 +2,9 @@

 #include <memory>

+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

 class Tutorial;
 class TutorialConstraint;
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
@ -1,9 +1,9 @@
 #include "StatTask.h"

 #include "4J_Profile.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/stats/StatsCounter.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"

 class Tutorial;

--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
@ -2,8 +2,8 @@

 #include <memory>

-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/item/ItemInstance.h"

 class Tutorial;
 class TutorialConstraint;
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
@ -2,8 +2,8 @@

 #include <memory>

-#include "minecraft/world/level/Level.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/level/Level.h"

 class Tutorial;
 class TutorialConstraint;
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
@ -2,18 +2,11 @@

 #include <assert.h>
 #include <string.h>
+
 #include <algorithm>
 #include <compare>

 #include "4J.Common/4J_InputActions.h"
-#include "TutorialMessage.h"
-#include "console_helpers/PlatformTime.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/world/entity/Entity.h"
 #include "4J_Profile.h"
 #include "Common/App_enums.h"
 #include "Common/App_structs.h"
@ -31,7 +24,15 @@
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "TutorialMessage.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/DyePowderItem.h"
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
@ -1,19 +1,19 @@
 #pragma once
 // using namespace std;
 #include <cstdint>
-#include <unordered_map>
 #include <memory>
 #include <ranges>
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>

 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "TutorialEnum.h"
 #include "TutorialMessage.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 class Entity;
 class ItemInstance;
--- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
@ -2,6 +2,7 @@

 #include <memory>

+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLevel.h"
@ -9,7 +10,6 @@
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"

 class ClientConnection;

--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,6 +1,7 @@
 #include "ArchiveFile.h"

 #include <assert.h>
+
 #include <cstdlib>
 #include <utility>

--- a/Platforms/IUIScene_AbstractContainerMenu.cpp
+++ b/Platforms/IUIScene_AbstractContainerMenu.cpp
@ -1,24 +1,24 @@
 #include "IUIScene_AbstractContainerMenu.h"

 #include <assert.h>
-#include <cmath>
+
 #include <algorithm>
+#include <cmath>
 #include <string>
 #include <vector>

 #include "4J.Common/4J_InputActions.h"
 #include "4J_Input.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/phys/Vec3.h"
 #include "4J_Render.h"
 #include "Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/HtmlString.h"
@ -32,6 +32,7 @@
 #include "minecraft/world/item/crafting/ArmorRecipes.h"
 #include "minecraft/world/item/crafting/FurnaceRecipes.h"
 #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "minecraft/world/phys/Vec3.h"
 #include "strings.h"

 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() {
--- a/Platforms/IUIScene_AbstractContainerMenu.h
+++ b/Platforms/IUIScene_AbstractContainerMenu.h
@ -4,8 +4,8 @@
 #include <memory>

 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-#include "UIStructs.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "UIStructs.h"

 class HtmlString;
 class ItemInstance;
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -3,13 +3,13 @@
 #include <assert.h>
 #include <wchar.h>

-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,10 +1,12 @@
 #include "IUIScene_BeaconMenu.h"

 #include <assert.h>
+
 #include <string>
 #include <vector>

 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
@ -16,7 +18,6 @@
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/inventory/BeaconMenu.h"
 #include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"

 IUIScene_BeaconMenu::IUIScene_BeaconMenu() {
    m_beacon = nullptr;
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/BrewingStandMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/BrewingStandMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_BrewingMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_ContainerMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -3,22 +3,23 @@
 #include <assert.h>
 #include <string.h>
 #include <wchar.h>
+
 #include <string>
 #include <vector>

 #include "4J.Common/4J_InputActions.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/player/LocalPlayer.h"
 #include "4J_Profile.h"
 #include "4J_Render.h"
 #include "Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Inventory.h"
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,10 +2,10 @@
 #include <memory>

 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/crafting/Recipy.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"

 class LocalPlayer;
 class ItemInstance;
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,19 +1,19 @@
 #include "IUIScene_CreativeMenu.h"

 #include <assert.h>
+
 #include <cmath>
 #include <string>
 #include <vector>

 #include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "java/JavaMath.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/SimpleContainer.h"
 #include "minecraft/world/entity/Painting.h"
@ -27,6 +27,7 @@
 #include "minecraft/world/item/FireworksItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
 #include "minecraft/world/level/tile/LeafTile.h"
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>

 #include "IUIScene_AbstractContainerMenu.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"

 class Inventory;
 class ItemInstance;
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,14 +1,15 @@
 #include "IUIScene_EnchantingMenu.h"

 #include <assert.h>
+
 #include <memory>

+#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"

 class Player;

--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/FireworksMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/FireworksMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_FireworksMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/FurnaceMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/FurnaceMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_FurnaceMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -3,8 +3,8 @@
 #include <cmath>
 #include <memory>

-#include "4J_Render.h"
 #include "4J_Profile.h"
+#include "4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/HopperMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/HopperMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_HopperMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/entity/animal/EntityHorse.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection(
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -2,8 +2,8 @@

 #include <assert.h>

-#include "minecraft/world/inventory/InventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/InventoryMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection
 IUIScene_InventoryMenu::GetSectionAndSlotInDirection(ESceneSection eSection,
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,31 +1,32 @@
 #include "IUIScene_PauseMenu.h"

 #include <stdint.h>
+
 #include <chrono>
-#include <thread>
 #include <cstddef>
 #include <memory>
 #include <string>
+#include <thread>
 #include <vector>

+#include "4J_Profile.h"
+#include "Common/App_enums.h"
+#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "console_helpers/compression.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/skins/DLCTexturePack.h"
 #include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "4J_Profile.h"
-#include "Common/App_enums.h"
-#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
-#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "strings.h"

 class TexturePack;
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -1,20 +1,21 @@
 #include "IUIScene_TradingMenu.h"

 #include <limits.h>
+
 #include <algorithm>

 #include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "java/InputOutputStream/ByteArrayOutputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/network/packet/TradeItemPacket.h"
 #include "minecraft/util/HtmlString.h"
--- a/targets/Minecraft.Client/Common/src/UI/All
+++ b/targets/Minecraft.Client/Common/src/UI/All
@ -6,10 +6,10 @@
 #include <vector>

 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/util/HtmlString.h"
 #include "minecraft/world/inventory/MerchantMenu.h"
 #include "minecraft/world/item/Rarity.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/world/item/trading/Merchant.h"

 class MerchantRecipe;
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
@ -2,16 +2,16 @@

 #include <memory>

-#include "Minecraft.Client/Common/src/UI/UILayer.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Gui.h"
 #include "4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UILayer.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Gui.h"

 UIComponent_Chat::UIComponent_Chat(int iPad, void* initData,
                                   UILayer* parentLayer)
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp
@ -1,8 +1,8 @@
 #include "UIComponent_DebugUIMarketingGuide.h"

 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"

 class UILayer;

--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp
@ -1,11 +1,11 @@
 #include "UIComponent_MenuBackground.h"

+#include "4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "4J_Render.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"

 UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData,
                                                       UILayer* parentLayer)
--- a/Show more
+++ b/Show more