restructure codebase according to vcproj filters

Minecraft.Client/Common/Consoles_App.cpp

@@ -1,67 +1,67 @@
 
-#include "../Minecraft.World/Platform/stdafx.h"
+#include "../../Minecraft.World/Header Files/stdafx.h"
 
-#include "../Minecraft.World/Recipes/Recipy.h"
-#include "../Minecraft.Client/GameState/Options.h"
-#include "../Minecraft.World/Util/AABB.h"
-#include "../Minecraft.World/Util/Vec3.h"
-#include "../Minecraft.Client/MinecraftServer.h"
-#include "../Minecraft.Client/Level/MultiPlayerLevel.h"
-#include "../Minecraft.Client/Rendering/GameRenderer.h"
-#include "../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
-#include "../Minecraft.Client/Rendering/LevelRenderer.h"
-#include "../Minecraft.Client/Textures/MobSkinMemTextureProcessor.h"
-#include "../Minecraft.Client/Minecraft.h"
-#include "../Minecraft.Client/Network/ClientConnection.h"
-#include "../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
-#include "../Minecraft.Client/Player/LocalPlayer.h"
-#include "../Minecraft.World/Player/Player.h"
-#include "../Minecraft.World/Containers/Inventory.h"
-#include "../Minecraft.World/Level/Level.h"
-#include "../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
-#include "../Minecraft.World/Containers/Container.h"
-#include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
-#include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
-#include "../Minecraft.World/Blocks/TileEntities/HopperTileEntity.h"
-#include "../Minecraft.World/Util/PathHelper.h"
-#include "../Minecraft.Client/GameState/StatsCounter.h"
-#include "../Minecraft.Client/GameState/GameMode.h"
-#include "../Minecraft.Client/Platform/Windows64/Social/SocialManager.h"
-#include "Tutorial/TutorialMode.h"
+#include "../../Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
+#include "../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.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"
+#include "../../Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "../../Minecraft.World/net/minecraft/world/Container.h"
+#include "../../Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h"
+#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/Header Files/PathHelper.h"
+#include "../net/minecraft/stats/StatsCounter.h"
+#include "../net/minecraft/server/level/GameMode.h"
+#include "../Windows64/Source Files/Social/SocialManager.h"
+#include "Source Files/Tutorial/TutorialMode.h"
 #if defined(_WINDOWS64)
-#include "../Minecraft.Client/Platform/Common/XML/ATGXmlParser.h"
-#include "../Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h"
+#include "../Windows64/XML/ATGXmlParser.h"
+#include "../Windows64/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "../Minecraft.Client/Network/PlayerList.h"
-#include "../Minecraft.Client/Player/ServerPlayer.h"
-#include "GameRules/ConsoleGameRules.h"
-#include "GameRules/ConsoleSchematicFile.h"
-#include "../Minecraft.World/IO/Streams/InputOutputStream.h"
-#include "../Minecraft.World/Level/Storage/LevelSettings.h"
-#include "../Minecraft.Client/Player/User.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.World/ConsoleJavaLibs/InputOutputStream/InputOutputStream.h"
+#include "../../Minecraft.World/net/minecraft/world/level/LevelSettings.h"
+#include "../net/minecraft/client/User.h"
 #include <cstring>
-#include "../Minecraft.World/Level/LevelData.h"
-#include "../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../Minecraft.World/IO/Streams/Compression.h"
-#include "../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
-#include "../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
-#include "DLC/DLCPack.h"
-#include "../Minecraft.Client/Utils/StringTable.h"
-#include "../Minecraft.Client/Utils/ArchiveFile.h"
-#include "../Minecraft.Client/Minecraft.h"
+#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.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"
 #if defined(__linux__)
 #include <unistd.h>
 #include <climits>
 #endif
-#include "UI/UI.h"
-#include "UI/UIScene_PauseMenu.h"
+#include "Source Files/UI/UI.h"
+#include "Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
 
 #include <thread>
 #include <chrono>
 
-#include "Leaderboards/LeaderboardManager.h"
+#include "Source Files/Leaderboards/LeaderboardManager.h"
 
 // CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;

Minecraft.Client/Common/Consoles_App.h

@@ -5,26 +5,26 @@
 
 // using namespace std;
 
-#include "Audio/Consoles_SoundEngine.h"
+#include "Source Files/Audio/Consoles_SoundEngine.h"
 #if !defined(__linux__)
 #include <xuiapp.h>
 #endif
-#include "Tutorial/TutorialEnum.h"
+#include "Source Files/Tutorial/TutorialEnum.h"
 
-#include "UI/UIStructs.h"
+#include "Source Files/UI/All Platforms/UIStructs.h"
 
-#include "../Minecraft.World/Network/Packets/DisconnectPacket.h"
+#include "../../Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
 #if !defined(__linux__)
 #include <xsocialpost.h>
 #endif
 
