revert: revert reformatting of headers, tbd

This reverts commit fef5c7b094.

CMakeLists.txt

@@ -229,4 +229,4 @@ elseif(BACKEND STREQUAL "Cross64")
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftClientCross64)
 else()
   message(FATAL_ERROR "Invalid Backend.")
-endif()
+endif()

Minecraft.Client/AbstractContainerScreen.cpp

@@ -6,9 +6,9 @@
 #include "GameMode.h"
 #include "KeyMapping.h"
 #include "Options.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 
 ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer();
 

Minecraft.Client/AbstractProjectileDispenseBehavior.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.core.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.core.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "AbstractProjectileDispenseBehavior.h"
 
 shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed)

Minecraft.Client/AbstractProjectileDispenseBehavior.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Minecraft.World/DefaultDispenseItemBehavior.h>
+#include "..\Minecraft.World\DefaultDispenseItemBehavior.h"
 
 class Projectile;
 

Minecraft.Client/AbstractTexturePack.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "Textures.h"
 #include "AbstractTexturePack.h"
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\InputOutputStream.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
 {

Minecraft.Client/AchievementPopup.cpp

@@ -4,10 +4,10 @@
 #include "Font.h"
 #include "Textures.h"
 #include "Lighting.h"
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/SharedConstants.h>
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\SharedConstants.h"
 
 AchievementPopup::AchievementPopup(Minecraft *mc)
 {

Minecraft.Client/AchievementScreen.cpp

@@ -8,10 +8,10 @@
 #include "Textures.h"
 #include "StatsCounter.h"
 #include "ItemRenderer.h"
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 
 

Minecraft.Client/AchievementScreen.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Screen.h"
-#include <Minecraft.World/net.minecraft.stats.h>
+#include "..\Minecraft.World\net.minecraft.stats.h"
 class StatsCounter;
 
 class AchievementScreen : public Screen

Minecraft.Client/ArchiveFile.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/compression.h>
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\compression.h"
 
 #include "ArchiveFile.h"
 

Minecraft.Client/ArchiveFile.h

@@ -3,8 +3,8 @@
 #include <vector>
 #include <unordered_map>
 
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\ArrayWithLength.h"
 
 using namespace std;
 

Minecraft.Client/ArrowRenderer.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ArrowRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS);
 

Minecraft.Client/BatModel.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.ambient.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
 #include "BatModel.h"
 #include "ModelPart.h"
 

Minecraft.Client/BatRenderer.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.ambient.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
 #include "BatRenderer.h"
 #include "BatModel.h"
 

Minecraft.Client/BeaconRenderer.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "BeaconRenderer.h"
 #include "Tesselator.h"
 

Minecraft.Client/BlazeModel.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "BlazeModel.h"
 #include "ModelPart.h"
 

Minecraft.Client/BlazeRenderer.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BlazeModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "BlazeRenderer.h"
 
 ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);

Minecraft.Client/BoatRenderer.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "BoatRenderer.h"
 #include "BoatModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);
 

Minecraft.Client/BookModel.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "BookModel.h"
 #include "ModelPart.h"
 

Minecraft.Client/BossMobGuiInfo.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BossMobGuiInfo.h"
-#include <Minecraft.World/BossMob.h>
+#include "../Minecraft.World/BossMob.h"
 
 float BossMobGuiInfo::healthProgress = 0.0f;
 int BossMobGuiInfo::displayTicks = 0;

