Merge pull request #13 from 4jcraft/leahs-dev-branch

feat(solution): Get it to compile (Linux)

.gitignore

@@ -1,3 +1,4 @@
 # .gitignore
 build/
 .cache/
+.idea/

CMakeLists.txt

@@ -6,6 +6,7 @@ project(MinecraftConsoles C CXX)
 # Set target arch type if empty. Visual studio solution generator provides it.
 ################################################################################
 set(CMAKE_VS_PLATFORM_NAME "Linux")
+set(CMAKE_CXX_STANDARD 11)
 
 ################################################################################
 # Global configuration types

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/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/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"
 
 void ArrowRenderer::render(shared_ptr<Entity> _arrow, double x, double y, double z, float rot, float a)
 {

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"
 
 BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f)

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"
 
 BoatRenderer::BoatRenderer()  : EntityRenderer()
 {

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/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 "../Minecraft.World/SharedConstants.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
 

Minecraft.Client/ChestRenderer.cpp

@@ -3,8 +3,8 @@
 #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/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 ChestRenderer::ChestRenderer()
 {

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"
 
 ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow)
 {

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,43 +9,43 @@
 #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.player.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.player.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/SoundTypes.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"
@@ -53,8 +53,8 @@
 #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 "../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/JavaMath.h"
 #include "Texture.h"
 #include "ClockTexture.h"
 

Minecraft.Client/Common/App_Defines.h

@@ -104,13 +104,6 @@
 #define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH			0x13
 #define MINECRAFT_LANGUAGE_GREEK						0x14
 
-#if defined(__linux__)
-#define __debugbreak()
-#define __int32 int
-typedef unsigned long ULONG;
-inline void InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION CriticalSection, ULONG SpinCount) {}
-#endif // __linux__
-
  /* Match these
 
  const int XC_LANGUAGE_ENGLISH							=1;

Minecraft.Client/Common/Audio/Consoles_SoundEngine.h

@@ -7,22 +7,22 @@
 #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"
+#include "../../windows64/Miles/include/mss.h"
 #elif defined(__linux__)
 // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones
 // #include "../../windows64/Miles/include/mss.h"
 #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,22 +1,22 @@
 #include "stdafx.h"
 
 #include "SoundEngine.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"
+#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"
 
 #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,13 @@
 class Mob;
 class Options;
 using namespace std;
-#include "..\..\Minecraft.World\SoundTypes.h"
+#include "../../../Minecraft.World/SoundTypes.h"
+#ifdef __linux__
+typedef float F32;
+typedef HANDLE	        HMSOUNDBANK;
+typedef HANDLE          HDIGDRIVER;
+typedef unsigned int 	HSTREAM;
+#endif // __linux__
 
 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 "..\Common\Tutorial\Tutorial.h"
+#include "../Common/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 "..\Common\Tutorial\TutorialMode.h"
+#include "../Common/Tutorial/TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {

Minecraft.Client/Common/Consoles_App.cpp

@@ -1,64 +1,64 @@
 
 #include "stdafx.h"
 
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\MinecraftServer.h"
-#include "..\MultiPlayerLevel.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\ClientConnection.h"
-#include "..\MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.Client\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 "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\GameMode.h"
-#include "..\Xbox\Social\SocialManager.h"
-#include "Tutorial\TutorialMode.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.Client/Options.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../MinecraftServer.h"
+#include "../MultiPlayerLevel.h"
+#include "../GameRenderer.h"
+#include "../ProgressRenderer.h"
+#include "../../Minecraft.Client/LevelRenderer.h"
+#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../ClientConnection.h"
+#include "../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/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 "../../Minecraft.Client/StatsCounter.h"
+#include "../GameMode.h"
+#include "../Xbox/Social/SocialManager.h"
+#include "Tutorial/TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
+#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h"
+#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "GameRules\ConsoleGameRules.h"
-#include "GameRules\ConsoleSchematicFile.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\LevelData.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\Minecraft.Client\EntityRenderDispatcher.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\TexturePackRepository.h"
-#include "..\DLCTexturePack.h"
-#include "DLC\DLCPack.h"
-#include "..\StringTable.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "GameRules/ConsoleGameRules.h"
+#include "GameRules/ConsoleSchematicFile.h"
+#include "../../Minecraft.World/InputOutputStream.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../User.h"
+#include "../../Minecraft.World/LevelData.h"
+#include "../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.Client/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

@@ -9,8 +9,8 @@ using namespace std;
 #include "../Common/Tutorial/TutorialEnum.h"
 
 #ifdef _XBOX
-#include "..\Common\XUI\XUI_Helper.h"
-#include "..\Common\XUI\XUI_HelpCredits.h"
+#include "../Common/XUI/XUI_Helper.h"
+#include "../Common/XUI/XUI_HelpCredits.h"
 #endif
 #include "UI/UIStructs.h"
 

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/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/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/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/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/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,12 +2,12 @@
 
 #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 "..\..\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 "../../StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"
 

Minecraft.Client/Common/GameRules/LevelGenerationOptions.h

@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#pragma message("LevelGenerationOptions.h ")
+// #pragma message("LevelGenerationOptions.h ")
 
 #include "GameRuleDefinition.h"
 #include "../../../Minecraft.World/StructureFeature.h"

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/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/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/Network/GameNetworkManager.cpp

@@ -1,43 +1,43 @@
 #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 "..\..\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 "../../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"
 #elif !(defined __PSVITA__)
-#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

@@ -7,18 +7,18 @@ using namespace std;
 #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/PlatformNetworkManagerStub.cpp

@@ -1,8 +1,8 @@
 #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"		// TODO - stub version of this?
+#include "../../Xbox/Network/NetworkPlayerXbox.h"		// TODO - stub version of this?
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
 

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/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"
 
@@ -428,7 +428,7 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId)
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CTelemetryManager::GetLevelExitProgressStat1()
@@ -440,7 +440,7 @@ INT CTelemetryManager::GetLevelExitProgressStat1()
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CTelemetryManager::GetLevelExitProgressStat2()

Minecraft.Client/Common/Telemetry/TelemetryManager.h

@@ -1,9 +1,75 @@
 #pragma once
 
-#include "../../Common/UI/UIEnums.h"
-#include "../../Xbox/Sentient/SentientTelemetryCommon.h"
 
-enum ETelemetryChallenges {};
+#include "../../Common/UI/UIEnums.h"
+
+enum ETelemetryChallenges
+{
+	eTelemetryChallenges_Unknown = 0,
+
+	eTelemetryTutorial_TrialStart,
+	eTelemetryTutorial_Halfway,
+	eTelemetryTutorial_Complete,
+
+	eTelemetryTutorial_Inventory,
+	eTelemetryTutorial_Crafting,
+	eTelemetryTutorial_Furnace,
+	eTelemetryTutorial_Fishing,
+	eTelemetryTutorial_Minecart,
+	eTelemetryTutorial_Boat,
+	eTelemetryTutorial_Bed,
+
+	eTelemetryTutorial_Redstone_And_Pistons,
+	eTelemetryTutorial_Portal,
+	eTelemetryTutorial_FoodBar,
+	eTelemetryTutorial_CreativeMode,
+	eTelemetryTutorial_BrewingMenu,
+
+	eTelemetryInGame_Ride_Minecart,
+	eTelemetryInGame_Ride_Boat,
+	eTelemetryInGame_Ride_Pig,
+	eTelemetryInGame_UseBed,
+
+	eTelemetryTutorial_CreativeInventory, // Added TU5
+
+	eTelemetryTutorial_EnchantingMenu,
+	eTelemetryTutorial_Brewing,
+	eTelemetryTutorial_Enchanting,
+	eTelemetryTutorial_Farming,
+
+	eTelemetryPlayerDeathSource_Fall,
+	eTelemetryPlayerDeathSource_Lava,
+	eTelemetryPlayerDeathSource_Fire,
+	eTelemetryPlayerDeathSource_Water,
+	eTelemetryPlayerDeathSource_Suffocate,
+	eTelemetryPlayerDeathSource_OutOfWorld,
+	eTelemetryPlayerDeathSource_Cactus,
+
+	eTelemetryPlayerDeathSource_Player_Weapon,
+	eTelemetryPlayerDeathSource_Player_Arrow,
+
+	eTelemetryPlayerDeathSource_Explosion_Tnt,
+	eTelemetryPlayerDeathSource_Explosion_Creeper,
+
+	eTelemetryPlayerDeathSource_Wolf,
+	eTelemetryPlayerDeathSource_Zombie,
+	eTelemetryPlayerDeathSource_Skeleton,
+	eTelemetryPlayerDeathSource_Spider,
+	eTelemetryPlayerDeathSource_Slime,
+	eTelemetryPlayerDeathSource_Ghast,
+	eTelemetryPlayerDeathSource_ZombiePigman,
+
+	eTelemetryTutorial_Breeding,
+	eTelemetryTutorial_Golem,
+
+	eTelemetryTutorial_Anvil, // Added TU14
+	eTelemetryTutorial_AnvilMenu,
+	eTelemetryTutorial_Trading,
+	eTelemetryTutorial_TradingMenu,
+	eTelemetryTutorial_Enderchest,
+
+	// Sent over network as a byte
+};
 
 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)

Minecraft.Client/Common/Trial/TrialMode.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Tutorial\FullTutorialMode.h"
+#include "../Tutorial/FullTutorialMode.h"
 
 class TrialMode : public FullTutorialMode
 {

Minecraft.Client/Common/Tutorial/AreaConstraint.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "AreaConstraint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
+#include "../../../Minecraft.World/AABB.h"
 
 AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
 	: TutorialConstraint( descriptionId )

Minecraft.Client/Common/Tutorial/AreaHint.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "AreaHint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
+#include "../../../Minecraft.World/AABB.h"
 #include "Tutorial.h"
 
 AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,

Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp

@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
 #include "Tutorial.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
 #include "ChangeStateConstraint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
 
 ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount,
 	double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )

Minecraft.Client/Common/Tutorial/ChoiceTask.cpp

@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
+#include "../../../Minecraft.World/Material.h"
 
 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,

Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 #include "CompleteUsingItemTask.h"
 
 CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)

Minecraft.Client/Common/Tutorial/ControllerTask.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ControllerTask.h"

Minecraft.Client/Common/Tutorial/CraftTask.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CraftTask.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 
 CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
 	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,

Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.h"
 #include "Tutorial.h"
 #include "DiggerItemHint.h"
 

Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
 #include "EffectChangedTask.h"
 
 EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,

Minecraft.Client/Common/Tutorial/FullTutorial.cpp

@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.phys.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../GameRules/ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
 #include "AreaHint.h"

Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"
 

Minecraft.Client/Common/Tutorial/InfoTask.cpp

@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
+#include "../../../Minecraft.World/Material.h"
 
 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)

Minecraft.Client/Common/Tutorial/LookAtEntityHint.h

@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\..\..\Minecraft.World\Class.h"
+#include "../../../Minecraft.World/Class.h"
 #include "TutorialHint.h"
 
 class ItemInstance;

Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "LookAtTileHint.h"
 

Minecraft.Client/Common/Tutorial/StatTask.cpp

@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\StatsCounter.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "../../Minecraft.h"
+#include "../../LocalPlayer.h"
+#include "../../StatsCounter.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
 #include "StatTask.h"
 
 StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)

Minecraft.Client/Common/Tutorial/TakeItemHint.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "TakeItemHint.h"
 

Minecraft.Client/Common/Tutorial/Tutorial.cpp

@@ -1,17 +1,17 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\SurvivalMode.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../SurvivalMode.h"
 #include "Tutorial.h"
 #include "TutorialMessage.h"
 #include "TutorialTasks.h"