From 5a3695023933e9dd97b60fa52b45074e6eb73cf8 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Mon, 9 Mar 2026 00:34:09 -0500 Subject: [PATCH] fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h --- Minecraft.Assets/meson.build | 4 +- Minecraft.Client/ClientConstants.cpp | 2 +- Minecraft.Client/Commands/TeleportCommand.cpp | 2 +- Minecraft.Client/GameState/CreativeMode.cpp | 2 +- Minecraft.Client/GameState/DemoMode.cpp | 2 +- Minecraft.Client/GameState/DemoUser.cpp | 2 +- Minecraft.Client/GameState/GameMode.cpp | 2 +- Minecraft.Client/GameState/Options.cpp | 2 +- Minecraft.Client/GameState/Settings.cpp | 2 +- Minecraft.Client/GameState/StatsCounter.cpp | 2 +- Minecraft.Client/GameState/StatsSyncer.cpp | 2 +- Minecraft.Client/GameState/SurvivalMode.cpp | 2 +- Minecraft.Client/Input/ConsoleInput.cpp | 2 +- Minecraft.Client/Input/Input.cpp | 2 +- Minecraft.Client/Input/KeyMapping.cpp | 2 +- Minecraft.Client/Level/DemoLevel.cpp | 2 +- Minecraft.Client/Level/DerivedServerLevel.cpp | 2 +- Minecraft.Client/Level/MultiPlayerLevel.cpp | 2 +- Minecraft.Client/Level/ServerLevel.cpp | 2 +- .../Level/ServerLevelListener.cpp | 2 +- Minecraft.Client/Minecraft.cpp | 6 +- Minecraft.Client/MinecraftServer.cpp | 4 +- Minecraft.Client/Network/ClientConnection.cpp | 2 +- .../Network/MultiPlayerChunkCache.cpp | 2 +- .../Network/PendingConnection.cpp | 2 +- Minecraft.Client/Network/PlayerChunkMap.cpp | 2 +- Minecraft.Client/Network/PlayerConnection.cpp | 2 +- Minecraft.Client/Network/PlayerList.cpp | 2 +- Minecraft.Client/Network/ServerChunkCache.cpp | 2 +- .../Network/ServerCommandDispatcher.cpp | 2 +- Minecraft.Client/Network/ServerConnection.cpp | 2 +- .../Platform/Common/C4JMemoryPoolAllocator.h | 2 +- .../Platform/Durango/Durango_App.cpp | 2 +- .../Platform/Durango/Durango_UIController.h | 2 +- .../Leaderboards/DurangoLeaderboardManager.h | 2 +- .../Leaderboards/DurangoStatsDebugger.cpp | 2 +- .../Durango/Network/NetworkPlayerDurango.h | 2 +- .../Network/PlatformNetworkManagerDurango.h | 6 +- .../Durango/Sentient/DurangoTelemetry.cpp | 2 +- .../Durango/Sentient/DurangoTelemetry.h | 2 +- .../Platform/Durango/XboxGameMode.cpp | 2 +- .../Platform/Durango/XboxGameMode.h | 2 +- .../{Build => Platform}/Extrax64Stubs.cpp | 0 Minecraft.Client/Platform/Linux/Linux_App.cpp | 2 +- .../Platform/Linux/Linux_Minecraft.cpp | 4 +- .../Platform/Linux/Linux_ShutdownManager.cpp | 2 +- .../Platform/Linux/Linux_UIController.h | 2 +- .../Platform/Linux/linux_game_stubs.cpp | 2 +- .../Leaderboards/OrbisLeaderboardManager.cpp | 4 +- .../Leaderboards/OrbisLeaderboardManager.h | 2 +- .../Orbis/Network/SQRNetworkManager_Orbis.cpp | 2 +- .../Orbis/Network/SQRNetworkManager_Orbis.h | 2 +- .../Orbis/Network/SonyCommerce_Orbis.h | 2 +- .../Orbis/Network/SonyRemoteStorage_Orbis.h | 2 +- .../Orbis/Network/SonyVoiceChat_Orbis.h | 2 +- Minecraft.Client/Platform/Orbis/Orbis_App.cpp | 4 +- Minecraft.Client/Platform/Orbis/Orbis_App.h | 4 +- .../Platform/Orbis/Orbis_Minecraft.cpp | 4 +- .../Platform/Orbis/Orbis_UIController.h | 2 +- .../Platform/PS3/Audio/PS3_SoundEngine.cpp | 4 +- .../Leaderboards/PS3LeaderboardManager.cpp | 4 +- .../PS3/Leaderboards/PS3LeaderboardManager.h | 2 +- .../PS3/Network/SQRNetworkManager_PS3.cpp | 4 +- .../PS3/Network/SQRNetworkManager_PS3.h | 2 +- .../Platform/PS3/Network/SonyCommerce_PS3.h | 2 +- .../PS3/Network/SonyRemoteStorage_PS3.h | 2 +- .../PS3/PS3Extras/ShutdownManager.cpp | 2 +- Minecraft.Client/Platform/PS3/PS3_App.cpp | 2 +- Minecraft.Client/Platform/PS3/PS3_App.h | 4 +- .../Platform/PS3/PS3_Minecraft.cpp | 10 +- .../Platform/PS3/PS3_UIController.cpp | 2 +- .../Platform/PS3/PS3_UIController.h | 2 +- .../ChunkUpdate/ChunkRebuildData.cpp | 2 +- .../SPU_Tasks/ChunkUpdate/ChunkRebuildData.h | 2 +- .../SPU_Tasks/ChunkUpdate/Tesselator_SPU.h | 2 +- .../CompressedTileStorage_SPU.h | 2 +- .../CompressedTileStorage_SPU.h | 2 +- .../Platform/PS3/XboxGameMode.cpp | 2 +- Minecraft.Client/Platform/PS3/XboxGameMode.h | 2 +- .../Platform/PS3/Xbox_Minecraft.cpp | 4 +- .../Leaderboards/PSVitaLeaderboardManager.cpp | 4 +- .../Leaderboards/PSVitaLeaderboardManager.h | 2 +- .../Network/SQRNetworkManager_AdHoc_Vita.cpp | 4 +- .../Network/SQRNetworkManager_AdHoc_Vita.h | 2 +- .../PSVita/Network/SQRNetworkManager_Vita.cpp | 4 +- .../PSVita/Network/SQRNetworkManager_Vita.h | 2 +- .../PSVita/Network/SonyCommerce_Vita.h | 2 +- .../PSVita/Network/SonyRemoteStorage_Vita.h | 2 +- .../PSVita/Network/SonyVoiceChat_Vita.h | 2 +- .../PSVita/PSVitaExtras/ShutdownManager.cpp | 2 +- .../Platform/PSVita/PSVita_App.cpp | 4 +- Minecraft.Client/Platform/PSVita/PSVita_App.h | 4 +- .../Platform/PSVita/PSVita_Minecraft.cpp | 10 +- .../Platform/PSVita/PSVita_UIController.h | 2 +- .../Leaderboards/WindowsLeaderboardManager.h | 2 +- .../Platform/Windows64/Windows64_App.cpp | 2 +- .../Windows64/Windows64_Minecraft.cpp | 4 +- .../Windows64/Windows64_UIController.h | 2 +- .../Platform/Xbox/Audio/SoundEngine.cpp | 2 +- .../Platform/Xbox/Font/XUI_FontData.h | 2 +- .../Leaderboards/XboxLeaderboardManager.h | 2 +- .../Platform/Xbox/Network/NetworkPlayerXbox.h | 2 +- .../Network/PlatformNetworkManagerXbox.cpp | 2 +- .../Xbox/Network/PlatformNetworkManagerXbox.h | 6 +- Minecraft.Client/Platform/Xbox/Xbox_App.cpp | 226 +++++++++--------- .../Platform/Xbox/Xbox_Minecraft.cpp | 2 +- .../Platform/Xbox/Xbox_UIController.cpp | 4 +- .../Platform/Xbox/Xbox_UIController.h | 2 +- .../{Build => Platform}/extraX64client.h | 0 .../{Build => Platform}/stdafx.cpp | 0 Minecraft.Client/{Build => Platform}/stdafx.h | 0 .../{Build => Platform}/stubs.cpp | 0 Minecraft.Client/{Build => Platform}/stubs.h | 0 Minecraft.Client/Player/EntityTracker.cpp | 2 +- Minecraft.Client/Player/LocalPlayer.cpp | 2 +- .../Player/MultiPlayerGameMode.cpp | 2 +- .../Player/MultiPlayerLocalPlayer.cpp | 2 +- Minecraft.Client/Player/RemotePlayer.cpp | 2 +- Minecraft.Client/Player/ServerPlayer.cpp | 2 +- .../Player/ServerPlayerGameMode.cpp | 2 +- Minecraft.Client/Player/TrackedEntity.cpp | 2 +- Minecraft.Client/Player/User.cpp | 2 +- Minecraft.Client/Rendering/Camera.cpp | 2 +- Minecraft.Client/Rendering/Chunk.cpp | 2 +- Minecraft.Client/Rendering/Cube.cpp | 2 +- .../Rendering/Culling/AllowAllCuller.cpp | 2 +- .../Rendering/Culling/DirtyChunkSorter.cpp | 2 +- .../Rendering/Culling/DistanceChunkSorter.cpp | 2 +- .../Rendering/Culling/ViewportCuller.cpp | 2 +- .../EntityRenderers/ArrowRenderer.cpp | 2 +- .../EntityRenderers/BlazeRenderer.cpp | 2 +- .../EntityRenderers/BoatRenderer.cpp | 2 +- .../EntityRenderers/ChestRenderer.cpp | 2 +- .../EntityRenderers/ChickenRenderer.cpp | 2 +- .../Rendering/EntityRenderers/CowRenderer.cpp | 2 +- .../EntityRenderers/CreeperRenderer.cpp | 2 +- .../EntityRenderers/DefaultRenderer.cpp | 2 +- .../EntityRenderers/EnchantTableRenderer.cpp | 2 +- .../EntityRenderers/EnderChestRenderer.cpp | 2 +- .../EntityRenderers/EnderCrystalRenderer.cpp | 2 +- .../EntityRenderers/EnderDragonRenderer.cpp | 2 +- .../EntityRenderers/EnderManRenderer.cpp | 2 +- .../EntityRenderDispatcher.cpp | 2 +- .../EntityRenderers/EntityRenderer.cpp | 2 +- .../EntityRenderers/EntityTileRenderer.cpp | 2 +- .../EntityRenderers/ExperienceOrbRenderer.cpp | 2 +- .../EntityRenderers/FallingTileRenderer.cpp | 2 +- .../EntityRenderers/FireballRenderer.cpp | 2 +- .../EntityRenderers/FishingHookRenderer.cpp | 2 +- .../EntityRenderers/GhastRenderer.cpp | 2 +- .../EntityRenderers/GiantMobRenderer.cpp | 2 +- .../EntityRenderers/HumanoidMobRenderer.cpp | 2 +- .../EntityRenderers/ItemFrameRenderer.cpp | 2 +- .../EntityRenderers/ItemInHandRenderer.cpp | 2 +- .../EntityRenderers/ItemRenderer.cpp | 2 +- .../EntityRenderers/ItemSpriteRenderer.cpp | 2 +- .../EntityRenderers/LavaSlimeRenderer.cpp | 2 +- .../EntityRenderers/LightningBoltRenderer.cpp | 2 +- .../EntityRenderers/MinecartRenderer.cpp | 2 +- .../Rendering/EntityRenderers/MobRenderer.cpp | 2 +- .../EntityRenderers/MobSpawnerRenderer.cpp | 2 +- .../EntityRenderers/MushroomCowRenderer.cpp | 2 +- .../EntityRenderers/OcelotRenderer.cpp | 2 +- .../EntityRenderers/PaintingRenderer.cpp | 2 +- .../Rendering/EntityRenderers/PigRenderer.cpp | 2 +- .../EntityRenderers/PistonPieceRenderer.cpp | 2 +- .../EntityRenderers/PlayerRenderer.cpp | 2 +- .../EntityRenderers/ProgressRenderer.cpp | 2 +- .../EntityRenderers/SheepRenderer.cpp | 2 +- .../EntityRenderers/SignRenderer.cpp | 2 +- .../EntityRenderers/SilverfishRenderer.cpp | 2 +- .../EntityRenderers/SkullTileRenderer.cpp | 2 +- .../EntityRenderers/SlimeRenderer.cpp | 2 +- .../EntityRenderers/SnowManRenderer.cpp | 2 +- .../EntityRenderers/SpiderRenderer.cpp | 2 +- .../EntityRenderers/SquidRenderer.cpp | 2 +- .../EntityRenderers/TheEndPortalRenderer.cpp | 2 +- .../TileEntityRenderDispatcher.cpp | 2 +- .../EntityRenderers/TileEntityRenderer.cpp | 2 +- .../EntityRenderers/TileRenderer.cpp | 2 +- .../Rendering/EntityRenderers/TntRenderer.cpp | 2 +- .../EntityRenderers/VillagerGolemRenderer.cpp | 2 +- .../EntityRenderers/VillagerRenderer.cpp | 2 +- .../EntityRenderers/WolfRenderer.cpp | 2 +- .../EntityRenderers/ZombieRenderer.cpp | 2 +- Minecraft.Client/Rendering/Frustum.cpp | 2 +- Minecraft.Client/Rendering/FrustumCuller.cpp | 2 +- Minecraft.Client/Rendering/FrustumCuller.h | 2 +- Minecraft.Client/Rendering/FrustumData.cpp | 2 +- Minecraft.Client/Rendering/GameRenderer.cpp | 2 +- Minecraft.Client/Rendering/LevelRenderer.cpp | 2 +- Minecraft.Client/Rendering/Lighting.cpp | 2 +- Minecraft.Client/Rendering/Minimap.cpp | 2 +- .../Rendering/Models/BlazeModel.cpp | 2 +- .../Rendering/Models/BoatModel.cpp | 2 +- .../Rendering/Models/BookModel.cpp | 2 +- .../Rendering/Models/ChestModel.cpp | 2 +- .../Rendering/Models/ChickenModel.cpp | 2 +- .../Rendering/Models/CowModel.cpp | 2 +- .../Rendering/Models/CreeperModel.cpp | 2 +- .../Rendering/Models/DragonModel.cpp | 2 +- .../Rendering/Models/EnderCrystalModel.cpp | 2 +- .../Rendering/Models/EnderManModel.cpp | 2 +- .../Rendering/Models/GhastModel.cpp | 2 +- .../Rendering/Models/HumanoidModel.cpp | 2 +- .../Rendering/Models/LargeChestModel.cpp | 2 +- .../Rendering/Models/LavaSlimeModel.cpp | 2 +- .../Rendering/Models/MinecartModel.cpp | 2 +- Minecraft.Client/Rendering/Models/Model.cpp | 2 +- .../Rendering/Models/ModelPart.cpp | 2 +- .../Rendering/Models/OcelotModel.cpp | 2 +- .../Rendering/Models/PigModel.cpp | 2 +- .../Rendering/Models/QuadrupedModel.cpp | 2 +- .../Rendering/Models/SheepFurModel.cpp | 2 +- .../Rendering/Models/SheepModel.cpp | 2 +- .../Rendering/Models/SignModel.cpp | 2 +- .../Rendering/Models/SilverfishModel.cpp | 2 +- .../Rendering/Models/SkeletonHeadModel.cpp | 2 +- .../Rendering/Models/SkeletonModel.cpp | 2 +- .../Rendering/Models/SlimeModel.cpp | 2 +- .../Rendering/Models/SnowManModel.cpp | 2 +- .../Rendering/Models/SpiderModel.cpp | 2 +- .../Rendering/Models/SquidModel.cpp | 2 +- .../Rendering/Models/VillagerGolemModel.cpp | 2 +- .../Rendering/Models/VillagerModel.cpp | 2 +- .../Rendering/Models/VillagerZombieModel.cpp | 2 +- .../Rendering/Models/WolfModel.cpp | 2 +- .../Rendering/Models/ZombieModel.cpp | 2 +- .../Rendering/OffsettedRenderList.cpp | 2 +- .../Particles/BreakingItemParticle.cpp | 2 +- .../Rendering/Particles/BubbleParticle.cpp | 2 +- .../Rendering/Particles/CritParticle.cpp | 2 +- .../Rendering/Particles/CritParticle2.cpp | 2 +- .../Particles/DragonBreathParticle.cpp | 2 +- .../Rendering/Particles/DripParticle.cpp | 2 +- .../Particles/EnchantmentTableParticle.cpp | 2 +- .../Rendering/Particles/EnderParticle.cpp | 2 +- .../Rendering/Particles/ExplodeParticle.cpp | 2 +- .../Rendering/Particles/FlameParticle.cpp | 2 +- .../Rendering/Particles/FootstepParticle.cpp | 2 +- .../Rendering/Particles/GuiParticle.cpp | 2 +- .../Rendering/Particles/GuiParticles.cpp | 2 +- .../Rendering/Particles/HeartParticle.cpp | 2 +- .../Particles/HugeExplosionParticle.cpp | 2 +- .../Particles/HugeExplosionSeedParticle.cpp | 2 +- .../Rendering/Particles/LavaParticle.cpp | 2 +- .../Particles/NetherPortalParticle.cpp | 2 +- .../Rendering/Particles/NoteParticle.cpp | 2 +- .../Rendering/Particles/Particle.cpp | 2 +- .../Rendering/Particles/ParticleEngine.cpp | 2 +- .../Particles/PlayerCloudParticle.cpp | 2 +- .../Rendering/Particles/RedDustParticle.cpp | 2 +- .../Rendering/Particles/SmokeParticle.cpp | 2 +- .../Particles/SnowShovelParticle.cpp | 2 +- .../Rendering/Particles/SpellParticle.cpp | 2 +- .../Rendering/Particles/SplashParticle.cpp | 2 +- .../Rendering/Particles/SuspendedParticle.cpp | 2 +- .../Particles/SuspendedTownParticle.cpp | 2 +- .../Particles/TakeAnimationParticle.cpp | 2 +- .../Rendering/Particles/TerrainParticle.cpp | 2 +- .../Rendering/Particles/WaterDropParticle.cpp | 2 +- Minecraft.Client/Rendering/Polygon.cpp | 2 +- Minecraft.Client/Rendering/Tesselator.cpp | 2 +- Minecraft.Client/Rendering/TexOffs.cpp | 2 +- Minecraft.Client/Rendering/Vertex.cpp | 2 +- Minecraft.Client/Rendering/glWrapper.cpp | 2 +- Minecraft.Client/Textures/BufferedImage.cpp | 2 +- Minecraft.Client/Textures/ClockTexture.cpp | 2 +- Minecraft.Client/Textures/CompassTexture.cpp | 2 +- Minecraft.Client/Textures/HttpTexture.cpp | 2 +- Minecraft.Client/Textures/MemTexture.cpp | 2 +- .../Textures/MobSkinMemTextureProcessor.cpp | 2 +- .../Textures/MobSkinTextureProcessor.cpp | 2 +- .../Textures/Packs/AbstractTexturePack.cpp | 2 +- .../Textures/Packs/DLCTexturePack.cpp | 18 +- .../Textures/Packs/DefaultTexturePack.cpp | 2 +- .../Textures/Packs/FileTexturePack.cpp | 2 +- .../Textures/Packs/FolderTexturePack.cpp | 2 +- .../Textures/Packs/TexturePack.cpp | 2 +- Minecraft.Client/Textures/Packs/TexturePack.h | 2 +- .../Textures/Packs/TexturePackRepository.cpp | 2 +- .../Stitching/PreStitchedTextureMap.cpp | 2 +- .../Textures/Stitching/StitchSlot.cpp | 2 +- .../Textures/Stitching/StitchedTexture.cpp | 2 +- .../Textures/Stitching/Stitcher.cpp | 2 +- .../Textures/Stitching/TextureMap.cpp | 2 +- Minecraft.Client/Textures/Texture.cpp | 2 +- Minecraft.Client/Textures/TextureHolder.cpp | 2 +- Minecraft.Client/Textures/TextureManager.cpp | 2 +- Minecraft.Client/Textures/Textures.cpp | 2 +- Minecraft.Client/UI/Button.cpp | 2 +- Minecraft.Client/UI/EditBox.cpp | 2 +- Minecraft.Client/UI/Font.cpp | 2 +- Minecraft.Client/UI/Gui.cpp | 2 +- Minecraft.Client/UI/GuiComponent.cpp | 2 +- Minecraft.Client/UI/GuiMessage.cpp | 2 +- Minecraft.Client/UI/Rect2i.cpp | 2 +- Minecraft.Client/UI/Screen.cpp | 2 +- Minecraft.Client/UI/ScreenSizeCalculator.cpp | 2 +- .../UI/Screens/AbstractContainerScreen.cpp | 2 +- .../UI/Screens/AchievementPopup.cpp | 2 +- .../UI/Screens/AchievementScreen.cpp | 2 +- Minecraft.Client/UI/Screens/ChatScreen.cpp | 2 +- Minecraft.Client/UI/Screens/ConfirmScreen.cpp | 2 +- Minecraft.Client/UI/Screens/ConnectScreen.cpp | 2 +- .../UI/Screens/ContainerScreen.cpp | 2 +- .../UI/Screens/ControlsScreen.cpp | 2 +- .../UI/Screens/CraftingScreen.cpp | 2 +- .../UI/Screens/CreateWorldScreen.cpp | 2 +- Minecraft.Client/UI/Screens/DeathScreen.cpp | 2 +- .../UI/Screens/DisconnectedScreen.cpp | 2 +- Minecraft.Client/UI/Screens/ErrorScreen.cpp | 2 +- Minecraft.Client/UI/Screens/FurnaceScreen.cpp | 2 +- .../UI/Screens/InBedChatScreen.cpp | 2 +- .../UI/Screens/InventoryScreen.cpp | 2 +- .../UI/Screens/JoinMultiplayerScreen.cpp | 2 +- .../UI/Screens/NameEntryScreen.cpp | 2 +- Minecraft.Client/UI/Screens/OptionsScreen.cpp | 2 +- Minecraft.Client/UI/Screens/PauseScreen.cpp | 2 +- .../UI/Screens/ReceivingLevelScreen.cpp | 2 +- .../UI/Screens/RenameWorldScreen.cpp | 2 +- .../UI/Screens/SelectWorldScreen.cpp | 2 +- Minecraft.Client/UI/Screens/StatsScreen.cpp | 2 +- .../UI/Screens/TextEditScreen.cpp | 2 +- Minecraft.Client/UI/Screens/TitleScreen.cpp | 2 +- Minecraft.Client/UI/Screens/TrapScreen.cpp | 2 +- .../UI/Screens/VideoSettingsScreen.cpp | 2 +- Minecraft.Client/UI/ScrolledSelectionList.cpp | 2 +- Minecraft.Client/UI/SimpleIcon.cpp | 2 +- Minecraft.Client/UI/SlideButton.cpp | 2 +- Minecraft.Client/UI/SmallButton.cpp | 2 +- Minecraft.Client/Utils/ArchiveFile.cpp | 2 +- Minecraft.Client/Utils/MemoryTracker.cpp | 2 +- Minecraft.Client/Utils/StringTable.cpp | 2 +- Minecraft.Client/Utils/Timer.cpp | 2 +- Minecraft.Client/Utils/WstringLookup.cpp | 2 +- ..._to_client.py => copy_assets_to_client.py} | 0 337 files changed, 483 insertions(+), 483 deletions(-) rename Minecraft.Client/{Build => Platform}/Extrax64Stubs.cpp (100%) rename Minecraft.Client/{Build => Platform}/extraX64client.h (100%) rename Minecraft.Client/{Build => Platform}/stdafx.cpp (100%) rename Minecraft.Client/{Build => Platform}/stdafx.h (100%) rename Minecraft.Client/{Build => Platform}/stubs.cpp (100%) rename Minecraft.Client/{Build => Platform}/stubs.h (100%) rename scripts/{move_assets_to_client.py => copy_assets_to_client.py} (100%) diff --git a/Minecraft.Assets/meson.build b/Minecraft.Assets/meson.build index cc9dc72d2..95e190225 100644 --- a/Minecraft.Assets/meson.build +++ b/Minecraft.Assets/meson.build @@ -24,7 +24,7 @@ localisation = custom_target('Minecraft.Assets_Localisation', colour_table = custom_target('Minecraft.Assets_Colour_Table', output : 'HTMLColours.col', - input : meson.current_source_dir() / 'Common/HTMLColours.xml', + input : meson.current_source_dir() / 'Common/Media/HTMLColours.xml', command : [ 'python3', meson.project_source_root() / 'scripts/build_col.py', '@INPUT@', @@ -35,7 +35,7 @@ colour_table = custom_target('Minecraft.Assets_Colour_Table', archive_sources = [ localisation[0], # client_platform_path / 'Windows64Media/Media/languages.loc', colour_table, - 'Common/splashes.txt', + 'Common/Media/splashes.txt', 'Common/Media/Graphics/SaveChest.png', 'Common/Media/Graphics/MinecraftIcon.png', 'Common/Media/Graphics/TexturePackIcon.png', diff --git a/Minecraft.Client/ClientConstants.cpp b/Minecraft.Client/ClientConstants.cpp index 50ba494f7..55a7ab0ad 100644 --- a/Minecraft.Client/ClientConstants.cpp +++ b/Minecraft.Client/ClientConstants.cpp @@ -1,4 +1,4 @@ -#include "Build/stdafx.h" +#include "Platform/stdafx.h" #include "ClientConstants.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W;//+ SharedConstants::VERSION_STRING; \ No newline at end of file diff --git a/Minecraft.Client/Commands/TeleportCommand.cpp b/Minecraft.Client/Commands/TeleportCommand.cpp index a81db8e4e..5b997d16e 100644 --- a/Minecraft.Client/Commands/TeleportCommand.cpp +++ b/Minecraft.Client/Commands/TeleportCommand.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../MinecraftServer.h" #include "../Network/PlayerList.h" #include "../Player/ServerPlayer.h" diff --git a/Minecraft.Client/GameState/CreativeMode.cpp b/Minecraft.Client/GameState/CreativeMode.cpp index 20f7aa8ce..aab4b6e8d 100644 --- a/Minecraft.Client/GameState/CreativeMode.cpp +++ b/Minecraft.Client/GameState/CreativeMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "CreativeMode.h" #include "../Player/User.h" #include "../Player/LocalPlayer.h" diff --git a/Minecraft.Client/GameState/DemoMode.cpp b/Minecraft.Client/GameState/DemoMode.cpp index d001377e5..9ecb5cf05 100644 --- a/Minecraft.Client/GameState/DemoMode.cpp +++ b/Minecraft.Client/GameState/DemoMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "DemoMode.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/GameState/DemoUser.cpp b/Minecraft.Client/GameState/DemoUser.cpp index 6a54971a9..d44b29110 100644 --- a/Minecraft.Client/GameState/DemoUser.cpp +++ b/Minecraft.Client/GameState/DemoUser.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "DemoUser.h" DemoUser::DemoUser() : User(L"DemoUser", L"n/a") diff --git a/Minecraft.Client/GameState/GameMode.cpp b/Minecraft.Client/GameState/GameMode.cpp index 29ee5fc6d..1ef38ca7a 100644 --- a/Minecraft.Client/GameState/GameMode.cpp +++ b/Minecraft.Client/GameState/GameMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "GameMode.h" #include "../Player/LocalPlayer.h" #include "../Level/MultiPlayerLevel.h" diff --git a/Minecraft.Client/GameState/Options.cpp b/Minecraft.Client/GameState/Options.cpp index e59ce7406..ed1f7eca5 100644 --- a/Minecraft.Client/GameState/Options.cpp +++ b/Minecraft.Client/GameState/Options.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Options.h" #include "../Input/KeyMapping.h" #include "../Rendering/LevelRenderer.h" diff --git a/Minecraft.Client/GameState/Settings.cpp b/Minecraft.Client/GameState/Settings.cpp index 296f8c920..7f035e18c 100644 --- a/Minecraft.Client/GameState/Settings.cpp +++ b/Minecraft.Client/GameState/Settings.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Settings.h" #include "../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/GameState/StatsCounter.cpp b/Minecraft.Client/GameState/StatsCounter.cpp index e8150a868..ab4895a2b 100644 --- a/Minecraft.Client/GameState/StatsCounter.cpp +++ b/Minecraft.Client/GameState/StatsCounter.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "StatsCounter.h" #include "../../Minecraft.World/Stats/Stat.h" #include "../../Minecraft.World/Stats/Stats.h" diff --git a/Minecraft.Client/GameState/StatsSyncer.cpp b/Minecraft.Client/GameState/StatsSyncer.cpp index d34a44fef..1e33aafa4 100644 --- a/Minecraft.Client/GameState/StatsSyncer.cpp +++ b/Minecraft.Client/GameState/StatsSyncer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "StatsSyncer.h" // 4J - TODO \ No newline at end of file diff --git a/Minecraft.Client/GameState/SurvivalMode.cpp b/Minecraft.Client/GameState/SurvivalMode.cpp index e797d9905..7fdf0dd27 100644 --- a/Minecraft.Client/GameState/SurvivalMode.cpp +++ b/Minecraft.Client/GameState/SurvivalMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "SurvivalMode.h" #include "DemoMode.h" #include "../Rendering/LevelRenderer.h" diff --git a/Minecraft.Client/Input/ConsoleInput.cpp b/Minecraft.Client/Input/ConsoleInput.cpp index ff6c3b6a0..98f047d18 100644 --- a/Minecraft.Client/Input/ConsoleInput.cpp +++ b/Minecraft.Client/Input/ConsoleInput.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ConsoleInput.h" ConsoleInput::ConsoleInput(const std::wstring& msg, ConsoleInputSource *source) diff --git a/Minecraft.Client/Input/Input.cpp b/Minecraft.Client/Input/Input.cpp index c53cd8270..3349b8381 100644 --- a/Minecraft.Client/Input/Input.cpp +++ b/Minecraft.Client/Input/Input.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../Minecraft.h" #include "../GameState/GameMode.h" #include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" diff --git a/Minecraft.Client/Input/KeyMapping.cpp b/Minecraft.Client/Input/KeyMapping.cpp index ade98f6b5..b993aabec 100644 --- a/Minecraft.Client/Input/KeyMapping.cpp +++ b/Minecraft.Client/Input/KeyMapping.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "KeyMapping.h" KeyMapping::KeyMapping(const std::wstring& name, int key) diff --git a/Minecraft.Client/Level/DemoLevel.cpp b/Minecraft.Client/Level/DemoLevel.cpp index 44c5b1f97..f7d633e96 100644 --- a/Minecraft.Client/Level/DemoLevel.cpp +++ b/Minecraft.Client/Level/DemoLevel.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "DemoLevel.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.storage.h" diff --git a/Minecraft.Client/Level/DerivedServerLevel.cpp b/Minecraft.Client/Level/DerivedServerLevel.cpp index 525cdb142..199db90fc 100644 --- a/Minecraft.Client/Level/DerivedServerLevel.cpp +++ b/Minecraft.Client/Level/DerivedServerLevel.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "DerivedServerLevel.h" #include "../../Minecraft.World/Level/Storage/SavedDataStorage.h" #include "../../Minecraft.World/Level/DerivedLevelData.h" diff --git a/Minecraft.Client/Level/MultiPlayerLevel.cpp b/Minecraft.Client/Level/MultiPlayerLevel.cpp index 9e8a96803..0ed7f1b16 100644 --- a/Minecraft.Client/Level/MultiPlayerLevel.cpp +++ b/Minecraft.Client/Level/MultiPlayerLevel.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MultiPlayerLevel.h" #include "../Player/MultiPlayerLocalPlayer.h" #include "../Network/ClientConnection.h" diff --git a/Minecraft.Client/Level/ServerLevel.cpp b/Minecraft.Client/Level/ServerLevel.cpp index 3326dcf98..6d56be34e 100644 --- a/Minecraft.Client/Level/ServerLevel.cpp +++ b/Minecraft.Client/Level/ServerLevel.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ServerLevel.h" #include "../MinecraftServer.h" #include "../Network/ServerChunkCache.h" diff --git a/Minecraft.Client/Level/ServerLevelListener.cpp b/Minecraft.Client/Level/ServerLevelListener.cpp index ac92c1657..6705a16fe 100644 --- a/Minecraft.Client/Level/ServerLevelListener.cpp +++ b/Minecraft.Client/Level/ServerLevelListener.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ServerLevelListener.h" #include "../Player/EntityTracker.h" #include "../MinecraftServer.h" diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 92feb78f0..80c75bad5 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -1,4 +1,4 @@ -#include "Build/stdafx.h" +#include "Platform/stdafx.h" #include "Minecraft.h" #include "GameState/GameMode.h" #include "Utils/Timer.h" @@ -65,8 +65,8 @@ #ifdef _XBOX #include "Platform/Xbox/Network/NetworkPlayerXbox.h" #endif -#include "Platform/UI/IUIScene_CreativeMenu.h" -#include "Platform/UI/UIFontData.h" +#include "Platform/Common/UI/IUIScene_CreativeMenu.h" +#include "Platform/Common/UI/UIFontData.h" #include "Textures/Packs/DLCTexturePack.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index 4072e5224..c20b35a10 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -1,4 +1,4 @@ -#include "Build/stdafx.h" +#include "Platform/stdafx.h" //#include "Minecraft.h" #include @@ -47,7 +47,7 @@ #include "Network/ServerCommandDispatcher.h" #include "../Minecraft.World/WorldGen/Biomes/BiomeSource.h" #include "Network/PlayerChunkMap.h" -#include "Platform/Telemetry/TelemetryManager.h" +#include "Platform/Common/Telemetry/TelemetryManager.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/Minecraft.Client/Network/ClientConnection.cpp b/Minecraft.Client/Network/ClientConnection.cpp index cfdc8be04..a671cc0d8 100644 --- a/Minecraft.Client/Network/ClientConnection.cpp +++ b/Minecraft.Client/Network/ClientConnection.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ClientConnection.h" #include "../Level/MultiPlayerLevel.h" #include "../Player/MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/Network/MultiPlayerChunkCache.cpp b/Minecraft.Client/Network/MultiPlayerChunkCache.cpp index a2d3df880..f4e3f7d0b 100644 --- a/Minecraft.Client/Network/MultiPlayerChunkCache.cpp +++ b/Minecraft.Client/Network/MultiPlayerChunkCache.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MultiPlayerChunkCache.h" #include "ServerChunkCache.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" diff --git a/Minecraft.Client/Network/PendingConnection.cpp b/Minecraft.Client/Network/PendingConnection.cpp index b0b9e869b..dec6b1f15 100644 --- a/Minecraft.Client/Network/PendingConnection.cpp +++ b/Minecraft.Client/Network/PendingConnection.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "PendingConnection.h" #include "PlayerConnection.h" #include "ServerConnection.h" diff --git a/Minecraft.Client/Network/PlayerChunkMap.cpp b/Minecraft.Client/Network/PlayerChunkMap.cpp index b8b660502..8bedd4d6e 100644 --- a/Minecraft.Client/Network/PlayerChunkMap.cpp +++ b/Minecraft.Client/Network/PlayerChunkMap.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "PlayerChunkMap.h" #include "PlayerConnection.h" #include "../Level/ServerLevel.h" diff --git a/Minecraft.Client/Network/PlayerConnection.cpp b/Minecraft.Client/Network/PlayerConnection.cpp index 18511aeec..76c71433c 100644 --- a/Minecraft.Client/Network/PlayerConnection.cpp +++ b/Minecraft.Client/Network/PlayerConnection.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "PlayerConnection.h" #include "../Player/ServerPlayer.h" #include "../Level/ServerLevel.h" diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp index f490cd805..7299f00a3 100644 --- a/Minecraft.Client/Network/PlayerList.cpp +++ b/Minecraft.Client/Network/PlayerList.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "PlayerList.h" #include "PlayerChunkMap.h" #include "../MinecraftServer.h" diff --git a/Minecraft.Client/Network/ServerChunkCache.cpp b/Minecraft.Client/Network/ServerChunkCache.cpp index c4543545c..c82e26a81 100644 --- a/Minecraft.Client/Network/ServerChunkCache.cpp +++ b/Minecraft.Client/Network/ServerChunkCache.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ServerChunkCache.h" #include "../Level/ServerLevel.h" #include "../MinecraftServer.h" diff --git a/Minecraft.Client/Network/ServerCommandDispatcher.cpp b/Minecraft.Client/Network/ServerCommandDispatcher.cpp index b9da8662d..205c0f51f 100644 --- a/Minecraft.Client/Network/ServerCommandDispatcher.cpp +++ b/Minecraft.Client/Network/ServerCommandDispatcher.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../MinecraftServer.h" #include "PlayerList.h" #include "../Player/ServerPlayer.h" diff --git a/Minecraft.Client/Network/ServerConnection.cpp b/Minecraft.Client/Network/ServerConnection.cpp index 6b7c2fa01..bef81d0d6 100644 --- a/Minecraft.Client/Network/ServerConnection.cpp +++ b/Minecraft.Client/Network/ServerConnection.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../GameState/Options.h" #include "ServerConnection.h" #include "PendingConnection.h" diff --git a/Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h index d026939a3..f6b7c8c02 100644 --- a/Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h +++ b/Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h @@ -1,7 +1,7 @@ #pragma once -#include "C4JMemoryPool.h" +#include "C4JMemoryPool.h" // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations. diff --git a/Minecraft.Client/Platform/Durango/Durango_App.cpp b/Minecraft.Client/Platform/Durango/Durango_App.cpp index 5b3a92055..d5dfed695 100644 --- a/Minecraft.Client/Platform/Durango/Durango_App.cpp +++ b/Minecraft.Client/Platform/Durango/Durango_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Durango/Durango_UIController.h b/Minecraft.Client/Platform/Durango/Durango_UIController.h index bb0c90f03..4ad3410e1 100644 --- a/Minecraft.Client/Platform/Durango/Durango_UIController.h +++ b/Minecraft.Client/Platform/Durango/Durango_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h index 8d81c8ff0..beb11d542 100644 --- a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h +++ b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" namespace P = Platform; namespace PC = Platform::Collections; diff --git a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp index 0522645d5..21460ecfe 100644 --- a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -9,7 +9,7 @@ #include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Common/Console_Awards_enum.h" +#include "../../Common/Console_Awards_enum.h" #include "DurangoStatsDebugger.h" diff --git a/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h index 2af0631a5..c7c5d8bd2 100644 --- a/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h +++ b/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" #include "DQRNetworkPlayer.h" // This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way. diff --git a/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h b/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h index 53de499c7..7d23c45fc 100644 --- a/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h +++ b/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h @@ -2,9 +2,9 @@ #include #include "../../../../Minecraft.World/Util/C4JThread.h" -#include "../../../../Common/Network/NetworkPlayerInterface.h" -#include "../../../../Common/Network/PlatformNetworkManagerInterface.h" -#include "../../../../Common/Network/SessionInfo.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" #include "DQRNetworkManager.h" #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp index 9aa9db854..788f8a7c6 100644 --- a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp +++ b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp @@ -7,7 +7,7 @@ #include "../../../../Minecraft.World/Level/LevelData.h" #include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../../Common/Network/GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" #include "../../../Player/MultiPlayerLocalPlayer.h" #include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h" diff --git a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h index 6428c60cd..d63c79c37 100644 --- a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h +++ b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h @@ -2,7 +2,7 @@ #include "../../../../Minecraft.World/Stats/DurangoStats.h" -#include "../../../../Common/Telemetry/TelemetryManager.h" +#include "../../Common/Telemetry/TelemetryManager.h" class CDurangoTelemetryManager : public CTelemetryManager { diff --git a/Minecraft.Client/Platform/Durango/XboxGameMode.cpp b/Minecraft.Client/Platform/Durango/XboxGameMode.cpp index cca97d5a5..64ad6ce3c 100644 --- a/Minecraft.Client/Platform/Durango/XboxGameMode.cpp +++ b/Minecraft.Client/Platform/Durango/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Platform/stdafx.h" #include "XboxGameMode.h" -#include "../../../Common/Tutorial/Tutorial.h" +#include "../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Platform/Durango/XboxGameMode.h b/Minecraft.Client/Platform/Durango/XboxGameMode.h index b1baff5d7..a9f0d6cd6 100644 --- a/Minecraft.Client/Platform/Durango/XboxGameMode.h +++ b/Minecraft.Client/Platform/Durango/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../Common/Tutorial/TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/Build/Extrax64Stubs.cpp b/Minecraft.Client/Platform/Extrax64Stubs.cpp similarity index 100% rename from Minecraft.Client/Build/Extrax64Stubs.cpp rename to Minecraft.Client/Platform/Extrax64Stubs.cpp diff --git a/Minecraft.Client/Platform/Linux/Linux_App.cpp b/Minecraft.Client/Platform/Linux/Linux_App.cpp index 4cfd82428..5fcd8017e 100644 --- a/Minecraft.Client/Platform/Linux/Linux_App.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp index 326f1f780..bba4269c3 100644 --- a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp @@ -50,8 +50,8 @@ static void sigsegv_handler(int sig) { #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "../Durango/Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Linux/Linux_ShutdownManager.cpp b/Minecraft.Client/Platform/Linux/Linux_ShutdownManager.cpp index cdb040555..cd0866a57 100644 --- a/Minecraft.Client/Platform/Linux/Linux_ShutdownManager.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_ShutdownManager.cpp @@ -1,6 +1,6 @@ // Linux stub implementations for ShutdownManager // The PS3/PSVita versions have full implementations; on Linux these are no-ops. -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../PS3/PS3Extras/ShutdownManager.h" void ShutdownManager::Initialise() {} diff --git a/Minecraft.Client/Platform/Linux/Linux_UIController.h b/Minecraft.Client/Platform/Linux/Linux_UIController.h index c261a5a82..6ed6934b0 100644 --- a/Minecraft.Client/Platform/Linux/Linux_UIController.h +++ b/Minecraft.Client/Platform/Linux/Linux_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp index 6c9c5bcb4..c2d65ab1b 100644 --- a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp +++ b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp @@ -6,7 +6,7 @@ #include #include "Stubs/LinuxStubs.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" void Display::update() {} diff --git a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp index 8e9c29c12..569a016e9 100644 --- a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../Orbis_App.h" -#include "../../../../Common/Consoles_App.h" +#include "../../Common/Consoles_App.h" -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h index aaecf9a5b..42fe6df0c 100644 --- a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h +++ b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" class OrbisLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp index d1501058c..f7a77b25c 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -12,7 +12,7 @@ #include "../ps4__np_conf.h" #include "Orbis_NPToolkit.h" #include "SonyVoiceChat_Orbis.h" -#include "../../../../Common/Network/Sony/SonyHttp.h" +#include "../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" diff --git a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h index 315247334..8bc917a2e 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h @@ -8,7 +8,7 @@ #include // #include "SonyVoiceChat_Orbis.h" -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h index ec39a9eb4..fc824a7e2 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyCommerce.h" class OrbisNPToolkit; class SonyCommerce_Orbis : public SonyCommerce diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h index afde7777b..8b42f58f2 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Orbis : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h index 62d4da52b..726186b89 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h @@ -4,7 +4,7 @@ #include #include #include -#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../Common/Network/Sony/SQRNetworkPlayer.h" static const int sc_maxVoiceDataSize = 2048; diff --git a/Minecraft.Client/Platform/Orbis/Orbis_App.cpp b/Minecraft.Client/Platform/Orbis/Orbis_App.cpp index acbd5fd27..fa0c48c84 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_App.cpp +++ b/Minecraft.Client/Platform/Orbis/Orbis_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" @@ -16,7 +16,7 @@ #include "Network/SonyRemoteStorage_Orbis.h" #include -#include "../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../Common/Network/Sony/SonyRemoteStorage.h" #include #include diff --git a/Minecraft.Client/Platform/Orbis/Orbis_App.h b/Minecraft.Client/Platform/Orbis/Orbis_App.h index 38d743081..68be9be45 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_App.h +++ b/Minecraft.Client/Platform/Orbis/Orbis_App.h @@ -3,8 +3,8 @@ class C4JStringTable; #include -#include "../../../Common/Network/Sony/SonyCommerce.h" -#include "../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../Common/Network/Sony/SonyCommerce.h" +#include "../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp index 8db86b326..07ca0bdc3 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp @@ -27,8 +27,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Orbis/Orbis_UIController.h b/Minecraft.Client/Platform/Orbis/Orbis_UIController.h index 237ba1bb9..940769e1b 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_UIController.h +++ b/Minecraft.Client/Platform/Orbis/Orbis_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp index a5d1bc681..e1addb366 100644 --- a/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp +++ b/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp @@ -5,8 +5,8 @@ #include #include #include -#include "../../../../Common/Audio/SoundEngine.h" -#include "../../../../Common/Consoles_App.h" +#include "../../Common/Audio/SoundEngine.h" +#include "../../Common/Consoles_App.h" #include "../Miles/include/mss.h" // This file has the platform specific functions required for PS3 audio diff --git a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp index 1ff2d648c..6c59243ba 100644 --- a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp +++ b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../PS3_App.h" -#include "../../../../Common/Consoles_App.h" +#include "../../Common/Consoles_App.h" -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h index 829086ad8..152db4791 100644 --- a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" #include "../../../../Minecraft.World/Platform/x64headers/extraX64.h" #include "../Passphrase/ps3__np_conf.h" diff --git a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp index e3100f6c6..4532a9379 100644 --- a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "SQRNetworkManager_PS3.h" -#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../Common/Network/Sony/SQRNetworkPlayer.h" #ifdef __PS3__ #include #include @@ -13,7 +13,7 @@ #include "../Passphrase/ps3__np_conf.h" #ifdef __PS3__ #include "SonyVoiceChat.h" -#include "../../../../Common/Network/Sony/SonyHttp.h" +#include "../../Common/Network/Sony/SonyHttp.h" #endif #include "../../../../Minecraft.World/Util/C4JThread.h" #include "../PS3Extras/PS3Strings.h" diff --git a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h index 60eb10083..7cc76aac2 100644 --- a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h @@ -9,7 +9,7 @@ #endif #include -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h index 0dee251d5..a39efafb6 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h @@ -6,7 +6,7 @@ #include #include #include -#include "../../../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyCommerce.h" #define SCE_TOOLKIT_NP_SKU_PRICE_LEN (SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \ + SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \ diff --git a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h index cc91b0b74..2385b6516 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" +#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage_PS3 : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp b/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp index 10f106ace..7cb0bfb5e 100644 --- a/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp +++ b/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "ShutdownManager.h" -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" #include "../../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/Platform/PS3/PS3_App.cpp b/Minecraft.Client/Platform/PS3/PS3_App.cpp index 68c6249b0..1b9537220 100644 --- a/Minecraft.Client/Platform/PS3/PS3_App.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/PS3/PS3_App.h b/Minecraft.Client/Platform/PS3/PS3_App.h index 2dc7ecd11..305a5f2b5 100644 --- a/Minecraft.Client/Platform/PS3/PS3_App.h +++ b/Minecraft.Client/Platform/PS3/PS3_App.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../Common/Network/Sony/SonyCommerce.h" -#include "../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../Common/Network/Sony/SonyCommerce.h" +#include "../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp b/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp index c50309cb6..9a80f25a5 100644 --- a/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp @@ -80,11 +80,11 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" -#include "../../../Common/Console_Awards_enum.h" +#include "../Common/Console_Awards_enum.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" #include "../../../Minecraft.World/Util/IntCache.h" @@ -94,8 +94,8 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = #include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h" #include "PS3Extras/EdgeZLib.h" #include "PS3Extras/C4JThread_SPU.h" -#include "../../../Common/Network/Sony/SQRNetworkManager.h" -#include "../../../Common/UI/IUIScene_PauseMenu.h" +#include "../Common/Network/Sony/SQRNetworkManager.h" +#include "../Common/UI/IUIScene_PauseMenu.h" #include diff --git a/Minecraft.Client/Platform/PS3/PS3_UIController.cpp b/Minecraft.Client/Platform/PS3/PS3_UIController.cpp index c224f9ddf..27a659ace 100644 --- a/Minecraft.Client/Platform/PS3/PS3_UIController.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_UIController.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Platform/stdafx.h" #include "PS3_UIController.h" -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" #include // Temp diff --git a/Minecraft.Client/Platform/PS3/PS3_UIController.h b/Minecraft.Client/Platform/PS3/PS3_UIController.h index 97958b09d..f8308a440 100644 --- a/Minecraft.Client/Platform/PS3/PS3_UIController.h +++ b/Minecraft.Client/Platform/PS3/PS3_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp index 739cc5f61..7d88b00b1 100644 --- a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp +++ b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #ifdef __PS3__ #ifndef SN_TARGET_PS3_SPU -// #include "../../../../Build/stdafx.h" +// #include "../../../../Platform/stdafx.h" #endif #endif diff --git a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h index c9ccb2cc2..f0f789133 100644 --- a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h +++ b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h @@ -1,7 +1,7 @@ #pragma once #ifndef SN_TARGET_PS3_SPU -#include "../../../../Build/stdafx.h" +#include "../../../../Platform/stdafx.h" #include "../../../../../Minecraft.World/Level/Storage/Region.h" #include "../../../../Rendering/Tesselator.h" #include "../../../../../Minecraft.World/Util/LightLayer.h" diff --git a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h index 96f3148c8..e420046cb 100644 --- a/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h +++ b/Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h @@ -6,7 +6,7 @@ typedef unsigned int DWORD; typedef unsigned char byte; #include #else -#include "../../../../Build/stdafx.h" +#include "../../../../Platform/stdafx.h" class ChunkRebuildData; #endif #endif diff --git a/Minecraft.Client/Platform/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h b/Minecraft.Client/Platform/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h index 7550966bb..ec6de4430 100644 --- a/Minecraft.Client/Platform/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/Platform/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h @@ -6,7 +6,7 @@ #include "SparseDataStorage_SPU.h" #ifndef SN_TARGET_PS3_SPU -#include "../../../../Build/stdafx.h" +#include "../../../../Platform/stdafx.h" #include "../../../../../Minecraft.World/Level/Storage/Region.h" #endif // SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/Platform/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h b/Minecraft.Client/Platform/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h index 8159cb0ef..f5c16dad7 100644 --- a/Minecraft.Client/Platform/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/Platform/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h @@ -4,7 +4,7 @@ #ifndef SN_TARGET_PS3_SPU -#include "../../../../Build/stdafx.h" +#include "../../../../Platform/stdafx.h" #include "../../../../../Minecraft.World/Level/Storage/Region.h" #endif // SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/Platform/PS3/XboxGameMode.cpp b/Minecraft.Client/Platform/PS3/XboxGameMode.cpp index cca97d5a5..64ad6ce3c 100644 --- a/Minecraft.Client/Platform/PS3/XboxGameMode.cpp +++ b/Minecraft.Client/Platform/PS3/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Platform/stdafx.h" #include "XboxGameMode.h" -#include "../../../Common/Tutorial/Tutorial.h" +#include "../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Platform/PS3/XboxGameMode.h b/Minecraft.Client/Platform/PS3/XboxGameMode.h index b1baff5d7..a9f0d6cd6 100644 --- a/Minecraft.Client/Platform/PS3/XboxGameMode.h +++ b/Minecraft.Client/Platform/PS3/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../Common/Tutorial/TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp index e6a23b79d..749111847 100644 --- a/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp @@ -27,8 +27,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "QNetManager.h" #include "../../Rendering/Tesselator.h" #include "Xbox_Awards_enum.h" diff --git a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index 1a3ab525b..e6c2c655b 100644 --- a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../PSVita_App.h" -#include "../../../../Common/Consoles_App.h" +#include "../../Common/Consoles_App.h" -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h index 93224490d..f02cfc180 100644 --- a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h +++ b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" #include "../PSVitaExtras/Conf.h" class PSVitaLeaderboardManager : public LeaderboardManager diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 06887a14f..37bb5cfe6 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -1,7 +1,7 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "SQRNetworkManager_AdHoc_Vita.h" #include "SonyVoiceChat_Vita.h" -#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h" +#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h" #include #include @@ -12,7 +12,7 @@ #include #include "../PSVitaExtras/Conf.h" -#include "../../../../Common/Network/Sony/SonyHttp.h" +#include "../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h index f8f80f205..4fa17dcec 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h @@ -8,7 +8,7 @@ #include -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" // class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp index 14b3af55c..049ba5b23 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -1,7 +1,7 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "SQRNetworkManager_Vita.h" #include "SonyVoiceChat_Vita.h" -#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h" +#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h" #include #include @@ -10,7 +10,7 @@ #include #include "../PSVitaExtras/Conf.h" -#include "../../../../Common/Network/Sony/SonyHttp.h" +#include "../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K ) diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h index 328e8d9a0..9c7975f96 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h @@ -8,7 +8,7 @@ #include -#include "../../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h index ab5129bf3..64b1d6a46 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyCommerce.h" #include #include #include diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h index c69302644..408eb11cc 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Vita : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h index a80558ee9..b9249d95d 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h @@ -4,7 +4,7 @@ #include #include #include -#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../Common/Network/Sony/SQRNetworkPlayer.h" static const int sc_maxVoiceDataSize = 2048; diff --git a/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp index d5153fded..b2642ee49 100644 --- a/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "ShutdownManager.h" -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" #include "../../../MinecraftServer.h" #ifdef __PS3__ #include "../../PS3/PS3Extras/C4JSpursJob.h" diff --git a/Minecraft.Client/Platform/PSVita/PSVita_App.cpp b/Minecraft.Client/Platform/PSVita/PSVita_App.cpp index 4430f10d6..ed23f0f15 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVita_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" @@ -13,7 +13,7 @@ #include "../../../Minecraft.World/Util/StringHelpers.h" #include "Network/SonyRemoteStorage_Vita.h" #include "Network/SonyCommerce_Vita.h" -#include "../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../Common/Network/Sony/SonyRemoteStorage.h" #include "Network/PSVita_NPToolkit.h" #include #include diff --git a/Minecraft.Client/Platform/PSVita/PSVita_App.h b/Minecraft.Client/Platform/PSVita/PSVita_App.h index 0d0f87ddd..24100436b 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_App.h +++ b/Minecraft.Client/Platform/PSVita/PSVita_App.h @@ -3,8 +3,8 @@ class C4JStringTable; //#include -#include "../../../Common/Network/Sony/SonyCommerce.h" -#include "../../../Common/Network/Sony/SonyRemoteStorage.h" +#include "../Common/Network/Sony/SonyCommerce.h" +#include "../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp index 66c95626d..56db1f465 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp @@ -40,11 +40,11 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" -#include "../../../Common/Console_Awards_enum.h" +#include "../Common/Console_Awards_enum.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" #include "../../../Minecraft.World/Util/IntCache.h" @@ -54,8 +54,8 @@ #include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h" //#include "../PS3/PS3Extras/EdgeZLib.h" #include "../../../Minecraft.World/Util/C4JThread.h" -#include "../../../Common/Network/Sony/SQRNetworkManager.h" -#include "../../../Common/UI/IUIScene_PauseMenu.h" +#include "../Common/Network/Sony/SQRNetworkManager.h" +#include "../Common/UI/IUIScene_PauseMenu.h" #include "PSVitaExtras/Conf.h" #include "Network/PSVita_NPToolkit.h" #include "Network/SonyVoiceChat_Vita.h" diff --git a/Minecraft.Client/Platform/PSVita/PSVita_UIController.h b/Minecraft.Client/Platform/PSVita/PSVita_UIController.h index 21a6d9715..6ddddb3ce 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_UIController.h +++ b/Minecraft.Client/Platform/PSVita/PSVita_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h index 75d8d3ce5..8083e5d43 100644 --- a/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h +++ b/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp index c12bae213..2193aedc1 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/Consoles_App.h" +#include "../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp index da6c4e0b9..ee6b689cb 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp @@ -25,8 +25,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../../Common/Leaderboards/LeaderboardManager.h" -//#include "../../../Common/XUI/XUI_Scene_Container.h" +//#include "../Common/Leaderboards/LeaderboardManager.h" +//#include "../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Windows64/Windows64_UIController.h b/Minecraft.Client/Platform/Windows64/Windows64_UIController.h index 3827f266d..cab14ce8a 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_UIController.h +++ b/Minecraft.Client/Platform/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp index f3c93dbbe..4c7875695 100644 --- a/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp @@ -8,7 +8,7 @@ #include "SoundEngine.h" #include "../../../Textures/Packs/TexturePackRepository.h" #include "../../../Textures/Packs/TexturePack.h" -#include "../../../../Common/DLC/DLCAudioFile.h" +#include "../../Common/DLC/DLCAudioFile.h" #include "../../../Textures/Packs/DLCTexturePack.h" diff --git a/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h index 1d75b7c76..40112436f 100644 --- a/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h +++ b/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h @@ -2,7 +2,7 @@ #include -#include "../../../../Common/UI/UIFontData.h" +#include "../../Common/UI/UIFontData.h" // 4J This class is partially based of the ATG font implementation //-------------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h index f394d9644..32b1e8472 100644 --- a/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h +++ b/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h @@ -3,7 +3,7 @@ #include #include -#include "../../../../Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" class XboxLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h index 26142c688..7614db6f6 100644 --- a/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h +++ b/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" // This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is // managed by PlatformNetworkManagerXbox. diff --git a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp index 7fcb6ea9a..58598cf17 100644 --- a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp +++ b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp @@ -3,7 +3,7 @@ #include "../../../../Minecraft.World/Util/StringHelpers.h" #include "PlatformNetworkManagerXbox.h" #include "NetworkPlayerXbox.h" -#include "../../../../Common/Network/GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerXbox *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h index d041294dd..40db532b6 100644 --- a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h +++ b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h @@ -3,9 +3,9 @@ #include #include #include "../../../../Minecraft.World/Util/C4JThread.h" -#include "../../../../Common/Network/NetworkPlayerInterface.h" -#include "../../../../Common/Network/PlatformNetworkManagerInterface.h" -#include "../../../../Common/Network/SessionInfo.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" // This is how often we allow a search for new games #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Platform/Xbox/Xbox_App.cpp b/Minecraft.Client/Platform/Xbox/Xbox_App.cpp index 65b45fbb7..c55ef4806 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_App.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_App.cpp @@ -1,64 +1,64 @@ #include "../../../Minecraft.World/Platform/stdafx.h" -#include "../../../Common/UI/UIStructs.h" +#include "../Common/UI/UIStructs.h" -#include "../../../Common/XUI/XUI_Intro.h" -#include "../../../Common/XUI/XUI_MainMenu.h" -#include "../../../Common/XUI/XUI_NewUpdateMessage.h" -#include "../../../Common/XUI/XUI_HelpAndOptions.h" -#include "../../../Common/XUI/XUI_TextEntry.h" -#include "../../../Common/XUI/XUI_HelpHowToPlay.h" -#include "../../../Common/XUI/XUI_HowToPlayMenu.h" -#include "../../../Common/XUI/XUI_HelpControls.h" -#include "../../../Common/XUI/XUI_TextEntry.h" -#include "../../../Common/XUI/XUI_LoadSettings.h" -#include "../../../Common/XUI/XUI_SettingsAll.h" -#include "../../../Common/XUI/XUI_SettingsOptions.h" -#include "../../../Common/XUI/XUI_SettingsAudio.h" -#include "../../../Common/XUI/XUI_SettingsControl.h" -#include "../../../Common/XUI/XUI_SettingsGraphics.h" -#include "../../../Common/XUI/XUI_SettingsUI.h" -#include "../../../Common/XUI/XUI_Leaderboards.h" -#include "../../../Common/XUI/XUI_Debug.h" -#include "../../../Common/XUI/XUI_DebugTips.h" -#include "../../../Common/XUI/XUI_Reinstall.h" -#include "../../../Common/XUI/XUI_Death.h" -#include "../../../Common/XUI/XUI_DebugOverlay.h" -#include "../../../Common/XUI/XUI_DLCOffers.h" -#include "../../../Common/XUI/XUI_SocialPost.h" -#include "../../../Common/XUI/XUI_Scene_Container.h" -#include "../../../Common/XUI/XUI_Scene_Furnace.h" -#include "../../../Common/XUI/XUI_Scene_Inventory.h" -#include "../../../Common/XUI/XUI_Scene_Trap.h" -#include "../../../Common/XUI/XUI_Control_ComboBox.h" -#include "../../../Common/XUI/XUI_MultiGameInfo.h" -#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h" -#include "../../../Common/XUI/XUI_MultiGameCreate.h" -#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" -#include "../../../Common/XUI/XUI_SignEntry.h" -#include "../../../Common/XUI/XUI_InGameInfo.h" -#include "../../../Common/XUI/XUI_TrialExitUpsell.h" -#include "../../../Common/XUI/XUI_BasePlayer.h" -#include "../../../Common/XUI/XUI_PartnernetPassword.h" -#include "../../../Common/XUI/XUI_SaveMessage.h" -#include "../../../Common/XUI/XUI_Chat.h" -#include "../../../Common/XUI/XUI_SkinSelect.h" -#include "../../../Common/XUI/XUI_InGameHostOptions.h" -#include "../../../Common/XUI/XUI_InGamePlayerOptions.h" -#include "../../../Common/XUI/XUI_Scene_Enchant.h" -#include "../../../Common/XUI/XUI_Scene_BrewingStand.h" -#include "../../../Common/XUI/XUI_XZP_Icons.h" -#include "../../../Common/XUI/XUI_Controls.h" -#include "../../../Common/XUI/XUI_Scene_Win.h" -#include "../../../Common/XUI/XUI_HUD.h" -#include "../../../Common/XUI/XUI_DebugSetCamera.h" -//#include "../../../Common/XUI/XUI_TransferToXboxOne.h" +#include "../Common/XUI/XUI_Intro.h" +#include "../Common/XUI/XUI_MainMenu.h" +#include "../Common/XUI/XUI_NewUpdateMessage.h" +#include "../Common/XUI/XUI_HelpAndOptions.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_HelpHowToPlay.h" +#include "../Common/XUI/XUI_HowToPlayMenu.h" +#include "../Common/XUI/XUI_HelpControls.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_LoadSettings.h" +#include "../Common/XUI/XUI_SettingsAll.h" +#include "../Common/XUI/XUI_SettingsOptions.h" +#include "../Common/XUI/XUI_SettingsAudio.h" +#include "../Common/XUI/XUI_SettingsControl.h" +#include "../Common/XUI/XUI_SettingsGraphics.h" +#include "../Common/XUI/XUI_SettingsUI.h" +#include "../Common/XUI/XUI_Leaderboards.h" +#include "../Common/XUI/XUI_Debug.h" +#include "../Common/XUI/XUI_DebugTips.h" +#include "../Common/XUI/XUI_Reinstall.h" +#include "../Common/XUI/XUI_Death.h" +#include "../Common/XUI/XUI_DebugOverlay.h" +#include "../Common/XUI/XUI_DLCOffers.h" +#include "../Common/XUI/XUI_SocialPost.h" +#include "../Common/XUI/XUI_Scene_Container.h" +#include "../Common/XUI/XUI_Scene_Furnace.h" +#include "../Common/XUI/XUI_Scene_Inventory.h" +#include "../Common/XUI/XUI_Scene_Trap.h" +#include "../Common/XUI/XUI_Control_ComboBox.h" +#include "../Common/XUI/XUI_MultiGameInfo.h" +#include "../Common/XUI/XUI_MultiGameJoinLoad.h" +#include "../Common/XUI/XUI_MultiGameCreate.h" +#include "../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "../Common/XUI/XUI_SignEntry.h" +#include "../Common/XUI/XUI_InGameInfo.h" +#include "../Common/XUI/XUI_TrialExitUpsell.h" +#include "../Common/XUI/XUI_BasePlayer.h" +#include "../Common/XUI/XUI_PartnernetPassword.h" +#include "../Common/XUI/XUI_SaveMessage.h" +#include "../Common/XUI/XUI_Chat.h" +#include "../Common/XUI/XUI_SkinSelect.h" +#include "../Common/XUI/XUI_InGameHostOptions.h" +#include "../Common/XUI/XUI_InGamePlayerOptions.h" +#include "../Common/XUI/XUI_Scene_Enchant.h" +#include "../Common/XUI/XUI_Scene_BrewingStand.h" +#include "../Common/XUI/XUI_XZP_Icons.h" +#include "../Common/XUI/XUI_Controls.h" +#include "../Common/XUI/XUI_Scene_Win.h" +#include "../Common/XUI/XUI_HUD.h" +#include "../Common/XUI/XUI_DebugSetCamera.h" +//#include "../Common/XUI/XUI_TransferToXboxOne.h" #ifdef _DEBUG_MENUS_ENABLED -#include "../../../Common/XUI/XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "../../../Common/XUI/XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "../../../Minecraft.World/Recipes/Recipy.h" @@ -88,16 +88,16 @@ #include "../../GameState/GameMode.h" #include "Social/SocialManager.h" #include -#include "../../../Common/Tutorial/TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" #include "XML/ATGXmlParser.h" #include "XML/xmlFilesCallback.h" #include "4JLibs/inc/4J_Input.h" #include "Font/XUI_FontRenderer.h" -#include "../../../Common/Minecraft_Macros.h" +#include "../Common/Minecraft_Macros.h" #include "../../Network/PlayerList.h" #include "../../Player/ServerPlayer.h" -#include "../../../Common/GameRules/ConsoleGameRules.h" -#include "../../../Common/GameRules/ConsoleSchematicFile.h" +#include "../Common/GameRules/ConsoleGameRules.h" +#include "../Common/GameRules/ConsoleSchematicFile.h" #include "../../../Minecraft.World/IO/Streams/InputOutputStream.h" #include "../../../Minecraft.World/Level/Storage/LevelSettings.h" #include "../../Player/User.h" @@ -109,67 +109,67 @@ #include "../../../Minecraft.World/IO/Streams/Compression.h" #include "../../Textures/Packs/TexturePackRepository.h" #include "../../Textures/Packs/TexturePack.h" -#include "../../../Common/DLC/DLCAudioFile.h" +#include "../Common/DLC/DLCAudioFile.h" #include "../../Textures/Packs/DLCTexturePack.h" -#include "../../../Common/XUI/XUI_Intro.h" -#include "../../../Common/XUI/XUI_MainMenu.h" -#include "../../../Common/XUI/XUI_NewUpdateMessage.h" -#include "../../../Common/XUI/XUI_HelpAndOptions.h" -#include "../../../Common/XUI/XUI_TextEntry.h" -#include "../../../Common/XUI/XUI_HelpHowToPlay.h" -#include "../../../Common/XUI/XUI_HowToPlayMenu.h" -#include "../../../Common/XUI/XUI_HelpControls.h" -#include "../../../Common/XUI/XUI_TextEntry.h" -#include "../../../Common/XUI/XUI_LoadSettings.h" -#include "../../../Common/XUI/XUI_SettingsAll.h" -#include "../../../Common/XUI/XUI_SettingsOptions.h" -#include "../../../Common/XUI/XUI_SettingsAudio.h" -#include "../../../Common/XUI/XUI_SettingsControl.h" -#include "../../../Common/XUI/XUI_SettingsGraphics.h" -#include "../../../Common/XUI/XUI_SettingsUI.h" -#include "../../../Common/XUI/XUI_Leaderboards.h" -#include "../../../Common/XUI/XUI_Debug.h" -#include "../../../Common/XUI/XUI_DebugTips.h" -#include "../../../Common/XUI/XUI_Reinstall.h" -#include "../../../Common/XUI/XUI_Death.h" -#include "../../../Common/XUI/XUI_DebugOverlay.h" -#include "../../../Common/XUI/XUI_DLCOffers.h" -#include "../../../Common/XUI/XUI_SocialPost.h" -#include "../../../Common/XUI/XUI_Scene_Container.h" -#include "../../../Common/XUI/XUI_Scene_Furnace.h" -#include "../../../Common/XUI/XUI_Scene_Inventory.h" -#include "../../../Common/XUI/XUI_Scene_Trap.h" -#include "../../../Common/XUI/XUI_Control_ComboBox.h" -#include "../../../Common/XUI/XUI_MultiGameInfo.h" -#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h" -#include "../../../Common/XUI/XUI_MultiGameCreate.h" -#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" -#include "../../../Common/XUI/XUI_SignEntry.h" -#include "../../../Common/XUI/XUI_InGameInfo.h" -#include "../../../Common/XUI/XUI_TrialExitUpsell.h" -#include "../../../Common/XUI/XUI_BasePlayer.h" -#include "../../../Common/XUI/XUI_PartnernetPassword.h" -#include "../../../Common/XUI/XUI_SaveMessage.h" -#include "../../../Common/XUI/XUI_Chat.h" -#include "../../../Common/XUI/XUI_SkinSelect.h" -#include "../../../Common/XUI/XUI_InGameHostOptions.h" -#include "../../../Common/XUI/XUI_InGamePlayerOptions.h" -#include "../../../Common/XUI/XUI_Scene_Enchant.h" -#include "../../../Common/XUI/XUI_Scene_BrewingStand.h" -#include "../../../Common/XUI/XUI_XZP_Icons.h" -#include "../../../Common/XUI/XUI_Controls.h" -#include "../../../Common/XUI/XUI_Scene_Win.h" -#include "../../../Common/XUI/XUI_HUD.h" -#include "../../../Common/XUI/XUI_Scene_Anvil.h" -#include "../../../Common/XUI/XUI_Scene_Trading.h" -#include "../../../Common/XUI/XUI_Teleport.h" +#include "../Common/XUI/XUI_Intro.h" +#include "../Common/XUI/XUI_MainMenu.h" +#include "../Common/XUI/XUI_NewUpdateMessage.h" +#include "../Common/XUI/XUI_HelpAndOptions.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_HelpHowToPlay.h" +#include "../Common/XUI/XUI_HowToPlayMenu.h" +#include "../Common/XUI/XUI_HelpControls.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_LoadSettings.h" +#include "../Common/XUI/XUI_SettingsAll.h" +#include "../Common/XUI/XUI_SettingsOptions.h" +#include "../Common/XUI/XUI_SettingsAudio.h" +#include "../Common/XUI/XUI_SettingsControl.h" +#include "../Common/XUI/XUI_SettingsGraphics.h" +#include "../Common/XUI/XUI_SettingsUI.h" +#include "../Common/XUI/XUI_Leaderboards.h" +#include "../Common/XUI/XUI_Debug.h" +#include "../Common/XUI/XUI_DebugTips.h" +#include "../Common/XUI/XUI_Reinstall.h" +#include "../Common/XUI/XUI_Death.h" +#include "../Common/XUI/XUI_DebugOverlay.h" +#include "../Common/XUI/XUI_DLCOffers.h" +#include "../Common/XUI/XUI_SocialPost.h" +#include "../Common/XUI/XUI_Scene_Container.h" +#include "../Common/XUI/XUI_Scene_Furnace.h" +#include "../Common/XUI/XUI_Scene_Inventory.h" +#include "../Common/XUI/XUI_Scene_Trap.h" +#include "../Common/XUI/XUI_Control_ComboBox.h" +#include "../Common/XUI/XUI_MultiGameInfo.h" +#include "../Common/XUI/XUI_MultiGameJoinLoad.h" +#include "../Common/XUI/XUI_MultiGameCreate.h" +#include "../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "../Common/XUI/XUI_SignEntry.h" +#include "../Common/XUI/XUI_InGameInfo.h" +#include "../Common/XUI/XUI_TrialExitUpsell.h" +#include "../Common/XUI/XUI_BasePlayer.h" +#include "../Common/XUI/XUI_PartnernetPassword.h" +#include "../Common/XUI/XUI_SaveMessage.h" +#include "../Common/XUI/XUI_Chat.h" +#include "../Common/XUI/XUI_SkinSelect.h" +#include "../Common/XUI/XUI_InGameHostOptions.h" +#include "../Common/XUI/XUI_InGamePlayerOptions.h" +#include "../Common/XUI/XUI_Scene_Enchant.h" +#include "../Common/XUI/XUI_Scene_BrewingStand.h" +#include "../Common/XUI/XUI_XZP_Icons.h" +#include "../Common/XUI/XUI_Controls.h" +#include "../Common/XUI/XUI_Scene_Win.h" +#include "../Common/XUI/XUI_HUD.h" +#include "../Common/XUI/XUI_Scene_Anvil.h" +#include "../Common/XUI/XUI_Scene_Trading.h" +#include "../Common/XUI/XUI_Teleport.h" #ifdef _DEBUG_MENUS_ENABLED -#include "../../../Common/XUI/XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "../../../Common/XUI/XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "Xbox_App.h" diff --git a/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp index 95a463422..bb63d51ce 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp @@ -25,7 +25,7 @@ #include "../../UI/Screens/ConnectScreen.h" #include "Social/SocialManager.h" #include "Leaderboards/XboxLeaderboardManager.h" -#include "../../../Common/XUI/XUI_Scene_Container.h" +#include "../Common/XUI/XUI_Scene_Container.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp index ee456e2d1..495dac0e0 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp @@ -1,7 +1,7 @@ #include "../../../Minecraft.World/Platform/stdafx.h" #include "Xbox_UIController.h" -#include "../../../Common/XUI/XUI_Scene_Base.h" -#include "../../../Common/XUI/XUI_Scene_Win.h" +#include "../Common/XUI/XUI_Scene_Base.h" +#include "../Common/XUI/XUI_Scene_Win.h" ConsoleUIController ui; diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h index b44567beb..041306a75 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h +++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/UI/IUIController.h" +#include "../Common/UI/IUIController.h" class ConsoleUIController : public IUIController { diff --git a/Minecraft.Client/Build/extraX64client.h b/Minecraft.Client/Platform/extraX64client.h similarity index 100% rename from Minecraft.Client/Build/extraX64client.h rename to Minecraft.Client/Platform/extraX64client.h diff --git a/Minecraft.Client/Build/stdafx.cpp b/Minecraft.Client/Platform/stdafx.cpp similarity index 100% rename from Minecraft.Client/Build/stdafx.cpp rename to Minecraft.Client/Platform/stdafx.cpp diff --git a/Minecraft.Client/Build/stdafx.h b/Minecraft.Client/Platform/stdafx.h similarity index 100% rename from Minecraft.Client/Build/stdafx.h rename to Minecraft.Client/Platform/stdafx.h diff --git a/Minecraft.Client/Build/stubs.cpp b/Minecraft.Client/Platform/stubs.cpp similarity index 100% rename from Minecraft.Client/Build/stubs.cpp rename to Minecraft.Client/Platform/stubs.cpp diff --git a/Minecraft.Client/Build/stubs.h b/Minecraft.Client/Platform/stubs.h similarity index 100% rename from Minecraft.Client/Build/stubs.h rename to Minecraft.Client/Platform/stubs.h diff --git a/Minecraft.Client/Player/EntityTracker.cpp b/Minecraft.Client/Player/EntityTracker.cpp index 0d219a34e..2b318b5ea 100644 --- a/Minecraft.Client/Player/EntityTracker.cpp +++ b/Minecraft.Client/Player/EntityTracker.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "EntityTracker.h" #include "../MinecraftServer.h" #include "../Network/PlayerList.h" diff --git a/Minecraft.Client/Player/LocalPlayer.cpp b/Minecraft.Client/Player/LocalPlayer.cpp index 11665ff0c..dee185522 100644 --- a/Minecraft.Client/Player/LocalPlayer.cpp +++ b/Minecraft.Client/Player/LocalPlayer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "LocalPlayer.h" #include "User.h" #include "../Input/Input.h" diff --git a/Minecraft.Client/Player/MultiPlayerGameMode.cpp b/Minecraft.Client/Player/MultiPlayerGameMode.cpp index c54695e6d..4e5e0426d 100644 --- a/Minecraft.Client/Player/MultiPlayerGameMode.cpp +++ b/Minecraft.Client/Player/MultiPlayerGameMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MultiPlayerGameMode.h" #include "../GameState/CreativeMode.h" #include "MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/Player/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/Player/MultiPlayerLocalPlayer.cpp index d62ff2ae6..2f6fae0e1 100644 --- a/Minecraft.Client/Player/MultiPlayerLocalPlayer.cpp +++ b/Minecraft.Client/Player/MultiPlayerLocalPlayer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" //#include "../../Minecraft.World/Util/JavaMath.h" #include "MultiPlayerLocalPlayer.h" #include "../Network/ClientConnection.h" diff --git a/Minecraft.Client/Player/RemotePlayer.cpp b/Minecraft.Client/Player/RemotePlayer.cpp index 0d9a6e977..5e554cbab 100644 --- a/Minecraft.Client/Player/RemotePlayer.cpp +++ b/Minecraft.Client/Player/RemotePlayer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "RemotePlayer.h" #include "../../Minecraft.World/Headers/net.minecraft.world.item.h" #include "../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Player/ServerPlayer.cpp b/Minecraft.Client/Player/ServerPlayer.cpp index 0ac82bf3d..d7eae5841 100644 --- a/Minecraft.Client/Player/ServerPlayer.cpp +++ b/Minecraft.Client/Player/ServerPlayer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ServerPlayer.h" #include "ServerPlayerGameMode.h" #include "../Level/ServerLevel.h" diff --git a/Minecraft.Client/Player/ServerPlayerGameMode.cpp b/Minecraft.Client/Player/ServerPlayerGameMode.cpp index eee12430f..50a1a5d55 100644 --- a/Minecraft.Client/Player/ServerPlayerGameMode.cpp +++ b/Minecraft.Client/Player/ServerPlayerGameMode.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ServerPlayerGameMode.h" #include "../Level/ServerLevel.h" #include "ServerPlayer.h" diff --git a/Minecraft.Client/Player/TrackedEntity.cpp b/Minecraft.Client/Player/TrackedEntity.cpp index 3d456f6b3..fb10ea8d1 100644 --- a/Minecraft.Client/Player/TrackedEntity.cpp +++ b/Minecraft.Client/Player/TrackedEntity.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "TrackedEntity.h" #include "ServerPlayer.h" #include "../Network/PlayerConnection.h" diff --git a/Minecraft.Client/Player/User.cpp b/Minecraft.Client/Player/User.cpp index 5cdc0162d..514070b54 100644 --- a/Minecraft.Client/Player/User.cpp +++ b/Minecraft.Client/Player/User.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "User.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/Camera.cpp b/Minecraft.Client/Rendering/Camera.cpp index 312957376..8a2338f1d 100644 --- a/Minecraft.Client/Rendering/Camera.cpp +++ b/Minecraft.Client/Rendering/Camera.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Camera.h" #include "../Utils/MemoryTracker.h" #include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" diff --git a/Minecraft.Client/Rendering/Chunk.cpp b/Minecraft.Client/Rendering/Chunk.cpp index f499de443..a91477615 100644 --- a/Minecraft.Client/Rendering/Chunk.cpp +++ b/Minecraft.Client/Rendering/Chunk.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Chunk.h" #include "EntityRenderers/TileRenderer.h" #include "EntityRenderers/TileEntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/Cube.cpp b/Minecraft.Client/Rendering/Cube.cpp index ee007f111..e3124c41f 100644 --- a/Minecraft.Client/Rendering/Cube.cpp +++ b/Minecraft.Client/Rendering/Cube.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Models/Model.h" #include "Models/ModelPart.h" #include "Cube.h" diff --git a/Minecraft.Client/Rendering/Culling/AllowAllCuller.cpp b/Minecraft.Client/Rendering/Culling/AllowAllCuller.cpp index 8bdbe7f2f..f72d825e2 100644 --- a/Minecraft.Client/Rendering/Culling/AllowAllCuller.cpp +++ b/Minecraft.Client/Rendering/Culling/AllowAllCuller.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "AllowAllCuller.h" bool AllowAllCuller::isVisible(AABB *bb) diff --git a/Minecraft.Client/Rendering/Culling/DirtyChunkSorter.cpp b/Minecraft.Client/Rendering/Culling/DirtyChunkSorter.cpp index ae702d9a0..a93002c59 100644 --- a/Minecraft.Client/Rendering/Culling/DirtyChunkSorter.cpp +++ b/Minecraft.Client/Rendering/Culling/DirtyChunkSorter.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DirtyChunkSorter.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" #include "../Chunk.h" diff --git a/Minecraft.Client/Rendering/Culling/DistanceChunkSorter.cpp b/Minecraft.Client/Rendering/Culling/DistanceChunkSorter.cpp index 9c7804d27..f67380a0a 100644 --- a/Minecraft.Client/Rendering/Culling/DistanceChunkSorter.cpp +++ b/Minecraft.Client/Rendering/Culling/DistanceChunkSorter.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DistanceChunkSorter.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" #include "../Chunk.h" diff --git a/Minecraft.Client/Rendering/Culling/ViewportCuller.cpp b/Minecraft.Client/Rendering/Culling/ViewportCuller.cpp index c5a881b63..8c6d5beb5 100644 --- a/Minecraft.Client/Rendering/Culling/ViewportCuller.cpp +++ b/Minecraft.Client/Rendering/Culling/ViewportCuller.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ViewportCuller.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ArrowRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ArrowRenderer.cpp index 408725c24..85d475925 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ArrowRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ArrowRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ArrowRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.projectile.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/BlazeRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/BlazeRenderer.cpp index cafe47861..9e2f4bcee 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/BlazeRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/BlazeRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/BlazeModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" #include "BlazeRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/BoatRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/BoatRenderer.cpp index 2a9fba093..270ee1eff 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/BoatRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/BoatRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "BoatRenderer.h" #include "../Models/BoatModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.cpp index ed0a215c4..20c9e3031 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ChestRenderer.h" #include "../Models/ChestModel.h" #include "../Models/LargeChestModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ChickenRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ChickenRenderer.cpp index ca795fee8..a718c8bff 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ChickenRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ChickenRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ChickenRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/CowRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/CowRenderer.cpp index ce7b9fd06..34385c584 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/CowRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/CowRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CowRenderer.h" CowRenderer::CowRenderer(Model *model, float shadow) : MobRenderer(model, shadow) diff --git a/Minecraft.Client/Rendering/EntityRenderers/CreeperRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/CreeperRenderer.cpp index db02d7bcd..d9079bf8d 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/CreeperRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/CreeperRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CreeperRenderer.h" #include "../Models/CreeperModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/DefaultRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/DefaultRenderer.cpp index 435410b3f..a79b23e6e 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/DefaultRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/DefaultRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DefaultRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.cpp index 92d1d4233..99db92af5 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/BookModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EnderChestRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EnderChestRenderer.cpp index 7fce13c64..5ba499998 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EnderChestRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EnderChestRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "../Models/ModelPart.h" #include "EnderChestRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EnderCrystalRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EnderCrystalRenderer.cpp index 3cbdc7aae..3b5e232a0 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EnderCrystalRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EnderCrystalRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/EnderCrystalModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.cpp index a9f067e7f..9b2cbee0a 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/DragonModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" #include "../Tesselator.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EnderManRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EnderManRenderer.cpp index 0f5704f77..cfb91c452 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EnderManRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EnderManRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EnderManRenderer.h" #include "../Models/EnderManModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.cpp b/Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.cpp index bfb07c214..b6b681e28 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.projectile.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.cpp index 7960e7d4d..7d3614bd0 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EntityRenderer.h" #include "../Models/HumanoidModel.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/EntityTileRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/EntityTileRenderer.cpp index 572d3a6c0..844260ea5 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/EntityTileRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/EntityTileRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EntityTileRenderer.h" #include "TileEntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ExperienceOrbRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ExperienceOrbRenderer.cpp index f555bb1f4..78ec3bceb 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ExperienceOrbRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ExperienceOrbRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ExperienceOrbRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/FallingTileRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/FallingTileRenderer.cpp index e41010e61..dc046ec1f 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/FallingTileRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/FallingTileRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FallingTileRenderer.h" #include "TileRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/FireballRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/FireballRenderer.cpp index 399faee27..cfbf5e334 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/FireballRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/FireballRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FireballRenderer.h" #include "EntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.projectile.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/FishingHookRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/FishingHookRenderer.cpp index 95af3d46d..4f30ed9cf 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/FishingHookRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/FishingHookRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FishingHookRenderer.h" #include "EntityRenderDispatcher.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/GhastRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/GhastRenderer.cpp index fe373d06d..059d5ef02 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/GhastRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/GhastRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "GhastRenderer.h" #include "../Models/GhastModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/GiantMobRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/GiantMobRenderer.cpp index e674e9d34..8bbd3d2fd 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/GiantMobRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/GiantMobRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "GiantMobRenderer.h" GiantMobRenderer::GiantMobRenderer(Model *model, float shadow, float _scale) : MobRenderer(model, shadow *_scale) diff --git a/Minecraft.Client/Rendering/EntityRenderers/HumanoidMobRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/HumanoidMobRenderer.cpp index 7fc66de50..f5c357940 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/HumanoidMobRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/HumanoidMobRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "HumanoidMobRenderer.h" #include "SkullTileRenderer.h" #include "../Models/HumanoidModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemFrameRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemFrameRenderer.cpp index fdb3d5554..fb077f206 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ItemFrameRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ItemFrameRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ItemRenderer.h" #include "TileRenderer.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp index 6ed000bb0..f1fdd1222 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ItemInHandRenderer.h" #include "TileRenderer.h" #include "../Tesselator.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp index 184484e74..6e3ecce1d 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ItemRenderer.h" #include "TileRenderer.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemSpriteRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemSpriteRenderer.cpp index bd8b79ca9..0966845a2 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ItemSpriteRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ItemSpriteRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ItemSpriteRenderer.h" #include "EntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.projectile.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/LavaSlimeRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/LavaSlimeRenderer.cpp index 09ea2c83f..27987b9ac 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/LavaSlimeRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/LavaSlimeRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" #include "../Models/LavaSlimeModel.h" #include "LavaSlimeRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/LightningBoltRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/LightningBoltRenderer.cpp index d4d5b8d5d..cb5ba79ee 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/LightningBoltRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/LightningBoltRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "LightningBoltRenderer.h" #include "../Tesselator.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.global.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/MinecartRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/MinecartRenderer.cpp index 0b0d7077b..9948ab907 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/MinecartRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/MinecartRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "MinecartRenderer.h" #include "../Models/MinecartModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/MobRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/MobRenderer.cpp index 5c4ca6a38..f14e58f01 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/MobRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/MobRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "MobRenderer.h" #include "../../Player/MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/MobSpawnerRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/MobSpawnerRenderer.cpp index 6c4f6a928..aa82227dd 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/MobSpawnerRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/MobSpawnerRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "MobSpawnerRenderer.h" #include "TileEntityRenderDispatcher.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/MushroomCowRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/MushroomCowRenderer.cpp index d59fa9036..a1efc1cc9 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/MushroomCowRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/MushroomCowRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../Models/QuadrupedModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/OcelotRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/OcelotRenderer.cpp index 2abb15113..8b36de448 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/OcelotRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/OcelotRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "OcelotRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/PaintingRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PaintingRenderer.cpp index 356b76492..4e948f5d1 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/PaintingRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/PaintingRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PaintingRenderer.h" #include "EntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/PigRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PigRenderer.cpp index eb7af5da4..047877d04 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/PigRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/PigRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PigRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp index 37cd733aa..a50dfe886 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PistonPieceRenderer.h" #include "../Tesselator.h" #include "../Lighting.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp index 156b6102b..bc0bbb6ab 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PlayerRenderer.h" #include "SkullTileRenderer.h" #include "../Models/HumanoidModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.cpp index 2fcaed9b2..50619a156 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Tesselator.h" #include "../../Textures/Textures.h" #include "ProgressRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SheepRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SheepRenderer.cpp index f30a79198..c0c65d6f3 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SheepRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SheepRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SheepRenderer.h" #include "../../Player/MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SignRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SignRenderer.cpp index 0b7147724..9b8d5aa80 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SignRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SignRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SignRenderer.h" #include "../Models/SignModel.h" #include "../Models/ModelPart.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SilverfishRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SilverfishRenderer.cpp index 1356cbdbc..6da4ed073 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SilverfishRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SilverfishRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SilverfishRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" #include "../Models/SilverfishModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SkullTileRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SkullTileRenderer.cpp index b3f19b02d..8d389f87a 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SkullTileRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SkullTileRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Blocks/TileEntities/SkullTileEntity.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.World/Headers/net.minecraft.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SlimeRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SlimeRenderer.cpp index 94fdf85ff..77f03f7c9 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SlimeRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SlimeRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SlimeRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SnowManRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SnowManRenderer.cpp index 8324b771d..0032a6e5e 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SnowManRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SnowManRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/SnowManModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SpiderRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SpiderRenderer.cpp index 2055bfa82..dcfa2fd1d 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SpiderRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SpiderRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SpiderRenderer.h" #include "../Models/SpiderModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/SquidRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/SquidRenderer.cpp index e7322d3d4..12cb1a2c2 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/SquidRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/SquidRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SquidRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/TheEndPortalRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/TheEndPortalRenderer.cpp index beb2effb8..a9971f71d 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/TheEndPortalRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/TheEndPortalRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "../Tesselator.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp index 86032f2ea..b55ff111a 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TileEntityRenderDispatcher.h" #include "TileEntityRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderer.cpp index d31ddfd8e..62621fada 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TileEntityRenderer.h" #include "TileEntityRenderDispatcher.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.cpp index 4a908cae5..a84a13eeb 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/TileRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TileRenderer.h" #include "../GameRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/TntRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/TntRenderer.cpp index 3f1ae5c8e..4bce1b017 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/TntRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/TntRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TntRenderer.h" #include "TileRenderer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/VillagerGolemRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/VillagerGolemRenderer.cpp index 1f495b297..2ec228b68 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/VillagerGolemRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/VillagerGolemRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../Models/VillagerGolemModel.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/VillagerRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/VillagerRenderer.cpp index 465d76e13..3dc0037e3 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/VillagerRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/VillagerRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.npc.h" #include "../Models/VillagerModel.h" #include "VillagerRenderer.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/WolfRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/WolfRenderer.cpp index f886f2db4..26a92255c 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/WolfRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/WolfRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "WolfRenderer.h" #include "../../Player/MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" diff --git a/Minecraft.Client/Rendering/EntityRenderers/ZombieRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ZombieRenderer.cpp index 8e47f334a..6831b2bd1 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ZombieRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ZombieRenderer.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Models/ZombieModel.h" #include "../Models/VillagerZombieModel.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" diff --git a/Minecraft.Client/Rendering/Frustum.cpp b/Minecraft.Client/Rendering/Frustum.cpp index 0a6e9fab1..c8d6655cc 100644 --- a/Minecraft.Client/Rendering/Frustum.cpp +++ b/Minecraft.Client/Rendering/Frustum.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../../Minecraft.World/IO/Streams/FloatBuffer.h" #include "Frustum.h" diff --git a/Minecraft.Client/Rendering/FrustumCuller.cpp b/Minecraft.Client/Rendering/FrustumCuller.cpp index e5d368ddf..d842e3cf3 100644 --- a/Minecraft.Client/Rendering/FrustumCuller.cpp +++ b/Minecraft.Client/Rendering/FrustumCuller.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "FrustumCuller.h" FrustumCuller::FrustumCuller() diff --git a/Minecraft.Client/Rendering/FrustumCuller.h b/Minecraft.Client/Rendering/FrustumCuller.h index 634c6de1c..5197ef10d 100644 --- a/Minecraft.Client/Rendering/FrustumCuller.h +++ b/Minecraft.Client/Rendering/FrustumCuller.h @@ -1,5 +1,5 @@ #pragma once -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Culling/Culler.h" #include "Frustum.h" diff --git a/Minecraft.Client/Rendering/FrustumData.cpp b/Minecraft.Client/Rendering/FrustumData.cpp index 9fb376886..525785fae 100644 --- a/Minecraft.Client/Rendering/FrustumData.cpp +++ b/Minecraft.Client/Rendering/FrustumData.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "FrustumData.h" float** m_Frustum; diff --git a/Minecraft.Client/Rendering/GameRenderer.cpp b/Minecraft.Client/Rendering/GameRenderer.cpp index b59a5ed62..b3b7d2995 100644 --- a/Minecraft.Client/Rendering/GameRenderer.cpp +++ b/Minecraft.Client/Rendering/GameRenderer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "GameRenderer.h" #include "EntityRenderers/ItemInHandRenderer.h" #include "LevelRenderer.h" diff --git a/Minecraft.Client/Rendering/LevelRenderer.cpp b/Minecraft.Client/Rendering/LevelRenderer.cpp index 0f8ea9483..538529ac4 100644 --- a/Minecraft.Client/Rendering/LevelRenderer.cpp +++ b/Minecraft.Client/Rendering/LevelRenderer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "LevelRenderer.h" #include "../Textures/Textures.h" #include "Tesselator.h" diff --git a/Minecraft.Client/Rendering/Lighting.cpp b/Minecraft.Client/Rendering/Lighting.cpp index ea232257f..eafba1dfd 100644 --- a/Minecraft.Client/Rendering/Lighting.cpp +++ b/Minecraft.Client/Rendering/Lighting.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Lighting.h" #include "../../Minecraft.World/IO/Streams/FloatBuffer.h" #include "../../Minecraft.World/Util/Vec3.h" diff --git a/Minecraft.Client/Rendering/Minimap.cpp b/Minecraft.Client/Rendering/Minimap.cpp index cb337cd83..6a28a95d8 100644 --- a/Minecraft.Client/Rendering/Minimap.cpp +++ b/Minecraft.Client/Rendering/Minimap.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../Minecraft.h" #include "Minimap.h" #include "../UI/Font.h" diff --git a/Minecraft.Client/Rendering/Models/BlazeModel.cpp b/Minecraft.Client/Rendering/Models/BlazeModel.cpp index 09dfbebaf..f1a805957 100644 --- a/Minecraft.Client/Rendering/Models/BlazeModel.cpp +++ b/Minecraft.Client/Rendering/Models/BlazeModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "BlazeModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/BoatModel.cpp b/Minecraft.Client/Rendering/Models/BoatModel.cpp index bd39f0f8d..90a9752d5 100644 --- a/Minecraft.Client/Rendering/Models/BoatModel.cpp +++ b/Minecraft.Client/Rendering/Models/BoatModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "BoatModel.h" BoatModel::BoatModel() : Model() diff --git a/Minecraft.Client/Rendering/Models/BookModel.cpp b/Minecraft.Client/Rendering/Models/BookModel.cpp index a10f42ec4..04237d2be 100644 --- a/Minecraft.Client/Rendering/Models/BookModel.cpp +++ b/Minecraft.Client/Rendering/Models/BookModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "BookModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/ChestModel.cpp b/Minecraft.Client/Rendering/Models/ChestModel.cpp index 209d3a6af..51e5cf0bc 100644 --- a/Minecraft.Client/Rendering/Models/ChestModel.cpp +++ b/Minecraft.Client/Rendering/Models/ChestModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ChestModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/ChickenModel.cpp b/Minecraft.Client/Rendering/Models/ChickenModel.cpp index 93ecc5d28..642954c9f 100644 --- a/Minecraft.Client/Rendering/Models/ChickenModel.cpp +++ b/Minecraft.Client/Rendering/Models/ChickenModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ChickenModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/CowModel.cpp b/Minecraft.Client/Rendering/Models/CowModel.cpp index ab4a80a32..698cbfc6a 100644 --- a/Minecraft.Client/Rendering/Models/CowModel.cpp +++ b/Minecraft.Client/Rendering/Models/CowModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CowModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/CreeperModel.cpp b/Minecraft.Client/Rendering/Models/CreeperModel.cpp index 5af5bb088..8a2d2e498 100644 --- a/Minecraft.Client/Rendering/Models/CreeperModel.cpp +++ b/Minecraft.Client/Rendering/Models/CreeperModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "CreeperModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/DragonModel.cpp b/Minecraft.Client/Rendering/Models/DragonModel.cpp index fd189af9d..9f85bed2e 100644 --- a/Minecraft.Client/Rendering/Models/DragonModel.cpp +++ b/Minecraft.Client/Rendering/Models/DragonModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DragonModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "../../../Minecraft.World/Entities/Mobs/EnderDragon.h" diff --git a/Minecraft.Client/Rendering/Models/EnderCrystalModel.cpp b/Minecraft.Client/Rendering/Models/EnderCrystalModel.cpp index 9eb7f1e07..05cb52e2c 100644 --- a/Minecraft.Client/Rendering/Models/EnderCrystalModel.cpp +++ b/Minecraft.Client/Rendering/Models/EnderCrystalModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EnderCrystalModel.h" diff --git a/Minecraft.Client/Rendering/Models/EnderManModel.cpp b/Minecraft.Client/Rendering/Models/EnderManModel.cpp index b32cc9ebe..81816d05b 100644 --- a/Minecraft.Client/Rendering/Models/EnderManModel.cpp +++ b/Minecraft.Client/Rendering/Models/EnderManModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EnderManModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/GhastModel.cpp b/Minecraft.Client/Rendering/Models/GhastModel.cpp index 388cac7f3..b5f64fd21 100644 --- a/Minecraft.Client/Rendering/Models/GhastModel.cpp +++ b/Minecraft.Client/Rendering/Models/GhastModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Util/Mth.h" #include "GhastModel.h" diff --git a/Minecraft.Client/Rendering/Models/HumanoidModel.cpp b/Minecraft.Client/Rendering/Models/HumanoidModel.cpp index 2fcf1c7e8..fe56ef1f3 100644 --- a/Minecraft.Client/Rendering/Models/HumanoidModel.cpp +++ b/Minecraft.Client/Rendering/Models/HumanoidModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "HumanoidModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "../../../Minecraft.World/Entities/Entity.h" diff --git a/Minecraft.Client/Rendering/Models/LargeChestModel.cpp b/Minecraft.Client/Rendering/Models/LargeChestModel.cpp index 0ed6487b1..65a708509 100644 --- a/Minecraft.Client/Rendering/Models/LargeChestModel.cpp +++ b/Minecraft.Client/Rendering/Models/LargeChestModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "LargeChestModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/LavaSlimeModel.cpp b/Minecraft.Client/Rendering/Models/LavaSlimeModel.cpp index dec013d5d..3bb1e9d35 100644 --- a/Minecraft.Client/Rendering/Models/LavaSlimeModel.cpp +++ b/Minecraft.Client/Rendering/Models/LavaSlimeModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "LavaSlimeModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/MinecartModel.cpp b/Minecraft.Client/Rendering/Models/MinecartModel.cpp index 4cabfb418..e7e659362 100644 --- a/Minecraft.Client/Rendering/Models/MinecartModel.cpp +++ b/Minecraft.Client/Rendering/Models/MinecartModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "MinecartModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/Model.cpp b/Minecraft.Client/Rendering/Models/Model.cpp index e3a1f2976..e4f278cbc 100644 --- a/Minecraft.Client/Rendering/Models/Model.cpp +++ b/Minecraft.Client/Rendering/Models/Model.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../TexOffs.h" #include "Model.h" diff --git a/Minecraft.Client/Rendering/Models/ModelPart.cpp b/Minecraft.Client/Rendering/Models/ModelPart.cpp index a93adfc69..341a0cb57 100644 --- a/Minecraft.Client/Rendering/Models/ModelPart.cpp +++ b/Minecraft.Client/Rendering/Models/ModelPart.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../TexOffs.h" #include "ModelPart.h" #include "../Cube.h" diff --git a/Minecraft.Client/Rendering/Models/OcelotModel.cpp b/Minecraft.Client/Rendering/Models/OcelotModel.cpp index 6e7bf6388..03e0e5dac 100644 --- a/Minecraft.Client/Rendering/Models/OcelotModel.cpp +++ b/Minecraft.Client/Rendering/Models/OcelotModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ModelPart.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/Models/PigModel.cpp b/Minecraft.Client/Rendering/Models/PigModel.cpp index 1921ddc24..f5facc2f6 100644 --- a/Minecraft.Client/Rendering/Models/PigModel.cpp +++ b/Minecraft.Client/Rendering/Models/PigModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PigModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/QuadrupedModel.cpp b/Minecraft.Client/Rendering/Models/QuadrupedModel.cpp index 9a13a11aa..ff9354681 100644 --- a/Minecraft.Client/Rendering/Models/QuadrupedModel.cpp +++ b/Minecraft.Client/Rendering/Models/QuadrupedModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "QuadrupedModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SheepFurModel.cpp b/Minecraft.Client/Rendering/Models/SheepFurModel.cpp index 4f6498577..c12ad5fdc 100644 --- a/Minecraft.Client/Rendering/Models/SheepFurModel.cpp +++ b/Minecraft.Client/Rendering/Models/SheepFurModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "SheepFurModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SheepModel.cpp b/Minecraft.Client/Rendering/Models/SheepModel.cpp index fdd4eb230..40ded26ff 100644 --- a/Minecraft.Client/Rendering/Models/SheepModel.cpp +++ b/Minecraft.Client/Rendering/Models/SheepModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "SheepModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SignModel.cpp b/Minecraft.Client/Rendering/Models/SignModel.cpp index 5e3c40ec3..1035d32fd 100644 --- a/Minecraft.Client/Rendering/Models/SignModel.cpp +++ b/Minecraft.Client/Rendering/Models/SignModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SignModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SilverfishModel.cpp b/Minecraft.Client/Rendering/Models/SilverfishModel.cpp index e5031a695..6e03ee6dd 100644 --- a/Minecraft.Client/Rendering/Models/SilverfishModel.cpp +++ b/Minecraft.Client/Rendering/Models/SilverfishModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SilverfishModel.h" #include "../Cube.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/Models/SkeletonHeadModel.cpp b/Minecraft.Client/Rendering/Models/SkeletonHeadModel.cpp index e2598e809..6f472a0c2 100644 --- a/Minecraft.Client/Rendering/Models/SkeletonHeadModel.cpp +++ b/Minecraft.Client/Rendering/Models/SkeletonHeadModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ModelPart.h" #include "SkeletonHeadModel.h" diff --git a/Minecraft.Client/Rendering/Models/SkeletonModel.cpp b/Minecraft.Client/Rendering/Models/SkeletonModel.cpp index e0b9ee629..0239e4c44 100644 --- a/Minecraft.Client/Rendering/Models/SkeletonModel.cpp +++ b/Minecraft.Client/Rendering/Models/SkeletonModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SkeletonModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SlimeModel.cpp b/Minecraft.Client/Rendering/Models/SlimeModel.cpp index 523f9874c..b8244ebbd 100644 --- a/Minecraft.Client/Rendering/Models/SlimeModel.cpp +++ b/Minecraft.Client/Rendering/Models/SlimeModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SlimeModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SnowManModel.cpp b/Minecraft.Client/Rendering/Models/SnowManModel.cpp index 2923f23e9..ba1053e1b 100644 --- a/Minecraft.Client/Rendering/Models/SnowManModel.cpp +++ b/Minecraft.Client/Rendering/Models/SnowManModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SnowManModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SpiderModel.cpp b/Minecraft.Client/Rendering/Models/SpiderModel.cpp index 7ceec04df..ff1a79b1d 100644 --- a/Minecraft.Client/Rendering/Models/SpiderModel.cpp +++ b/Minecraft.Client/Rendering/Models/SpiderModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SpiderModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/SquidModel.cpp b/Minecraft.Client/Rendering/Models/SquidModel.cpp index 56637a8d6..baeb6ea19 100644 --- a/Minecraft.Client/Rendering/Models/SquidModel.cpp +++ b/Minecraft.Client/Rendering/Models/SquidModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SquidModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/VillagerGolemModel.cpp b/Minecraft.Client/Rendering/Models/VillagerGolemModel.cpp index e8e120b70..ec83b39c8 100644 --- a/Minecraft.Client/Rendering/Models/VillagerGolemModel.cpp +++ b/Minecraft.Client/Rendering/Models/VillagerGolemModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" #include "ModelPart.h" #include "VillagerGolemModel.h" diff --git a/Minecraft.Client/Rendering/Models/VillagerModel.cpp b/Minecraft.Client/Rendering/Models/VillagerModel.cpp index 351efff71..3f7242175 100644 --- a/Minecraft.Client/Rendering/Models/VillagerModel.cpp +++ b/Minecraft.Client/Rendering/Models/VillagerModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "VillagerModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/Models/VillagerZombieModel.cpp b/Minecraft.Client/Rendering/Models/VillagerZombieModel.cpp index c1c6faed0..891f98faf 100644 --- a/Minecraft.Client/Rendering/Models/VillagerZombieModel.cpp +++ b/Minecraft.Client/Rendering/Models/VillagerZombieModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ModelPart.h" #include "VillagerZombieModel.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/Models/WolfModel.cpp b/Minecraft.Client/Rendering/Models/WolfModel.cpp index b58344b24..101f3a58e 100644 --- a/Minecraft.Client/Rendering/Models/WolfModel.cpp +++ b/Minecraft.Client/Rendering/Models/WolfModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "WolfModel.h" #include "../../../Minecraft.World/Entities/Mobs/Wolf.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/Models/ZombieModel.cpp b/Minecraft.Client/Rendering/Models/ZombieModel.cpp index 400210e8c..918f751fc 100644 --- a/Minecraft.Client/Rendering/Models/ZombieModel.cpp +++ b/Minecraft.Client/Rendering/Models/ZombieModel.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ZombieModel.h" #include "../../../Minecraft.World/Util/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/Rendering/OffsettedRenderList.cpp b/Minecraft.Client/Rendering/OffsettedRenderList.cpp index 44d5d46e5..2c2dfd92d 100644 --- a/Minecraft.Client/Rendering/OffsettedRenderList.cpp +++ b/Minecraft.Client/Rendering/OffsettedRenderList.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../../Minecraft.World/IO/Streams/IntBuffer.h" #include "OffsettedRenderList.h" diff --git a/Minecraft.Client/Rendering/Particles/BreakingItemParticle.cpp b/Minecraft.Client/Rendering/Particles/BreakingItemParticle.cpp index d046bff3c..b20aaa6e5 100644 --- a/Minecraft.Client/Rendering/Particles/BreakingItemParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/BreakingItemParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "BreakingItemParticle.h" #include "../Tesselator.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/Particles/BubbleParticle.cpp b/Minecraft.Client/Rendering/Particles/BubbleParticle.cpp index 5bd5d7048..54011b215 100644 --- a/Minecraft.Client/Rendering/Particles/BubbleParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/BubbleParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "BubbleParticle.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Util/Mth.h" diff --git a/Minecraft.Client/Rendering/Particles/CritParticle.cpp b/Minecraft.Client/Rendering/Particles/CritParticle.cpp index 7a1de6ac6..8f142f2e6 100644 --- a/Minecraft.Client/Rendering/Particles/CritParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/CritParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CritParticle.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.entity.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/CritParticle2.cpp b/Minecraft.Client/Rendering/Particles/CritParticle2.cpp index 79efcc2d7..2c01bd48f 100644 --- a/Minecraft.Client/Rendering/Particles/CritParticle2.cpp +++ b/Minecraft.Client/Rendering/Particles/CritParticle2.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CritParticle2.h" #include "../../../Minecraft.World/Util/JavaMath.h" diff --git a/Minecraft.Client/Rendering/Particles/DragonBreathParticle.cpp b/Minecraft.Client/Rendering/Particles/DragonBreathParticle.cpp index 4102ab59a..53f9bd3e2 100644 --- a/Minecraft.Client/Rendering/Particles/DragonBreathParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/DragonBreathParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "DragonBreathParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/DripParticle.cpp b/Minecraft.Client/Rendering/Particles/DripParticle.cpp index 33f3b9af7..a66e38fdd 100644 --- a/Minecraft.Client/Rendering/Particles/DripParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/DripParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.material.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/Particles/EnchantmentTableParticle.cpp b/Minecraft.Client/Rendering/Particles/EnchantmentTableParticle.cpp index 4911e6758..113edbff2 100644 --- a/Minecraft.Client/Rendering/Particles/EnchantmentTableParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/EnchantmentTableParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "EnchantmentTableParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/EnderParticle.cpp b/Minecraft.Client/Rendering/Particles/EnderParticle.cpp index fe9b527cb..9b786d009 100644 --- a/Minecraft.Client/Rendering/Particles/EnderParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/EnderParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "EnderParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/ExplodeParticle.cpp b/Minecraft.Client/Rendering/Particles/ExplodeParticle.cpp index 79dc24084..11d9e257e 100644 --- a/Minecraft.Client/Rendering/Particles/ExplodeParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/ExplodeParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ExplodeParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/FlameParticle.cpp b/Minecraft.Client/Rendering/Particles/FlameParticle.cpp index 3c3ab3366..4ef80a2e1 100644 --- a/Minecraft.Client/Rendering/Particles/FlameParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/FlameParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Util/Random.h" #include "FlameParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/FootstepParticle.cpp b/Minecraft.Client/Rendering/Particles/FootstepParticle.cpp index 6d7fc46d7..8d4e9d86c 100644 --- a/Minecraft.Client/Rendering/Particles/FootstepParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/FootstepParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FootstepParticle.h" #include "../../Textures/Textures.h" #include "../Tesselator.h" diff --git a/Minecraft.Client/Rendering/Particles/GuiParticle.cpp b/Minecraft.Client/Rendering/Particles/GuiParticle.cpp index 6b45c6652..27c828da9 100644 --- a/Minecraft.Client/Rendering/Particles/GuiParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/GuiParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "GuiParticle.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/GuiParticles.cpp b/Minecraft.Client/Rendering/Particles/GuiParticles.cpp index 777464771..3311854f5 100644 --- a/Minecraft.Client/Rendering/Particles/GuiParticles.cpp +++ b/Minecraft.Client/Rendering/Particles/GuiParticles.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "GuiParticles.h" #include "GuiParticle.h" #include "../../Textures/Textures.h" diff --git a/Minecraft.Client/Rendering/Particles/HeartParticle.cpp b/Minecraft.Client/Rendering/Particles/HeartParticle.cpp index 7cc49e827..7109c688a 100644 --- a/Minecraft.Client/Rendering/Particles/HeartParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/HeartParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "HeartParticle.h" // 4J - added diff --git a/Minecraft.Client/Rendering/Particles/HugeExplosionParticle.cpp b/Minecraft.Client/Rendering/Particles/HugeExplosionParticle.cpp index 1ba5a73bd..e57961054 100644 --- a/Minecraft.Client/Rendering/Particles/HugeExplosionParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/HugeExplosionParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "HugeExplosionParticle.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../Textures/Textures.h" diff --git a/Minecraft.Client/Rendering/Particles/HugeExplosionSeedParticle.cpp b/Minecraft.Client/Rendering/Particles/HugeExplosionSeedParticle.cpp index 7eecdbf9a..cdbc6e157 100644 --- a/Minecraft.Client/Rendering/Particles/HugeExplosionSeedParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/HugeExplosionSeedParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "HugeExplosionSeedParticle.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/Rendering/Particles/LavaParticle.cpp b/Minecraft.Client/Rendering/Particles/LavaParticle.cpp index 90ba0486c..9eb825357 100644 --- a/Minecraft.Client/Rendering/Particles/LavaParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/LavaParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "LavaParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/NetherPortalParticle.cpp b/Minecraft.Client/Rendering/Particles/NetherPortalParticle.cpp index 21b969a14..5667515eb 100644 --- a/Minecraft.Client/Rendering/Particles/NetherPortalParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/NetherPortalParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "NetherPortalParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/NoteParticle.cpp b/Minecraft.Client/Rendering/Particles/NoteParticle.cpp index d8fcccba0..d4f50d182 100644 --- a/Minecraft.Client/Rendering/Particles/NoteParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/NoteParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/Mth.h" #include "NoteParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/Particle.cpp b/Minecraft.Client/Rendering/Particles/Particle.cpp index 203abcafa..422f9ca6d 100644 --- a/Minecraft.Client/Rendering/Particles/Particle.cpp +++ b/Minecraft.Client/Rendering/Particles/Particle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "Particle.h" #include "../Tesselator.h" #include "../../../Minecraft.World/Util/Random.h" diff --git a/Minecraft.Client/Rendering/Particles/ParticleEngine.cpp b/Minecraft.Client/Rendering/Particles/ParticleEngine.cpp index d979256f1..978ac1ea0 100644 --- a/Minecraft.Client/Rendering/Particles/ParticleEngine.cpp +++ b/Minecraft.Client/Rendering/Particles/ParticleEngine.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ParticleEngine.h" #include "Particle.h" #include "../../Textures/Textures.h" diff --git a/Minecraft.Client/Rendering/Particles/PlayerCloudParticle.cpp b/Minecraft.Client/Rendering/Particles/PlayerCloudParticle.cpp index c112be7eb..f11b6f961 100644 --- a/Minecraft.Client/Rendering/Particles/PlayerCloudParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/PlayerCloudParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PlayerCloudParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/Rendering/Particles/RedDustParticle.cpp b/Minecraft.Client/Rendering/Particles/RedDustParticle.cpp index 5f8c18570..e10544ddb 100644 --- a/Minecraft.Client/Rendering/Particles/RedDustParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/RedDustParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "RedDustParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/SmokeParticle.cpp b/Minecraft.Client/Rendering/Particles/SmokeParticle.cpp index 2be3d0070..15cf3b5d7 100644 --- a/Minecraft.Client/Rendering/Particles/SmokeParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SmokeParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "SmokeParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/SnowShovelParticle.cpp b/Minecraft.Client/Rendering/Particles/SnowShovelParticle.cpp index ef7338db2..6e57fc8b5 100644 --- a/Minecraft.Client/Rendering/Particles/SnowShovelParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SnowShovelParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "SnowShovelParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/SpellParticle.cpp b/Minecraft.Client/Rendering/Particles/SpellParticle.cpp index 9ba4907b2..f53228112 100644 --- a/Minecraft.Client/Rendering/Particles/SpellParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SpellParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "SpellParticle.h" diff --git a/Minecraft.Client/Rendering/Particles/SplashParticle.cpp b/Minecraft.Client/Rendering/Particles/SplashParticle.cpp index 4457ee524..b71fa6b72 100644 --- a/Minecraft.Client/Rendering/Particles/SplashParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SplashParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SplashParticle.h" SplashParticle::SplashParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : WaterDropParticle(level, x, y, z) diff --git a/Minecraft.Client/Rendering/Particles/SuspendedParticle.cpp b/Minecraft.Client/Rendering/Particles/SuspendedParticle.cpp index 386fdaaaf..81d62e265 100644 --- a/Minecraft.Client/Rendering/Particles/SuspendedParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SuspendedParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SuspendedParticle.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/Rendering/Particles/SuspendedTownParticle.cpp b/Minecraft.Client/Rendering/Particles/SuspendedTownParticle.cpp index 97c2bd177..7d719ec32 100644 --- a/Minecraft.Client/Rendering/Particles/SuspendedTownParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/SuspendedTownParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SuspendedTownParticle.h" #include "../../../Minecraft.World/Util/Random.h" #include "../../../Minecraft.World/Util/JavaMath.h" diff --git a/Minecraft.Client/Rendering/Particles/TakeAnimationParticle.cpp b/Minecraft.Client/Rendering/Particles/TakeAnimationParticle.cpp index 8f185d021..7f6318fe9 100644 --- a/Minecraft.Client/Rendering/Particles/TakeAnimationParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/TakeAnimationParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TakeAnimationParticle.h" #include "../EntityRenderers/EntityRenderDispatcher.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.item.h" diff --git a/Minecraft.Client/Rendering/Particles/TerrainParticle.cpp b/Minecraft.Client/Rendering/Particles/TerrainParticle.cpp index 505e852e6..8cac8d642 100644 --- a/Minecraft.Client/Rendering/Particles/TerrainParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/TerrainParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TerrainParticle.h" #include "../Tesselator.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" diff --git a/Minecraft.Client/Rendering/Particles/WaterDropParticle.cpp b/Minecraft.Client/Rendering/Particles/WaterDropParticle.cpp index e78093010..36c14c98c 100644 --- a/Minecraft.Client/Rendering/Particles/WaterDropParticle.cpp +++ b/Minecraft.Client/Rendering/Particles/WaterDropParticle.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "WaterDropParticle.h" #include "../../../Minecraft.World/Util/JavaMath.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/Rendering/Polygon.cpp b/Minecraft.Client/Rendering/Polygon.cpp index 9fc8e06c8..73c7cca83 100644 --- a/Minecraft.Client/Rendering/Polygon.cpp +++ b/Minecraft.Client/Rendering/Polygon.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Polygon.h" // 4J added for common init code diff --git a/Minecraft.Client/Rendering/Tesselator.cpp b/Minecraft.Client/Rendering/Tesselator.cpp index 5f1231ff4..e1c7373b3 100644 --- a/Minecraft.Client/Rendering/Tesselator.cpp +++ b/Minecraft.Client/Rendering/Tesselator.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Tesselator.h" #include "../../Minecraft.World/Util/BasicTypeContainers.h" #include "../../Minecraft.World/IO/Streams/FloatBuffer.h" diff --git a/Minecraft.Client/Rendering/TexOffs.cpp b/Minecraft.Client/Rendering/TexOffs.cpp index a4bbdff0d..372023966 100644 --- a/Minecraft.Client/Rendering/TexOffs.cpp +++ b/Minecraft.Client/Rendering/TexOffs.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "TexOffs.h" TexOffs::TexOffs(int x, int y) : diff --git a/Minecraft.Client/Rendering/Vertex.cpp b/Minecraft.Client/Rendering/Vertex.cpp index d6a9ca8a0..42c79ac3e 100644 --- a/Minecraft.Client/Rendering/Vertex.cpp +++ b/Minecraft.Client/Rendering/Vertex.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Vertex.h" Vertex::Vertex(float x, float y, float z, float u, float v) diff --git a/Minecraft.Client/Rendering/glWrapper.cpp b/Minecraft.Client/Rendering/glWrapper.cpp index d64e0cebb..7b13fc285 100644 --- a/Minecraft.Client/Rendering/glWrapper.cpp +++ b/Minecraft.Client/Rendering/glWrapper.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #ifndef __linux__ diff --git a/Minecraft.Client/Textures/BufferedImage.cpp b/Minecraft.Client/Textures/BufferedImage.cpp index 70b9664eb..cf64c2e3f 100644 --- a/Minecraft.Client/Textures/BufferedImage.cpp +++ b/Minecraft.Client/Textures/BufferedImage.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../../Minecraft.World/Util/StringHelpers.h" #include "Textures.h" #include "../../Minecraft.World/Util/ArrayWithLength.h" diff --git a/Minecraft.Client/Textures/ClockTexture.cpp b/Minecraft.Client/Textures/ClockTexture.cpp index 0bd0f41f5..592b1260d 100644 --- a/Minecraft.Client/Textures/ClockTexture.cpp +++ b/Minecraft.Client/Textures/ClockTexture.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../Minecraft.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" diff --git a/Minecraft.Client/Textures/CompassTexture.cpp b/Minecraft.Client/Textures/CompassTexture.cpp index 1a4535886..fe26b4222 100644 --- a/Minecraft.Client/Textures/CompassTexture.cpp +++ b/Minecraft.Client/Textures/CompassTexture.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../Minecraft.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" diff --git a/Minecraft.Client/Textures/HttpTexture.cpp b/Minecraft.Client/Textures/HttpTexture.cpp index 8f8aa8378..05ea7e8fb 100644 --- a/Minecraft.Client/Textures/HttpTexture.cpp +++ b/Minecraft.Client/Textures/HttpTexture.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "HttpTexture.h" HttpTexture::HttpTexture(const std::wstring& _url, HttpTextureProcessor *processor) diff --git a/Minecraft.Client/Textures/MemTexture.cpp b/Minecraft.Client/Textures/MemTexture.cpp index 5dc6e5166..343aa48a3 100644 --- a/Minecraft.Client/Textures/MemTexture.cpp +++ b/Minecraft.Client/Textures/MemTexture.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MemTexture.h" MemTexture::MemTexture(const std::wstring& _url, PBYTE pbData,DWORD dwBytes, MemTextureProcessor *processor) diff --git a/Minecraft.Client/Textures/MobSkinMemTextureProcessor.cpp b/Minecraft.Client/Textures/MobSkinMemTextureProcessor.cpp index ecbb59368..73122d7ef 100644 --- a/Minecraft.Client/Textures/MobSkinMemTextureProcessor.cpp +++ b/Minecraft.Client/Textures/MobSkinMemTextureProcessor.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MobSkinMemTextureProcessor.h" BufferedImage *MobSkinMemTextureProcessor::process(BufferedImage *in) diff --git a/Minecraft.Client/Textures/MobSkinTextureProcessor.cpp b/Minecraft.Client/Textures/MobSkinTextureProcessor.cpp index 10e4f8656..aea0f4b17 100644 --- a/Minecraft.Client/Textures/MobSkinTextureProcessor.cpp +++ b/Minecraft.Client/Textures/MobSkinTextureProcessor.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MobSkinTextureProcessor.h" BufferedImage *MobSkinTextureProcessor::process(BufferedImage *in) diff --git a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp index 4ff7b9c6f..56739429d 100644 --- a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Textures.h" #include "AbstractTexturePack.h" #include "../../../Minecraft.World/IO/Streams/InputOutputStream.h" diff --git a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp index 31bc3daf2..3519b038c 100644 --- a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp @@ -1,15 +1,15 @@ -#include "../../Build/stdafx.h" -#include "../../../Common/DLC/DLCGameRulesFile.h" -#include "../../../Common/DLC/DLCGameRulesHeader.h" -#include "../../../Common/DLC/DLCGameRules.h" +#include "../../Platform/stdafx.h" +#include "../../Platform/Common/DLC/DLCGameRulesFile.h" +#include "../../Platform/Common/DLC/DLCGameRulesHeader.h" +#include "../../Platform/Common/DLC/DLCGameRules.h" #include "DLCTexturePack.h" -#include "../../../Common/DLC/DLCColourTableFile.h" -#include "../../../Common/DLC/DLCUIDataFile.h" -#include "../../../Common/DLC/DLCTextureFile.h" -#include "../../../Common/DLC/DLCLocalisationFile.h" +#include "../../Platform/Common/DLC/DLCColourTableFile.h" +#include "../../Platform/Common/DLC/DLCUIDataFile.h" +#include "../../Platform/Common/DLC/DLCTextureFile.h" +#include "../../Platform/Common/DLC/DLCLocalisationFile.h" #include "../../../Minecraft.World/Util/StringHelpers.h" #include "../../Utils/StringTable.h" -#include "../../../Common/DLC/DLCAudioFile.h" +#include "../../Platform/Common/DLC/DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 #include "../../Platform/Xbox/XML/ATGXmlParser.h" diff --git a/Minecraft.Client/Textures/Packs/DefaultTexturePack.cpp b/Minecraft.Client/Textures/Packs/DefaultTexturePack.cpp index 5484ada30..62418287b 100644 --- a/Minecraft.Client/Textures/Packs/DefaultTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/DefaultTexturePack.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DefaultTexturePack.h" #include "../Textures.h" #include "../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Textures/Packs/FileTexturePack.cpp b/Minecraft.Client/Textures/Packs/FileTexturePack.cpp index 93c9426a9..4cbf392ed 100644 --- a/Minecraft.Client/Textures/Packs/FileTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/FileTexturePack.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FileTexturePack.h" FileTexturePack::FileTexturePack(DWORD id, File *file, TexturePack *fallback) : AbstractTexturePack(id, file, file->getName(), fallback) diff --git a/Minecraft.Client/Textures/Packs/FolderTexturePack.cpp b/Minecraft.Client/Textures/Packs/FolderTexturePack.cpp index a63498ecf..51e5a669c 100644 --- a/Minecraft.Client/Textures/Packs/FolderTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/FolderTexturePack.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FolderTexturePack.h" FolderTexturePack::FolderTexturePack(DWORD id, const std::wstring &name, File *folder, TexturePack *fallback) : AbstractTexturePack(id, folder, name, fallback) diff --git a/Minecraft.Client/Textures/Packs/TexturePack.cpp b/Minecraft.Client/Textures/Packs/TexturePack.cpp index 77e1d8b87..cd9a0adf8 100644 --- a/Minecraft.Client/Textures/Packs/TexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/TexturePack.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TexturePack.h" std::wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/) diff --git a/Minecraft.Client/Textures/Packs/TexturePack.h b/Minecraft.Client/Textures/Packs/TexturePack.h index 78e9410e7..edbabc796 100644 --- a/Minecraft.Client/Textures/Packs/TexturePack.h +++ b/Minecraft.Client/Textures/Packs/TexturePack.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../Common/App_enums.h" +#include "../../Platform/Common/App_enums.h" class InputStream; class Minecraft; diff --git a/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp b/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp index 27a4df8e8..2b10c3a4a 100644 --- a/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp +++ b/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TexturePackRepository.h" #include "DefaultTexturePack.h" #include "FileTexturePack.h" diff --git a/Minecraft.Client/Textures/Stitching/PreStitchedTextureMap.cpp b/Minecraft.Client/Textures/Stitching/PreStitchedTextureMap.cpp index cdcfb0a07..9b55f0132 100644 --- a/Minecraft.Client/Textures/Stitching/PreStitchedTextureMap.cpp +++ b/Minecraft.Client/Textures/Stitching/PreStitchedTextureMap.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.item.h" diff --git a/Minecraft.Client/Textures/Stitching/StitchSlot.cpp b/Minecraft.Client/Textures/Stitching/StitchSlot.cpp index 7f7d99b9d..c79b57bb9 100644 --- a/Minecraft.Client/Textures/Stitching/StitchSlot.cpp +++ b/Minecraft.Client/Textures/Stitching/StitchSlot.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../TextureHolder.h" #include "../../../Minecraft.World/Util/StringHelpers.h" #include "StitchSlot.h" diff --git a/Minecraft.Client/Textures/Stitching/StitchedTexture.cpp b/Minecraft.Client/Textures/Stitching/StitchedTexture.cpp index 014b43eae..86eb37577 100644 --- a/Minecraft.Client/Textures/Stitching/StitchedTexture.cpp +++ b/Minecraft.Client/Textures/Stitching/StitchedTexture.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Texture.h" #include "../../../Minecraft.World/Util/StringHelpers.h" #include "../ClockTexture.h" diff --git a/Minecraft.Client/Textures/Stitching/Stitcher.cpp b/Minecraft.Client/Textures/Stitching/Stitcher.cpp index 4d8be3f12..b70751dde 100644 --- a/Minecraft.Client/Textures/Stitching/Stitcher.cpp +++ b/Minecraft.Client/Textures/Stitching/Stitcher.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "StitchSlot.h" #include "../Texture.h" #include "../TextureHolder.h" diff --git a/Minecraft.Client/Textures/Stitching/TextureMap.cpp b/Minecraft.Client/Textures/Stitching/TextureMap.cpp index 3ee9794ff..dc8efa546 100644 --- a/Minecraft.Client/Textures/Stitching/TextureMap.cpp +++ b/Minecraft.Client/Textures/Stitching/TextureMap.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.item.h" diff --git a/Minecraft.Client/Textures/Texture.cpp b/Minecraft.Client/Textures/Texture.cpp index 16084d176..7b568f402 100644 --- a/Minecraft.Client/Textures/Texture.cpp +++ b/Minecraft.Client/Textures/Texture.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../../Minecraft.World/IO/Streams/ByteBuffer.h" #include "../UI/Rect2i.h" #include "TextureManager.h" diff --git a/Minecraft.Client/Textures/TextureHolder.cpp b/Minecraft.Client/Textures/TextureHolder.cpp index 4ea7d3d9f..9723e420e 100644 --- a/Minecraft.Client/Textures/TextureHolder.cpp +++ b/Minecraft.Client/Textures/TextureHolder.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Stitching/Stitcher.h" #include "Texture.h" #include "../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Textures/TextureManager.cpp b/Minecraft.Client/Textures/TextureManager.cpp index b2808e470..6fd3813fa 100644 --- a/Minecraft.Client/Textures/TextureManager.cpp +++ b/Minecraft.Client/Textures/TextureManager.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Stitching/Stitcher.h" #include "Texture.h" #include "Packs/TexturePack.h" diff --git a/Minecraft.Client/Textures/Textures.cpp b/Minecraft.Client/Textures/Textures.cpp index 9d0bcfb19..0974a3f66 100644 --- a/Minecraft.Client/Textures/Textures.cpp +++ b/Minecraft.Client/Textures/Textures.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Textures.h" #include "Packs/TexturePackRepository.h" #include "HttpTexture.h" diff --git a/Minecraft.Client/UI/Button.cpp b/Minecraft.Client/UI/Button.cpp index cb74f5fc2..d3cfe3e3b 100644 --- a/Minecraft.Client/UI/Button.cpp +++ b/Minecraft.Client/UI/Button.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Button.h" #include "../Textures/Textures.h" diff --git a/Minecraft.Client/UI/EditBox.cpp b/Minecraft.Client/UI/EditBox.cpp index 5d29b7291..0a0e9550e 100644 --- a/Minecraft.Client/UI/EditBox.cpp +++ b/Minecraft.Client/UI/EditBox.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "EditBox.h" #include "../../Minecraft.World/Util/SharedConstants.h" diff --git a/Minecraft.Client/UI/Font.cpp b/Minecraft.Client/UI/Font.cpp index 65c2bf2b6..3ece2e8bb 100644 --- a/Minecraft.Client/UI/Font.cpp +++ b/Minecraft.Client/UI/Font.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../Textures/Textures.h" #include "Font.h" #include "../GameState/Options.h" diff --git a/Minecraft.Client/UI/Gui.cpp b/Minecraft.Client/UI/Gui.cpp index 8f2083fd4..6f28cf559 100644 --- a/Minecraft.Client/UI/Gui.cpp +++ b/Minecraft.Client/UI/Gui.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Gui.h" #include "../Rendering/EntityRenderers/ItemRenderer.h" #include "../Rendering/GameRenderer.h" diff --git a/Minecraft.Client/UI/GuiComponent.cpp b/Minecraft.Client/UI/GuiComponent.cpp index 8ffc8b4d4..460cf6fa1 100644 --- a/Minecraft.Client/UI/GuiComponent.cpp +++ b/Minecraft.Client/UI/GuiComponent.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "GuiComponent.h" #include "../Rendering/Tesselator.h" diff --git a/Minecraft.Client/UI/GuiMessage.cpp b/Minecraft.Client/UI/GuiMessage.cpp index b0c034f8f..6f62556a5 100644 --- a/Minecraft.Client/UI/GuiMessage.cpp +++ b/Minecraft.Client/UI/GuiMessage.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "GuiMessage.h" GuiMessage::GuiMessage(const std::wstring& string) diff --git a/Minecraft.Client/UI/Rect2i.cpp b/Minecraft.Client/UI/Rect2i.cpp index 70a07e8ca..6681adf15 100644 --- a/Minecraft.Client/UI/Rect2i.cpp +++ b/Minecraft.Client/UI/Rect2i.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Rect2i.h" Rect2i::Rect2i(int x, int y, int width, int height) diff --git a/Minecraft.Client/UI/Screen.cpp b/Minecraft.Client/UI/Screen.cpp index 56133bc12..3fe91d598 100644 --- a/Minecraft.Client/UI/Screen.cpp +++ b/Minecraft.Client/UI/Screen.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Screen.h" #include "Button.h" #include "../Rendering/Particles/GuiParticles.h" diff --git a/Minecraft.Client/UI/ScreenSizeCalculator.cpp b/Minecraft.Client/UI/ScreenSizeCalculator.cpp index b90483271..4ca1bd905 100644 --- a/Minecraft.Client/UI/ScreenSizeCalculator.cpp +++ b/Minecraft.Client/UI/ScreenSizeCalculator.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ScreenSizeCalculator.h" #include "../GameState/Options.h" diff --git a/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp b/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp index df09bfb3f..56e5ed54e 100644 --- a/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp +++ b/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "AbstractContainerScreen.h" #include "../../Rendering/EntityRenderers/ItemRenderer.h" #include "../../Player/MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/UI/Screens/AchievementPopup.cpp b/Minecraft.Client/UI/Screens/AchievementPopup.cpp index bd91e6790..16c4e378b 100644 --- a/Minecraft.Client/UI/Screens/AchievementPopup.cpp +++ b/Minecraft.Client/UI/Screens/AchievementPopup.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "AchievementPopup.h" #include "../../Rendering/EntityRenderers/ItemRenderer.h" #include "../Font.h" diff --git a/Minecraft.Client/UI/Screens/AchievementScreen.cpp b/Minecraft.Client/UI/Screens/AchievementScreen.cpp index 6bc23a760..ea8edce72 100644 --- a/Minecraft.Client/UI/Screens/AchievementScreen.cpp +++ b/Minecraft.Client/UI/Screens/AchievementScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "AchievementScreen.h" #include "../SmallButton.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/UI/Screens/ChatScreen.cpp b/Minecraft.Client/UI/Screens/ChatScreen.cpp index 4d14e9e01..f612de51a 100644 --- a/Minecraft.Client/UI/Screens/ChatScreen.cpp +++ b/Minecraft.Client/UI/Screens/ChatScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ChatScreen.h" #include "../../Player/MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/Util/SharedConstants.h" diff --git a/Minecraft.Client/UI/Screens/ConfirmScreen.cpp b/Minecraft.Client/UI/Screens/ConfirmScreen.cpp index edd398443..472c5680e 100644 --- a/Minecraft.Client/UI/Screens/ConfirmScreen.cpp +++ b/Minecraft.Client/UI/Screens/ConfirmScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ConfirmScreen.h" #include "../SmallButton.h" #include "../../../Minecraft.World/Headers/net.minecraft.locale.h" diff --git a/Minecraft.Client/UI/Screens/ConnectScreen.cpp b/Minecraft.Client/UI/Screens/ConnectScreen.cpp index 8631cbbd1..865e8be75 100644 --- a/Minecraft.Client/UI/Screens/ConnectScreen.cpp +++ b/Minecraft.Client/UI/Screens/ConnectScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ConnectScreen.h" #include "../../Network/ClientConnection.h" #include "TitleScreen.h" diff --git a/Minecraft.Client/UI/Screens/ContainerScreen.cpp b/Minecraft.Client/UI/Screens/ContainerScreen.cpp index 84451b4fc..e3d6d1ffd 100644 --- a/Minecraft.Client/UI/Screens/ContainerScreen.cpp +++ b/Minecraft.Client/UI/Screens/ContainerScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ContainerScreen.h" #include "../../Textures/Textures.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" diff --git a/Minecraft.Client/UI/Screens/ControlsScreen.cpp b/Minecraft.Client/UI/Screens/ControlsScreen.cpp index 0ec49940c..e4feda948 100644 --- a/Minecraft.Client/UI/Screens/ControlsScreen.cpp +++ b/Minecraft.Client/UI/Screens/ControlsScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ControlsScreen.h" #include "../../GameState/Options.h" #include "../SmallButton.h" diff --git a/Minecraft.Client/UI/Screens/CraftingScreen.cpp b/Minecraft.Client/UI/Screens/CraftingScreen.cpp index 3fd956417..8935e0191 100644 --- a/Minecraft.Client/UI/Screens/CraftingScreen.cpp +++ b/Minecraft.Client/UI/Screens/CraftingScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CraftingScreen.h" #include "../../Textures/Textures.h" #include "../../Player/MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp b/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp index 27e3d33e7..6629a420f 100644 --- a/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp +++ b/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "CreateWorldScreen.h" #include "../EditBox.h" #include "../Button.h" diff --git a/Minecraft.Client/UI/Screens/DeathScreen.cpp b/Minecraft.Client/UI/Screens/DeathScreen.cpp index ae0098487..6a4949313 100644 --- a/Minecraft.Client/UI/Screens/DeathScreen.cpp +++ b/Minecraft.Client/UI/Screens/DeathScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../../../Minecraft.World/Util/StringHelpers.h" #include "DeathScreen.h" #include "../Button.h" diff --git a/Minecraft.Client/UI/Screens/DisconnectedScreen.cpp b/Minecraft.Client/UI/Screens/DisconnectedScreen.cpp index 3e8db2ff4..031e1777f 100644 --- a/Minecraft.Client/UI/Screens/DisconnectedScreen.cpp +++ b/Minecraft.Client/UI/Screens/DisconnectedScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "DisconnectedScreen.h" #include "TitleScreen.h" #include "../Button.h" diff --git a/Minecraft.Client/UI/Screens/ErrorScreen.cpp b/Minecraft.Client/UI/Screens/ErrorScreen.cpp index ba151cb0c..481d785dd 100644 --- a/Minecraft.Client/UI/Screens/ErrorScreen.cpp +++ b/Minecraft.Client/UI/Screens/ErrorScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ErrorScreen.h" ErrorScreen::ErrorScreen(const std::wstring& title, const std::wstring& message) diff --git a/Minecraft.Client/UI/Screens/FurnaceScreen.cpp b/Minecraft.Client/UI/Screens/FurnaceScreen.cpp index a4eedadde..20d19c04c 100644 --- a/Minecraft.Client/UI/Screens/FurnaceScreen.cpp +++ b/Minecraft.Client/UI/Screens/FurnaceScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "FurnaceScreen.h" #include "../../Textures/Textures.h" #include "../../Player/LocalPlayer.h" diff --git a/Minecraft.Client/UI/Screens/InBedChatScreen.cpp b/Minecraft.Client/UI/Screens/InBedChatScreen.cpp index c3d7cb85d..9cbf8a25a 100644 --- a/Minecraft.Client/UI/Screens/InBedChatScreen.cpp +++ b/Minecraft.Client/UI/Screens/InBedChatScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "InBedChatScreen.h" #include "../Button.h" #include "../../Player/MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/UI/Screens/InventoryScreen.cpp b/Minecraft.Client/UI/Screens/InventoryScreen.cpp index cb31a973d..61dd3f139 100644 --- a/Minecraft.Client/UI/Screens/InventoryScreen.cpp +++ b/Minecraft.Client/UI/Screens/InventoryScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "InventoryScreen.h" #include "../../Player/MultiPlayerLocalPlayer.h" #include "../Font.h" diff --git a/Minecraft.Client/UI/Screens/JoinMultiplayerScreen.cpp b/Minecraft.Client/UI/Screens/JoinMultiplayerScreen.cpp index 6917fbb34..7f617a98a 100644 --- a/Minecraft.Client/UI/Screens/JoinMultiplayerScreen.cpp +++ b/Minecraft.Client/UI/Screens/JoinMultiplayerScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "JoinMultiplayerScreen.h" #include "../Button.h" #include "../EditBox.h" diff --git a/Minecraft.Client/UI/Screens/NameEntryScreen.cpp b/Minecraft.Client/UI/Screens/NameEntryScreen.cpp index 0f4f968ad..36d65f182 100644 --- a/Minecraft.Client/UI/Screens/NameEntryScreen.cpp +++ b/Minecraft.Client/UI/Screens/NameEntryScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "NameEntryScreen.h" #include "../Button.h" #include "../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/UI/Screens/OptionsScreen.cpp b/Minecraft.Client/UI/Screens/OptionsScreen.cpp index e6023345c..7ff2a8a46 100644 --- a/Minecraft.Client/UI/Screens/OptionsScreen.cpp +++ b/Minecraft.Client/UI/Screens/OptionsScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "OptionsScreen.h" #include "../SmallButton.h" #include "../SlideButton.h" diff --git a/Minecraft.Client/UI/Screens/PauseScreen.cpp b/Minecraft.Client/UI/Screens/PauseScreen.cpp index 991d9a71a..759c2b1fc 100644 --- a/Minecraft.Client/UI/Screens/PauseScreen.cpp +++ b/Minecraft.Client/UI/Screens/PauseScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "PauseScreen.h" #include "../Button.h" #include "../../GameState/StatsCounter.h" diff --git a/Minecraft.Client/UI/Screens/ReceivingLevelScreen.cpp b/Minecraft.Client/UI/Screens/ReceivingLevelScreen.cpp index c1b7e46b0..70d61842a 100644 --- a/Minecraft.Client/UI/Screens/ReceivingLevelScreen.cpp +++ b/Minecraft.Client/UI/Screens/ReceivingLevelScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "ReceivingLevelScreen.h" #include "../../Network/ClientConnection.h" #include "../../../Minecraft.World/Headers/net.minecraft.locale.h" diff --git a/Minecraft.Client/UI/Screens/RenameWorldScreen.cpp b/Minecraft.Client/UI/Screens/RenameWorldScreen.cpp index 6c62d5d6d..14e8eaea4 100644 --- a/Minecraft.Client/UI/Screens/RenameWorldScreen.cpp +++ b/Minecraft.Client/UI/Screens/RenameWorldScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "RenameWorldScreen.h" #include "../EditBox.h" #include "../Button.h" diff --git a/Minecraft.Client/UI/Screens/SelectWorldScreen.cpp b/Minecraft.Client/UI/Screens/SelectWorldScreen.cpp index 42afd57ff..3d797d5bf 100644 --- a/Minecraft.Client/UI/Screens/SelectWorldScreen.cpp +++ b/Minecraft.Client/UI/Screens/SelectWorldScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "SelectWorldScreen.h" #include "../Button.h" #include "ConfirmScreen.h" diff --git a/Minecraft.Client/UI/Screens/StatsScreen.cpp b/Minecraft.Client/UI/Screens/StatsScreen.cpp index 5e6fb2cba..c36e8b1d4 100644 --- a/Minecraft.Client/UI/Screens/StatsScreen.cpp +++ b/Minecraft.Client/UI/Screens/StatsScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "StatsScreen.h" #include "../../GameState/StatsCounter.h" #include "../../Rendering/EntityRenderers/ItemRenderer.h" diff --git a/Minecraft.Client/UI/Screens/TextEditScreen.cpp b/Minecraft.Client/UI/Screens/TextEditScreen.cpp index 82acbf81a..c625b0c73 100644 --- a/Minecraft.Client/UI/Screens/TextEditScreen.cpp +++ b/Minecraft.Client/UI/Screens/TextEditScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TextEditScreen.h" #include "../Button.h" #include "../../Rendering/EntityRenderers/TileEntityRenderDispatcher.h" diff --git a/Minecraft.Client/UI/Screens/TitleScreen.cpp b/Minecraft.Client/UI/Screens/TitleScreen.cpp index 087d18b19..09889b5f4 100644 --- a/Minecraft.Client/UI/Screens/TitleScreen.cpp +++ b/Minecraft.Client/UI/Screens/TitleScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "../Button.h" #include "OptionsScreen.h" #include "SelectWorldScreen.h" diff --git a/Minecraft.Client/UI/Screens/TrapScreen.cpp b/Minecraft.Client/UI/Screens/TrapScreen.cpp index f54261862..89660dadf 100644 --- a/Minecraft.Client/UI/Screens/TrapScreen.cpp +++ b/Minecraft.Client/UI/Screens/TrapScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "TrapScreen.h" #include "../../Player/LocalPlayer.h" #include "../../Textures/Textures.h" diff --git a/Minecraft.Client/UI/Screens/VideoSettingsScreen.cpp b/Minecraft.Client/UI/Screens/VideoSettingsScreen.cpp index 93392c6ea..2b765d59f 100644 --- a/Minecraft.Client/UI/Screens/VideoSettingsScreen.cpp +++ b/Minecraft.Client/UI/Screens/VideoSettingsScreen.cpp @@ -1,4 +1,4 @@ -#include "../../Build/stdafx.h" +#include "../../Platform/stdafx.h" #include "VideoSettingsScreen.h" #include "../SmallButton.h" #include "../SlideButton.h" diff --git a/Minecraft.Client/UI/ScrolledSelectionList.cpp b/Minecraft.Client/UI/ScrolledSelectionList.cpp index 3908b4a2e..7652cced6 100644 --- a/Minecraft.Client/UI/ScrolledSelectionList.cpp +++ b/Minecraft.Client/UI/ScrolledSelectionList.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "ScrolledSelectionList.h" #include "Button.h" #include "../Rendering/Tesselator.h" diff --git a/Minecraft.Client/UI/SimpleIcon.cpp b/Minecraft.Client/UI/SimpleIcon.cpp index c69a9938b..9ea0e89f2 100644 --- a/Minecraft.Client/UI/SimpleIcon.cpp +++ b/Minecraft.Client/UI/SimpleIcon.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "SimpleIcon.h" SimpleIcon::SimpleIcon(const std::wstring &name, float U0, float V0, float U1, float V1) : StitchedTexture(name) diff --git a/Minecraft.Client/UI/SlideButton.cpp b/Minecraft.Client/UI/SlideButton.cpp index a9d4c250e..4f4323b9e 100644 --- a/Minecraft.Client/UI/SlideButton.cpp +++ b/Minecraft.Client/UI/SlideButton.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "SlideButton.h" SlideButton::SlideButton(int id, int x, int y, const Options::Option *option, const std::wstring& msg, float value) : Button(id, x, y, 150, 20, msg) diff --git a/Minecraft.Client/UI/SmallButton.cpp b/Minecraft.Client/UI/SmallButton.cpp index ff736996f..1733ff946 100644 --- a/Minecraft.Client/UI/SmallButton.cpp +++ b/Minecraft.Client/UI/SmallButton.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "SmallButton.h" SmallButton::SmallButton(int id, int x, int y, const std::wstring& msg) : Button(id, x, y, 150, 20, msg) diff --git a/Minecraft.Client/Utils/ArchiveFile.cpp b/Minecraft.Client/Utils/ArchiveFile.cpp index 8d2773b7b..b2a8b383b 100644 --- a/Minecraft.Client/Utils/ArchiveFile.cpp +++ b/Minecraft.Client/Utils/ArchiveFile.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "../../Minecraft.World/Util/StringHelpers.h" #include "../../Minecraft.World/IO/Streams/Compression.h" diff --git a/Minecraft.Client/Utils/MemoryTracker.cpp b/Minecraft.Client/Utils/MemoryTracker.cpp index 48a72578d..56ba15ba0 100644 --- a/Minecraft.Client/Utils/MemoryTracker.cpp +++ b/Minecraft.Client/Utils/MemoryTracker.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "MemoryTracker.h" #include "../../Minecraft.World/IO/Streams/IntBuffer.h" #include "../../Minecraft.World/IO/Streams/ByteBuffer.h" diff --git a/Minecraft.Client/Utils/StringTable.cpp b/Minecraft.Client/Utils/StringTable.cpp index 78e763129..ac324a2d4 100644 --- a/Minecraft.Client/Utils/StringTable.cpp +++ b/Minecraft.Client/Utils/StringTable.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "StringTable.h" StringTable::StringTable(void) diff --git a/Minecraft.Client/Utils/Timer.cpp b/Minecraft.Client/Utils/Timer.cpp index ff9e79b4f..524575c1a 100644 --- a/Minecraft.Client/Utils/Timer.cpp +++ b/Minecraft.Client/Utils/Timer.cpp @@ -1,4 +1,4 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "Timer.h" #include "../../Minecraft.World/Platform/System.h" diff --git a/Minecraft.Client/Utils/WstringLookup.cpp b/Minecraft.Client/Utils/WstringLookup.cpp index 57983dd51..dfd3de37c 100644 --- a/Minecraft.Client/Utils/WstringLookup.cpp +++ b/Minecraft.Client/Utils/WstringLookup.cpp @@ -1,5 +1,5 @@ -#include "../Build/stdafx.h" +#include "../Platform/stdafx.h" #include "WstringLookup.h" diff --git a/scripts/move_assets_to_client.py b/scripts/copy_assets_to_client.py similarity index 100% rename from scripts/move_assets_to_client.py rename to scripts/copy_assets_to_client.py