Minecraft.Client/BreakingItemParticle.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "BreakingItemParticle.h"
 #include "Tesselator.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
 {	

Minecraft.Client/BubbleParticle.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "BubbleParticle.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
 
 BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 	{

Minecraft.Client/BufferedImage.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"	
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "Textures.h"
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "BufferedImage.h"
 
 #ifdef _XBOX

Minecraft.Client/Camera.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Camera.h"
 #include "MemoryTracker.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/TilePos.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\TilePos.h"
 
 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;

Minecraft.Client/Camera.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/IntBuffer.h>
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\IntBuffer.h"
 
 
 class TilePos;

Minecraft.Client/ChatScreen.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "ChatScreen.h"
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
 

Minecraft.Client/ChestRenderer.cpp

@@ -3,9 +3,9 @@
 #include "ChestModel.h"
 #include "LargeChestModel.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/Calendar.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\Calendar.h"
 
 ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
 //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST);

Minecraft.Client/ChickenModel.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ChickenModel.h"
 #include "ModelPart.h"
 

Minecraft.Client/ChickenRenderer.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ChickenRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN);
 

Minecraft.Client/Chunk.cpp

@@ -2,16 +2,16 @@
 #include "Chunk.h"
 #include "TileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "LevelRenderer.h"
 
 #ifdef __PS3__
-#include <PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h>
-#include <PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h>
-#include <PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h>
+#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h"
+#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h"
+#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h"
 
 #include "C4JThread_SPU.h"
 #include "C4JSpursJob.h"

Minecraft.Client/Chunk.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "AllowAllCuller.h"
 #include "Tesselator.h"
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "LevelRenderer.h"
 
 class Level;

Minecraft.Client/ClientConnection.cpp

@@ -9,55 +9,55 @@
 #include "TakeAnimationParticle.h"
 #include "CritParticle.h"
 #include "User.h"
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.ai.attributes.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.npc.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/Socket.h>
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\Socket.h"
 #include "Minecraft.h"
 #include "ProgressRenderer.h"
 #include "LevelRenderer.h"
 #include "Options.h"
 #include "MinecraftServer.h"
 #include "ClientConstants.h"
-#include <Minecraft.World/SoundTypes.h>
-#include <Minecraft.World/BasicTypeContainers.h>
+#include "..\Minecraft.World\SoundTypes.h"
+#include "..\Minecraft.World\BasicTypeContainers.h"
 #include "TexturePackRepository.h"
 #ifdef _XBOX
-#include <Common/XUI/XUI_Scene_Trading.h>
+#include "Common\XUI\XUI_Scene_Trading.h"
 #else
-#include <Common/UI/UI.h>
+#include "Common\UI\UI.h"
 #endif
 #ifdef __PS3__
-#include <PS3/Network/SonyVoiceChat.h>
+#include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
-#include <Minecraft.World/GenericStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
+#include "..\Minecraft.World\GenericStats.h"
 #endif
 
 ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)

Minecraft.Client/ClientConnection.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.network.h>
+#include "..\Minecraft.World\net.minecraft.network.h"
 class Minecraft;
 class MultiPlayerLevel;
 class SavedDataStorage;

Minecraft.Client/ClockTexture.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Minecraft.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\JavaMath.h"
 #include "Texture.h"
 #include "ClockTexture.h"
 

Minecraft.Client/Common/Audio/Consoles_SoundEngine.h

@@ -1,19 +1,19 @@
 #pragma once
 
-#include <Minecraft.World/SoundTypes.h>
+#include "..\..\..\Minecraft.World\SoundTypes.h"
 
 #ifdef _XBOX
 
 #elif defined (__PS3__)
 #undef __in
 #undef __out
-#include <PS3/Miles/include/mss.h>
+#include "..\..\PS3\Miles\include\mss.h"
 #elif defined (__PSVITA__)
-#include <PSVITA/Miles/include/mss.h>
+#include "..\..\PSVITA\Miles\include\mss.h"
 #elif defined _DURANGO
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT
-#include <Durango/Miles/include/mss.h>
+#include "..\..\Durango\Miles\include\mss.h"
 #elif defined _WINDOWS64
 #include <windows64/Miles/include/mss.h>
 #elif defined _CROSS64 
@@ -21,7 +21,7 @@
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2
-#include <Orbis/Miles/include/mss.h>
+#include "..\..\Orbis\Miles\include\mss.h"
 #endif
 
 typedef struct

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 
 #include "SoundEngine.h"
+<<<<<<< HEAD
 #include <Consoles_App.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.level.h>
@@ -9,14 +10,24 @@
 #include <TexturePackRepository.h>
 #include <DLCTexturePack.h>
 #include <Common/DLC/DLCAudioFile.h>
