major: Switch to forward slashes(+more) to fix compilation on Linux (#1403)

Notably also adds some metadata files for NixOS * add support for linux clang cross compiles * add linux clang instructions * un-capitalize Mob.horse.* * update the description in flake.nix --------- Co-authored-by: Loki <lokirautio@gmail.com>
2026-04-14 16:47:37 -05:00
parent f78dec6e00
commit c0da06e4ee
874 changed files with 4256 additions and 3544 deletions
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -3,20 +3,20 @@
 #include "IUIScene_AbstractContainerMenu.h"

 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"

 #ifdef __ORBIS__
 #include <pad.h>
 #endif

 #ifdef _WINDOWS64
-#include "..\..\Windows64\KeyboardMouseInput.h"
+#include "../../Windows64/KeyboardMouseInput.h"
 #endif

 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "IUIScene_AnvilMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"

 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.ContainerListener.h"

 // The 0-indexed slot in the inventory list that lines up with the result slot
 #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\CustomPayloadPacket.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\Minecraft.World\HtmlString.h"
+#include "../Minecraft.World/CustomPayloadPacket.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.effect.h"
+#include "../Minecraft.World/HtmlString.h"
 #include "IUIScene_BeaconMenu.h"
 #include "Minecraft.h"
 #include "MultiPlayerLocalPlayer.h"
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Common\UI\IUIScene_AbstractContainerMenu.h"
+#include "Common/UI/IUIScene_AbstractContainerMenu.h"

 class BeaconTileEntity;

--- a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "IUIScene_BrewingMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_ContainerMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"

-#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"

 #include "UI.h"
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "..\..\..\Minecraft.World\Recipy.h"
-#include "..\..\..\Minecraft.World\Item.h"
+#include "../../../Minecraft.World/Recipy.h"
+#include "../../../Minecraft.World/Item.h"

 class LocalPlayer;

--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -2,16 +2,16 @@
 #include "IUIScene_CreativeMenu.h"

 #include "UI.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.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.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.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.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../../../Minecraft.World/JavaMath.h"

 // 4J JEV - Images for each tab.
 IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = nullptr;
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
 // 4J Stu - This class is for code that is common between XUI and Iggy

 class SimpleContainer;
--- a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "IUIScene_DispenserMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
--- a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "IUIScene_FireworksMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "IUIScene_FurnaceMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.ai.attributes.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.monster.h"
 #include "IUIScene_HUD.h"

 #include "UI.h"
--- a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_HorseInventoryMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "IUIScene_InventoryMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
--- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "IUIScene_PauseMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MinecraftServer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.phys.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 #ifndef _XBOX
 #include "UI.h"
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.trading.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 #include "IUIScene_TradingMenu.h"

 #include "UI.h"
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\MerchantMenu.h"
+#include "../Minecraft.World/MerchantMenu.h"

 class MerchantRecipe;

--- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
@@ -2,8 +2,8 @@
 #include "UI.h"
 #include "UIComponent_Chat.h"
 #include "UISplitScreenHelpers.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Gui.h"
+#include "../../Minecraft.h"
+#include "../../Gui.h"

 UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -3,8 +3,8 @@
 #include "UIComponent_Panorama.h"
 #include "Minecraft.h"
 #include "MultiPlayerLevel.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"

 UIComponent_Panorama::UIComponent_Panorama(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -2,11 +2,11 @@
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
 #include "UISplitScreenHelpers.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"

 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/JavaMath.h"

 UIControl::UIControl()
 {
--- a/Minecraft.Client/Common/UI/UIControl_Base.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/JavaMath.h"

 UIControl_Base::UIControl_Base()
 {
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentBook.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TileEntityRenderDispatcher.h"
-#include "..\..\EnchantTableRenderer.h"
-#include "..\..\Lighting.h"
-#include "..\..\BookModel.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../TileEntityRenderDispatcher.h"
+#include "../../EnchantTableRenderer.h"
+#include "../../Lighting.h"
+#include "../../BookModel.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentButton.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIControl_EnchantmentButton::UIControl_EnchantmentButton()
 {
--- a/Minecraft.Client/Common/UI/UIControl_Label.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Label.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_Label.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIControl_Label::UIControl_Label()
 {
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
@@ -1,22 +1,22 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"

-#include "..\..\PlayerRenderer.h"
-#include "..\..\HorseRenderer.h"
+#include "../../PlayerRenderer.h"
+#include "../../HorseRenderer.h"

-#include "..\..\HumanoidModel.h"
-#include "..\..\ModelHorse.h"
+#include "../../HumanoidModel.h"
+#include "../../ModelHorse.h"

-#include "..\..\Lighting.h"
-#include "..\..\ModelPart.h"
-#include "..\..\Options.h"
+#include "../../Lighting.h"
+#include "../../ModelPart.h"
+#include "../../Options.h"

-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-//#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.EntityHorse.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
+//#include "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h"

-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "UI.h"
 #include "UIControl_MinecraftHorse.h"

--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\PlayerRenderer.h"
-#include "..\..\HumanoidModel.h"
-#include "..\..\Lighting.h"
-#include "..\..\ModelPart.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../PlayerRenderer.h"
+#include "../../HumanoidModel.h"
+#include "../../Lighting.h"
+#include "../../ModelPart.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "UI.h"
 #include "UIControl_MinecraftPlayer.h"

--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\PlayerRenderer.h"
-#include "..\..\HumanoidModel.h"
-#include "..\..\Lighting.h"
-#include "..\..\ModelPart.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../PlayerRenderer.h"
+#include "../../HumanoidModel.h"
+#include "../../Lighting.h"
+#include "../../ModelPart.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "UIControl_PlayerSkinPreview.h"

 //#define SKIN_PREVIEW_BOB_ANIM
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
@@ -1,7 +1,7 @@
 #pragma once

 #include "UIControl.h"
-#include "..\..\Textures.h"
+#include "../../Textures.h"

 class ModelPart;
 class EntityRenderer;
--- a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_TextInput.h"
-#include "..\..\Screen.h"
+#include "../../Screen.h"

 UIControl_TextInput::UIControl_TextInput()
 {
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -5,18 +5,18 @@
 #include "UIScene.h"
 #include "UIControl_Slider.h"
 #include "UIControl_TexturePackList.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../LocalPlayer.h"
+#include "../../DLCTexturePack.h"
+#include "../../TexturePackRepository.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../EnderDragonRenderer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
 #include "UISplitScreenHelpers.h"
 #ifdef _WINDOWS64
-#include "..\..\Windows64\KeyboardMouseInput.h"
+#include "../../Windows64/KeyboardMouseInput.h"
 #endif
 #ifdef __PSVITA__
 #include <message_dialog.h>
@@ -28,7 +28,7 @@

 //#define ENABLE_IGGY_EXPLORER
 #ifdef ENABLE_IGGY_EXPLORER
-#include "Windows64\Iggy\include\iggyexpruntime.h"
+#include "Windows64/Iggy/include/iggyexpruntime.h"
 #endif

 //#define ENABLE_IGGY_PERFMON
@@ -38,18 +38,18 @@
 #define PM_ORIGIN_Y 34

 #ifdef __ORBIS__
-#include "Orbis\Iggy\include\iggyperfmon.h"
-#include "Orbis\Iggy\include\iggyperfmon_orbis.h"
+#include "Orbis/Iggy/include/iggyperfmon.h"
+#include "Orbis/Iggy/include/iggyperfmon_orbis.h"
 #elif defined _DURANGO
-#include "Durango\Iggy\include\iggyperfmon.h"
+#include "Durango/Iggy/include/iggyperfmon.h"
 #elif defined __PS3__
-#include "PS3\Iggy\include\iggyperfmon.h"
-#include "PS3\Iggy\include\iggyperfmon_ps3.h"
+#include "PS3/Iggy/include/iggyperfmon.h"
+#include "PS3/Iggy/include/iggyperfmon_ps3.h"
 #elif defined __PSVITA__
-#include "PSVita\Iggy\include\iggyperfmon.h"
-#include "PSVita\Iggy\include\iggyperfmon_psp2.h"
+#include "PSVita/Iggy/include/iggyperfmon.h"
+#include "PSVita/Iggy/include/iggyperfmon_psp2.h"
 #elif defined __WINDOWS64
-#include "Windows64\Iggy\include\iggyperfmon.h"
+#include "Windows64/Iggy/include/iggyperfmon.h"
 #endif

 #endif
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -3,10 +3,10 @@
 #include "UIScene.h"
 #include "UISplitScreenHelpers.h"

-#include "..\..\Lighting.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\ItemRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../../Lighting.h"
+#include "../../LocalPlayer.h"
+#include "../../ItemRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"

 UIScene::UIScene(int iPad, UILayer *parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -3,11 +3,11 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "UISplitScreenHelpers.h"

-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #ifdef _WINDOWS64
-#include "..\..\Windows64\KeyboardMouseInput.h"
+#include "../../Windows64/KeyboardMouseInput.h"
 #endif

 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "UIScene_AnvilMenu.h"

 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
@@ -2,7 +2,7 @@

 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_AnvilMenu.h"
-#include "..\Minecraft.World\MerchantMenu.h"
+#include "../Minecraft.World/MerchantMenu.h"

 class InventoryMenu;

--- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_BeaconMenu.h"

 UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.h"
 #include "UIScene_BrewingStandMenu.h"

 UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #ifdef _WINDOWS64
-#include "..\..\Windows64\Network\WinsockNetLayer.h"
-#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "../../Windows64/Network/WinsockNetLayer.h"
+#include "../../../Minecraft.World/DisconnectPacket.h"

 static int ConnectingProgress_OnRejectedDialogOK(LPVOID, int iPad, const C4JStorage::EMessageResult)
 {
--- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
@@ -2,14 +2,14 @@
 #include "UI.h"
 #include "UIScene_ContainerMenu.h"

-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../Tutorial/TutorialEnum.h"

 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ControlsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"

 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
 #ifdef _WINDOWS64
-#include "..\..\Windows64\Iggy\gdraw\gdraw_d3d11.h"
+#include "../../Windows64/Iggy/gdraw/gdraw_d3d11.h"
 #endif

 #ifdef __PSVITA__
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -1,26 +1,26 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\..\Minecraft.World\IntCache.h"
-#include "..\..\..\Minecraft.World\LevelType.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/BiomeSource.h"
+#include "../../../Minecraft.World/IntCache.h"
+#include "../../../Minecraft.World/LevelType.h"
+#include "../../DLCTexturePack.h"

 #ifdef __PSVITA__
-#include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h"
+#include "PSVita/Network/SQRNetworkManager_AdHoc_Vita.h"
 #endif

 #ifdef  _WINDOWS64

 #include <windows.h>
-#include "Xbox\Resource.h"
+#include "Xbox/Resource.h"
 #endif

 #define GAME_CREATE_ONLINE_TIMER_ID 0
--- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
@@ -2,12 +2,12 @@
 #include "UI.h"
 #include "UIScene_CreativeMenu.h"

-#include "..\Minecraft.World\JavaMath.h"
-#include "..\..\LocalPlayer.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../../LocalPlayer.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"

 #ifdef __PSVITA__
 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0
--- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "UIScene_Credits.h"

 #define CREDIT_ICON -2
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #if defined(__PS3__) || defined(__ORBIS__)
-#include "Common\Network\Sony\SonyCommerce.h"
+#include "Common/Network/Sony/SonyCommerce.h"
 #endif
 #include "UIScene_DLCMainMenu.h"

--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif

 #ifdef __PSVITA__
-#include "PSVita\Network\SonyCommerce_Vita.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
 #endif

 #define PLAYER_ONLINE_TIMER_ID 0
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -2,8 +2,8 @@
 #include "UI.h"
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"

 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -4,8 +4,8 @@
 #include "UI.h"
 #include "UIScene_DebugCreateSchematic.h"
 #include "Minecraft.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"

 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene.h"
-#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
+#include "../../Common/GameRules/ConsoleSchematicFile.h"

 class UIScene_DebugCreateSchematic : public UIScene
 {
--- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
@@ -3,18 +3,18 @@
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugOverlay.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\GameRenderer.h"
-#include "..\..\MultiPlayerLevel.h"
+#include "../../Minecraft.h"
+#include "../../MinecraftServer.h"
+#include "../../GameRenderer.h"
+#include "../../MultiPlayerLevel.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\..\..\Minecraft.World\net.minecraft.commands.common.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.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../../../Minecraft.World/net.minecraft.commands.common.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"

 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
@@ -5,7 +5,7 @@
 #include "UIScene_DebugSetCamera.h"
 #include "Minecraft.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_DispenserMenu.h"

 UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_EULA.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_EnchantingMenu.h"

 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -2,9 +2,9 @@
 #include "UI.h"
 #include "UIScene_EndPoem.h"
 #include "UIBitmapFont.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
-#include "..\..\LocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../LocalPlayer.h"
 #include "UIScene_FireworksMenu.h"

 UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_FullscreenProgress.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ProgressRenderer.h"
+#include "../../Minecraft.h"
+#include "../../ProgressRenderer.h"

 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_FurnaceMenu.h"

 UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -3,12 +3,12 @@
 #include "UIScene_HUD.h"
 #include "UISplitScreenHelpers.h"
 #include "BossMobGuiInfo.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../EnderDragonRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include <ChatScreen.h>

 UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HelpAndOptionsMenu.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"

 UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_HopperMenu.h"

 UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "UIScene_HorseInventoryMenu.h"

 UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HowToPlay.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {
--- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameHostOptionsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"

 UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameInfoMenu.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"

 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGamePlayerOptionsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"

 #define CHECKBOXES_TIMER_ID 0
 #define CHECKBOXES_TIMER_TIME 100
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -2,18 +2,18 @@
 #include "UI.h"
 #include "UIScene_InventoryMenu.h"

-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\Lighting.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../Lighting.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../Tutorial/TutorialEnum.h"

 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
@@ -3,7 +3,7 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_InventoryMenu.h"

-#include "..\..\..\Minecraft.World\MobEffect.h"
+#include "../../../Minecraft.World/MobEffect.h"

 class InventoryMenu;

--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_JoinMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Options.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.h"
+#include "../../Minecraft.h"
+#include "../../TexturePackRepository.h"
+#include "../../Options.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.h"

 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000
--- a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_Keyboard.h"
-#include "..\..\Screen.h"
+#include "../../Screen.h"

 #ifdef _WINDOWS64
 // Global buffer that stores the text entered in the native keyboard scene.
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LeaderboardsMenu.h"
-#include "..\Leaderboards\LeaderboardManager.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Leaderboards/LeaderboardManager.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"

 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
@@ -1,8 +1,8 @@
 #pragma once

 #include "UIScene.h"
-// #include "..\Leaderboards\LeaderboardManager.h"
-#include "..\Leaderboards\LeaderboardInterface.h"
+// #include "../Leaderboards/LeaderboardManager.h"
+#include "../Leaderboards/LeaderboardInterface.h"

 class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener
 {
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LoadMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\User.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Options.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../User.h"
+#include "../../TexturePackRepository.h"
+#include "../../Options.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif
-#include "..\..\DLCTexturePack.h"
+#include "../../DLCTexturePack.h"
 #if defined(__ORBIS__) || defined(__PSVITA__)
 #include <ces.h>
 #endif
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -2,20 +2,20 @@
 #include "UI.h"
 #include "UIScene_LoadOrJoinMenu.h"

-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFile.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\Network\SessionInfo.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
+#include "../../../Minecraft.World/ConsoleSaveFile.h"
+#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h"
+#include "../../ProgressRenderer.h"
+#include "../../MinecraftServer.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../Network/SessionInfo.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
-#include "Common\Network\Sony\SonyRemoteStorage.h"
+#include "Common/Network/Sony/SonyHttp.h"
+#include "Common/Network/Sony/SonyRemoteStorage.h"
 #include "DLCTexturePack.h"
 #endif
 #if defined(__ORBIS__) || defined(__PSVITA__)
@@ -26,8 +26,8 @@
 #endif

 #ifdef _WINDOWS64
-#include "..\..\..\Minecraft.World\NbtIo.h"
-#include "..\..\..\Minecraft.World\compression.h"
+#include "../../../Minecraft.World/NbtIo.h"
+#include "../../../Minecraft.World/compression.h"

 static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
 {
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Mth.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\User.h"
-#include "..\..\MinecraftServer.h"
+#include "../../../Minecraft.World/Mth.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../User.h"
+#include "../../MinecraftServer.h"
 #include "UI.h"
 #include "UIScene_MainMenu.h"
 #ifdef __ORBIS__
--- a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_NewUpdateMessage.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -1,22 +1,22 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_PauseMenu.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../MinecraftServer.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #endif

 #ifdef _DURANGO
-#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h"
+#include "../../Durango/Leaderboards/DurangoStatsDebugger.h"
 #endif

 #ifdef __PSVITA__
-#include "PSVita\Network\SonyCommerce_Vita.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
 #endif

 #if defined __PS3__ || defined __ORBIS__
--- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_QuadrantSignin.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #if defined(__ORBIS__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif

 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SettingsGraphicsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\GameRenderer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../GameRenderer.h"

 namespace
 {
--- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SettingsMenu.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"

 UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SignEntryMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"

 UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #elif defined __PSVITA__
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\..\..\Minecraft.World\Definitions.h"
+#include "../../../Minecraft.World/Definitions.h"
 #include "UIScene.h"
 #include "UIControl_PlayerSkinPreview.h"

--- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_TeleportMenu.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 #include "TeleportCommand.h"

 UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.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.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.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.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "UIScene_TradingMenu.h"

 UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
--- a/Minecraft.Client/Common/UI/UIString.cpp
+++ b/Minecraft.Client/Common/UI/UIString.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"

-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"

 #include "UIString.h"

--- a/Minecraft.Client/Common/UI/UITTFFont.cpp
+++ b/Minecraft.Client/Common/UI/UITTFFont.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\File.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/File.h"
 #include "UITTFFont.h"

 UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharacter)