painful update

Common/UI/IUIScene_AbstractContainerMenu.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "IUIScene_AbstractContainerMenu.h"
 
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.crafting.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.crafting.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
 
 #ifdef __ORBIS__
 #include <pad.h>

Common/UI/IUIScene_AnvilMenu.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "IUIScene_AnvilMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Network/ClientConnection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
 
 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {

Common/UI/IUIScene_AnvilMenu.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.ContainerListener.h"
+#include "../../Minecraft.World/Headers/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

Common/UI/IUIScene_BrewingMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "IUIScene_BrewingMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {

Common/UI/IUIScene_ContainerMenu.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "IUIScene_ContainerMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {

Common/UI/IUIScene_CraftingMenu.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.crafting.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
-#include "../../../Player/LocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.crafting.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]=

Common/UI/IUIScene_CraftingMenu.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "../../../../Minecraft.World/Recipes/Recipy.h"
-#include "../../../../Minecraft.World/Items/Item.h"
+#include "../../Minecraft.World/Recipes/Recipy.h"
+#include "../../Minecraft.World/Items/Item.h"
 
 class LocalPlayer;
 

Common/UI/IUIScene_CreativeMenu.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "IUIScene_CreativeMenu.h"
 
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
 
 // 4J JEV - Images for each tab.
 IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL;

Common/UI/IUIScene_CreativeMenu.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h"
+#include "../../Minecraft.World/Containers/AbstractContainerMenu.h"
 // 4J Stu - This class is for code that is common between XUI and Iggy
 
 class SimpleContainer;

Common/UI/IUIScene_DispenserMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "IUIScene_DispenserMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {

Common/UI/IUIScene_EnchantingMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )

Common/UI/IUIScene_FurnaceMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "IUIScene_FurnaceMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {

Common/UI/IUIScene_InventoryMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "IUIScene_InventoryMenu.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {

Common/UI/IUIScene_PauseMenu.cpp

@@ -1,15 +1,15 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "IUIScene_PauseMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../MinecraftServer.h"
-#include "../../../Level/MultiPlayerLevel.h"
-#include "../../../Rendering/EntityRenderers/ProgressRenderer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Textures/Packs/TexturePack.h"
-#include "../../../Textures/Packs/DLCTexturePack.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
+#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 
 int IUIScene_PauseMenu::ExitGameDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)

Common/UI/IUIScene_StartGame.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../Textures/Packs/TexturePack.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "IUIScene_StartGame.h"
 
 IUIScene_StartGame::IUIScene_StartGame(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)

Common/UI/IUIScene_TradingMenu.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.trading.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Network/ClientConnection.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.trading.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
 IUIScene_TradingMenu::IUIScene_TradingMenu()

Common/UI/IUIScene_TradingMenu.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../../../../Minecraft.World/Containers/MerchantMenu.h"
+#include "../../Minecraft.World/Containers/MerchantMenu.h"
 
 class MerchantRecipe;
 

Common/UI/UIBitmapFont.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
-#include "../../../Textures/BufferedImage.h"
+#include "../../Minecraft.Client/Textures/BufferedImage.h"
 #include "UIFontData.h"
 
 #include <unordered_set>

Common/UI/UIComponent_Chat.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_Chat.h"
-#include "../../../Minecraft.h"
-#include "../../../UI/Gui.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/UI/Gui.h"
 
 UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIComponent_DebugUIConsole.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_DebugUIConsole.h"
 

Common/UI/UIComponent_DebugUIMarketingGuide.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_DebugUIMarketingGuide.h"
 

Common/UI/UIComponent_Logo.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_Logo.h"
 

Common/UI/UIComponent_MenuBackground.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_MenuBackground.h"
 

