run IWYU on Minecraft.Client

minecraft/Minecraft.Client/Common/Consoles_App.cpp

@@ -1,20 +1,20 @@
 
-#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.Client/Header Files/stdafx.h"
 
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
-#include "../net/minecraft/client/Options.h"
+#include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "../net/minecraft/server/MinecraftServer.h"
-#include "../net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "../net/minecraft/client/renderer/GameRenderer.h"
-#include "../net/minecraft/client/ProgressRenderer.h"
-#include "../net/minecraft/client/renderer/LevelRenderer.h"
-#include "../Header Files/MobSkinMemTextureProcessor.h"
-#include "../net/minecraft/client/Minecraft.h"
-#include "../net/minecraft/client/multiplayer/ClientConnection.h"
-#include "../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "../net/minecraft/client/player/LocalPlayer.h"
+#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h"
+#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
+#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"
+#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
@@ -24,44 +24,44 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h"
 #include "Minecraft.World/ConsoleHelpers/PathHelper.h"
-#include "../net/minecraft/stats/StatsCounter.h"
-#include "../net/minecraft/server/level/GameMode.h"
-#include "Source Files/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
+#include "Minecraft.Client/net/minecraft/server/level/GameMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
 #if defined(_WINDOWS64)
-#include "../Windows64/XML/ATGXmlParser.h"
-#include "../Windows64/XML/xmlFilesCallback.h"
+#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
+#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
 #include "Minecraft_Macros.h"
-#include "../net/minecraft/server/PlayerList.h"
-#include "../net/minecraft/server/level/ServerPlayer.h"
-#include "Source Files/GameRules/ConsoleGameRules.h"
-#include "Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h"
+#include "Minecraft.Client/net/minecraft/server/PlayerList.h"
+#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "java/InputOutputStream/InputOutputStream.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
-#include "../net/minecraft/client/User.h"
+#include "Minecraft.Client/net/minecraft/client/User.h"
 #include <cstring>
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "Minecraft.World/Header Files/compression.h"
-#include "../net/minecraft/client/skins/TexturePackRepository.h"
-#include "../net/minecraft/client/skins/DLCTexturePack.h"
-#include "Source Files/DLC/DLCPack.h"
-#include "Source Files/Localisation/StringTable.h"
-#include "Source Files/UI/All Platforms/ArchiveFile.h"
-#include "../net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
+#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #if defined(__linux__)
 #include <unistd.h>
 #include <climits>
 #endif
-#include "Source Files/UI/UI.h"
-#include "Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/Source Files/UI/UI.h"
+#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
 
 #include <thread>
 #include <chrono>
 
-#include "Source Files/Leaderboards/LeaderboardManager.h"
+#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h"
 
 // CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