-#include "../Minecraft.Client/Utils/StringTable.h"
-#include "DLC/DLCManager.h"
-#include "GameRules/ConsoleGameRulesConstants.h"
-#include "GameRules/GameRuleManager.h"
-#include "../Minecraft.Client/Rendering/Models/SkinBox.h"
-#include "../Minecraft.Client/Utils/ArchiveFile.h"
-#include "../Minecraft.World/Entities/MinecartHopper.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.World/net/minecraft/world/entity/item/MinecartHopper.h"
 
 typedef struct _JoinFromInviteData {
     std::uint32_t dwUserIndex;       // dwUserIndex

Minecraft.Client/Common/ShutdownManager.h

@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <mutex>
 
-#include "../../../Minecraft.World/Util/C4JThread.h"
+#include "../../Minecraft.World/ConsoleHelpers/C4JThread.h"
 
 class ShutdownManager {
 public:

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "Consoles_SoundEngine.h"
 
 bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {

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

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../Minecraft.World/Util/SoundTypes.h"
+#include "../../../../Minecraft.World/Header Files/SoundTypes.h"
 
 #ifdef _WINDOWS64
-#include "../../windows64/Miles/include/mss.h"
+#include "../../../Windows64/Miles Sound System/Include/mss.h"
 #else
 // Linux currently uses the Windows64 Miles headers as the compatible host SDK.
-#include "../../Minecraft.Client/Platform/Windows64/Miles/include/mss.h"
+#include "../../../Windows64/Miles Sound System/Include/mss.h"
 #endif
 
 typedef struct {

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

@@ -1,13 +1,13 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "SoundEngine.h"
-#include "../../Minecraft.World/Util/PathHelper.h"
-#include "../Consoles_App.h"
-#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Level/LevelData.h"
-#include "../../Minecraft.World/Util/Mth.h"
-#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
-#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
+#include "../../../../Minecraft.World/Header Files/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.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"
 
 #if defined(__linux__)
@@ -33,7 +33,7 @@ int strcasecmp(const char* a, const char* b) {
 #include "stb_vorbis.c"
 #endif
 #if defined(_WINDOWS64)
-#include "../../Minecraft.Client/Platform/Windows64/Windows64_App.h"
+#include "../../../Windows64/Windows64_App.h"
 #include "../../Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
 #endif
 

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

@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "../../Minecraft.World/Util/SoundTypes.h"
+#include "../../../../Minecraft.World/Header Files/SoundTypes.h"
 #include "./miniaudio.h"
 constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
 constexpr float SFX_3D_MAX_DISTANCE = 16.0f;

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 
 #include "Consoles_SoundEngine.h"
 

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

@@ -1,6 +1,6 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "ColourTable.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 
 std::unordered_map<std::wstring, eMinecraftColour>
     ColourTable::s_colourNamesMap;

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

@@ -1,4 +1,4 @@
-#include "../Minecraft.World/Platform/stdafx.h"
+#include "../../../Minecraft.World/Header Files/stdafx.h"
 #include "ConsoleGameMode.h"
 #include "Tutorial/Tutorial.h"
 

Minecraft.Client/Common/Source Files/Console_Utils.cpp

@@ -1,4 +1,4 @@
-#include "../Minecraft.World/Platform/stdafx.h"
+#include "../../../Minecraft.World/Header Files/stdafx.h"
 
 #define CDECL
 

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

@@ -1,12 +1,12 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include "DLCManager.h"
 #include "DLCAudioFile.h"
 #if defined(_WINDOWS64)
-#include "../../Minecraft.Client/Platform/Common/XML/ATGXmlParser.h"
-#include "../../Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h"
+#include "../../../Windows64/XML/ATGXmlParser.h"
+#include "../../../Windows64/XML/xmlFilesCallback.h"
 #endif
 
 namespace {

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCCapeFile.h"
 

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

@@ -1,9 +1,9 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "../../Minecraft.Client/Minecraft.h"
-#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
-#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
+#include "../../../net/minecraft/client/Minecraft.h"
+#include "../../../net/minecraft/client/skins/TexturePackRepository.h"
+#include "../../../net/minecraft/client/skins/TexturePack.h"
 
 DLCColourTableFile::DLCColourTableFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_ColourTable, path) {

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCFile.h"
 
 DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) {

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

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

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCGameRulesFile.h"
 

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

@@ -1,10 +1,10 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 
 #include <string>
 
-#include "../../Minecraft.World/IO/Files/File.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
+#include "../../../../Minecraft.World/ConsoleJavaLibs/File.h"
+#include "../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../Minecraft.World/ConsoleJavaLibs/InputOutputStream/InputOutputStream.h"
 
 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"

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

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCGameRules.h"
-#include "../GameRules/LevelGenerationOptions.h"
+#include "../GameRules/LevelGeneration/LevelGenerationOptions.h"
 
 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource {
 private:

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

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

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

@@ -1,12 +1,12 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include <algorithm>
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Util/PortableFileIO.h"
-#include "../../Minecraft.Client/Minecraft.h"
-#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.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 <cstring>
 #include <limits>
 #include <cstddef>

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCPack.h"
 #include "DLCSkinFile.h"
 #include "DLCCapeFile.h"
@@ -9,7 +9,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 
 DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
     m_dataPath = L"";

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

@@ -1,11 +1,11 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
-#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.h"
-#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../Minecraft.World/Player/Player.h"
-#include "../../Minecraft.World/Util/StringHelpers.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"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {

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

@@ -1,6 +1,6 @@
 #pragma once
 #include "DLCFile.h"
-#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
+#include "../../../net/minecraft/client/model/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile {
 private:

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCTextureFile.h"
 

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
 #include "DLCManager.h"
 #include "DLCUIDataFile.h"
 

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

@@ -0,0 +1,32 @@
+#pragma once
+#include "ConsoleGameRulesConstants.h"
+
+#include "GameRuleManager.h"
+
+#include "LevelRules/Rules/GameRule.h"
+
+#include "LevelRules/RuleDefinitions/GameRuleDefinition.h"
+
+#include "LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "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 "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 "LevelRules/Rules/GameRulesInstance.h"

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

@@ -1,14 +1,14 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/IO/Streams/Compression.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/IO/Files/File.h"
-#include "../../Minecraft.World/IO/Streams/Compression.h"
+#include "../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../Minecraft.World/Header Files/compression.h"
+#include "../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../Minecraft.World/ConsoleJavaLibs/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 "../../Minecraft.Client/Utils/StringTable.h"
+#include "../Localisation/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 

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

@@ -1,8 +1,8 @@
 #pragma once
 ////using namespace std;
 
-#include "LevelGenerators.h"
-#include "LevelRules.h"
+#include "LevelGeneration/LevelGenerators.h"
+#include "LevelRules/LevelRules.h"
 #include "../DLC/DLCGameRulesHeader.h"
 
 class LevelGenerationOptions;

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

@@ -1,14 +1,14 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
+#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/Util/AABB.h"
+#include "../../../../../Minecraft.World/net/minecraft/world/phys/AABB.h"
 
 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
     LevelGenerationOptions* levelGenOptions) {

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

@@ -1,8 +1,8 @@
 #pragma once
 #include <optional>
-#include "GameRuleDefinition.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "ConsoleSchematicFile.h"
-#include "../../Minecraft.World/Util/AABB.h"
+#include "../../../../../Minecraft.World/net/minecraft/world/phys/AABB.h"
 
 class AABB;
 class Vec3;

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

@@ -1,5 +1,5 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "BiomeOverride.h"
 
 BiomeOverride::BiomeOverride() {

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

@@ -1,7 +1,7 @@
 #pragma once
 // using namespace std;
 
-#include "GameRuleDefinition.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
 class BiomeOverride : public GameRuleDefinition {
 private:

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

@@ -1,11 +1,11 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "ConsoleGenerateStructure.h"
-#include "ConsoleGameRules.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.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"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
     m_x = m_y = m_z = 0;

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

@@ -1,6 +1,6 @@
 #pragma once
-#include "GameRuleDefinition.h"
-#include "../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "../../../../../Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 class Level;
 class Random;

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GameRuleDefinition.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
 class ConsoleGenerateStructureAction : public GameRuleDefinition {
 public:

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

@@ -1,16 +1,16 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
 #include <vector>
-#include "../../Minecraft.World/Headers/com.mojang.nbt.h"
-#include "../../Minecraft.World/Platform/System.h"
+#include "../../../../../Minecraft.World/com/mojang/nbt/com.mojang.nbt.h"
+#include "../../../../../Minecraft.World/ConsoleJavaLibs/System.h"
 #include "ConsoleSchematicFile.h"
-#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.entity.item.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../Minecraft.World/IO/Streams/Compression.h"
+#include "../../../../../Minecraft.World/ConsoleJavaLibs/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"
 
 ConsoleSchematicFile::ConsoleSchematicFile() {
     m_xSize = m_ySize = m_zSize = 0;

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

@@ -4,7 +4,7 @@
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
-#include "../../Minecraft.World/Util/ArrayWithLength.h"
+#include "../../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h"
 
 class Level;
 class DataOutputStream;

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

@@ -1,15 +1,15 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
 
 #include <unordered_set>
 
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Util/Pos.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../Minecraft.Client/Utils/StringTable.h"
+#include "../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../../Minecraft.World/net/minecraft/Pos.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/chunk/net.minecraft.world.level.chunk.h"
+#include "../../Localisation/StringTable.h"
 #include "LevelGenerationOptions.h"
-#include "ConsoleGameRules.h"
+#include "../ConsoleGameRules.h"
 
 JustGrSource::JustGrSource() {
     m_displayName = L"Default_DisplayName";

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

@@ -5,8 +5,8 @@
 
 #include <cstdint>
 
-#include "GameRuleDefinition.h"
-#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "../../../../../Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "LevelGenerationOptions.h"
 #include "LevelGenerators.h"
 

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

@@ -1,5 +1,5 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "StartFeature.h"
 
 StartFeature::StartFeature() {

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

@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "GameRuleDefinition.h"
-#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
+#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "../../../../../Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class StartFeature : public GameRuleDefinition {
 private:

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "XboxStructureActionGenerateBox.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../../../Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {
     m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0;

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "ConsoleGenerateStructureAction.h"
+#include "../ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "XboxStructureActionPlaceBlock.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../../../Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {
     m_x = m_y = m_z = m_tile = m_data = 0;

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "ConsoleGenerateStructureAction.h"
+#include "../ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;

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

@@ -1,11 +1,11 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
-#include "AddItemRuleDefinition.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.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"
 
 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
     m_tile = Tile::chest_Id;

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

@@ -1,9 +1,9 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "XboxStructureActionPlaceSpawner.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.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"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {
     m_tile = Tile::mobSpawner_Id;

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

@@ -1,4 +1,4 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "LevelRules.h"
 
 LevelRules::LevelRules() {}

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#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"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {

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

@@ -1,8 +1,8 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#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"
 

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

@@ -1,10 +1,10 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.Client/Utils/WstringLookup.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../WstringLookup.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../Minecraft.World/Network/Connection.h"
-#include "../../Minecraft.World/Headers/net.minecraft.network.packet.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"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition() {
     m_itemId = 0;

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

@@ -1,9 +1,9 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "CompleteAllRuleDefinition.h"
-#include "ConsoleGameRules.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Network/Connection.h"
-#include "../../Minecraft.World/Headers/net.minecraft.network.packet.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"
 
 void CompleteAllRuleDefinition::getChildren(
     std::vector<GameRuleDefinition*>* children) {

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

@@ -1,8 +1,8 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#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 "../../ConsoleGameRules.h"
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
     m_lastRuleStatusChanged = nullptr;

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.Client/Utils/WstringLookup.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "ConsoleGameRules.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../WstringLookup.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../ConsoleGameRules.h"
 
 GameRuleDefinition::GameRuleDefinition() {
     m_descriptionId = L"";

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

@@ -3,10 +3,10 @@
 #include <unordered_map>
 #include <string>
 
-#include "../../Minecraft.World/Items/ItemInstance.h"
-#include "ConsoleGameRulesConstants.h"
+#include "../../../../../../Minecraft.World/net/minecraft/world/item/ItemInstance.h"
+#include "../../ConsoleGameRulesConstants.h"
 
-#include "GameRulesInstance.h"
+#include "../Rules/GameRulesInstance.h"
 
 class GameRule;
 class LevelRuleset;

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.Client/Utils/StringTable.h"
-#include "ConsoleGameRules.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../Localisation/StringTable.h"
+#include "../../ConsoleGameRules.h"
 #include "LevelRuleset.h"
 
 LevelRuleset::LevelRuleset() { m_stringTable = nullptr; }

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

@@ -1,7 +1,7 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "NamedAreaRuleDefinition.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "../../../../../../Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition() {
     m_name = L"";

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

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GameRuleDefinition.h"
-#include "../../Minecraft.World/Util/AABB.h"
+#include "../../../../../../Minecraft.World/net/minecraft/world/phys/AABB.h"
 
 class NamedAreaRuleDefinition : public GameRuleDefinition {
 private:

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

@@ -1,11 +1,11 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
 #include "UpdatePlayerRuleDefinition.h"
-#include "ConsoleGameRules.h"
-#include "../../Minecraft.World/Util/Pos.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.food.h"
-#include "../../Minecraft.World/Headers/net.minecraft.world.item.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"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
     m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;

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

@@ -1,5 +1,5 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../../../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition() {

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

@@ -2,7 +2,7 @@
 // using namespace std;
 
 #include "GameRuleDefinition.h"
-#include "../../Minecraft.World/Util/Pos.h"
+#include "../../../../../../Minecraft.World/net/minecraft/Pos.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition {
 private:

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

@@ -1,5 +1,5 @@
-#include "../../Minecraft.World/Platform/stdafx.h"
-#include "ConsoleGameRules.h"
+#include "../../../../../../Minecraft.World/Header Files/stdafx.h"
+#include "../../ConsoleGameRules.h"
 
 GameRule::GameRule(GameRuleDefinition* definition, Connection* connection) {
     m_definition = definition;

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

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