run IWYU on Minecraft.World

minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp

@@ -1,17 +1,20 @@
-#include "../Header Files/stdafx.h"
-
-#include "C4JThread.h"
-
+#include <bits/cpu-set.h>
 #include <bit>
 #include <cassert>
 #include <cerrno>
 #include <chrono>
-#include <climits>
 #include <cstdio>
 #include <limits>
 #include <thread>
-#include <utility>
 #include <vector>
+#include <algorithm>
+#include <atomic>
+#include <condition_variable>
+#include <cstdint>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <string>
 
 #if defined(_WIN32)
 #include <Windows.h>
@@ -27,6 +30,8 @@
 #endif
 
 #include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
 
 thread_local C4JThread* C4JThread::ms_currentThread = nullptr;
 

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp

@@ -1,9 +1,9 @@
-#include "../../Header Files/stdafx.h"
-#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "../../net/minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "Minecraft.World/Header Files/stdafx.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h"
 #include "ConsoleSaveFileIO.h"
 #include "ConsoleSaveFileConverter.h"
-#include "../../net/minecraft/util/ProgressListener.h"
+#include "Minecraft.World/net/minecraft/util/ProgressListener.h"
 
 void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave,
                                                  FileEntry* sourceFileEntry,

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp

@@ -1,9 +1,12 @@
-#include "../../Header Files/stdafx.h"
+#include <assert.h>
+#include <cstdint>
+#include <vector>
 
-#include "java/File.h"
 #include "ConsoleSaveFile.h"
 #include "ConsoleSaveFileInputStream.h"
 