@@ -3606,7 +3606,7 @@ void CMinecraftApp::loadMediaArchive() {
 #if _WINDOWS64
     mediapath = L"Common\\Media\\MediaWindows64.arc";
 #elif __linux__
-    mediapath = L"Common/Media/MediaLinux.arc";
+    mediapath = L"Minecraft.Client/Common/Media/MediaLinux.arc";
 #endif
 
     if (!mediapath.empty()) {

minecraft/Minecraft.Client/Common/Consoles_App.h

@@ -8,19 +8,19 @@
 
 // using namespace std;
 
-#include "Source Files/Audio/Consoles_SoundEngine.h"
-#include "Source Files/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"
 
-#include "Source Files/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h"
 
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
 
-#include "Source Files/Localisation/StringTable.h"
-#include "Source Files/DLC/DLCManager.h"
-#include "Source Files/GameRules/ConsoleGameRulesConstants.h"
-#include "Source Files/GameRules/GameRuleManager.h"
-#include "../Header Files/SkinBox.h"
-#include "Source Files/UI/All Platforms/ArchiveFile.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
+#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h"
 
 typedef struct _JoinFromInviteData {

minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp

@@ -1,5 +1,5 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "Consoles_SoundEngine.h"
+#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h"
 
 bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {
     return m_bIsPlayingStreamingCDMusic;

minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h

@@ -1,7 +1,13 @@
 #pragma once
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "Minecraft.World/Header Files/SoundTypes.h"
 
+class File;
+
 typedef struct {
     float x, y, z;
 } AUDIO_VECTOR;

minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp

@@ -1,19 +1,33 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <cmath>
+#include <cstdlib>
+#include <initializer_list>
+#include <memory>
+#include <vector>
+
 #include "SoundEngine.h"
 #include <filesystem>
 #include "Minecraft.World/ConsoleHelpers/PathHelper.h"
-#include "../../Consoles_App.h"
-#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
-#include "../../../net/minecraft/client/skins/TexturePackRepository.h"
-#include "../../../net/minecraft/client/skins/DLCTexturePack.h"
-#include "../DLC/DLCAudioFile.h"
+#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
+#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "Minecraft.World/net/minecraft/world/entity/Mob.h"
+#include "java/Random.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 
 #if defined(__linux__)
 #define STB_VORBIS_HEADER_ONLY
 #include "stb_vorbis.c"
+
 // Fixes strcasecmp in miniaudio
 // https://stackoverflow.com/questions/31127260/strcasecmp-a-non-standard-function
 int strcasecmp(const char* a, const char* b) {
@@ -30,11 +44,12 @@ int strcasecmp(const char* a, const char* b) {
 }
 #define MINIAUDIO_IMPLEMENTATION
 #include "miniaudio.h"
+
 #undef STB_VORBIS_HEADER_ONLY
 #include "stb_vorbis.c"
 #endif
 #if defined(_WINDOWS64)
-#include "../../../Windows64/Windows64_App.h"
+#include "Minecraft.Client/Windows64/Windows64_App.h"
 #include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
 #endif
 
@@ -80,8 +95,8 @@ const char* SoundEngine::m_szStreamFileA[eStream_Max] = {"calm1",
                                                          "ward",
                                                          "where_are_we_now"};
 #if defined(__linux__)
-char SoundEngine::m_szSoundPath[] = {"Common/Sound/"};
-char SoundEngine::m_szMusicPath[] = {"Common/"};
+char SoundEngine::m_szSoundPath[] = {"Minecraft.Client/Common/Sound/"};
+char SoundEngine::m_szMusicPath[] = {"Minecraft.Client/Common/"};
 char SoundEngine::m_szRedistName[] = {"redist64"};
 #endif
 
@@ -161,8 +176,8 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume,
         if (szId[i] == '.') szId[i] = '/';
 
     std::string base = PathHelper::GetExecutableDirA() + "/";
-    const char* roots[] = {"Sound/Minecraft/", "Common/Sound/Minecraft/",
-                           "Common/res/TitleUpdate/res/Sound/Minecraft/"};
+    const char* roots[] = {"Sound/Minecraft/", "Minecraft.Client/Common/Sound/Minecraft/",
+                           "Minecraft.Client/Common/res/TitleUpdate/res/Sound/Minecraft/"};
     char finalPath[512] = {0};
     bool found = false;
 
@@ -230,8 +245,8 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) {
     const char* roots[] = {
         "Sound/Minecraft/UI/",
         "Sound/Minecraft/",
-        "Common/Sound/Minecraft/UI/",
-        "Common/Sound/Minecraft/",
+        "Minecraft.Client/Common/Sound/Minecraft/UI/",
+        "Minecraft.Client/Common/Sound/Minecraft/",
     };
     char finalPath[512] = {0};
     bool found = false;
@@ -434,7 +449,7 @@ void SoundEngine::playMusicTick() {
                 bool found = false;
                 m_szStreamName[0] = '\0';
 
-                const char* roots[] = {"Common/music/", "music/", "./"};
+                const char* roots[] = {"Minecraft.Client/Common/music/", "music/", "./"};
 
                 for (const char* r : roots) {
                     for (const char* e : {".ogg", ".mp3", ".wav"}) {

minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h

@@ -1,9 +1,18 @@
 #pragma once
 class Mob;
 class Options;
+class C4JThread;
+class Random;
+
 using namespace std;
+#include <string>
+
 #include "Minecraft.World/Header Files/SoundTypes.h"
 #include "./miniaudio.h"
+#include "Minecraft.Client/Common/App_Defines.h"
+#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h"
+#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+
 constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
 constexpr float SFX_3D_MAX_DISTANCE = 16.0f;
 constexpr float SFX_3D_ROLLOFF = 0.5f;

minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp

@@ -1,6 +1,5 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-
 #include "Consoles_SoundEngine.h"
+#include "Minecraft.World/Header Files/SoundTypes.h"
 
 const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = {
     L"mob/chicken/chicken",        //	eSoundType_MOB_CHICKEN_AMBIENT

minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp

@@ -1,6 +1,12 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <utility>
+#include <vector>
+
 #include "ColourTable.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
+#include "Minecraft.World/x64headers/extraX64.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
 
 std::unordered_map<std::wstring, eMinecraftColour>
     ColourTable::s_colourNamesMap;

minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h

@@ -1,5 +1,9 @@
 #pragma once
 #include <cstdint>
+#include <string>
+#include <unordered_map>
+
+#include "Minecraft.Client/Common/App_enums.h"
 
 class ColourTable {
 private:

minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp

@@ -1,6 +1,10 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "ConsoleGameMode.h"
-#include "Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
+
+class ClientConnection;
+class Minecraft;
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft* minecraft,
                                  ClientConnection* connection)

minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h

@@ -1,5 +1,8 @@
 #pragma once
-#include "Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
+
+class ClientConnection;
+class Minecraft;
 
 class ConsoleGameMode : public TutorialMode {
 public:

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp

@@ -1,12 +1,18 @@
-#include "Minecraft.World/Header Files/stdafx.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 "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 #if defined(_WINDOWS64)
-#include "../../../Windows64/XML/ATGXmlParser.h"
-#include "../../../Windows64/XML/xmlFilesCallback.h"
+#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
+#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
 
 namespace {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h

@@ -1,4 +1,8 @@
 #pragma once
+#include <cstdint>
+#include <string>
+#include <vector>
+
 #include "DLCFile.h"
 
 class DLCAudioFile : public DLCFile {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp

@@ -1,6 +1,7 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCCapeFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 
 DLCCapeFile::DLCCapeFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Cape, path) {}

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h

@@ -1,4 +1,7 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCFile.h"
 
 class DLCCapeFile : public DLCFile {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp

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

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h

@@ -1,4 +1,7 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCFile.h"
 
 class ColourTable;

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp

@@ -1,5 +1,8 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <sstream>
+
 #include "DLCFile.h"
+#include "Minecraft.Client/Common/Minecraft_Macros.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
 
 DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) {
     m_type = type;

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h

@@ -1,5 +1,7 @@
 #pragma once
 #include <cstdint>
+#include <string>
+
 #include "DLCManager.h"
 
 class DLCFile {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCFile.h"
-#include "../GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h"
 
 class DLCGameRules : public DLCFile {
 public:

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp

@@ -1,6 +1,6 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCGameRulesFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h"
 
 DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path)
     : DLCGameRules(DLCManager::e_DLCType_GameRules, path) {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h

@@ -1,4 +1,7 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCGameRules.h"
 
 class DLCGameRulesFile : public DLCGameRules {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp

@@ -1,13 +1,13 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-
 #include <string>
 
-#include "java/File.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "java/InputOutputStream/InputOutputStream.h"
-
 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+
+class StringTable;
 
 DLCGameRulesHeader::DLCGameRulesHeader(const std::wstring& path)
     : DLCGameRules(DLCManager::e_DLCType_GameRulesHeader, path) {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h

@@ -1,7 +1,12 @@
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 #include "DLCGameRules.h"
-#include "../GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h"
+
+class StringTable;
 
 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource {
 private:

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp

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

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h

@@ -1,4 +1,7 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCFile.h"
 
 class StringTable;

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp

@@ -1,12 +1,12 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.Client/Header Files/stdafx.h"
 #include <algorithm>
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.World/Header Files/PortableFileIO.h"
-#include "../../../net/minecraft/client/Minecraft.h"
-#include "../../../net/minecraft/client/skins/TexturePackRepository.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include <cstring>
 #include <limits>
 #include <cstddef>

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp

@@ -1,4 +1,8 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+#include <algorithm>
+#include <sstream>
+#include <utility>
+
 #include "DLCPack.h"
 #include "DLCSkinFile.h"
 #include "DLCCapeFile.h"
@@ -10,6 +14,14 @@
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "4J_Profile.h"
+#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 
 DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
     m_dataPath = L"";

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h

@@ -1,7 +1,13 @@
 #pragma once
 // using namespace std;
 #include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "DLCManager.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h"
 
 class DLCFile;
 class DLCSkinFile;

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp

@@ -1,11 +1,13 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include "../../../net/minecraft/client/model/geom/ModelPart.h"
-#include "../../../net/minecraft/client/renderer/entity/EntityRenderer.h"
-#include "../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h"
+#include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h

@@ -1,6 +1,13 @@
 #pragma once
+#include <cstdint>
+#include <format>
+#include <string>
+#include <vector>
+
 #include "DLCFile.h"
-#include "../../../net/minecraft/client/model/HumanoidModel.h"
+#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class DLCSkinFile : public DLCFile {
 private:

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp

@@ -1,6 +1,6 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCTextureFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
 
 DLCTextureFile::DLCTextureFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Texture, path) {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h

@@ -1,5 +1,9 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
 
 class DLCTextureFile : public DLCFile {
 private:

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp

@@ -1,6 +1,7 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCUIDataFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 
 DLCUIDataFile::DLCUIDataFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_UIData, path) {

minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h

@@ -1,4 +1,7 @@
 #pragma once
+#include <cstdint>
+#include <string>
+
 #include "DLCFile.h"
 
 class DLCUIDataFile : public DLCFile {

minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h

@@ -3,30 +3,30 @@
 
 #include "GameRuleManager.h"
 
-#include "LevelRules/Rules/GameRule.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
 
-#include "LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
-#include "LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 
-#include "LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 
-#include "LevelGeneration/LevelGenerationOptions.h"
-#include "LevelGeneration/ApplySchematicRuleDefinition.h"
-#include "LevelGeneration/ConsoleGenerateStructure.h"
-#include "LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
-#include "LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
-#include "LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
-#include "LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
-#include "LevelGeneration/BiomeOverride.h"
-#include "LevelGeneration/StartFeature.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h"
 
-#include "LevelRules/Rules/GameRulesInstance.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h"

minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp

@@ -1,14 +1,14 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.Client/Header Files/stdafx.h"
 #include "Minecraft.World/Header Files/compression.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "java/File.h"
 #include "Minecraft.World/Header Files/compression.h"
-#include "../DLC/DLCPack.h"
-#include "../DLC/DLCLocalisationFile.h"
-#include "../DLC/DLCGameRulesFile.h"
-#include "../DLC/DLCGameRules.h"
-#include "../DLC/DLCGameRulesHeader.h"
-#include "../Localisation/StringTable.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp

@@ -1,14 +1,19 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <algorithm>
+#include <cmath>
+
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "Minecraft.World/x64headers/extraX64.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
     LevelGenerationOptions* levelGenOptions) {

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp

@@ -1,6 +1,9 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "BiomeOverride.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 BiomeOverride::BiomeOverride() {
     m_tile = 0;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h

@@ -1,7 +1,11 @@
 #pragma once
 // using namespace std;
 
-#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include <cstdint>
+#include <string>
+
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class BiomeOverride : public GameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp

@@ -1,11 +1,21 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+#include <algorithm>
+
 #include "ConsoleGenerateStructure.h"
-#include "../ConsoleGameRules.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/net.minecraft.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/Direction.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
     m_x = m_y = m_z = 0;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h

@@ -1,6 +1,11 @@
 #pragma once
-#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include <string>
+#include <vector>
+
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
 
 class Level;
 class Random;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
 class ConsoleGenerateStructureAction : public GameRuleDefinition {
 public:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp

@@ -1,16 +1,34 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <assert.h>
+#include <string.h>
 #include <vector>
-#include "nbt/com.mojang.nbt.h"
-#include "java/System.h"
+#include <algorithm>
+#include <string>
+#include <unordered_map>
+
 #include "ConsoleSchematicFile.h"
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
-#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
 #include "Minecraft.World/Header Files/compression.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
+#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h"
+#include "Minecraft.World/net/minecraft/world/entity/Painting.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/LightLayer.h"
+#include "Minecraft.World/net/minecraft/world/level/TilePos.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
+#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "Minecraft.World/x64headers/extraX64.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"
+#include "nbt/ListTag.h"
+#include "nbt/NbtIo.h"
+#include "nbt/Tag.h"
 
 ConsoleSchematicFile::ConsoleSchematicFile() {
     m_xSize = m_ySize = m_zSize = 0;
@@ -152,10 +170,6 @@ void ConsoleSchematicFile::load(DataInputStream* dis) {
                     y = ((IntTag*)eTag->get(L"TileY"))->data;
                     z = ((IntTag*)eTag->get(L"TileZ"))->data;
                 }
-#ifdef _DEBUG
-                // app.DebugPrintf(1,"Loaded entity type %d at
-                // (%f,%f,%f)\n",(int)type,x,y,z);
-#endif
                 m_entities.push_back(std::pair<Vec3, CompoundTag*>(
                     Vec3(x, y, z), (CompoundTag*)eTag->copy()));
             }

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h

@@ -4,7 +4,17 @@
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+#include <ranges>
+#include <utility>
+#include <vector>
+
 #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.World/Header Files/compression.h"
+#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 
 class Level;
 class DataOutputStream;
@@ -13,6 +23,7 @@ class TileEntity;
 class LevelChunk;
 class AABB;
 class Vec3;
+class CompoundTag;
 
 class ConsoleSchematicFile {
 public:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp

@@ -1,4 +1,4 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.Client/Header Files/stdafx.h"
 
 #include <fstream>
 #include <filesystem>
@@ -9,9 +9,9 @@
 #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "../../Localisation/StringTable.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
 #include "LevelGenerationOptions.h"
-#include "../ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
 
 JustGrSource::JustGrSource() {
     m_displayName = L"Default_DisplayName";

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class ApplySchematicRuleDefinition;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp

@@ -1,6 +1,8 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <algorithm>
+
 #include "LevelGenerationOptions.h"
 #include "LevelGenerators.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h"
 
 LevelGenerators::LevelGenerators() {}
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <format>
+#include <string>
+#include <vector>
 // using namespace std;
 
 class LevelGenerationOptions;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp

@@ -1,6 +1,9 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "StartFeature.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 StartFeature::StartFeature() {
     m_chunkX = 0;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h

@@ -1,8 +1,11 @@
 #pragma once
 // using namespace std;
 
-#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include <string>
+
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class StartFeature : public GameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp

@@ -1,11 +1,17 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+#include <memory>
+
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
-#include "../../LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h"
-#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
-#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 
 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
     m_tile = Tile::chest_Id;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class AddItemRuleDefinition;
 class StructurePiece;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <string>
+
 #include "XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class StructurePiece;
 class Level;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp

@@ -1,5 +1,5 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "LevelRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h"
 
 LevelRules::LevelRules() {}
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 class LevelRuleset;
 
 class LevelRules {

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp

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

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class ItemInstance;
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp

@@ -1,10 +1,15 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <algorithm>
+
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
-#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.World/net/minecraft/world/Container.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 AddItemRuleDefinition::AddItemRuleDefinition() {
     m_itemId = m_quantity = m_auxValue = m_dataTag = 0;
@@ -45,10 +50,6 @@ GameRuleDefinition* AddItemRuleDefinition::addChild(
         rule = new AddEnchantmentRuleDefinition();
         m_enchantments.push_back((AddEnchantmentRuleDefinition*)rule);
     } else {
-#ifndef _CONTENT_PACKAGE
-        // wprintf(L"AddItemRuleDefinition: Attempted to add invalid child rule
-        // - %d\n", ruleType );
-#endif
     }
     return rule;
 }

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class Container;
 class AddEnchantmentRuleDefinition;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp

@@ -1,10 +1,13 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-#include "../../WstringLookup.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
-#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition() {
     m_itemId = 0;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h"
 
 class Pos;
 class UseTileRuleDefinition;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp

@@ -1,9 +1,16 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <memory>
+#include <unordered_map>
+#include <utility>
+
 #include "CompleteAllRuleDefinition.h"
-#include "../../ConsoleGameRules.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
-#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 
 void CompleteAllRuleDefinition::getChildren(
     std::vector<GameRuleDefinition*>* children) {

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <string>
+
 #include "CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+
+class GameRule;
 
 class CompleteAllRuleDefinition : public CompoundGameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp

@@ -1,8 +1,17 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "CompoundGameRuleDefinition.h"
-#include "../../ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
     m_lastRuleStatusChanged = nullptr;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include <vector>
+
 #include "GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h"
 
 class CompoundGameRuleDefinition : public GameRuleDefinition {
 protected:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp

@@ -1,7 +1,22 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-#include "../../WstringLookup.h"
+#include <assert.h>
+#include <wchar.h>
+#include <format>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "../../ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+
+class Connection;
 
 GameRuleDefinition::GameRuleDefinition() {
     m_descriptionId = L"";

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h

@@ -2,16 +2,20 @@
 // using namespace std;
 #include <unordered_map>
 #include <string>
+#include <format>
+#include <memory>
 
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
-#include "../../ConsoleGameRulesConstants.h"
-
-#include "../Rules/GameRulesInstance.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h"
 
 class GameRule;
 class LevelRuleset;
 class Player;
 class WstringLookup;
+class Connection;
+class DataOutputStream;
+class ItemInstance;
 
 class GameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp

@@ -1,8 +1,10 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "../../../Localisation/StringTable.h"
-#include "../../ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
 #include "LevelRuleset.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+
+class AABB;
 
 LevelRuleset::LevelRuleset() { m_stringTable = nullptr; }
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h

@@ -1,8 +1,14 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class NamedAreaRuleDefinition;
+class AABB;
+class StringTable;
 
 class LevelRuleset : public CompoundGameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp

@@ -1,7 +1,11 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+
 #include "NamedAreaRuleDefinition.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition() {
     m_name = L"";

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h

@@ -1,7 +1,10 @@
 #pragma once
 
+#include <string>
+
 #include "GameRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class NamedAreaRuleDefinition : public GameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp

@@ -1,11 +1,17 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <wchar.h>
+#include <memory>
+
 #include "UpdatePlayerRuleDefinition.h"
-#include "../../ConsoleGameRules.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h"
-#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "Minecraft.World/net/minecraft/world/food/FoodData.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
     m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h

@@ -1,7 +1,11 @@
 #pragma once
 // using namespace std;
 
+#include <string>
+#include <vector>
+
 #include "GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class AddItemRuleDefinition;
 class Pos;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp

@@ -1,6 +1,9 @@
-#include "Minecraft.World/Header Files/stdafx.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition() {
     m_tileId = -1;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h

@@ -1,8 +1,11 @@
 #pragma once
 // using namespace std;
 
+#include <string>
+
 #include "GameRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition {
 private:

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp

@@ -1,5 +1,18 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-#include "../../ConsoleGameRules.h"
+
+#include <wchar.h>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+
+class Connection;
+class ItemInstance;
 
 GameRule::GameRule(GameRuleDefinition* definition, Connection* connection) {
     m_definition = definition;

minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h

@@ -1,11 +1,17 @@
 #pragma once
 // using namespace std;
 
+#include <stdint.h>
 #include <unordered_map>
+#include <memory>
+#include <string>
 
 class CompoundTag;
 class GameRuleDefinition;
 class Connection;
+class DataInputStream;
+class DataOutputStream;
+class ItemInstance;
 
 // A game rule maintains the state for one particular definition
 class GameRule {

minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp

@@ -1,5 +1,5 @@
 
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <utility>
 
 #include "WstringLookup.h"
 

minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 class WstringLookup {
 private:
     unsigned int numIDs;

minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp

@@ -1,5 +1,7 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <assert.h>
+
 #include "LeaderboardInterface.h"
+#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h"
 
 LeaderboardInterface::LeaderboardInterface(LeaderboardManager* man) {
     m_manager = man;

minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h

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

minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp

@@ -1,8 +1,7 @@
-#include "Minecraft.World/Header Files/stdafx.h"
-
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-
 #include "LeaderboardManager.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {
     L"Friends", L"MyScore", L"TopRank"};

minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h

@@ -1,8 +1,11 @@
 #pragma once
 
+#include <string>
+
+#include "4J.Common/4J_Compat.h"
+
 // Forward Declarations.
 class LeaderboardManager;
-
 // READ LISTENTER //
 class LeaderboardReadListener;
 

minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h

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

minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp

@@ -1,5 +1,12 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <ranges>
+#include <utility>
+
 #include "StringTable.h"
+#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
 
 StringTable::StringTable(void) {}
 

minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #define LOCALE_COUNT 11
 

minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp

@@ -3,7 +3,7 @@
 #include <fstream>
 #include <filesystem>
 
-#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.Client/Header Files/stdafx.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
@@ -12,29 +12,29 @@
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h"
-#include "../../../net/minecraft/client/multiplayer/ClientConnection.h"
-#include "../../../net/minecraft/client/Minecraft.h"
-#include "../../../net/minecraft/client/User.h"
-#include "../../../net/minecraft/server/MinecraftServer.h"
-#include "../../../net/minecraft/server/PlayerList.h"
-#include "../../../net/minecraft/server/level/ServerPlayer.h"
-#include "../../../net/minecraft/server/network/PlayerConnection.h"
-#include "../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "../../../net/minecraft/client/ProgressRenderer.h"
-#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/User.h"
+#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+#include "Minecraft.Client/net/minecraft/server/PlayerList.h"
+#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
+#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
 #include "Minecraft.World/Header Files/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "../../../net/minecraft/client/skins/TexturePackRepository.h"
-#include "../../../net/minecraft/client/skins/TexturePack.h"
+#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
+#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 
-#include "../../../net/minecraft/client/gui/Gui.h"
-#include "../../../net/minecraft/client/renderer/LevelRenderer.h"
-#include "../GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
 #include "GameNetworkManager.h"
 
-#include "../UI/UI.h"
-#include "../UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/Source Files/UI/UI.h"
+#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
 
 // Global instance
 CGameNetworkManager g_NetworkManager;

minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp

@@ -1,5 +1,10 @@
 #include "NetworkPlayerQNet.h"
 
+#include <limits.h>
+
+#include "Minecraft.World/x64headers/extraX64.h"
+#include "java/System.h"
+
 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {
     m_qnetPlayer = qnetPlayer;
     m_pSocket = nullptr;

minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h

@@ -1,6 +1,13 @@
 #pragma once
 
+#include <stdint.h>
+#include <string>
+
 #include "NetworkPlayerInterface.h"
+#include "4J.Common/4J_Compat.h"
+
+class IQNetPlayer;
+class Socket;
 
 // This is an implementation of the INetworkPlayer interface for the supported
 // QNet-backed path. It

minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp

@@ -1,8 +1,15 @@
-#include "Minecraft.World/Header Files/stdafx.h"
+#include <string.h>
+#include <wchar.h>
+#include <compare>
+
 #include "Socket.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "NetworkPlayerQNet.h"
 #include "PlatformNetworkManagerStub.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
 
 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;
 

minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h

@@ -1,10 +1,19 @@
 #pragma once
+#include <stdint.h>
 // using namespace std;
 #include <vector>
+#include <string>
+
 #include "Minecraft.World/ConsoleHelpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.World/x64headers/extraX64.h"
+
+class C4JThread;
+class CGameNetworkManager;
+class INetworkPlayer;
 
 class CPlatformNetworkManagerStub : public CPlatformNetworkManager {
     friend class CGameNetworkManager;

minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp

@@ -1,13 +1,15 @@
+#include <stdio.h>
 #include <thread>
 #include <chrono>
+#include <vector>
 
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "Socket.h"
-#include <algorithm>
-
 // 4jcraft TODO
-#include "../../Minecraft.Client/Common/ShutdownManager.h"
-#include "../../Minecraft.Client/net/minecraft/server/network/ServerConnection.h"
+#include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 class SocketAddress {};