+=======
+#include "..\Consoles_App.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\Minecraft.World\leveldata.h"
+#include "..\..\Minecraft.World\mth.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\DLCTexturePack.h"
+#include "Common\DLC\DLCAudioFile.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #ifdef __PSVITA__
 #include <audioout.h>
 #endif
 
 #ifdef _WINDOWS64
-#include <Minecraft.Client/Windows64/Windows64_App.h>
-#include <Minecraft.Client/Windows64/Miles/include/imssapi.h>
+#include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
+#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h"
 #endif
 
 #ifdef __ORBIS__

Minecraft.Client/Common/Audio/SoundEngine.h

@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include <Minecraft.World/SoundTypes.h>
+#include "..\..\Minecraft.World\SoundTypes.h"
 
 enum eMUSICFILES
 {

Minecraft.Client/Common/C4JMemoryPoolAllocator.h

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <Minecraft.Client/Common/C4JMemoryPool.h>
+#include "..\Minecraft.Client\Common\C4JMemoryPool.h"
 
 // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations.
 

Minecraft.Client/Common/Colours/ColourTable.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ColourTable.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;
 

Minecraft.Client/Common/ConsoleGameMode.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include <./Tutorial/Tutorial.h>
+#include ".\Tutorial\Tutorial.h"
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)

Minecraft.Client/Common/ConsoleGameMode.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <./Tutorial/TutorialMode.h>
+#include ".\Tutorial\TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {

Minecraft.Client/Common/Consoles_App.cpp

@@ -1,64 +1,64 @@
 
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/compression.h>
-#include <Options.h>
-#include <MinecraftServer.h>
-#include <MultiPlayerLevel.h>
-#include <GameRenderer.h>
-#include <ProgressRenderer.h>
-#include <LevelRenderer.h>
-#include <MobSkinMemTextureProcessor.h>
-#include <Minecraft.h>
-#include <ClientConnection.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/Inventory.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/DispenserTileEntity.h>
-#include <Minecraft.World/SignTileEntity.h>
-#include <StatsCounter.h>
-#include <GameMode.h>
-#include <Xbox/Social/SocialManager.h>
-#include <Tutorial/TutorialMode.h>
+#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\Options.h"
+#include "..\MinecraftServer.h"
+#include "..\MultiPlayerLevel.h"
+#include "..\GameRenderer.h"
+#include "..\ProgressRenderer.h"
+#include "..\LevelRenderer.h"
+#include "..\MobSkinMemTextureProcessor.h"
+#include "..\Minecraft.h"
+#include "..\ClientConnection.h"
+#include "..\MultiPlayerLocalPlayer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\Player.h"
+#include "..\..\Minecraft.World\Inventory.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\FurnaceTileEntity.h"
+#include "..\..\Minecraft.World\Container.h"
+#include "..\..\Minecraft.World\DispenserTileEntity.h"
+#include "..\..\Minecraft.World\SignTileEntity.h"
+#include "..\StatsCounter.h"
+#include "..\GameMode.h"
+#include "..\Xbox\Social\SocialManager.h"
+#include "Tutorial\TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include <Xbox/XML/ATGXmlParser.h>
-#include <Xbox/XML/xmlFilesCallback.h>
+#include "..\Xbox\XML\ATGXmlParser.h"
+#include "..\Xbox\XML\xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include <PlayerList.h>
-#include <ServerPlayer.h>
-#include <GameRules/ConsoleGameRules.h>
-#include <GameRules/ConsoleSchematicFile.h>
-#include <User.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <EntityRenderDispatcher.h>
-#include <Minecraft.World/compression.h>
-#include <TexturePackRepository.h>
-#include <DLCTexturePack.h>
-#include <DLC/DLCPack.h>
-#include <StringTable.h>
+#include "..\PlayerList.h"
+#include "..\ServerPlayer.h"
+#include "GameRules\ConsoleGameRules.h"
+#include "GameRules\ConsoleSchematicFile.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\LevelData.h"
+#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\EntityRenderDispatcher.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\TexturePackRepository.h"
+#include "..\DLCTexturePack.h"
+#include "DLC\DLCPack.h"
+#include "..\StringTable.h"
 #ifndef _XBOX