Common/UI/UIComponent_Panorama.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_Panorama.h"
-#include "../../../Minecraft.h"
-#include "../../../Level/MultiPlayerLevel.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.storage.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.storage.h"
 
 UIComponent_Panorama::UIComponent_Panorama(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIComponent_PressStartToPlay.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIComponent_Tooltips.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_Tooltips.h"
 

Common/UI/UIComponent_TutorialPopup.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
 #include "../Tutorial/Tutorial.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Minecraft.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
 
 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIControl.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Util/JavaMath.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/JavaMath.h"
 
 UIControl::UIControl()
 {

Common/UI/UIControl_Base.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Util/JavaMath.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/JavaMath.h"
 
 UIControl_Base::UIControl_Base()
 {

Common/UI/UIControl_BitmapIcon.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_BitmapIcon.h"
 

Common/UI/UIControl_Button.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Button.h"
 

Common/UI/UIControl_ButtonList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_ButtonList.h"
 

Common/UI/UIControl_CheckBox.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_CheckBox.h"
 

Common/UI/UIControl_Cursor.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Cursor.h"
 

Common/UI/UIControl_DLCList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_DLCList.h"
 

Common/UI/UIControl_DynamicLabel.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_DynamicLabel.h"
 

Common/UI/UIControl_EnchantmentBook.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentBook.h"
-#include "../../../Minecraft.h"
-#include "../../../Rendering/EntityRenderers/TileEntityRenderDispatcher.h"
-#include "../../../Rendering/EntityRenderers/EnchantTableRenderer.h"
-#include "../../../Rendering/Lighting.h"
-#include "../../../Rendering/Models/BookModel.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.h"
+#include "../../Minecraft.Client/Rendering/Lighting.h"
+#include "../../Minecraft.Client/Rendering/Models/BookModel.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 
 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {

Common/UI/UIControl_EnchantmentButton.cpp

@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <iterator>
 #include <sstream>
 #include "UI.h"
 #include "UIControl_EnchantmentButton.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 #include <iterator>
 

Common/UI/UIControl_HTMLLabel.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_HTMLLabel.h"
 

Common/UI/UIControl_Label.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Label.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIControl_Label::UIControl_Label()
 {

Common/UI/UIControl_LeaderboardList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_LeaderboardList.h"
 

Common/UI/UIControl_MinecraftPlayer.cpp

@@ -1,14 +1,14 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Minecraft.h"
-#include "../../../UI/ScreenSizeCalculator.h"
-#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../../Rendering/EntityRenderers/PlayerRenderer.h"
-#include "../../../Rendering/Models/HumanoidModel.h"
-#include "../../../Rendering/Lighting.h"
-#include "../../../Rendering/Models/ModelPart.h"
-#include "../../../GameState/Options.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.h"
+#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
+#include "../../Minecraft.Client/Rendering/Lighting.h"
+#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "UI.h"
 #include "UIControl_MinecraftPlayer.h"
 

Common/UI/UIControl_PlayerList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_PlayerList.h"
 

Common/UI/UIControl_PlayerSkinPreview.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Minecraft.h"
-#include "../../../UI/ScreenSizeCalculator.h"
-#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../../Rendering/EntityRenderers/PlayerRenderer.h"
-#include "../../../Rendering/Models/HumanoidModel.h"
-#include "../../../Rendering/Lighting.h"
-#include "../../../Rendering/Models/ModelPart.h"
-#include "../../../GameState/Options.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.h"
+#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
+#include "../../Minecraft.Client/Rendering/Lighting.h"
+#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
 #include "UIControl_PlayerSkinPreview.h"
 
 //#define SKIN_PREVIEW_BOB_ANIM

Common/UI/UIControl_PlayerSkinPreview.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "UIControl.h"
-#include "../../../Textures/Textures.h"
+#include "../../Minecraft.Client/Textures/Textures.h"
 
 class ModelPart;
 class EntityRenderer;

Common/UI/UIControl_Progress.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Progress.h"
 

Common/UI/UIControl_SaveList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_SaveList.h"
 

Common/UI/UIControl_Slider.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Slider.h"
 

Common/UI/UIControl_SlotList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_SlotList.h"
 

Common/UI/UIControl_SpaceIndicatorBar.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_SpaceIndicatorBar.h"
 

Common/UI/UIControl_TextInput.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_TextInput.h"
 

Common/UI/UIControl_TexturePackList.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_TexturePackList.h"
 

Common/UI/UIControl_Touch.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIControl_Touch.h"
 

Common/UI/UIController.cpp

@@ -1,15 +1,15 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UIController.h"
 #include "UI.h"
 #include "UIScene.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../Player/LocalPlayer.h"
-#include "../../../Textures/Packs/DLCTexturePack.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Minecraft.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h"
-#include "../../../Rendering/EntityRenderers/EnderDragonRenderer.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
+#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
 #ifdef __PSVITA__
 #include <message_dialog.h>
@@ -21,7 +21,7 @@
 
 //#define ENABLE_IGGY_EXPLORER
 #ifdef ENABLE_IGGY_EXPLORER
-#include "../../../Platform/Windows64/Iggy/include/iggyexpruntime.h"
+#include "../../Minecraft.Client/Platform/Windows64/Iggy/include/iggyexpruntime.h"
 #endif
 
 //#define ENABLE_IGGY_PERFMON
@@ -31,18 +31,18 @@
 #define PM_ORIGIN_Y 34
 
 #ifdef __ORBIS__
-#include "../../../Platform/Orbis/Iggy/include/iggyperfmon.h"
-#include "../../../Platform/Orbis/Iggy/include/iggyperfmon_orbis.h"
+#include "../../Minecraft.Client/Platform/Orbis/Iggy/include/iggyperfmon.h"
+#include "../../Minecraft.Client/Platform/Orbis/Iggy/include/iggyperfmon_orbis.h"
 #elif defined _DURANGO
-#include "../../../Platform/Durango/Iggy/include/iggyperfmon.h"
+#include "../../Minecraft.Client/Platform/Durango/Iggy/include/iggyperfmon.h"
 #elif defined __PS3__
-#include "../../../Platform/PS3/Iggy/include/iggyperfmon.h"
-#include "../../../Platform/PS3/Iggy/include/iggyperfmon_ps3.h"
+#include "../../Minecraft.Client/Platform/PS3/Iggy/include/iggyperfmon.h"
+#include "../../Minecraft.Client/Platform/PS3/Iggy/include/iggyperfmon_ps3.h"
 #elif defined __PSVITA__
-#include "../../../Platform/PSVita/Iggy/include/iggyperfmon.h"
-#include "../../../Platform/PSVita/Iggy/include/iggyperfmon_psp2.h"
+#include "../../Minecraft.Client/Platform/PSVita/Iggy/include/iggyperfmon.h"
+#include "../../Minecraft.Client/Platform/PSVita/Iggy/include/iggyperfmon_psp2.h"
 #elif defined __WINDOWS64
-#include "../../../Platform/Windows64/Iggy/include/iggyperfmon.h"
+#include "../../Minecraft.Client/Platform/Windows64/Iggy/include/iggyperfmon.h"
 #endif
 
 #endif

Common/UI/UIFontData.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UIFontData.h"
 
 	/////////////////////////////////////////////////////

Common/UI/UIGroup.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UIGroup.h"
 
 UIGroup::UIGroup(EUIGroup group, int iPad)

Common/UI/UILayer.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UILayer.h"
 #include "UIScene.h"

Common/UI/UIScene.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene.h"
 
-#include "../../../Rendering/Lighting.h"
-#include "../../../Player/LocalPlayer.h"
-#include "../../../Rendering/EntityRenderers/ItemRenderer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.Client/Rendering/Lighting.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 
 UIScene::UIScene(int iPad, UILayer *parentLayer)
 {

Common/UI/UIScene_AbstractContainerMenu.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_AbstractContainerMenu.h"
 
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_AnvilMenu.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "UIScene_AnvilMenu.h"
 
 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)

Common/UI/UIScene_AnvilMenu.h

@@ -2,7 +2,7 @@
 
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_AnvilMenu.h"
-#include "../../../../Minecraft.World/Containers/MerchantMenu.h"
+#include "../../Minecraft.World/Containers/MerchantMenu.h"
 
 class InventoryMenu;
 

Common/UI/UIScene_BrewingStandMenu.cpp

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

Common/UI/UIScene_ConnectingProgress.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.Client/Minecraft.h"
 
 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_ContainerMenu.cpp

@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_ContainerMenu.h"
 
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
-#include "../../../Player/LocalPlayer.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "../Tutorial/Tutorial.h"
 #include "../Tutorial/TutorialMode.h"
 #include "../Tutorial/TutorialEnum.h"

Common/UI/UIScene_ControlsMenu.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_ControlsMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_CraftingMenu.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
 
 #ifdef __PSVITA__

Common/UI/UIScene_CreateWorldMenu.cpp

@@ -1,26 +1,26 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include "../../../MinecraftServer.h"
-#include "../../../Minecraft.h"
-#include "../../../GameState/Options.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Textures/Packs/TexturePack.h"
-#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/WorldGen/Biomes/BiomeSource.h"
-#include "../../../../Minecraft.World/Util/IntCache.h"
-#include "../../../../Minecraft.World/Level/Storage/LevelType.h"
-#include "../../../Textures/Packs/DLCTexturePack.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
+#include "../../Minecraft.World/Level/Storage/LevelSettings.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/WorldGen/Biomes/BiomeSource.h"
+#include "../../Minecraft.World/Util/IntCache.h"
+#include "../../Minecraft.World/Level/Storage/LevelType.h"
+#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
 
 #ifdef __PSVITA__
-#include "../../../Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h"
+#include "../../Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h"
 #endif
 
 #ifdef  _WINDOWS64
 
 #include <windows.h>
-#include "../../../Platform/Xbox/Resource.h"
+#include "../../Minecraft.Client/Platform/Xbox/Resource.h"
 #endif
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0

Common/UI/UIScene_CreativeMenu.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_CreativeMenu.h"
 
-#include "../../../../Minecraft.World/Util/JavaMath.h"
-#include "../../../Player/LocalPlayer.h"
+#include "../../Minecraft.World/Util/JavaMath.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
 #include "../Tutorial/Tutorial.h"
 #include "../Tutorial/TutorialMode.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 
 #ifdef __PSVITA__
 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0

Common/UI/UIScene_Credits.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_Credits.h"
 

Common/UI/UIScene_DLCMainMenu.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #if defined(__PS3__) || defined(__ORBIS__)
 #include "../Network/Sony/SonyCommerce.h"

Common/UI/UIScene_DLCOffersMenu.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 #include "../Network/Sony/SonyHttp.h"
 #endif
 
 #ifdef __PSVITA__
-#include "../../../Platform/PSVita/Network/SonyCommerce_Vita.h"
+#include "../../Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h"
 #endif
 
 #define PLAYER_ONLINE_TIMER_ID 0

Common/UI/UIScene_DeathMenu.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 
 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_DebugCreateSchematic.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugCreateSchematic.h"
-#include "../../../Minecraft.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
 
 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_DebugOptions.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_DebugOptions.h"
 

Common/UI/UIScene_DebugOverlay.cpp

@@ -1,20 +1,20 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugOverlay.h"
-#include "../../../Minecraft.h"
-#include "../../../MinecraftServer.h"
-#include "../../../Rendering/GameRenderer.h"
-#include "../../../Level/MultiPlayerLevel.h"
-#include "../../../Network/ClientConnection.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.storage.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.commands.common.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/Rendering/GameRenderer.h"
+#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.storage.h"
+#include "../../Minecraft.World/Headers/net.minecraft.commands.common.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
 
 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_DebugSetCamera.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugSetCamera.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_DispenserMenu.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "UIScene_DispenserMenu.h"
 
 UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)

Common/UI/UIScene_EULA.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_EULA.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_EnchantingMenu.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "UIScene_EnchantingMenu.h"
 
 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)

Common/UI/UIScene_EndPoem.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_EndPoem.h"
 #include "UIBitmapFont.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_FullscreenProgress.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_FullscreenProgress.h"
-#include "../../../Minecraft.h"
-#include "../../../Rendering/EntityRenderers/ProgressRenderer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
 
 
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)

Common/UI/UIScene_FurnaceMenu.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "UIScene_FurnaceMenu.h"
 
 UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)

Common/UI/UIScene_HUD.cpp

@@ -1,14 +1,14 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_HUD.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h"
-#include "../../../Rendering/EntityRenderers/EnderDragonRenderer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_HelpAndOptionsMenu.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_HelpAndOptionsMenu.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.Client/Minecraft.h"
 
 UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_HowToPlay.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_HowToPlay.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {

Common/UI/UIScene_HowToPlayMenu.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_HowToPlayMenu.h"
 

Common/UI/UIScene_InGameHostOptionsMenu.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameHostOptionsMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Network/ClientConnection.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
 
 UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_InGameInfoMenu.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameInfoMenu.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Network/ClientConnection.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
 
 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {

Common/UI/UIScene_InGamePlayerOptionsMenu.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_InGamePlayerOptionsMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Network/ClientConnection.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
 
 
 #define CHECKBOXES_TIMER_ID 0

Common/UI/UIScene_InGameSaveManagementMenu.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameSaveManagementMenu.h"
 

Common/UI/UIScene_Intro.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_Intro.h"
 

Common/UI/UIScene_InventoryMenu.cpp

@@ -1,16 +1,16 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_InventoryMenu.h"
 
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Minecraft.h"
-#include "../../../GameState/Options.h"
-#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../../Rendering/Lighting.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
+#include "../../Minecraft.Client/Rendering/Lighting.h"
 #include "../Tutorial/Tutorial.h"
 #include "../Tutorial/TutorialMode.h"
 #include "../Tutorial/TutorialEnum.h"

Common/UI/UIScene_InventoryMenu.h

@@ -3,7 +3,7 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_InventoryMenu.h"
 
-#include "../../../../Minecraft.World/Entities/MobEffect.h"
+#include "../../Minecraft.World/Entities/MobEffect.h"
 
 class InventoryMenu;
 

Common/UI/UIScene_JoinMenu.cpp

@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_JoinMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../GameState/Options.h"
-#include "../../../MinecraftServer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000

Common/UI/UIScene_Keyboard.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_Keyboard.h"
 

Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_LaunchMoreOptionsMenu.h"
 

Common/UI/UIScene_LeaderboardsMenu.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_LeaderboardsMenu.h"
 #include "../Leaderboards/LeaderboardManager.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100

Common/UI/UIScene_LoadMenu.cpp

@@ -1,16 +1,16 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_LoadMenu.h"
-#include "../../../Minecraft.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../GameState/Options.h"
-#include "../../../MinecraftServer.h"
-#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/GameState/Options.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.World/Level/Storage/LevelSettings.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 #include "../Network/Sony/SonyHttp.h"
 #endif
-#include "../../../Textures/Packs/DLCTexturePack.h"
+#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
 #if defined(__ORBIS__) || defined(__PSVITA__)
 #include <ces.h>
 #endif

Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -1,18 +1,18 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UI.h"
 #include "UIScene_LoadOrJoinMenu.h"
 
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.storage.h"
-#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFile.h"
-#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h"
-#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileSplit.h"
-#include "../../../Rendering/EntityRenderers/ProgressRenderer.h"
-#include "../../../MinecraftServer.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Textures/Packs/TexturePack.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.storage.h"
+#include "../../Minecraft.World/IO/Files/ConsoleSaveFile.h"
+#include "../../Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h"
+#include "../../Minecraft.World/IO/Files/ConsoleSaveFileSplit.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
 #include "../Network/SessionInfo.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 #include "../Network/Sony/SonyHttp.h"

Common/UI/UIScene_MainMenu.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/Mth.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Util/Random.h"
-#include "../../../Player/User.h"
-#include "../../../MinecraftServer.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/Mth.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/Random.h"
+#include "../../Minecraft.Client/Player/User.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
 #include "UI.h"
 #include "UIScene_MainMenu.h"
 #ifdef __ORBIS__