+class ConsoleSavePath;
+
 ConsoleSaveFileInputStream::ConsoleSaveFileInputStream(
     ConsoleSaveFile* saveFile, const ConsoleSavePath& file) {
     m_saveFile = saveFile;

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h

@@ -2,8 +2,9 @@
 // 4J Stu - Implements the Java InputStream but rather than writing directly to
 // disc it writes through the save file
 
-#include "java/InputOutputStream/InputStream.h"
+#include <stdint.h>
 
+#include "java/InputOutputStream/InputStream.h"
 #include "ConsoleSavePath.h"
 
 class ConsoleSaveFile;

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp

@@ -1,21 +1,36 @@
-#include <thread>
+#include <assert.h>
+#include <wchar.h>
 #include <chrono>
+#include <algorithm>
+#include <compare>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+#include <format>
+#include <vector>
 
-#include "../../Header Files/stdafx.h"
-#include "../StringHelpers.h"
-#include "../../Header Files/PortableFileIO.h"
+#include "Minecraft.World/Header Files/PortableFileIO.h"
 #include "ConsoleSaveFileOriginal.h"
 #include "java/File.h"
-#include <chrono>
-#include <thread>
-#include "../../Header Files/compression.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
-#include "../../net/minecraft/world/level/net.minecraft.world.level.h"
-#include "../../net/minecraft/world/level/storage/LevelData.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h"
-#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "4J.Common/4J_Compat.h"
+#include "4J_Storage.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "compression.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "java/System.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 #define RESERVE_ALLOCATION MEM_RESERVE
 #define COMMIT_ALLOCATION MEM_COMMIT

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h

@@ -1,9 +1,12 @@
 #pragma once
 #include <mutex>
+#include <string>
 
 #include "FileHeader.h"
 #include "ConsoleSavePath.h"
 #include "ConsoleSaveFile.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/ConsoleHelpers/Definitions.h"
 
 class ConsoleSaveFileOriginal : public ConsoleSaveFile {
 private:

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp

@@ -1,9 +1,12 @@
-#include "../../Header Files/stdafx.h"
-#include "java/File.h"
-#include "ConsoleSaveFileOutputStream.h"
+#include <assert.h>
+#include <cstdint>
+#include <vector>
 
+#include "ConsoleSaveFileOutputStream.h"
 #include "ConsoleSaveFile.h"
 
+class ConsoleSavePath;
+
 // Creates a file output stream to write to the file represented by the
 // specified File object. A new FileDescriptor object is created to represent
 // this file connection. First, if there is a security manager, its checkWrite

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h

@@ -2,8 +2,9 @@
 // 4J Stu - Implements the Java InputStream but rather than writing directly to
 // disc it writes through the save file
 
-#include "java/InputOutputStream/OutputStream.h"
+#include <stdint.h>
 
+#include "java/InputOutputStream/OutputStream.h"
 #include "ConsoleSavePath.h"
 
 class ConsoleSaveFile;

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp

@@ -1,20 +1,40 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
 #include <thread>
 #include <chrono>
+#include <algorithm>
+#include <compare>
+#include <format>
+#include <utility>
 
-#include "../../Header Files/stdafx.h"
-#include "../StringHelpers.h"
-#include "../../Header Files/PortableFileIO.h"
+#include "Minecraft.World/Header Files/PortableFileIO.h"
 #include "ConsoleSaveFileSplit.h"
 #include "ConsoleSaveFileConverter.h"
 #include "java/File.h"
-#include "../../Header Files/compression.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
-#include "../../net/minecraft/world/level/net.minecraft.world.level.h"
-#include "../../net/minecraft/world/level/storage/LevelData.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h"
-#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "4J.Common/4J_Compat.h"
+#include "4J_Storage.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "compression.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "java/System.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
+#include "Minecraft.World/x64headers/extraX64.h"
+
+class ProgressListener;
 
 #define RESERVE_ALLOCATION MEM_RESERVE
 #define COMMIT_ALLOCATION MEM_COMMIT

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h

@@ -1,11 +1,18 @@
 #pragma once
 #include <mutex>
+#include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "FileHeader.h"
 #include "ConsoleSavePath.h"
 #include "ConsoleSaveFile.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/ConsoleHelpers/Definitions.h"
 
 class ProgressRenderer;
+class ProgressListener;
 
 class ConsoleSaveFileSplit : public ConsoleSaveFile {
 private:

minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp

@@ -1,8 +1,22 @@
-#include "../../Header Files/stdafx.h"
-#include "FileHeader.h"
 
 // #define _DEBUG_FILE_HEADER
 
+#include <assert.h>
+#include <string.h>
+#include <wchar.h>
+#include <algorithm>
+#include <compare>
+#include <format>
+#include <string>
+#include <vector>
+
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/System.h"
+
 extern CConsoleMinecraftApp app;
 
 FileHeader::FileHeader() {

minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp

@@ -1,5 +1,10 @@
-#include "../Header Files/stdafx.h"
-#include "PerformanceTimer.h"
+
+#include <chrono>
+#include <string>
+
+#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
+#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 
 PerformanceTimer::PerformanceTimer() { Reset(); }
 

minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp

@@ -1,4 +1,4 @@
-#include "../Header Files/stdafx.h"
+#include "Minecraft.World/Header Files/stdafx.h"
 #include "simdutf.h"
 
 std::wstring toLower(const std::wstring& a) {

minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp

@@ -1,4 +1,3 @@
-#include "../Header Files/stdafx.h"
 #include <cstdint>
 
 // From Xbox documentation

minecraft/Minecraft.World/Header Files/PortableFileIO.h

@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <string>
 
-#include "../ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 
 namespace PortableFileIO {
 enum class BinaryReadStatus {

minecraft/Minecraft.World/Header Files/compression.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <mutex>
-#include "../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
 
 class Compression {
 public:

minecraft/Minecraft.World/Header Files/stdafx.h

@@ -26,7 +26,7 @@
 
 #include <memory>
 
-#include "../x64headers/extraX64.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 #include <list>
 #include <map>
@@ -44,17 +44,17 @@
 
 #include <assert.h>
 
-#include "../ConsoleHelpers/Definitions.h"
+#include "Minecraft.World/ConsoleHelpers/Definitions.h"
 #include "java/Class.h"
 #include "java/Exceptions.h"
-#include "../net/minecraft/util/Mth.h"
-#include "../ConsoleHelpers/StringHelpers.h"
-#include "../ConsoleHelpers/ArrayWithLength.h"
+#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h"
 #include "java/Random.h"
-#include "../net/minecraft/world/level/TilePos.h"
-#include "../net/minecraft/world/level/ChunkPos.h"
-#include "../Header Files/compression.h"
-#include "../ConsoleHelpers/PerformanceTimer.h"
+#include "Minecraft.World/net/minecraft/world/level/TilePos.h"
+#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h"
+#include "Minecraft.World/Header Files/compression.h"
+#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
 
 #ifdef _FINAL_BUILD
 #define printf BREAKTHECOMPILE

minecraft/Minecraft.World/Source Files/Minecraft.World.cpp

@@ -1,23 +1,43 @@
-#include "../Header Files/stdafx.h"
-
-#include "../net/minecraft/world/item/net.minecraft.world.item.h"
-#include "../net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
-#include "../net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
-#include "../net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
-#include "../net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "../net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h"
-#include "../net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "../net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "../net/minecraft/world/entity/net.minecraft.world.entity.h"
-#include "../net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "../net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
-#include "../net/minecraft/world/effect/net.minecraft.world.effect.h"
-
-#include "../Header Files/Minecraft.World.h"
+#include "Minecraft.World/Header Files/Minecraft.World.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
-
-#include "../net/minecraft/stats/CommonStats.h"
+#include "Minecraft.World/net/minecraft/stats/CommonStats.h"
+#include "Minecraft.World/net/minecraft/SharedConstants.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
+#include "Minecraft.World/net/minecraft/stats/GenericStats.h"
+#include "Minecraft.World/net/minecraft/stats/Stats.h"
+#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h"
+#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
+#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h"
+#include "Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h"
+#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h"
+#include "Minecraft.World/net/minecraft/world/item/HatchetItem.h"
+#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "Minecraft.World/net/minecraft/world/item/PickaxeItem.h"
+#include "Minecraft.World/net/minecraft/world/item/ShovelItem.h"
+#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h"
+#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h"
+#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h"
+#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h"
+#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
+#include "Minecraft.World/net/minecraft/world/level/LevelType.h"
+#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h"
+#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h"
+#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
+#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
 
 void MinecraftWorld_RunStaticCtors() {
     // The ordering of these static ctors can be important. If they are within

minecraft/Minecraft.World/Source Files/compression.cpp

@@ -1,5 +1,13 @@
-#include "../Header Files/stdafx.h"
-#include "../Header Files/compression.h"
+#include <assert.h>
+#include <string.h>
+#include <zconf.h>
+#include <cstdint>
+#include <mutex>
+
+#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "compression.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 #if defined(_WIN64) || defined(__linux__)
 // zconf.h defines "typedef unsigned char Byte" which conflicts with the
 // project's "class Byte" from BasicTypeContainers.h (via stdafx.h).
@@ -7,6 +15,7 @@
 // under that alias; Bytef (= Byte FAR) will resolve to zlib_Byte as well.
 #define Byte zlib_Byte
 #include <zlib.h>
+
 #undef Byte
 #endif
 

minecraft/Minecraft.World/net/minecraft/Direction.cpp

@@ -1,6 +1,6 @@
-#include "../../Header Files/stdafx.h"
 #include "Direction.h"
 #include "Facing.h"
+#include "Minecraft.World/net/minecraft/util/Mth.h"
 
 const int Direction::STEP_X[] = {0, -1, 0, 1};
 

minecraft/Minecraft.World/net/minecraft/Direction.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 class Direction {
 public:
     static const int UNDEFINED = -1;

minecraft/Minecraft.World/net/minecraft/Facing.cpp

@@ -1,4 +1,3 @@
-#include "../../Header Files/stdafx.h"
 #include "Facing.h"
 
 const int Facing::OPPOSITE_FACING[6] = {UP, DOWN, SOUTH, NORTH, EAST, WEST};

minecraft/Minecraft.World/net/minecraft/Facing.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 class Facing {
 public:
     static const int DOWN = 0;

minecraft/Minecraft.World/net/minecraft/Pos.cpp

@@ -1,6 +1,9 @@
-#include "../../Header Files/stdafx.h"
 
-#include "Pos.h"
+
+#include <math.h>
+
+#include "Minecraft.World/net/minecraft/Pos.h"
+#include "Minecraft.World/net/minecraft/Pos.h"
 
 Pos::Pos() { x = y = z = 0; }
 

minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp

@@ -1,7 +1,8 @@
-#include "../../Header Files/stdafx.h"
-#include "java/File.h"
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "SharedConstants.h"
+
+#include <string>
+
+#include "Minecraft.World/net/minecraft/SharedConstants.h"
+#include "Minecraft.World/net/minecraft/SharedConstants.h"
 
 const std::wstring SharedConstants::VERSION_STRING = L"1.6.4";
 const bool SharedConstants::TEXTURE_LIGHTING = true;

minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
 
 class CommandSender;
 

minecraft/Minecraft.World/net/minecraft/commands/Command.cpp

@@ -1,9 +1,9 @@
-#include "../../../Header Files/stdafx.h"
-#include "net.minecraft.commands.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 "Command.h"
+#include "Minecraft.World/net/minecraft/commands/AdminLogCommand.h"
+#include "Minecraft.World/net/minecraft/commands/CommandSender.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
 
 AdminLogCommand* Command::logger;
 

minecraft/Minecraft.World/net/minecraft/commands/Command.h

@@ -2,8 +2,14 @@
 
 // 4J Stu - Based loosely on the Java versions
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+#include <string>
+
 #include "CommandsEnum.h"
-#include "../network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+#include "4J.Common/4J_Compat.h"
 
 class AdminLogCommand;
 class CommandSender;

minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp

@@ -1,6 +1,10 @@
-#include "../../../Header Files/stdafx.h"
-#include "net.minecraft.commands.h"
+#include <string>
+#include <utility>
+
 #include "CommandDispatcher.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandSender.h"
 
 int CommandDispatcher::performCommand(std::shared_ptr<CommandSender> sender,
                                       EGameCommand command,

minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h

@@ -1,5 +1,13 @@
 #pragma once
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
+
 class Command;
 class CommandSender;
 

minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CommandsEnum.h"
-#include "../network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
 
 class CommandSender {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp

@@ -1,5 +1,5 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
+#include <memory>
+
 #include "DefaultGameModeCommand.h"
 
 EGameCommand DefaultGameModeCommand::getId() {

minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <stdint.h>
+
 #include "GameModeCommand.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class GameType;
 

minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp

@@ -1,6 +1,12 @@
-#include "../../../../Header Files/stdafx.h"
-#include "net.minecraft.commands.common.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
+
+#include <stdint.h>
+#include <memory>
+#include <string>
+
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
+#include "Minecraft.World/net/minecraft/commands/common/EffectCommand.h"
+
+class CommandSender;
 
 EGameCommand EffectCommand::getId() { return eGameCommand_Effect; }
 

minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h

@@ -1,6 +1,12 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+#include <string>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
+
+class CommandSender;
 
 class EffectCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp

@@ -1,9 +1,20 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../../network/packet/net.minecraft.network.packet.h"
-#include "../../world/item/net.minecraft.world.item.h"
-#include "../../world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include <string>
+#include <vector>
+
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
 #include "EnchantItemCommand.h"
+#include "4J.Common/4J_Compat.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h"
 
 EGameCommand EnchantItemCommand::getId() { return eGameCommand_EnchantItem; }
 

minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h

@@ -1,8 +1,13 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+#include <memory>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class GameCommandPacket;
+class Player;
 
 class EnchantItemCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp

@@ -1,8 +1,5 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
-#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/net/minecraft/server/PlayerList.h"
-#include "../../world/level/net.minecraft.world.level.h"
+#include <memory>
+
 #include "ExperienceCommand.h"
 
 EGameCommand ExperienceCommand::getId() { return eGameCommand_Experience; }

minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class CommandSender;
 

minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
 #include "GameModeCommand.h"
 
+class CommandSender;
+
 EGameCommand GameModeCommand::getId() { return eGameCommand_GameMode; }
 
 int GameModeCommand::getPermissionLevel() { return LEVEL_GAMEMASTERS; }

minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h

@@ -1,8 +1,14 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+#include <memory>
+#include <string>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class GameType;
+class CommandSender;
 
 class GameModeCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp

@@ -1,10 +1,18 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
-#include "../../world/entity/item/net.minecraft.world.entity.item.h"
-#include "../../world/item/net.minecraft.world.item.h"
-#include "../../network/packet/net.minecraft.network.packet.h"
+#include <vector>
+
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
 #include "GiveItemCommand.h"
+#include "4J.Common/4J_Compat.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h"
+#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
+#include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 
 EGameCommand GiveItemCommand::getId() { return eGameCommand_Give; }
 

minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h

@@ -1,8 +1,14 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+#include <memory>
+#include <string>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class GameCommandPacket;
+class Player;
 
 class GiveItemCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp

@@ -1,9 +1,11 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
-#include "../../world/entity/player/net.minecraft.world.entity.player.h"
-#include "../../world/damageSource/net.minecraft.world.damagesource.h"
-#include "KillCommand.h"
 #include <limits>
+#include <memory>
+#include <string>
+
+#include "KillCommand.h"
+#include "Minecraft.World/net/minecraft/commands/CommandSender.h"
+#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
 
 EGameCommand KillCommand::getId() { return eGameCommand_Kill; }
 

minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class KillCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp

@@ -1,9 +1,16 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../net.minecraft.commands.h"
+#include <string>
+#include <vector>
+
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
-#include "../../network/packet/net.minecraft.network.packet.h"
 #include "TimeCommand.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+
+class CommandSender;
 
 EGameCommand TimeCommand::getId() { return eGameCommand_Time; }
 

minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h

@@ -1,6 +1,13 @@
 #pragma once
 
-#include "../Command.h"
+#include <stdint.h>
+#include <memory>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
+#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h"
+
+class CommandSender;
 
 class TimeCommand : public Command {
 public:

minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp

@@ -1,11 +1,12 @@
-#include "../../../../Header Files/stdafx.h"
+#include <string>
+#include <vector>
+
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
-#include "../net.minecraft.commands.h"
-#include "../../world/level/net.minecraft.world.level.h"
-#include "../../world/level/storage/net.minecraft.world.level.storage.h"
-#include "../../network/packet/net.minecraft.network.packet.h"
 #include "ToggleDownfallCommand.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 
 EGameCommand ToggleDownfallCommand::getId() {
     return eGameCommand_ToggleDownfall;

minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h

@@ -1,5 +1,9 @@
 #pragma once
-#include "../Command.h"
+#include <stdint.h>
+#include <memory>
+
+#include "Minecraft.World/net/minecraft/commands/Command.h"
+#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h"
 
 class GameCommandPacket;
 

minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp

@@ -1,11 +1,15 @@
-#include "../../../Header Files/stdafx.h"
-
 #include "AbstractProjectileDispenseBehavior.h"
-#include "../world/level/tile/DispenserTile.h"
-#include "../world/entity/projectile/Projectile.h"
-#include "../world/level/Level.h"
-#include "../world/level/tile/LevelEvent.h"
-#include "../world/item/ItemInstance.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/Projectile.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h"
+#include "java/Class.h"
+#include "Minecraft.World/net/minecraft/core/BlockSource.h"
+#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h"
+#include "Minecraft.World/net/minecraft/core/FacingEnum.h"
+#include "Minecraft.World/net/minecraft/core/Position.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 
 std::shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(
     BlockSource* source, std::shared_ptr<ItemInstance> dispensed,

minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h

@@ -1,8 +1,11 @@
 #pragma once
+#include <memory>
+
 #include "DefaultDispenseItemBehavior.h"
 
 class Projectile;
 class Position;
+class Level;
 
 class AbstractProjectileDispenseBehavior : public DefaultDispenseItemBehavior {
 public:

minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp

@@ -1,6 +1,9 @@
-#include "../../../Header Files/stdafx.h"
+#include <utility>
 
 #include "BehaviorRegistry.h"
+#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h"
+
+class Item;
 
 BehaviorRegistry::BehaviorRegistry(DispenseItemBehavior* defaultValue) {
     defaultBehavior = defaultValue;

minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h

@@ -1,7 +1,12 @@
 #pragma once
 
+#include <unordered_map>
+
 #include "DispenseItemBehavior.h"
 
+class DispenseItemBehavior;
+class Item;
+
 class BehaviorRegistry {
 private:
     std::unordered_map<Item*, DispenseItemBehavior*> storage;

minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp

@@ -1,8 +1,8 @@
-#include "../../../Header Files/stdafx.h"
+#include <memory>
+
 #include "BlockSourceImpl.h"
-#include "../world/level/net.minecraft.world.level.h"
-#include "../world/level/tile/net.minecraft.world.level.tile.h"
-#include "../world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 
 BlockSourceImpl::BlockSourceImpl(Level* world, int x, int y, int z) {
     this->world = world;

minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp

@@ -1,10 +1,12 @@
-#include "../../../Header Files/stdafx.h"
-#include "../net.minecraft.h"
-#include "net.minecraft.core.h"
-#include "../world/level/tile/net.minecraft.world.level.tile.h"
-#include "../world/level/net.minecraft.world.level.h"
-#include "../world/entity/item/net.minecraft.world.entity.item.h"
 #include "DefaultDispenseItemBehavior.h"
+#include "java/Random.h"
+#include "Minecraft.World/net/minecraft/core/BlockSource.h"
+#include "Minecraft.World/net/minecraft/core/FacingEnum.h"
+#include "Minecraft.World/net/minecraft/core/Position.h"
+#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h"
 
 std::shared_ptr<ItemInstance> DefaultDispenseItemBehavior::dispense(
     BlockSource* source, std::shared_ptr<ItemInstance> dispensed) {

minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h

@@ -1,8 +1,13 @@
 #pragma once
+#include <memory>
+
 #include "DispenseItemBehavior.h"
+#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 
 class FacingEnum;
 class Position;
+class BlockSource;
+class Level;
 
 class DefaultDispenseItemBehavior : public DispenseItemBehavior {
 protected:

minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp

@@ -1,5 +1,3 @@
-#include "../../../Header Files/stdafx.h"
-
 #include "DispenseItemBehavior.h"
 
 DispenseItemBehavior* DispenseItemBehavior::NOOP =

minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "Behavior.h"
 
 class ItemInstance;

minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp

@@ -1,5 +1,3 @@
-#include "../../../Header Files/stdafx.h"
-
 #include "FacingEnum.h"
 
 FacingEnum* FacingEnum::DOWN = new FacingEnum(0, 1, 0, -1, 0);

minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp

@@ -1,11 +1,39 @@
-#include "../../../Header Files/stdafx.h"
-#include "../world/entity/item/net.minecraft.world.entity.item.h"
-#include "../world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "../world/level/net.minecraft.world.level.h"
-#include "../world/level/tile/net.minecraft.world.level.tile.h"
-#include "../world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "../world/item/net.minecraft.world.item.h"
+#include <memory>
+#include <string>
+
 #include "ItemDispenseBehaviors.h"
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/Class.h"
+#include "java/Random.h"
+#include "Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h"
+#include "Minecraft.World/net/minecraft/core/BlockSource.h"
+#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h"
+#include "Minecraft.World/net/minecraft/core/FacingEnum.h"
+#include "Minecraft.World/net/minecraft/core/Position.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
+#include "Minecraft.World/net/minecraft/world/entity/Mob.h"
+#include "Minecraft.World/net/minecraft/world/entity/item/Boat.h"
+#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h"
+#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h"
+#include "Minecraft.World/net/minecraft/world/item/BucketItem.h"
+#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.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/PotionItem.h"
+#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
+#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h"
 
 /* Arrow */
 

minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp

@@ -1,4 +1,3 @@
-#include "../../../Header Files/stdafx.h"
 #include "Language.h"
 #include "I18n.h"
 

minecraft/Minecraft.World/net/minecraft/locale/I18n.h

@@ -1,8 +1,13 @@
 #pragma once
 
-#include "../../../Header Files/stdafx.h"
+#include <stdarg.h>
+#include <string>
+
+#include "Minecraft.World/Header Files/stdafx.h"
 #include "Language.h"
 
+class Language;
+
 class I18n {
 private:
     static Language* lang;

minecraft/Minecraft.World/net/minecraft/locale/Language.cpp

@@ -1,7 +1,13 @@
-#include "../../../Header Files/stdafx.h"
+#include <stdint.h>
+#include <wchar.h>
+#include <sstream>
+#include <utility>
+#include <vector>
+
 #include "Language.h"
 #include "java/File.h"
 #include "java/InputOutputStream/FileInputStream.h"
+#include "java/InputOutputStream/InputStream.h"
 
 // 4J - TODO - properly implement
 // 4jcraft: done!

minecraft/Minecraft.World/net/minecraft/locale/Language.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <stdarg.h>
+#include <string>
+#include <unordered_map>
+
 class Language {
 private:
     static Language* singleton;

minecraft/Minecraft.World/net/minecraft/network/Connection.cpp

@@ -1,13 +1,25 @@
-#include <thread>
-#include <chrono>
+#include <stdio.h>
+#include <unistd.h>
+#include <vector>
 
-#include "../../../Header Files/stdafx.h"
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "Minecraft.Client/Common/Source Files/Network/Socket.h"
 #include "Connection.h"
-#include "../../../ConsoleHelpers/ThreadName.h"
-#include "../../../Header Files/compression.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h"
+#include "compression.h"
+#include "java/InputOutputStream/BufferedOutputStream.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "java/System.h"
+#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h"
+#include "Minecraft.World/x64headers/extraX64.h"
+
+class SocketAddress;
 
 // This should always be enabled, except for debugging use
 #if !defined(_DEBUG)

minecraft/Minecraft.World/net/minecraft/network/Connection.h

@@ -1,16 +1,27 @@
 #pragma once
 
-#include "../../../Header Files/stdafx.h"
+#include <stdint.h>
 #include <queue>
+#include <mutex>
+#include <memory>
+#include <string>
+
+#include "Minecraft.World/Header Files/stdafx.h"
 #include "java/System.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "packet/net.minecraft.network.packet.h"
-#include "../../../ConsoleHelpers/C4JThread.h"
-
-#include <mutex>
-
+#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
 #include "Minecraft.Client/Common/Source Files/Network/Socket.h"
+#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
+
+class DataInputStream;
+class DataOutputStream;
+class Packet;
+class PacketListener;
+class SocketAddress;
 
 // 4J JEV, size of the threads (bytes).
 #define READ_STACK_SIZE 0

minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp

@@ -1,11 +1,8 @@
-#include "../../../../Header Files/stdafx.h"
-#include <exception>
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
 #include "PacketListener.h"
 #include "AddEntityPacket.h"
-#include <bitset>
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 
 void AddEntityPacket::_init(std::shared_ptr<Entity> e, int type, int data,
                             int xp, int yp, int zp, int yRotp, int xRotp) {

minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h

@@ -1,6 +1,12 @@
 #pragma once
 
+#include <stdint.h>
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
+
+class Entity;
 
 class AddEntityPacket : public Packet,
                         public std::enable_shared_from_this<AddEntityPacket> {

minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp

@@ -1,8 +1,9 @@
-#include "../../../../Header Files/stdafx.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "PacketListener.h"
 #include "AddExperienceOrbPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h"
 
 AddExperienceOrbPacket::AddExperienceOrbPacket() {
     id = 0;

minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ExperienceOrb;
 

minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp

@@ -1,11 +1,12 @@
-#include "../../../../Header Files/stdafx.h"
-#include <exception>
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
-#include "../../world/entity/global/net.minecraft.world.entity.global.h"
+#include <stdint.h>
+
 #include "PacketListener.h"
 #include "AddGlobalEntityPacket.h"
+#include "java/Class.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/util/Mth.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 
 const int AddGlobalEntityPacket::LIGHTNING = 1;
 

minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
+
+class Entity;
 
 class AddGlobalEntityPacket
     : public Packet,

minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp

@@ -1,9 +1,12 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
+#include <vector>
+
 #include "PacketListener.h"
 #include "AddMobPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
+#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h"
+#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h"
 
 AddMobPacket::AddMobPacket() {
     id = -1;

minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h

@@ -1,7 +1,12 @@
 #pragma once
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+
 #include "Packet.h"
-#include "../../world/entity/SyncedEntityData.h"
+#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class LivingEntity;
 

minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp

@@ -1,9 +1,8 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
 #include "PacketListener.h"
 #include "AddPaintingPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/entity/Painting.h"
 
 AddPaintingPacket::AddPaintingPacket() {
     id = -1;

minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class Painting;
 

minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp

@@ -1,10 +1,14 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/player/net.minecraft.world.entity.player.h"
-#include "../../world/item/net.minecraft.world.item.h"
+#include <vector>
+
 #include "PacketListener.h"
 #include "AddPlayerPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.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/item/ItemInstance.h"
+#include "Minecraft.World/x64headers/extraX64.h"
 
 AddPlayerPacket::AddPlayerPacket() {
     id = -1;

minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h

@@ -1,9 +1,14 @@
 #pragma once
 
 #include <cstdint>
+#include <format>
+#include <memory>
+#include <string>
 
 #include "Packet.h"
-#include "../../world/entity/SyncedEntityData.h"
+#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class Player;
 

minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp

@@ -1,9 +1,10 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
+#include <stdint.h>
+
 #include "PacketListener.h"
 #include "AnimatePacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 
 AnimatePacket::AnimatePacket() {
     id = -1;

minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
+
+class Entity;
 
 class AnimatePacket : public Packet,
                       public std::enable_shared_from_this<AnimatePacket> {

minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp

@@ -1,8 +1,9 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
+#include <string.h>
+
 #include "PacketListener.h"
 #include "AwardStatPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 AwardStatPacket::AwardStatPacket() {
     this->m_paramData.clear();

minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h

@@ -1,6 +1,12 @@
 #pragma once
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+#include <vector>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class AwardStatPacket : public Packet,
                         public std::enable_shared_from_this<AwardStatPacket> {

minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp

@@ -1,14 +1,15 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include <exception>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/level/net.minecraft.world.level.h"
-#include "../../../../Header Files/compression.h"
+#include <assert.h>
+#include <string.h>
+
 #include "PacketListener.h"
 #include "BlockRegionUpdatePacket.h"
-#include "../../world/level/chunk/LevelChunk.h"
-#include "../../world/level/chunk/DataLayer.h"
-#include "../../world/level/dimension/Dimension.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
+#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "compression.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
 
 #define BLOCK_REGION_UPDATE_FULLCHUNK 0x01
 #define BLOCK_REGION_UPDATE_ZEROHEIGHT \

minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <stdint.h>
+#include <memory>
+#include <vector>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class Level;
 

minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp

@@ -1,9 +1,10 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "../../net.minecraft.h"
-#include "../../world/entity/player/net.minecraft.world.entity.player.h"
 #include "PacketListener.h"
 #include "ChatPacket.h"
+#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/SharedConstants.h"
+#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
 
 // longest allowed string is "<" + name + "> " + message
 const unsigned int ChatPacket::MAX_LENGTH =

minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ChatPacket : public Packet,
                    public std::enable_shared_from_this<ChatPacket> {

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp

@@ -1,11 +1,10 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/level/net.minecraft.world.level.h"
-#include "../../world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "PacketListener.h"
 #include "ChunkTilesUpdatePacket.h"
-#include "../../world/level/dimension/Dimension.h"
+#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/Level.h"
+#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 
 ChunkTilesUpdatePacket::~ChunkTilesUpdatePacket() {
 }

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h

@@ -1,6 +1,12 @@
 #pragma once
 
+#include <stdint.h>
+#include <format>
+#include <memory>
+#include <vector>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class Level;
 

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp

@@ -1,9 +1,7 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/level/net.minecraft.world.level.h"
 #include "PacketListener.h"
 #include "ChunkVisibilityAreaPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ChunkVisibilityAreaPacket::ChunkVisibilityAreaPacket() {
     m_minX = 0;

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class Level;
 

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp

@@ -1,8 +1,7 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "PacketListener.h"
 #include "ChunkVisibilityPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ChunkVisibilityPacket::ChunkVisibilityPacket() {
     this->shouldDelay = false;

minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "Packet.h"
-
-#include "../../../../Header Files/stdafx.h"
 #include <iostream>
+#include <memory>
+
+#include "Packet.h"
+#include "Minecraft.World/Header Files/stdafx.h"
 #include "PacketListener.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ChunkVisibilityPacket
     : public Packet,

minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp

@@ -1,6 +1,9 @@
-#include "../../../../Header Files/stdafx.h"
+#include <stdint.h>
+
 #include "PacketListener.h"
 #include "ClientCommandPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ClientCommandPacket::ClientCommandPacket() { action = 0; }
 

minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <memory>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ClientCommandPacket
     : public Packet,

minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "../../../../Header Files/stdafx.h"
+#include "Minecraft.World/Header Files/stdafx.h"
 
 class ClientInformationPacket : public Packet {};

minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp

@@ -1,8 +1,10 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
+#include <stdint.h>
+#include <string.h>
+
 #include "PacketListener.h"
 #include "ComplexItemDataPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 
 ComplexItemDataPacket::~ComplexItemDataPacket() {}

minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <format>
+#include <memory>
+#include <vector>
+
 #include "Packet.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ComplexItemDataPacket
     : public Packet,

minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp

@@ -1,8 +1,9 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
+#include <stdint.h>
+
 #include "PacketListener.h"
 #include "ContainerAckPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ContainerAckPacket::ContainerAckPacket() {
     containerId = 0;

minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "Packet.h"
-
-#include "../../../../Header Files/stdafx.h"
 #include <iostream>
+#include <memory>
+
+#include "Packet.h"
+#include "Minecraft.World/Header Files/stdafx.h"
 #include "PacketListener.h"
+#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 
 class ContainerAckPacket
     : public Packet,

minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Header Files/stdafx.h"
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "../../world/entity/net.minecraft.world.entity.h"
+#include <stdint.h>
+
 #include "PacketListener.h"
 #include "ContainerButtonClickPacket.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 
 ContainerButtonClickPacket::ContainerButtonClickPacket() {}