-#include <ArchiveFile.h>
+#include "..\ArchiveFile.h"
 #endif
-#include <Minecraft.h>
+#include "..\Minecraft.h"
 #ifdef _XBOX
-#include <Xbox/GameConfig/Minecraft.spa.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
-#include <XUI/XUI_TextEntry.h>
-#include <XUI/XUI_XZP_Icons.h>
-#include <XUI/XUI_PauseMenu.h>
+#include "..\Xbox\GameConfig\Minecraft.spa.h"
+#include "..\Xbox\Network\NetworkPlayerXbox.h"
+#include "XUI\XUI_TextEntry.h"
+#include "XUI\XUI_XZP_Icons.h"
+#include "XUI\XUI_PauseMenu.h"
 #else
-#include <UI/UI.h>
-#include <UI/UIScene_PauseMenu.h>
+#include "UI\UI.h"
+#include "UI\UIScene_PauseMenu.h"
 #endif
 #ifdef __PS3__
 #include <sys/tty.h>
@@ -67,7 +67,7 @@
 #include <save_data_dialog.h>
 #endif
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "..\Common\Leaderboards\LeaderboardManager.h"
 
 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;

Minecraft.Client/Common/Consoles_App.h

@@ -2,26 +2,26 @@
 
 using namespace std;
 
-#include <Audio/Consoles_SoundEngine.h>
+#include "Audio/Consoles_SoundEngine.h"
 
 #include <xuiapp.h>
-#include <./Tutorial/TutorialEnum.h>
+#include ".\Tutorial\TutorialEnum.h"
 
 #ifdef _XBOX
-#include <./XUI/XUI_Helper.h>
-#include <./XUI/XUI_HelpCredits.h>
+#include ".\XUI\XUI_Helper.h"
+#include ".\XUI\XUI_HelpCredits.h"
 #endif
-#include <UI/UIStructs.h>
+#include "UI\UIStructs.h"
 
-#include <Minecraft.World/DisconnectPacket.h>
+#include "..\..\Minecraft.World\DisconnectPacket.h"
 #include <xsocialpost.h>
 
-#include <StringTable.h>
-#include <./DLC/DLCManager.h>
-#include <./GameRules/ConsoleGameRulesConstants.h>
-#include <./GameRules/GameRuleManager.h>
-#include <SkinBox.h>
-#include <ArchiveFile.h>
+#include "..\StringTable.h"
+#include ".\DLC\DLCManager.h"
+#include ".\GameRules\ConsoleGameRulesConstants.h"
+#include ".\GameRules\GameRuleManager.h"
+#include "..\SkinBox.h"
+#include "..\ArchiveFile.h"
 
 typedef struct _JoinFromInviteData
 {

Minecraft.Client/Common/DLC/DLCAudioFile.cpp

@@ -2,8 +2,8 @@
 #include "DLCManager.h"
 #include "DLCAudioFile.h"
 #if defined _XBOX || defined _WINDOWS64
-#include <Xbox/XML/ATGXmlParser.h>
-#include <Xbox/XML/xmlFilesCallback.h>
+#include "..\..\Xbox\XML\ATGXmlParser.h"
+#include "..\..\Xbox\XML\xmlFilesCallback.h"
 #endif
 
 DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)

Minecraft.Client/Common/DLC/DLCColourTableFile.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
 
 DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	

Minecraft.Client/Common/DLC/DLCGameRules.h

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

Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/InputOutputStream.h>
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
 
 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"

Minecraft.Client/Common/DLC/DLCGameRulesHeader.h

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

Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include <StringTable.h>
+#include "..\..\StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	

Minecraft.Client/Common/DLC/DLCManager.cpp

@@ -3,9 +3,9 @@
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
 
 WCHAR *DLCManager::wchTypeNamesA[]=
 {

Minecraft.Client/Common/DLC/DLCPack.cpp

@@ -9,7 +9,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
 {

Minecraft.Client/Common/DLC/DLCSkinFile.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include <ModelPart.h>
-#include <EntityRenderer.h>
-#include <EntityRenderDispatcher.h>
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\ModelPart.h"
+#include "..\..\EntityRenderer.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\..\Minecraft.World\Player.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {

Minecraft.Client/Common/DLC/DLCSkinFile.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "DLCFile.h"
-#include <Minecraft.Client/HumanoidModel.h>
+#include "..\..\..\Minecraft.Client\HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile
 {

Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.enchantment.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
 #include "AddEnchantmentRuleDefinition.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()

Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 

Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"

Minecraft.Client/Common/GameRules/BiomeOverride.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "BiomeOverride.h"
 
 BiomeOverride::BiomeOverride()

Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <WstringLookup.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\WstringLookup.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/Connection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\Connection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition()
 {

Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "CompleteAllRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Connection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Connection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
 {

Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "CompoundGameRuleDefinition.h"
 #include "ConsoleGameRules.h"
 

Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h

@@ -1,6 +1,6 @@
 #pragma once
 
-//#include <
+//#include "
 
 class ConsoleGameRules
 {

Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "ConsoleGenerateStructure.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
 {

Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructurePiece.h>
+#include "..\..\..\Minecraft.World\StructurePiece.h"
 
 class Level;
 class Random;

Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp

@@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include <vector>
-#include <Minecraft.World/com.mojang.nbt.h>
-#include <Minecraft.World/System.h>
+#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
+#include "..\..\..\Minecraft.World\System.h"
 #include "ConsoleSchematicFile.h"
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/compression.h>
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\compression.h"
 
 ConsoleSchematicFile::ConsoleSchematicFile()
 {

Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h

@@ -4,7 +4,7 @@ using namespace std;
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
 
 class Level;
 class DataOutputStream;

Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <WstringLookup.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\WstringLookup.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "ConsoleGameRules.h"
 
 GameRuleDefinition::GameRuleDefinition()

Minecraft.Client/Common/GameRules/GameRuleDefinition.h

@@ -3,7 +3,7 @@ using namespace std;
 #include <unordered_map>
 #include <string>
 
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #include "ConsoleGameRulesConstants.h"
 
 #include "GameRulesInstance.h"

Minecraft.Client/Common/GameRules/GameRuleManager.cpp

@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/compression.h>
-#include <DLC/DLCPack.h>
-#include <DLC/DLCLocalisationFile.h>
-#include <DLC/DLCGameRulesFile.h>
-#include <DLC/DLCGameRules.h>
-#include <DLC/DLCGameRulesHeader.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\DLC\DLCPack.h"
+#include "..\DLC\DLCLocalisationFile.h"
+#include "..\DLC\DLCGameRulesFile.h"
+#include "..\DLC\DLCGameRules.h"
+#include "..\DLC\DLCGameRulesHeader.h"
+#include "..\..\StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 

Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp

@@ -2,13 +2,13 @@
 
 #include <unordered_set>
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Common/DLC/DLCGameRulesHeader.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Pos.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "Common\DLC\DLCGameRulesHeader.h"
+#include "..\..\StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"
 

Minecraft.Client/Common/GameRules/LevelGenerationOptions.h

@@ -4,7 +4,7 @@ using namespace std;
 #pragma message("LevelGenerationOptions.h ")
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructureFeature.h>
+#include "..\..\..\Minecraft.World\StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;

Minecraft.Client/Common/GameRules/LevelRuleset.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\StringTable.h"
 #include "ConsoleGameRules.h"
 #include "LevelRuleset.h"
 

Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NamedAreaRuleDefinition.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition()
 {

Minecraft.Client/Common/GameRules/StartFeature.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "StartFeature.h"
 
 StartFeature::StartFeature()

Minecraft.Client/Common/GameRules/StartFeature.h

@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructureFeature.h>
+#include "..\..\..\Minecraft.World\StructureFeature.h"
 
 class StartFeature : public GameRuleDefinition
 {

Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UpdatePlayerRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\Pos.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
 {

Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition()

Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h

@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/Pos.h>
+#include "..\..\..\Minecraft.World\Pos.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition
 {

Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionGenerateBox.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
 {

Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionPlaceBlock.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
 {

Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
 #include "AddItemRuleDefinition.h"
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
 {

Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XboxStructureActionPlaceSpawner.h"
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner()
 {

Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include "LeaderboardManager.h"
 

Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp

@@ -8,21 +8,21 @@
 
 #include "base64.h"
 
-#include <Common/Consoles_App.h>
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "Common\Consoles_App.h"
+#include "Common\Network\Sony\SQRNetworkManager.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 
 #ifdef __ORBIS__
-#include <Orbis/OrbisExtras/ShutdownManager.h>
-#include <Orbis/Orbis_App.h>
+#include "Orbis\OrbisExtras\ShutdownManager.h"
+#include "Orbis\Orbis_App.h"
 #elif defined __PSVITA__
-#include <PSVita/PSVitaExtras/ShutdownManager.h>
-#include <PSVita/PSVita_App.h>
+#include "PSVita\PSVitaExtras\ShutdownManager.h"
+#include "PSVita\PSVita_App.h"
 #elif defined __PS3__
-#include <PS3/PS3Extras/ShutdownManager.h>
-#include <PS3/PS3_App.h>
+#include "PS3\PS3Extras\ShutdownManager.h"
+#include "PS3\PS3_App.h"
 #else
 #error "SonyLeaderboardManager is included for a non-sony platform."
 #endif

Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 #ifdef __PS3__
 typedef CellRtcTick SonyRtcTick;

Minecraft.Client/Common/Network/GameNetworkManager.cpp

@@ -1,44 +1,44 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/FireworksRecipe.h>
-#include <ClientConnection.h>
-#include <Minecraft.h>
-#include <User.h>
-#include <MinecraftServer.h>
-#include <PlayerList.h>
-#include <ServerPlayer.h>
-#include <PlayerConnection.h>
-#include <MultiPlayerLevel.h>
-#include <ProgressRenderer.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.World/DisconnectPacket.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\ThreadName.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\FireworksRecipe.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\Minecraft.h"
+#include "..\..\User.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\PlayerList.h"
+#include "..\..\ServerPlayer.h"
+#include "..\..\PlayerConnection.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\..\..\Minecraft.World\OldChunkStorage.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
 
-#include <Gui.h>
-#include <LevelRenderer.h>
-#include <Minecraft.World/IntCache.h>
-#include <GameRules/ConsoleGameRules.h>
+#include "..\..\Gui.h"
+#include "..\..\LevelRenderer.h"
+#include "..\..\..\Minecraft.World\IntCache.h"
+#include "..\GameRules\ConsoleGameRules.h"
 #include "GameNetworkManager.h"
 
 #ifdef _XBOX
-#include <Common/XUI/XUI_PauseMenu.h>
+#include "Common\XUI\XUI_PauseMenu.h"
 #else
-#include <Common/UI/UI.h>
-#include <Common/UI/UIScene_PauseMenu.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "Common\UI\UI.h"
+#include "Common\UI\UIScene_PauseMenu.h"
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #endif
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 // Global instance

Minecraft.Client/Common/Network/GameNetworkManager.h

@@ -2,21 +2,21 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #ifdef _XBOX
-#include <Xbox/Network/PlatformNetworkManagerXbox.h>
+#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
 #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-#include <Common/Network/Sony/PlatformNetworkManagerSony.h>
+#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
 #elif defined _DURANGO
-#include <Durango/Network/PlatformNetworkManagerDurango.h>
+#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
 #else
 #include "PlatformNetworkManagerStub.h"
 #endif
 #include "SessionInfo.h"
 
 #ifdef __ORBIS__
-#include <Orbis/Network/PsPlusUpsellWrapper_Orbis.h>
+#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
 #endif
 
 class ClientConnection;

Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h

@@ -2,7 +2,7 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp

@@ -1,12 +1,12 @@
 #include "stdafx.h"	
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerStub.h"
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #ifdef _WINDOWS64
-#include <Windows64/Network/WinsockNetLayer.h>
-#include <Minecraft.h>
-#include <User.h>
+#include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\User.h"
 #endif
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h

@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"

Minecraft.Client/Common/Network/SessionInfo.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #if defined(__PS3__) || defined(__ORBIS__)
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 #endif
 
 

Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/NetworkPlayerInterface.h>
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
 #include "SQRNetworkPlayer.h"
 
 // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way.

Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerSony.h"
 #include "NetworkPlayerSony.h"
-#include <Common/Network/GameNetworkManager.h>
+#include "..\..\Common\Network\GameNetworkManager.h"
 
 CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
 

Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h

@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Minecraft.World/C4JThread.h>
-#include <Common/Network/NetworkPlayerInterface.h>
-#include <Common/Network/PlatformNetworkManagerInterface.h>
-#include <Common/Network/SessionInfo.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
+#include "..\..\Common\Network\SessionInfo.h"
 #include "SQRNetworkPlayer.h"
 
 // This is how often we allow a search for new games

Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <np.h>
 #ifdef __PS3__
-#include <netex/libnetctl.h>
-#include <netex/net.h>
+#include <netex\libnetctl.h>
+#include <netex\net.h>
 #else
 #include <libnetctl.h>
 #include <net.h>
@@ -12,7 +12,7 @@
 
 #include <unordered_map>
 #if defined __PSVITA__
-#include <Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h>
+#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
 #endif
 
 class SQRNetworkPlayer;

Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp

@@ -3,16 +3,16 @@
 
 #ifdef __PS3__
 #include <cell/rudp.h>
-#include <PS3/Network/SonyVoiceChat.h>
+#include "PS3/Network/SonyVoiceChat.h"
 
 #elif defined __ORBIS__
 #include <rudp.h>
-#include <Orbis/Network/SonyVoiceChat_Orbis.h>
+#include "Orbis/Network/SonyVoiceChat_Orbis.h"
 
 #else // __PSVITA__
 #include <rudp.h>
 #include <adhoc_matching.h>
-#include <PSVita/Network/SonyVoiceChat_Vita.h>
+#include "PSVita/Network/SonyVoiceChat_Vita.h"
 
 #endif
 

Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce.h"
-#include <PS3Extras/ShutdownManager.h>
+#include "..\PS3Extras\ShutdownManager.h"
 #include <sys/event.h>
 
 

Minecraft.Client/Common/Network/Sony/SonyHttp.cpp

@@ -3,15 +3,15 @@
 
 
 #ifdef __PS3__
-#include <PS3/Network/SonyHttp_PS3.h>
+#include "PS3\Network\SonyHttp_PS3.h"
 SonyHttp_PS3 g_SonyHttp;
 
 #elif defined __ORBIS__
-#include <Orbis/Network/SonyHttp_Orbis.h>
+#include "Orbis\Network\SonyHttp_Orbis.h"
 SonyHttp_Orbis g_SonyHttp;
 
 #elif defined __PSVITA__
-#include <PSVita/Network/SonyHttp_Vita.h>
+#include "PSVita\Network\SonyHttp_Vita.h"
 SonyHttp_Vita g_SonyHttp;
 
 #endif

Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.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
 {

Minecraft.Client/Common/Telemetry/TelemetryManager.cpp

@@ -2,9 +2,9 @@
 
 #include "MultiPlayerLocalPlayer.h"
 
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/Level.h>
+#include "..\Minecraft.World\LevelSettings.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\Level.h"
 
 #include "TelemetryManager.h"
 

Minecraft.Client/Common/Telemetry/TelemetryManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIEnums.h>
+#include "..\..\Common\UI\UIEnums.h"
 
 class CTelemetryManager
 {

Minecraft.Client/Common/Trial/TrialMode.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TrialMode.h"
-#include <Tutorial/FullTutorial.h>
+#include "..\Tutorial\FullTutorial.h"
 
 TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: FullTutorialMode(iPad, minecraft, connection)