diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp index 1c86d72e6..2864779a5 100644 --- a/4J.Input/4J_Input.cpp +++ b/4J.Input/4J_Input.cpp @@ -4,7 +4,7 @@ // avoiding a coupling dependency on 4J_Render.h. #include "4J_Input.h" -#include "../Minecraft.Client/Build/Common/App_enums.h" +#include "../Common/App_enums.h" #include #include #include diff --git a/4J.Render/4J_Render.cpp b/4J.Render/4J_Render.cpp index d04509fc6..7a644a42e 100644 --- a/4J.Render/4J_Render.cpp +++ b/4J.Render/4J_Render.cpp @@ -1,3 +1,5 @@ + +// TODO: ADD BETTER COMMENTS. #include "4J_Render.h" #include #include // getenv @@ -42,13 +44,22 @@ static pthread_mutex_t s_sharedCtxMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_t s_mainThread; static bool s_mainThreadSet = false; +// viewport go brr +static void onFramebufferResize(GLFWwindow * /*win*/, int w, int h) +{ + if (w < 1) w = 1; + if (h < 1) h = 1; + s_windowWidth = w; + s_windowHeight = h; + ::glViewport(0, 0, w, h); +} + void C4JRender::Initialise() { if (!glfwInit()) { fprintf(stderr, "[4J_Render] Failed to initialise GLFW\n"); return; } - // todo: make resolution work GLFWmonitor *primaryMonitor = glfwGetPrimaryMonitor(); const GLFWvidmode *mode = primaryMonitor ? glfwGetVideoMode(primaryMonitor) : nullptr; @@ -79,6 +90,9 @@ void C4JRender::Initialise() glfwMakeContextCurrent(s_window); glfwSwapInterval(1); // vsync + // Keep viewport in sync with OS-driven window resizes. + glfwSetFramebufferSizeCallback(s_window, onFramebufferResize); + // init opengl ::glEnable(GL_TEXTURE_2D); ::glEnable(GL_DEPTH_TEST); @@ -318,14 +332,6 @@ void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count, } ::glEnd(); } else { - // Standard (non-compact) vertex: 8 × int32 = 32 bytes per vertex - // Layout: [x(f), y(f), z(f), u(f), v(f), color(RGBA packed), normal, tex2] - // Color byte-order fix for little-endian (x86/x64): - // Console code stores color as int col = (r<<24)|(g<<16)|(b<<8)|a - // In little-endian memory the bytes are: [a, b, g, r] at increasing addresses. - // Read as: col[3]=r, col[2]=g, col[1]=b, col[0]=a. - // Always use glBegin/glEnd — safe for both display-list compilation and immediate mode. - // (glVertexPointer/glDrawArrays inside glNewList record a stale pointer, not the data.) unsigned int *idata = (unsigned int *)dataIn; ::glBegin(mode); for (int i = 0; i < count; i++) { @@ -423,12 +429,6 @@ void C4JRender::TextureBind(int idx) void C4JRender::TextureBindVertex(int idx) { - // No-op on desktop OpenGL. On consoles this binds a lightmap to the vertex shader - // sampler. On desktop GL 2.1 fixed-function there is no vertex texture concept; - // lighting is handled via vertex colors. Binding anything here OVERRIDES GL_TEXTURE0 - // after the call (because the game calls glTexParameteri on whatever is active), - // causing the terrain atlas filter params to be corrupted or the lightmap to appear - // on terrain instead of the atlas. Leave it as a no-op. (void)idx; } @@ -451,13 +451,6 @@ void C4JRender::TextureData(int width, int height, void *data, int level, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); - // For the base level (0), force the texture to be non-mipmapped and pixel-crisp. - // glGenerateMipmap() was previously called here as a "safety net", but on Mesa/Nvidia - // drivers it silently resets GL_TEXTURE_MIN_FILTER to the OpenGL spec default - // (GL_NEAREST_MIPMAP_LINEAR), overriding the GL_NEAREST set before this call. - // Fix: set GL_TEXTURE_MAX_LEVEL=0 (only sample level 0) and re-enforce GL_NEAREST. - // The game manually uploads explicit mip levels 1..N-1 after this call anyway, - // so we don't need glGenerateMipmap() as a completeness safety net. if (level == 0) { ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); diff --git a/Common/Audio/Consoles_SoundEngine.cpp b/Common/Audio/Consoles_SoundEngine.cpp index 052201a9f..54331b3c2 100644 --- a/Common/Audio/Consoles_SoundEngine.cpp +++ b/Common/Audio/Consoles_SoundEngine.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Consoles_SoundEngine.h" diff --git a/Common/Audio/Consoles_SoundEngine.h b/Common/Audio/Consoles_SoundEngine.h index 0c0b0ff96..c98f4e4fd 100644 --- a/Common/Audio/Consoles_SoundEngine.h +++ b/Common/Audio/Consoles_SoundEngine.h @@ -1,28 +1,28 @@ #pragma once -#include "../../../../Minecraft.World/Util/SoundTypes.h" +#include "../../Minecraft.World/Util/SoundTypes.h" #ifdef _XBOX #elif defined (__PS3__) #undef __in #undef __out -#include "../../../Platform/PS3/Miles/include/mss.h" +#include "../../Minecraft.Client/Platform/PS3/Miles/include/mss.h" #elif defined (__PSVITA__) #include "../../PSVITA/Miles/include/mss.h" #elif defined _DURANGO // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT -#include "../../../Platform/Durango/Miles/include/mss.h" +#include "../../Minecraft.Client/Platform/Durango/Miles/include/mss.h" #elif defined _WINDOWS64 #include "../../windows64/Miles/include/mss.h" #elif defined(__linux__) // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones -#include "../../../Platform/Windows64/Miles/include/mss.h" +#include "../../Minecraft.Client/Platform/Windows64/Miles/include/mss.h" #else // PS4 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT2 -#include "../../../Platform/Orbis/Miles/include/mss.h" +#include "../../Minecraft.Client/Platform/Orbis/Miles/include/mss.h" #endif typedef struct diff --git a/Common/Audio/SoundEngine.cpp b/Common/Audio/SoundEngine.cpp index 45ccd8a38..f873a61fd 100644 --- a/Common/Audio/SoundEngine.cpp +++ b/Common/Audio/SoundEngine.cpp @@ -1,13 +1,13 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "SoundEngine.h" #include "../Consoles_App.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Level/LevelData.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Level/LevelData.h" #include "../../Minecraft.World/Util/Mth.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/DLCTexturePack.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #include "../DLC/DLCAudioFile.h" #ifdef __PSVITA__ @@ -15,8 +15,8 @@ #endif #ifdef _WINDOWS64 -#include "../../../Platform/Windows64/Windows64_App.h" -#include "../../../Platform/Windows64/Miles/include/imssapi.h" +#include "../../Minecraft.Client/Platform/Windows64/Windows64_App.h" +#include "../../Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h" #endif #ifdef __ORBIS__ diff --git a/Common/Audio/SoundEngine.h b/Common/Audio/SoundEngine.h index 4f6ea511d..abdf317f4 100644 --- a/Common/Audio/SoundEngine.h +++ b/Common/Audio/SoundEngine.h @@ -2,7 +2,7 @@ class Mob; class Options; using namespace std; -#include "../../../../Minecraft.World/Util/SoundTypes.h" +#include "../../Minecraft.World/Util/SoundTypes.h" enum eMUSICFILES { diff --git a/Common/Audio/SoundNames.cpp b/Common/Audio/SoundNames.cpp index fe1228098..3db0f54ea 100644 --- a/Common/Audio/SoundNames.cpp +++ b/Common/Audio/SoundNames.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Consoles_SoundEngine.h" diff --git a/Common/Colours/ColourTable.cpp b/Common/Colours/ColourTable.cpp index c6a9c4953..15d03647b 100644 --- a/Common/Colours/ColourTable.cpp +++ b/Common/Colours/ColourTable.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "ColourTable.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" unordered_map ColourTable::s_colourNamesMap; diff --git a/Common/ConsoleGameMode.cpp b/Common/ConsoleGameMode.cpp index 48a833358..64d3b8fc8 100644 --- a/Common/ConsoleGameMode.cpp +++ b/Common/ConsoleGameMode.cpp @@ -1,4 +1,4 @@ -#include "../../../Minecraft.World/Build/stdafx.h" +#include "../Minecraft.World/Build/stdafx.h" #include "ConsoleGameMode.h" #include "Tutorial/Tutorial.h" diff --git a/Common/Console_Utils.cpp b/Common/Console_Utils.cpp index e19fc07f2..04d26d90d 100644 --- a/Common/Console_Utils.cpp +++ b/Common/Console_Utils.cpp @@ -1,4 +1,4 @@ -#include "../../../Minecraft.World/Build/stdafx.h" +#include "../Minecraft.World/Build/stdafx.h" #define CDECL diff --git a/Common/Consoles_App.cpp b/Common/Consoles_App.cpp index aeb8b66a4..9a377a92c 100644 --- a/Common/Consoles_App.cpp +++ b/Common/Consoles_App.cpp @@ -1,58 +1,58 @@  -#include "../../../Minecraft.World/Build/stdafx.h" +#include "../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.World/Recipes/Recipy.h" -#include "../../GameState/Options.h" -#include "../../../Minecraft.World/Util/AABB.h" -#include "../../../Minecraft.World/Util/Vec3.h" -#include "../../MinecraftServer.h" -#include "../../Level/MultiPlayerLevel.h" -#include "../../Rendering/GameRenderer.h" -#include "../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../Rendering/LevelRenderer.h" -#include "../../Textures/MobSkinMemTextureProcessor.h" -#include "../../Minecraft.h" -#include "../../Network/ClientConnection.h" -#include "../../Player/MultiPlayerLocalPlayer.h" -#include "../../Player/LocalPlayer.h" -#include "../../../Minecraft.World/Player/Player.h" -#include "../../../Minecraft.World/Containers/Inventory.h" -#include "../../../Minecraft.World/Level/Level.h" -#include "../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" -#include "../../../Minecraft.World/Containers/Container.h" -#include "../../../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" -#include "../../../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" -#include "../../GameState/StatsCounter.h" -#include "../../GameState/GameMode.h" -#include "../../Platform/Xbox/Social/SocialManager.h" +#include "../Minecraft.World/Recipes/Recipy.h" +#include "../Minecraft.Client/GameState/Options.h" +#include "../Minecraft.World/Util/AABB.h" +#include "../Minecraft.World/Util/Vec3.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../Minecraft.Client/Rendering/GameRenderer.h" +#include "../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../Minecraft.Client/Rendering/LevelRenderer.h" +#include "../Minecraft.Client/Textures/MobSkinMemTextureProcessor.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Network/ClientConnection.h" +#include "../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/Player/LocalPlayer.h" +#include "../Minecraft.World/Player/Player.h" +#include "../Minecraft.World/Containers/Inventory.h" +#include "../Minecraft.World/Level/Level.h" +#include "../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" +#include "../Minecraft.World/Containers/Container.h" +#include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" +#include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" +#include "../Minecraft.Client/GameState/StatsCounter.h" +#include "../Minecraft.Client/GameState/GameMode.h" +#include "../Minecraft.Client/Platform/Xbox/Social/SocialManager.h" #include "Tutorial/TutorialMode.h" #if defined _XBOX || defined _WINDOWS64 -#include "../../Platform/Xbox/XML/ATGXmlParser.h" -#include "../../Platform/Xbox/XML/xmlFilesCallback.h" +#include "../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h" +#include "../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h" #endif #include "Minecraft_Macros.h" -#include "../../Network/PlayerList.h" -#include "../../Player/ServerPlayer.h" +#include "../Minecraft.Client/Network/PlayerList.h" +#include "../Minecraft.Client/Player/ServerPlayer.h" #include "GameRules/ConsoleGameRules.h" #include "GameRules/ConsoleSchematicFile.h" -#include "../../../Minecraft.World/IO/Streams/InputOutputStream.h" -#include "../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../Player/User.h" -#include "../../../Minecraft.World/Level/LevelData.h" -#include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" -#include "../../Rendering/EntityRenderers/EntityRenderDispatcher.h" -#include "../../../Minecraft.World/IO/Streams/Compression.h" -#include "../../Textures/Packs/TexturePackRepository.h" -#include "../../Textures/Packs/DLCTexturePack.h" +#include "../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../Minecraft.Client/Player/User.h" +#include "../Minecraft.World/Level/LevelData.h" +#include "../Minecraft.World/Headers/net.minecraft.world.entity.player.h" +#include "../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h" +#include "../Minecraft.World/IO/Streams/Compression.h" +#include "../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #include "DLC/DLCPack.h" -#include "../../Utils/StringTable.h" +#include "../Minecraft.Client/Utils/StringTable.h" #ifndef _XBOX -#include "../../Utils/ArchiveFile.h" +#include "../Minecraft.Client/Utils/ArchiveFile.h" #endif -#include "../../Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #ifdef _XBOX -#include "../../Platform/Xbox/GameConfig/Minecraft.spa.h" -#include "../../Platform/Xbox/Network/NetworkPlayerXbox.h" +#include "../Minecraft.Client/Platform/Xbox/GameConfig/Minecraft.spa.h" +#include "../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" #include "XUI/XUI_TextEntry.h" #include "XUI/XUI_XZP_Icons.h" #include "XUI/XUI_PauseMenu.h" diff --git a/Common/Consoles_App.h b/Common/Consoles_App.h index a0e22d924..1013db920 100644 --- a/Common/Consoles_App.h +++ b/Common/Consoles_App.h @@ -14,17 +14,17 @@ using namespace std; #endif #include "UI/UIStructs.h" -#include "../../../Minecraft.World/Network/Packets/DisconnectPacket.h" +#include "../Minecraft.World/Network/Packets/DisconnectPacket.h" #ifndef __linux__ #include #endif // __linux__ -#include "../../Utils/StringTable.h" +#include "../Minecraft.Client/Utils/StringTable.h" #include "DLC/DLCManager.h" #include "GameRules/ConsoleGameRulesConstants.h" #include "GameRules/GameRuleManager.h" -#include "../../Rendering/Models/SkinBox.h" -#include "../../Utils/ArchiveFile.h" +#include "../Minecraft.Client/Rendering/Models/SkinBox.h" +#include "../Minecraft.Client/Utils/ArchiveFile.h" typedef struct _JoinFromInviteData { diff --git a/Common/DLC/DLCAudioFile.cpp b/Common/DLC/DLCAudioFile.cpp index b18ed92f5..e2e20e6f2 100644 --- a/Common/DLC/DLCAudioFile.cpp +++ b/Common/DLC/DLCAudioFile.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 -#include "../../../Platform/Xbox/XML/ATGXmlParser.h" -#include "../../../Platform/Xbox/XML/xmlFilesCallback.h" +#include "../../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h" +#include "../../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h" #endif DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) diff --git a/Common/DLC/DLCCapeFile.cpp b/Common/DLC/DLCCapeFile.cpp index 0be1e8067..19ca06451 100644 --- a/Common/DLC/DLCCapeFile.cpp +++ b/Common/DLC/DLCCapeFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCCapeFile.h" diff --git a/Common/DLC/DLCColourTableFile.cpp b/Common/DLC/DLCColourTableFile.cpp index 59a75c53a..70b8cc7f5 100644 --- a/Common/DLC/DLCColourTableFile.cpp +++ b/Common/DLC/DLCColourTableFile.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCColourTableFile.h" -#include "../../../Minecraft.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path) { diff --git a/Common/DLC/DLCFile.cpp b/Common/DLC/DLCFile.cpp index fb98db81a..32d312005 100644 --- a/Common/DLC/DLCFile.cpp +++ b/Common/DLC/DLCFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCFile.h" DLCFile::DLCFile(DLCManager::EDLCType type, const wstring &path) diff --git a/Common/DLC/DLCGameRulesFile.cpp b/Common/DLC/DLCGameRulesFile.cpp index dd549f902..e464bd2fa 100644 --- a/Common/DLC/DLCGameRulesFile.cpp +++ b/Common/DLC/DLCGameRulesFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCGameRulesFile.h" diff --git a/Common/DLC/DLCGameRulesHeader.cpp b/Common/DLC/DLCGameRulesHeader.cpp index a8d8509ed..c006a3385 100644 --- a/Common/DLC/DLCGameRulesHeader.cpp +++ b/Common/DLC/DLCGameRulesHeader.cpp @@ -1,10 +1,10 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../../Minecraft.World/IO/Files/File.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/IO/Streams/InputOutputStream.h" #include "DLCManager.h" #include "DLCGameRulesHeader.h" diff --git a/Common/DLC/DLCLocalisationFile.cpp b/Common/DLC/DLCLocalisationFile.cpp index c54475a11..48595a2a9 100644 --- a/Common/DLC/DLCLocalisationFile.cpp +++ b/Common/DLC/DLCLocalisationFile.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCLocalisationFile.h" -#include "../../../Utils/StringTable.h" +#include "../../Minecraft.Client/Utils/StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path) { diff --git a/Common/DLC/DLCManager.cpp b/Common/DLC/DLCManager.cpp index c30eab3ca..9416024fa 100644 --- a/Common/DLC/DLCManager.cpp +++ b/Common/DLC/DLCManager.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "DLCManager.h" #include "DLCPack.h" #include "DLCFile.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Minecraft.h" -#include "../../../Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" #ifdef __linux__ #include diff --git a/Common/DLC/DLCPack.cpp b/Common/DLC/DLCPack.cpp index f2878045b..cc1bda232 100644 --- a/Common/DLC/DLCPack.cpp +++ b/Common/DLC/DLCPack.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCPack.h" #include "DLCSkinFile.h" #include "DLCCapeFile.h" @@ -9,7 +9,7 @@ #include "DLCGameRulesHeader.h" #include "DLCAudioFile.h" #include "DLCColourTableFile.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask) { diff --git a/Common/DLC/DLCSkinFile.cpp b/Common/DLC/DLCSkinFile.cpp index fd366ba37..846016824 100644 --- a/Common/DLC/DLCSkinFile.cpp +++ b/Common/DLC/DLCSkinFile.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCSkinFile.h" -#include "../../../Rendering/Models/ModelPart.h" -#include "../../../Rendering/EntityRenderers/EntityRenderer.h" -#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h" -#include "../../../../Minecraft.World/Player/Player.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Rendering/Models/ModelPart.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h" +#include "../../Minecraft.World/Player/Player.h" +#include "../../Minecraft.World/Util/StringHelpers.h" DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path) { diff --git a/Common/DLC/DLCSkinFile.h b/Common/DLC/DLCSkinFile.h index 0e6d75308..ebe7cda1b 100644 --- a/Common/DLC/DLCSkinFile.h +++ b/Common/DLC/DLCSkinFile.h @@ -1,6 +1,6 @@ #pragma once #include "DLCFile.h" -#include "../../../Rendering/Models/HumanoidModel.h" +#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h" class DLCSkinFile : public DLCFile { diff --git a/Common/DLC/DLCTextureFile.cpp b/Common/DLC/DLCTextureFile.cpp index 2593f3d72..e6d96a751 100644 --- a/Common/DLC/DLCTextureFile.cpp +++ b/Common/DLC/DLCTextureFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCTextureFile.h" diff --git a/Common/DLC/DLCUIDataFile.cpp b/Common/DLC/DLCUIDataFile.cpp index 438338aae..552a1390f 100644 --- a/Common/DLC/DLCUIDataFile.cpp +++ b/Common/DLC/DLCUIDataFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "DLCManager.h" #include "DLCUIDataFile.h" diff --git a/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Common/GameRules/AddEnchantmentRuleDefinition.cpp index 6bb11ff4c..0d31bc149 100644 --- a/Common/GameRules/AddEnchantmentRuleDefinition.cpp +++ b/Common/GameRules/AddEnchantmentRuleDefinition.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h" #include "AddEnchantmentRuleDefinition.h" AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() diff --git a/Common/GameRules/AddItemRuleDefinition.cpp b/Common/GameRules/AddItemRuleDefinition.cpp index d3eb1b0d6..2823daa08 100644 --- a/Common/GameRules/AddItemRuleDefinition.cpp +++ b/Common/GameRules/AddItemRuleDefinition.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.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.entity.player.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.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.entity.player.h" #include "AddItemRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h" diff --git a/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Common/GameRules/ApplySchematicRuleDefinition.cpp index 03fc1b5c8..48c747078 100644 --- a/Common/GameRules/ApplySchematicRuleDefinition.cpp +++ b/Common/GameRules/ApplySchematicRuleDefinition.cpp @@ -1,10 +1,10 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "ApplySchematicRuleDefinition.h" #include "LevelGenerationOptions.h" #include "ConsoleSchematicFile.h" diff --git a/Common/GameRules/BiomeOverride.cpp b/Common/GameRules/BiomeOverride.cpp index ef624bcb8..64273a2e9 100644 --- a/Common/GameRules/BiomeOverride.cpp +++ b/Common/GameRules/BiomeOverride.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "BiomeOverride.h" BiomeOverride::BiomeOverride() diff --git a/Common/GameRules/CollectItemRuleDefinition.cpp b/Common/GameRules/CollectItemRuleDefinition.cpp index 4e118e68e..d58982cac 100644 --- a/Common/GameRules/CollectItemRuleDefinition.cpp +++ b/Common/GameRules/CollectItemRuleDefinition.cpp @@ -1,10 +1,10 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Utils/WstringLookup.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Utils/WstringLookup.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "CollectItemRuleDefinition.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Network/Connection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Network/Connection.h" +#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { diff --git a/Common/GameRules/CompleteAllRuleDefinition.cpp b/Common/GameRules/CompleteAllRuleDefinition.cpp index 477264b36..fda12166a 100644 --- a/Common/GameRules/CompleteAllRuleDefinition.cpp +++ b/Common/GameRules/CompleteAllRuleDefinition.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "CompleteAllRuleDefinition.h" #include "ConsoleGameRules.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Network/Connection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Network/Connection.h" +#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h" void CompleteAllRuleDefinition::getChildren(vector *children) { diff --git a/Common/GameRules/CompoundGameRuleDefinition.cpp b/Common/GameRules/CompoundGameRuleDefinition.cpp index 87eaf27f1..529d1719e 100644 --- a/Common/GameRules/CompoundGameRuleDefinition.cpp +++ b/Common/GameRules/CompoundGameRuleDefinition.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" #include "CompoundGameRuleDefinition.h" #include "ConsoleGameRules.h" diff --git a/Common/GameRules/ConsoleGenerateStructure.cpp b/Common/GameRules/ConsoleGenerateStructure.cpp index 6fdeb397d..55f5f79aa 100644 --- a/Common/GameRules/ConsoleGenerateStructure.cpp +++ b/Common/GameRules/ConsoleGenerateStructure.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "ConsoleGenerateStructure.h" #include "ConsoleGameRules.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.h" ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) { diff --git a/Common/GameRules/ConsoleGenerateStructure.h b/Common/GameRules/ConsoleGenerateStructure.h index f88fcb42b..0ecafec2c 100644 --- a/Common/GameRules/ConsoleGenerateStructure.h +++ b/Common/GameRules/ConsoleGenerateStructure.h @@ -1,6 +1,6 @@ #pragma once #include "GameRuleDefinition.h" -#include "../../../../Minecraft.World/WorldGen/Structures/StructurePiece.h" +#include "../../Minecraft.World/WorldGen/Structures/StructurePiece.h" class Level; class Random; diff --git a/Common/GameRules/ConsoleSchematicFile.cpp b/Common/GameRules/ConsoleSchematicFile.cpp index e9604f97b..6aac59841 100644 --- a/Common/GameRules/ConsoleSchematicFile.cpp +++ b/Common/GameRules/ConsoleSchematicFile.cpp @@ -1,16 +1,16 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../../Minecraft.World/Headers/com.mojang.nbt.h" -#include "../../../../Minecraft.World/Build/System.h" +#include "../../Minecraft.World/Headers/com.mojang.nbt.h" +#include "../../Minecraft.World/Build/System.h" #include "ConsoleSchematicFile.h" -#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" ConsoleSchematicFile::ConsoleSchematicFile() { diff --git a/Common/GameRules/ConsoleSchematicFile.h b/Common/GameRules/ConsoleSchematicFile.h index c91a41cd3..e0f8f7a0b 100644 --- a/Common/GameRules/ConsoleSchematicFile.h +++ b/Common/GameRules/ConsoleSchematicFile.h @@ -4,7 +4,7 @@ using namespace std; #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #define XBOX_SCHEMATIC_CURRENT_VERSION 2 -#include "../../../../Minecraft.World/Util/ArrayWithLength.h" +#include "../../Minecraft.World/Util/ArrayWithLength.h" class Level; class DataOutputStream; diff --git a/Common/GameRules/GameRule.cpp b/Common/GameRules/GameRule.cpp index 8e42aa5eb..141956d04 100644 --- a/Common/GameRules/GameRule.cpp +++ b/Common/GameRules/GameRule.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "ConsoleGameRules.h" GameRule::GameRule(GameRuleDefinition *definition, Connection *connection) diff --git a/Common/GameRules/GameRuleDefinition.cpp b/Common/GameRules/GameRuleDefinition.cpp index bc20a7263..61789a526 100644 --- a/Common/GameRules/GameRuleDefinition.cpp +++ b/Common/GameRules/GameRuleDefinition.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Utils/WstringLookup.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Utils/WstringLookup.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "ConsoleGameRules.h" GameRuleDefinition::GameRuleDefinition() diff --git a/Common/GameRules/GameRuleDefinition.h b/Common/GameRules/GameRuleDefinition.h index fb93248d8..c312d64fd 100644 --- a/Common/GameRules/GameRuleDefinition.h +++ b/Common/GameRules/GameRuleDefinition.h @@ -3,7 +3,7 @@ using namespace std; #include #include -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #include "ConsoleGameRulesConstants.h" #include "GameRulesInstance.h" diff --git a/Common/GameRules/GameRuleManager.cpp b/Common/GameRules/GameRuleManager.cpp index 51364e002..8120c6805 100644 --- a/Common/GameRules/GameRuleManager.cpp +++ b/Common/GameRules/GameRuleManager.cpp @@ -1,14 +1,14 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/IO/Files/File.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" #include "../DLC/DLCPack.h" #include "../DLC/DLCLocalisationFile.h" #include "../DLC/DLCGameRulesFile.h" #include "../DLC/DLCGameRules.h" #include "../DLC/DLCGameRulesHeader.h" -#include "../../../Utils/StringTable.h" +#include "../../Minecraft.Client/Utils/StringTable.h" #include "ConsoleGameRules.h" #include "GameRuleManager.h" diff --git a/Common/GameRules/LevelGenerationOptions.cpp b/Common/GameRules/LevelGenerationOptions.cpp index e84cd292f..c155275b6 100644 --- a/Common/GameRules/LevelGenerationOptions.cpp +++ b/Common/GameRules/LevelGenerationOptions.cpp @@ -1,13 +1,13 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Util/Pos.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" -#include "../../../Utils/StringTable.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/Pos.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h" +#include "../../Minecraft.Client/Utils/StringTable.h" #include "LevelGenerationOptions.h" #include "ConsoleGameRules.h" diff --git a/Common/GameRules/LevelGenerationOptions.h b/Common/GameRules/LevelGenerationOptions.h index b75c2119f..094d2a47a 100644 --- a/Common/GameRules/LevelGenerationOptions.h +++ b/Common/GameRules/LevelGenerationOptions.h @@ -4,7 +4,7 @@ using namespace std; // #pragma message("LevelGenerationOptions.h ") #include "GameRuleDefinition.h" -#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h" +#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h" class ApplySchematicRuleDefinition; class LevelChunk; diff --git a/Common/GameRules/LevelGenerators.cpp b/Common/GameRules/LevelGenerators.cpp index 362383f92..6af893768 100644 --- a/Common/GameRules/LevelGenerators.cpp +++ b/Common/GameRules/LevelGenerators.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "LevelGenerationOptions.h" #include "LevelGenerators.h" diff --git a/Common/GameRules/LevelRules.cpp b/Common/GameRules/LevelRules.cpp index 9520cf996..0d8a19a57 100644 --- a/Common/GameRules/LevelRules.cpp +++ b/Common/GameRules/LevelRules.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "LevelRules.h" diff --git a/Common/GameRules/LevelRuleset.cpp b/Common/GameRules/LevelRuleset.cpp index 555db7a4b..5bec31a12 100644 --- a/Common/GameRules/LevelRuleset.cpp +++ b/Common/GameRules/LevelRuleset.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Utils/StringTable.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Utils/StringTable.h" #include "ConsoleGameRules.h" #include "LevelRuleset.h" diff --git a/Common/GameRules/NamedAreaRuleDefinition.cpp b/Common/GameRules/NamedAreaRuleDefinition.cpp index 1e656af01..fede86e95 100644 --- a/Common/GameRules/NamedAreaRuleDefinition.cpp +++ b/Common/GameRules/NamedAreaRuleDefinition.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "NamedAreaRuleDefinition.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { diff --git a/Common/GameRules/StartFeature.cpp b/Common/GameRules/StartFeature.cpp index da0505a89..de06fca4a 100644 --- a/Common/GameRules/StartFeature.cpp +++ b/Common/GameRules/StartFeature.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "StartFeature.h" StartFeature::StartFeature() diff --git a/Common/GameRules/StartFeature.h b/Common/GameRules/StartFeature.h index 4980ac9ab..9555a610a 100644 --- a/Common/GameRules/StartFeature.h +++ b/Common/GameRules/StartFeature.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h" +#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h" class StartFeature : public GameRuleDefinition { diff --git a/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Common/GameRules/UpdatePlayerRuleDefinition.cpp index 329330abd..7246ae3b3 100644 --- a/Common/GameRules/UpdatePlayerRuleDefinition.cpp +++ b/Common/GameRules/UpdatePlayerRuleDefinition.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UpdatePlayerRuleDefinition.h" #include "ConsoleGameRules.h" -#include "../../../../Minecraft.World/Util/Pos.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.food.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Util/Pos.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.food.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() { diff --git a/Common/GameRules/UseTileRuleDefinition.cpp b/Common/GameRules/UseTileRuleDefinition.cpp index 7817df153..cc80a6311 100644 --- a/Common/GameRules/UseTileRuleDefinition.cpp +++ b/Common/GameRules/UseTileRuleDefinition.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "UseTileRuleDefinition.h" UseTileRuleDefinition::UseTileRuleDefinition() diff --git a/Common/GameRules/UseTileRuleDefinition.h b/Common/GameRules/UseTileRuleDefinition.h index 6b95d47a2..2df22056f 100644 --- a/Common/GameRules/UseTileRuleDefinition.h +++ b/Common/GameRules/UseTileRuleDefinition.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "../../../../Minecraft.World/Util/Pos.h" +#include "../../Minecraft.World/Util/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Common/GameRules/XboxStructureActionGenerateBox.cpp index a748358b7..916ac113a 100644 --- a/Common/GameRules/XboxStructureActionGenerateBox.cpp +++ b/Common/GameRules/XboxStructureActionGenerateBox.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XboxStructureActionGenerateBox.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() { diff --git a/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Common/GameRules/XboxStructureActionPlaceBlock.cpp index b4c9d28b9..9d47ac6a7 100644 --- a/Common/GameRules/XboxStructureActionPlaceBlock.cpp +++ b/Common/GameRules/XboxStructureActionPlaceBlock.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XboxStructureActionPlaceBlock.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() { diff --git a/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Common/GameRules/XboxStructureActionPlaceContainer.cpp index abaaae744..6a70e9e22 100644 --- a/Common/GameRules/XboxStructureActionPlaceContainer.cpp +++ b/Common/GameRules/XboxStructureActionPlaceContainer.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XboxStructureActionPlaceContainer.h" #include "AddItemRuleDefinition.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { diff --git a/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Common/GameRules/XboxStructureActionPlaceSpawner.cpp index d51865f49..6baddbbc2 100644 --- a/Common/GameRules/XboxStructureActionPlaceSpawner.cpp +++ b/Common/GameRules/XboxStructureActionPlaceSpawner.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XboxStructureActionPlaceSpawner.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { diff --git a/Common/Leaderboards/LeaderboardManager.cpp b/Common/Leaderboards/LeaderboardManager.cpp index 753dd3411..7dad9aff1 100644 --- a/Common/Leaderboards/LeaderboardManager.cpp +++ b/Common/Leaderboards/LeaderboardManager.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "LeaderboardManager.h" diff --git a/Common/Network/GameNetworkManager.cpp b/Common/Network/GameNetworkManager.cpp index 1aa62bb41..bf34c7273 100644 --- a/Common/Network/GameNetworkManager.cpp +++ b/Common/Network/GameNetworkManager.cpp @@ -1,30 +1,30 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Network/Socket.h" -#include "../../../../Minecraft.World/Util/ThreadName.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" -#include "../../../Network/ClientConnection.h" -#include "../../../Minecraft.h" -#include "../../../Player/User.h" -#include "../../../MinecraftServer.h" -#include "../../../Network/PlayerList.h" -#include "../../../Player/ServerPlayer.h" -#include "../../../Network/PlayerConnection.h" -#include "../../../Level/MultiPlayerLevel.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Network/Packets/DisconnectPacket.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" -#include "../../../../Minecraft.World/Level/Storage/OldChunkStorage.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Network/Socket.h" +#include "../../Minecraft.World/Util/ThreadName.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/User.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Network/PlayerList.h" +#include "../../Minecraft.Client/Player/ServerPlayer.h" +#include "../../Minecraft.Client/Network/PlayerConnection.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Network/Packets/DisconnectPacket.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.World/Level/Storage/OldChunkStorage.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" -#include "../../../UI/Gui.h" -#include "../../../Rendering/LevelRenderer.h" -#include "../../../../Minecraft.World/Util/IntCache.h" +#include "../../Minecraft.Client/UI/Gui.h" +#include "../../Minecraft.Client/Rendering/LevelRenderer.h" +#include "../../Minecraft.World/Util/IntCache.h" #include "../GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" @@ -33,11 +33,11 @@ #elif !(defined __PSVITA__) #include "../UI/UI.h" #include "../UI/UIScene_PauseMenu.h" -#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.h" +#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" #endif #ifdef _DURANGO -#include "../../../../Minecraft.World/Stats/DurangoStats.h" +#include "../../Minecraft.World/Stats/DurangoStats.h" #endif #define WAIT_TIMEOUT 258 diff --git a/Common/Network/GameNetworkManager.h b/Common/Network/GameNetworkManager.h index 479c2f51f..edeff6ecc 100644 --- a/Common/Network/GameNetworkManager.h +++ b/Common/Network/GameNetworkManager.h @@ -4,21 +4,21 @@ using namespace std; #ifndef __linux__ #include #endif -#include "../../../../Minecraft.World/Util/C4JThread.h" +#include "../../Minecraft.World/Util/C4JThread.h" #include "NetworkPlayerInterface.h" #ifdef _XBOX -#include "../../../Platform/Xbox/Network/PlatformNetworkManagerXbox.h" +#include "../../Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h" #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ #include "Sony/PlatformNetworkManagerSony.h" #elif defined _DURANGO -#include "../../../Platform/Durango/Network/PlatformNetworkManagerDurango.h" +#include "../../Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h" #else #include "PlatformNetworkManagerStub.h" #endif #include "SessionInfo.h" #ifdef __ORBIS__ -#include "../../../Platform/Orbis/Network/PsPlusUpsellWrapper_Orbis.h" +#include "../../Minecraft.Client/Platform/Orbis/Network/PsPlusUpsellWrapper_Orbis.h" #endif class ClientConnection; diff --git a/Common/Network/PlatformNetworkManagerInterface.h b/Common/Network/PlatformNetworkManagerInterface.h index fe7580bb5e..976320973 100644 --- a/Common/Network/PlatformNetworkManagerInterface.h +++ b/Common/Network/PlatformNetworkManagerInterface.h @@ -4,7 +4,7 @@ using namespace std; #ifndef __linux__ #include #endif // __linux__ -#include "../../../../Minecraft.World/Util/C4JThread.h" +#include "../../Minecraft.World/Util/C4JThread.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" diff --git a/Common/Network/PlatformNetworkManagerStub.cpp b/Common/Network/PlatformNetworkManagerStub.cpp index 1fb3d3059..f5d276914 100644 --- a/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Common/Network/PlatformNetworkManagerStub.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Network/Socket.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Network/Socket.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "PlatformNetworkManagerStub.h" -#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.h" // TODO - stub version of this? +#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" // TODO - stub version of this? CPlatformNetworkManagerStub *g_pPlatformNetworkManager; diff --git a/Common/Network/PlatformNetworkManagerStub.h b/Common/Network/PlatformNetworkManagerStub.h index 8a9dc797a..3b4615516 100644 --- a/Common/Network/PlatformNetworkManagerStub.h +++ b/Common/Network/PlatformNetworkManagerStub.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "../../../../Minecraft.World/Util/C4JThread.h" +#include "../../Minecraft.World/Util/C4JThread.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerInterface.h" #include "SessionInfo.h" diff --git a/Common/Network/Sony/NetworkPlayerSony.cpp b/Common/Network/Sony/NetworkPlayerSony.cpp index a09235635..c03c5fa9c 100644 --- a/Common/Network/Sony/NetworkPlayerSony.cpp +++ b/Common/Network/Sony/NetworkPlayerSony.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "NetworkPlayerSony.h" NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer) diff --git a/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Common/Network/Sony/PlatformNetworkManagerSony.cpp index 0a19a99de..35316e166 100644 --- a/Common/Network/Sony/PlatformNetworkManagerSony.cpp +++ b/Common/Network/Sony/PlatformNetworkManagerSony.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../../Minecraft.World/Network/Socket.h" -#include "../../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Network/Socket.h" +#include "../../../Minecraft.World/Util/StringHelpers.h" #include "PlatformNetworkManagerSony.h" #include "NetworkPlayerSony.h" #include "../GameNetworkManager.h" diff --git a/Common/Network/Sony/PlatformNetworkManagerSony.h b/Common/Network/Sony/PlatformNetworkManagerSony.h index 4746296d4..64262f39e 100644 --- a/Common/Network/Sony/PlatformNetworkManagerSony.h +++ b/Common/Network/Sony/PlatformNetworkManagerSony.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "../../../../../Minecraft.World/Util/C4JThread.h" +#include "../../../Minecraft.World/Util/C4JThread.h" #include "../NetworkPlayerInterface.h" #include "../PlatformNetworkManagerInterface.h" #include "../SessionInfo.h" diff --git a/Common/Network/Sony/SQRNetworkManager.cpp b/Common/Network/Sony/SQRNetworkManager.cpp index 3dcb1b54f..367c35191 100644 --- a/Common/Network/Sony/SQRNetworkManager.cpp +++ b/Common/Network/Sony/SQRNetworkManager.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "SQRNetworkManager.h" diff --git a/Common/Network/Sony/SQRNetworkPlayer.cpp b/Common/Network/Sony/SQRNetworkPlayer.cpp index 4b89841d9..172842453 100644 --- a/Common/Network/Sony/SQRNetworkPlayer.cpp +++ b/Common/Network/Sony/SQRNetworkPlayer.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "SQRNetworkPlayer.h" #ifdef __PS3__ diff --git a/Common/Network/Sony/SonyCommerce.cpp b/Common/Network/Sony/SonyCommerce.cpp index fc8340776..0e36ce000 100644 --- a/Common/Network/Sony/SonyCommerce.cpp +++ b/Common/Network/Sony/SonyCommerce.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "SonyCommerce.h" #include "../../../../Platform/PS3/PS3Extras/ShutdownManager.h" diff --git a/Common/Network/Sony/SonyHttp.cpp b/Common/Network/Sony/SonyHttp.cpp index 705be8f5e..dbc295d5b 100644 --- a/Common/Network/Sony/SonyHttp.cpp +++ b/Common/Network/Sony/SonyHttp.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "SonyHttp.h" diff --git a/Common/Network/Sony/SonyRemoteStorage.cpp b/Common/Network/Sony/SonyRemoteStorage.cpp index 12b4d12ba..a4504dab6 100644 --- a/Common/Network/Sony/SonyRemoteStorage.cpp +++ b/Common/Network/Sony/SonyRemoteStorage.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Minecraft.World/Build/stdafx.h" +#include "../../../Minecraft.World/Build/stdafx.h" #include "SonyRemoteStorage.h" diff --git a/Common/Telemetry/TelemetryManager.cpp b/Common/Telemetry/TelemetryManager.cpp index 604238509..2fdb35742 100644 --- a/Common/Telemetry/TelemetryManager.cpp +++ b/Common/Telemetry/TelemetryManager.cpp @@ -1,10 +1,10 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../../Minecraft.World/Level/LevelData.h" -#include "../../../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.World/Level/LevelData.h" +#include "../../Minecraft.World/Level/Level.h" #include "TelemetryManager.h" diff --git a/Common/Telemetry/TelemetryManager.h b/Common/Telemetry/TelemetryManager.h index 5877845e5..8c7cee1c5 100644 --- a/Common/Telemetry/TelemetryManager.h +++ b/Common/Telemetry/TelemetryManager.h @@ -4,9 +4,9 @@ // SentientManager.h -> MinecraftTelemetry.h. Using the Windows64 path would // cause duplicate enum definitions. #if defined(__linux__) -#include "../../../Platform/Orbis/Sentient/TelemetryEnum.h" +#include "../../Minecraft.Client/Platform/Orbis/Sentient/TelemetryEnum.h" #else -#include "../../../Platform/Windows64/Sentient/TelemetryEnum.h" +#include "../../Minecraft.Client/Platform/Windows64/Sentient/TelemetryEnum.h" #endif #include "../UI/UIEnums.h" diff --git a/Common/Trial/TrialMode.cpp b/Common/Trial/TrialMode.cpp index 7887b46a2..cb9ec5232 100644 --- a/Common/Trial/TrialMode.cpp +++ b/Common/Trial/TrialMode.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "TrialMode.h" #include "../Tutorial/FullTutorial.h" diff --git a/Common/Tutorial/AreaConstraint.cpp b/Common/Tutorial/AreaConstraint.cpp index 80d5f3d46..6e28c3b4c 100644 --- a/Common/Tutorial/AreaConstraint.cpp +++ b/Common/Tutorial/AreaConstraint.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" -#include "../../../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/AABB.h" AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ ) : TutorialConstraint( descriptionId ) diff --git a/Common/Tutorial/AreaHint.cpp b/Common/Tutorial/AreaHint.cpp index 344ba44c7..1e192b866 100644 --- a/Common/Tutorial/AreaHint.cpp +++ b/Common/Tutorial/AreaHint.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "AreaHint.h" -#include "../../../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/AABB.h" #include "Tutorial.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/Common/Tutorial/AreaTask.cpp b/Common/Tutorial/AreaTask.cpp index aae2ec281..b0230cc58 100644 --- a/Common/Tutorial/AreaTask.cpp +++ b/Common/Tutorial/AreaTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Tutorial.h" #include "AreaTask.h" diff --git a/Common/Tutorial/ChangeStateConstraint.cpp b/Common/Tutorial/ChangeStateConstraint.cpp index a5b23869c..660610e6e 100644 --- a/Common/Tutorial/ChangeStateConstraint.cpp +++ b/Common/Tutorial/ChangeStateConstraint.cpp @@ -1,13 +1,13 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Tutorial.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" #include "ChangeStateConstraint.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../Network/ClientConnection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" +#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ ) diff --git a/Common/Tutorial/ChoiceTask.cpp b/Common/Tutorial/ChoiceTask.cpp index 1e1cbebe5..5033c5bf6 100644 --- a/Common/Tutorial/ChoiceTask.cpp +++ b/Common/Tutorial/ChoiceTask.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ChoiceTask.h" -#include "../../../../Minecraft.World/Blocks/Material.h" +#include "../../Minecraft.World/Blocks/Material.h" ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/, diff --git a/Common/Tutorial/CompleteUsingItemTask.cpp b/Common/Tutorial/CompleteUsingItemTask.cpp index 2e4d12b1e..9bff5fb49 100644 --- a/Common/Tutorial/CompleteUsingItemTask.cpp +++ b/Common/Tutorial/CompleteUsingItemTask.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #include "CompleteUsingItemTask.h" CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion) diff --git a/Common/Tutorial/ControllerTask.cpp b/Common/Tutorial/ControllerTask.cpp index d6730cdbe..65106434c 100644 --- a/Common/Tutorial/ControllerTask.cpp +++ b/Common/Tutorial/ControllerTask.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ControllerTask.h" diff --git a/Common/Tutorial/CraftTask.cpp b/Common/Tutorial/CraftTask.cpp index ee9292d14..cf21fba71 100644 --- a/Common/Tutorial/CraftTask.cpp +++ b/Common/Tutorial/CraftTask.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "CraftTask.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" CraftTask::CraftTask( int itemId, int auxValue, int quantity, Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector *inConstraints /*= NULL*/, diff --git a/Common/Tutorial/DiggerItemHint.cpp b/Common/Tutorial/DiggerItemHint.cpp index 078c5f4d4..4e8ffec69 100644 --- a/Common/Tutorial/DiggerItemHint.cpp +++ b/Common/Tutorial/DiggerItemHint.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.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.entity.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.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.entity.h" #include "Tutorial.h" #include "DiggerItemHint.h" diff --git a/Common/Tutorial/EffectChangedTask.cpp b/Common/Tutorial/EffectChangedTask.cpp index c15be841f..e3f4a86a7 100644 --- a/Common/Tutorial/EffectChangedTask.cpp +++ b/Common/Tutorial/EffectChangedTask.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h" #include "EffectChangedTask.h" EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply, diff --git a/Common/Tutorial/FullTutorial.cpp b/Common/Tutorial/FullTutorial.cpp index e64e68514..841bb1b71 100644 --- a/Common/Tutorial/FullTutorial.cpp +++ b/Common/Tutorial/FullTutorial.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.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.tile.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h" +#include "../../Minecraft.World/Build/stdafx.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.tile.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h" #include "../GameRules/ConsoleGameRules.h" #include "DiggerItemHint.h" #include "TutorialTasks.h" diff --git a/Common/Tutorial/FullTutorialActiveTask.cpp b/Common/Tutorial/FullTutorialActiveTask.cpp index 04fa3ea8c..3a276e698 100644 --- a/Common/Tutorial/FullTutorialActiveTask.cpp +++ b/Common/Tutorial/FullTutorialActiveTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Tutorial.h" #include "FullTutorialActiveTask.h" diff --git a/Common/Tutorial/FullTutorialMode.cpp b/Common/Tutorial/FullTutorialMode.cpp index 78d133b23..31722afa9 100644 --- a/Common/Tutorial/FullTutorialMode.cpp +++ b/Common/Tutorial/FullTutorialMode.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" diff --git a/Common/Tutorial/InfoTask.cpp b/Common/Tutorial/InfoTask.cpp index 5544a48f6..038325994 100644 --- a/Common/Tutorial/InfoTask.cpp +++ b/Common/Tutorial/InfoTask.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "InfoTask.h" -#include "../../../../Minecraft.World/Blocks/Material.h" +#include "../../Minecraft.World/Blocks/Material.h" InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/) diff --git a/Common/Tutorial/InputConstraint.cpp b/Common/Tutorial/InputConstraint.cpp index 82953022e..af7d7bd63 100644 --- a/Common/Tutorial/InputConstraint.cpp +++ b/Common/Tutorial/InputConstraint.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "InputConstraint.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) diff --git a/Common/Tutorial/LookAtEntityHint.cpp b/Common/Tutorial/LookAtEntityHint.cpp index 5b166584b..4a20cd3fa 100644 --- a/Common/Tutorial/LookAtEntityHint.cpp +++ b/Common/Tutorial/LookAtEntityHint.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Tutorial.h" #include "LookAtEntityHint.h" diff --git a/Common/Tutorial/LookAtEntityHint.h b/Common/Tutorial/LookAtEntityHint.h index 1c4629a89..9fd852440 100644 --- a/Common/Tutorial/LookAtEntityHint.h +++ b/Common/Tutorial/LookAtEntityHint.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "../../../../Minecraft.World/Util/Class.h" +#include "../../Minecraft.World/Util/Class.h" #include "TutorialHint.h" class ItemInstance; diff --git a/Common/Tutorial/LookAtTileHint.cpp b/Common/Tutorial/LookAtTileHint.cpp index c0a88ffe4..706035312 100644 --- a/Common/Tutorial/LookAtTileHint.cpp +++ b/Common/Tutorial/LookAtTileHint.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "Tutorial.h" #include "LookAtTileHint.h" diff --git a/Common/Tutorial/PickupTask.cpp b/Common/Tutorial/PickupTask.cpp index 10268a13a..ee96b910f 100644 --- a/Common/Tutorial/PickupTask.cpp +++ b/Common/Tutorial/PickupTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "PickupTask.h" void PickupTask::onTake(shared_ptr item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux) diff --git a/Common/Tutorial/ProcedureCompoundTask.cpp b/Common/Tutorial/ProcedureCompoundTask.cpp index 88f906dce..b46646937 100644 --- a/Common/Tutorial/ProcedureCompoundTask.cpp +++ b/Common/Tutorial/ProcedureCompoundTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "ProcedureCompoundTask.h" ProcedureCompoundTask::~ProcedureCompoundTask() diff --git a/Common/Tutorial/ProgressFlagTask.cpp b/Common/Tutorial/ProgressFlagTask.cpp index edf71b658..a078c6ac6 100644 --- a/Common/Tutorial/ProgressFlagTask.cpp +++ b/Common/Tutorial/ProgressFlagTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "ProgressFlagTask.h" bool ProgressFlagTask::isCompleted() diff --git a/Common/Tutorial/StatTask.cpp b/Common/Tutorial/StatTask.cpp index 2adde0670..88c243e22 100644 --- a/Common/Tutorial/StatTask.cpp +++ b/Common/Tutorial/StatTask.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../GameState/StatsCounter.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" #include "StatTask.h" StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/) diff --git a/Common/Tutorial/TakeItemHint.cpp b/Common/Tutorial/TakeItemHint.cpp index c39f783a2..e3d6e5dae 100644 --- a/Common/Tutorial/TakeItemHint.cpp +++ b/Common/Tutorial/TakeItemHint.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "Tutorial.h" #include "TakeItemHint.h" diff --git a/Common/Tutorial/Tutorial.cpp b/Common/Tutorial/Tutorial.cpp index 8f9e09935..70e46feb8 100644 --- a/Common/Tutorial/Tutorial.cpp +++ b/Common/Tutorial/Tutorial.cpp @@ -1,17 +1,17 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.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.tile.h" -#include "../../../MinecraftServer.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Level/MultiPlayerLevel.h" -#include "../../../GameState/SurvivalMode.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.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.tile.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/GameState/SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" #include "TutorialTasks.h" diff --git a/Common/Tutorial/TutorialHint.cpp b/Common/Tutorial/TutorialHint.cpp index cd4f98f39..4de2c1df7 100644 --- a/Common/Tutorial/TutorialHint.cpp +++ b/Common/Tutorial/TutorialHint.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" #include "Tutorial.h" #include "TutorialHint.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) : m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ), diff --git a/Common/Tutorial/TutorialMessage.cpp b/Common/Tutorial/TutorialMessage.cpp index 1f0cded55..cbd9b9111 100644 --- a/Common/Tutorial/TutorialMessage.cpp +++ b/Common/Tutorial/TutorialMessage.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "TutorialMessage.h" TutorialMessage::TutorialMessage(int messageId, bool limitRepeats /*= false*/, unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/) diff --git a/Common/Tutorial/TutorialMode.cpp b/Common/Tutorial/TutorialMode.cpp index 26b43de7b..f4e6fa1e1 100644 --- a/Common/Tutorial/TutorialMode.cpp +++ b/Common/Tutorial/TutorialMode.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Level/MultiPlayerLevel.h" -#include "../../../../Minecraft.World/Containers/Inventory.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.tile.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.World/Containers/Inventory.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.tile.h" #include "TutorialMode.h" TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad ) diff --git a/Common/Tutorial/TutorialMode.h b/Common/Tutorial/TutorialMode.h index 1a13252c6..bda5b8958 100644 --- a/Common/Tutorial/TutorialMode.h +++ b/Common/Tutorial/TutorialMode.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "../../../Player/MultiPlayerGameMode.h" +#include "../../Minecraft.Client/Player/MultiPlayerGameMode.h" #include "Tutorial.h" class TutorialMode : public MultiPlayerGameMode diff --git a/Common/Tutorial/TutorialTask.cpp b/Common/Tutorial/TutorialTask.cpp index eba9cdb72..7e614b65b 100644 --- a/Common/Tutorial/TutorialTask.cpp +++ b/Common/Tutorial/TutorialTask.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "TutorialTask.h" diff --git a/Common/Tutorial/UseItemTask.cpp b/Common/Tutorial/UseItemTask.cpp index 2cbb1f18d..8f8a2b305 100644 --- a/Common/Tutorial/UseItemTask.cpp +++ b/Common/Tutorial/UseItemTask.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #include "UseItemTask.h" UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId, diff --git a/Common/Tutorial/UseTileTask.cpp b/Common/Tutorial/UseTileTask.cpp index 191c37e07..7a89620fd 100644 --- a/Common/Tutorial/UseTileTask.cpp +++ b/Common/Tutorial/UseTileTask.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #include "UseTileTask.h" UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId, diff --git a/Common/Tutorial/XuiCraftingTask.cpp b/Common/Tutorial/XuiCraftingTask.cpp index 3b4f5cb54..cd6aebe47 100644 --- a/Common/Tutorial/XuiCraftingTask.cpp +++ b/Common/Tutorial/XuiCraftingTask.cpp @@ -1,5 +1,5 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #if !(defined _XBOX) && !(defined __PSVITA__) #include "../UI/UI.h" #endif diff --git a/Common/Tutorial/XuiCraftingTask.h b/Common/Tutorial/XuiCraftingTask.h index fff91c833..4136c8514 100644 --- a/Common/Tutorial/XuiCraftingTask.h +++ b/Common/Tutorial/XuiCraftingTask.h @@ -1,6 +1,6 @@ #pragma once #include "TutorialTask.h" -#include "../../../../Minecraft.World/Recipes/Recipy.h" +#include "../../Minecraft.World/Recipes/Recipy.h" class XuiCraftingTask : public TutorialTask { diff --git a/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Common/UI/IUIScene_AbstractContainerMenu.cpp index acb96a88e..aa9296e0a 100644 --- a/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/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 diff --git a/Common/UI/IUIScene_AnvilMenu.cpp b/Common/UI/IUIScene_AnvilMenu.cpp index 1f5c43ae7..b9c0d3094 100644 --- a/Common/UI/IUIScene_AnvilMenu.cpp +++ b/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() { diff --git a/Common/UI/IUIScene_AnvilMenu.h b/Common/UI/IUIScene_AnvilMenu.h index e4178d83e..aece26a89 100644 --- a/Common/UI/IUIScene_AnvilMenu.h +++ b/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 diff --git a/Common/UI/IUIScene_BrewingMenu.cpp b/Common/UI/IUIScene_BrewingMenu.cpp index 8ac0f10a5..cbdb33d4c 100644 --- a/Common/UI/IUIScene_BrewingMenu.cpp +++ b/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 ) { diff --git a/Common/UI/IUIScene_ContainerMenu.cpp b/Common/UI/IUIScene_ContainerMenu.cpp index c7b543766..7f2c5e76d 100644 --- a/Common/UI/IUIScene_ContainerMenu.cpp +++ b/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 ) { diff --git a/Common/UI/IUIScene_CraftingMenu.cpp b/Common/UI/IUIScene_CraftingMenu.cpp index d0421ad87..43d92f8fa 100644 --- a/Common/UI/IUIScene_CraftingMenu.cpp +++ b/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]= diff --git a/Common/UI/IUIScene_CraftingMenu.h b/Common/UI/IUIScene_CraftingMenu.h index 98b952752..c33a4d38f 100644 --- a/Common/UI/IUIScene_CraftingMenu.h +++ b/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; diff --git a/Common/UI/IUIScene_CreativeMenu.cpp b/Common/UI/IUIScene_CreativeMenu.cpp index a3fbfe7f5..938784ad7 100644 --- a/Common/UI/IUIScene_CreativeMenu.cpp +++ b/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; diff --git a/Common/UI/IUIScene_CreativeMenu.h b/Common/UI/IUIScene_CreativeMenu.h index c844d9d89..bef521bd7 100644 --- a/Common/UI/IUIScene_CreativeMenu.h +++ b/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; diff --git a/Common/UI/IUIScene_DispenserMenu.cpp b/Common/UI/IUIScene_DispenserMenu.cpp index 6746e0e33..51b326e30 100644 --- a/Common/UI/IUIScene_DispenserMenu.cpp +++ b/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 ) { diff --git a/Common/UI/IUIScene_EnchantingMenu.cpp b/Common/UI/IUIScene_EnchantingMenu.cpp index b50e28548..5dde19eed 100644 --- a/Common/UI/IUIScene_EnchantingMenu.cpp +++ b/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 ) diff --git a/Common/UI/IUIScene_FurnaceMenu.cpp b/Common/UI/IUIScene_FurnaceMenu.cpp index 0e553fb1a..d54373f16 100644 --- a/Common/UI/IUIScene_FurnaceMenu.cpp +++ b/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 ) { diff --git a/Common/UI/IUIScene_InventoryMenu.cpp b/Common/UI/IUIScene_InventoryMenu.cpp index 67eee0a53..dc21cc8d4 100644 --- a/Common/UI/IUIScene_InventoryMenu.cpp +++ b/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 ) { diff --git a/Common/UI/IUIScene_PauseMenu.cpp b/Common/UI/IUIScene_PauseMenu.cpp index ff4c53e45..6a81c4b3d 100644 --- a/Common/UI/IUIScene_PauseMenu.cpp +++ b/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) diff --git a/Common/UI/IUIScene_StartGame.cpp b/Common/UI/IUIScene_StartGame.cpp index d6dfad931..5121c5805 100644 --- a/Common/UI/IUIScene_StartGame.cpp +++ b/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) diff --git a/Common/UI/IUIScene_TradingMenu.cpp b/Common/UI/IUIScene_TradingMenu.cpp index 2e853d212..b338b01da 100644 --- a/Common/UI/IUIScene_TradingMenu.cpp +++ b/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() diff --git a/Common/UI/IUIScene_TradingMenu.h b/Common/UI/IUIScene_TradingMenu.h index 8dfd6aa33..6f9f9a1cf 100644 --- a/Common/UI/IUIScene_TradingMenu.h +++ b/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; diff --git a/Common/UI/UIBitmapFont.cpp b/Common/UI/UIBitmapFont.cpp index 9787342f9..dac59674b 100644 --- a/Common/UI/UIBitmapFont.cpp +++ b/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 diff --git a/Common/UI/UIComponent_Chat.cpp b/Common/UI/UIComponent_Chat.cpp index e3e041e3e..98878e2bd 100644 --- a/Common/UI/UIComponent_Chat.cpp +++ b/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) { diff --git a/Common/UI/UIComponent_DebugUIConsole.cpp b/Common/UI/UIComponent_DebugUIConsole.cpp index 7bdc0fc57..82abc9a88 100644 --- a/Common/UI/UIComponent_DebugUIConsole.cpp +++ b/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" diff --git a/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Common/UI/UIComponent_DebugUIMarketingGuide.cpp index eb9db0be5..e07652b5d 100644 --- a/Common/UI/UIComponent_DebugUIMarketingGuide.cpp +++ b/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" diff --git a/Common/UI/UIComponent_Logo.cpp b/Common/UI/UIComponent_Logo.cpp index 6cbbeee8e..ac932c339 100644 --- a/Common/UI/UIComponent_Logo.cpp +++ b/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" diff --git a/Common/UI/UIComponent_MenuBackground.cpp b/Common/UI/UIComponent_MenuBackground.cpp index cf7ba0d99..3b1dd2b6d 100644 --- a/Common/UI/UIComponent_MenuBackground.cpp +++ b/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" diff --git a/Common/UI/UIComponent_Panorama.cpp b/Common/UI/UIComponent_Panorama.cpp index 41565139a..72c658018 100644 --- a/Common/UI/UIComponent_Panorama.cpp +++ b/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) { diff --git a/Common/UI/UIComponent_PressStartToPlay.cpp b/Common/UI/UIComponent_PressStartToPlay.cpp index b712e8f7e..f5e9c5ab0 100644 --- a/Common/UI/UIComponent_PressStartToPlay.cpp +++ b/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) { diff --git a/Common/UI/UIComponent_Tooltips.cpp b/Common/UI/UIComponent_Tooltips.cpp index bb3db8e7b..82b853b6e 100644 --- a/Common/UI/UIComponent_Tooltips.cpp +++ b/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" diff --git a/Common/UI/UIComponent_TutorialPopup.cpp b/Common/UI/UIComponent_TutorialPopup.cpp index a6f6bb8d4..b2d9814a6 100644 --- a/Common/UI/UIComponent_TutorialPopup.cpp +++ b/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) { diff --git a/Common/UI/UIControl.cpp b/Common/UI/UIControl.cpp index 0fb3608c6..240b1b413 100644 --- a/Common/UI/UIControl.cpp +++ b/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() { diff --git a/Common/UI/UIControl_Base.cpp b/Common/UI/UIControl_Base.cpp index d04592776..35077000e 100644 --- a/Common/UI/UIControl_Base.cpp +++ b/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() { diff --git a/Common/UI/UIControl_BitmapIcon.cpp b/Common/UI/UIControl_BitmapIcon.cpp index c2c56bf9c..90b5f0ff0 100644 --- a/Common/UI/UIControl_BitmapIcon.cpp +++ b/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" diff --git a/Common/UI/UIControl_Button.cpp b/Common/UI/UIControl_Button.cpp index ec4efde8d..3adecae16 100644 --- a/Common/UI/UIControl_Button.cpp +++ b/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" diff --git a/Common/UI/UIControl_ButtonList.cpp b/Common/UI/UIControl_ButtonList.cpp index 7e3bcd78a..df23758cb 100644 --- a/Common/UI/UIControl_ButtonList.cpp +++ b/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" diff --git a/Common/UI/UIControl_CheckBox.cpp b/Common/UI/UIControl_CheckBox.cpp index 23490d2ce..e2e0468cc 100644 --- a/Common/UI/UIControl_CheckBox.cpp +++ b/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" diff --git a/Common/UI/UIControl_Cursor.cpp b/Common/UI/UIControl_Cursor.cpp index b824fd4b9..6c660622a 100644 --- a/Common/UI/UIControl_Cursor.cpp +++ b/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" diff --git a/Common/UI/UIControl_DLCList.cpp b/Common/UI/UIControl_DLCList.cpp index 374197c09..ff5f95c5a 100644 --- a/Common/UI/UIControl_DLCList.cpp +++ b/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" diff --git a/Common/UI/UIControl_DynamicLabel.cpp b/Common/UI/UIControl_DynamicLabel.cpp index 93806f929..0b1e60110 100644 --- a/Common/UI/UIControl_DynamicLabel.cpp +++ b/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" diff --git a/Common/UI/UIControl_EnchantmentBook.cpp b/Common/UI/UIControl_EnchantmentBook.cpp index 89cbd8b48..b19e08c52 100644 --- a/Common/UI/UIControl_EnchantmentBook.cpp +++ b/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() { diff --git a/Common/UI/UIControl_EnchantmentButton.cpp b/Common/UI/UIControl_EnchantmentButton.cpp index 955d0d718..11cc27c97 100644 --- a/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Common/UI/UIControl_EnchantmentButton.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #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 diff --git a/Common/UI/UIControl_HTMLLabel.cpp b/Common/UI/UIControl_HTMLLabel.cpp index 78081462b..503483bff 100644 --- a/Common/UI/UIControl_HTMLLabel.cpp +++ b/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" diff --git a/Common/UI/UIControl_Label.cpp b/Common/UI/UIControl_Label.cpp index ad620ba8c..33ba6a629 100644 --- a/Common/UI/UIControl_Label.cpp +++ b/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() { diff --git a/Common/UI/UIControl_LeaderboardList.cpp b/Common/UI/UIControl_LeaderboardList.cpp index e404a8b07..aa593ec06 100644 --- a/Common/UI/UIControl_LeaderboardList.cpp +++ b/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" diff --git a/Common/UI/UIControl_MinecraftPlayer.cpp b/Common/UI/UIControl_MinecraftPlayer.cpp index 8e60bd1d8..8d692730c 100644 --- a/Common/UI/UIControl_MinecraftPlayer.cpp +++ b/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" diff --git a/Common/UI/UIControl_PlayerList.cpp b/Common/UI/UIControl_PlayerList.cpp index c12311557..d1baff9de 100644 --- a/Common/UI/UIControl_PlayerList.cpp +++ b/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" diff --git a/Common/UI/UIControl_PlayerSkinPreview.cpp b/Common/UI/UIControl_PlayerSkinPreview.cpp index 5aa953738..d1e3d4b2a 100644 --- a/Common/UI/UIControl_PlayerSkinPreview.cpp +++ b/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 diff --git a/Common/UI/UIControl_PlayerSkinPreview.h b/Common/UI/UIControl_PlayerSkinPreview.h index 18ab3cecf..e58615081 100644 --- a/Common/UI/UIControl_PlayerSkinPreview.h +++ b/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; diff --git a/Common/UI/UIControl_Progress.cpp b/Common/UI/UIControl_Progress.cpp index 6d55c637b..d7435ef78 100644 --- a/Common/UI/UIControl_Progress.cpp +++ b/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" diff --git a/Common/UI/UIControl_SaveList.cpp b/Common/UI/UIControl_SaveList.cpp index 70464fd63..a40308042 100644 --- a/Common/UI/UIControl_SaveList.cpp +++ b/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" diff --git a/Common/UI/UIControl_Slider.cpp b/Common/UI/UIControl_Slider.cpp index bff6a5b7e..402cdc002 100644 --- a/Common/UI/UIControl_Slider.cpp +++ b/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" diff --git a/Common/UI/UIControl_SlotList.cpp b/Common/UI/UIControl_SlotList.cpp index f3cab73a2..d3b180a23 100644 --- a/Common/UI/UIControl_SlotList.cpp +++ b/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" diff --git a/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Common/UI/UIControl_SpaceIndicatorBar.cpp index fdfc7ff4a..588c7ca10 100644 --- a/Common/UI/UIControl_SpaceIndicatorBar.cpp +++ b/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" diff --git a/Common/UI/UIControl_TextInput.cpp b/Common/UI/UIControl_TextInput.cpp index 619872864..ff0710dac 100644 --- a/Common/UI/UIControl_TextInput.cpp +++ b/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" diff --git a/Common/UI/UIControl_TexturePackList.cpp b/Common/UI/UIControl_TexturePackList.cpp index 95e776973..4380e7196 100644 --- a/Common/UI/UIControl_TexturePackList.cpp +++ b/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" diff --git a/Common/UI/UIControl_Touch.cpp b/Common/UI/UIControl_Touch.cpp index 3abdea101..53af0975d 100644 --- a/Common/UI/UIControl_Touch.cpp +++ b/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" diff --git a/Common/UI/UIController.cpp b/Common/UI/UIController.cpp index f5ed2c407..142b3c3ad 100644 --- a/Common/UI/UIController.cpp +++ b/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 @@ -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 diff --git a/Common/UI/UIFontData.cpp b/Common/UI/UIFontData.cpp index c68e84974..36b5dccb6 100644 --- a/Common/UI/UIFontData.cpp +++ b/Common/UI/UIFontData.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UIFontData.h" ///////////////////////////////////////////////////// diff --git a/Common/UI/UIGroup.cpp b/Common/UI/UIGroup.cpp index 8ad91bcfd..dcc2307c2 100644 --- a/Common/UI/UIGroup.cpp +++ b/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) diff --git a/Common/UI/UILayer.cpp b/Common/UI/UILayer.cpp index 8bbbae10e..bac7077ec 100644 --- a/Common/UI/UILayer.cpp +++ b/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" diff --git a/Common/UI/UIScene.cpp b/Common/UI/UIScene.cpp index d8af0cf37..2cfde5ddc 100644 --- a/Common/UI/UIScene.cpp +++ b/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) { diff --git a/Common/UI/UIScene_AbstractContainerMenu.cpp b/Common/UI/UIScene_AbstractContainerMenu.cpp index fb7c0c28a..b47f4402f 100644 --- a/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_AnvilMenu.cpp b/Common/UI/UIScene_AnvilMenu.cpp index 99df06ac3..19a1705f8 100644 --- a/Common/UI/UIScene_AnvilMenu.cpp +++ b/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) diff --git a/Common/UI/UIScene_AnvilMenu.h b/Common/UI/UIScene_AnvilMenu.h index de262d9e4..18f471495 100644 --- a/Common/UI/UIScene_AnvilMenu.h +++ b/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; diff --git a/Common/UI/UIScene_BrewingStandMenu.cpp b/Common/UI/UIScene_BrewingStandMenu.cpp index 59eb68494..284886901 100644 --- a/Common/UI/UIScene_BrewingStandMenu.cpp +++ b/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) diff --git a/Common/UI/UIScene_ConnectingProgress.cpp b/Common/UI/UIScene_ConnectingProgress.cpp index e9d1acbba..38c72f5ce 100644 --- a/Common/UI/UIScene_ConnectingProgress.cpp +++ b/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) { diff --git a/Common/UI/UIScene_ContainerMenu.cpp b/Common/UI/UIScene_ContainerMenu.cpp index a2828a4fe..c995ed97d 100644 --- a/Common/UI/UIScene_ContainerMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_ControlsMenu.cpp b/Common/UI/UIScene_ControlsMenu.cpp index de9d6f18c..c3a22e508 100644 --- a/Common/UI/UIScene_ControlsMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_CraftingMenu.cpp b/Common/UI/UIScene_CraftingMenu.cpp index def563d84..6d7a51e0d 100644 --- a/Common/UI/UIScene_CraftingMenu.cpp +++ b/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__ diff --git a/Common/UI/UIScene_CreateWorldMenu.cpp b/Common/UI/UIScene_CreateWorldMenu.cpp index bb44c9b02..4b98fb059 100644 --- a/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/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 -#include "../../../Platform/Xbox/Resource.h" +#include "../../Minecraft.Client/Platform/Xbox/Resource.h" #endif #define GAME_CREATE_ONLINE_TIMER_ID 0 diff --git a/Common/UI/UIScene_CreativeMenu.cpp b/Common/UI/UIScene_CreativeMenu.cpp index ac941d43f..5dd886eb2 100644 --- a/Common/UI/UIScene_CreativeMenu.cpp +++ b/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 diff --git a/Common/UI/UIScene_Credits.cpp b/Common/UI/UIScene_Credits.cpp index 3bdb02e15..d62e27505 100644 --- a/Common/UI/UIScene_Credits.cpp +++ b/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" diff --git a/Common/UI/UIScene_DLCMainMenu.cpp b/Common/UI/UIScene_DLCMainMenu.cpp index 52e705d40..b4f4d3cc5 100644 --- a/Common/UI/UIScene_DLCMainMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_DLCOffersMenu.cpp b/Common/UI/UIScene_DLCOffersMenu.cpp index 4622c8720..fdcb64c0f 100644 --- a/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/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 diff --git a/Common/UI/UIScene_DeathMenu.cpp b/Common/UI/UIScene_DeathMenu.cpp index cfecabfdd..72abfa35a 100644 --- a/Common/UI/UIScene_DeathMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_DebugCreateSchematic.cpp b/Common/UI/UIScene_DebugCreateSchematic.cpp index 32ea3d0ea..9c4b94588 100644 --- a/Common/UI/UIScene_DebugCreateSchematic.cpp +++ b/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) { diff --git a/Common/UI/UIScene_DebugOptions.cpp b/Common/UI/UIScene_DebugOptions.cpp index 649a67f28..d9667fa92 100644 --- a/Common/UI/UIScene_DebugOptions.cpp +++ b/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" diff --git a/Common/UI/UIScene_DebugOverlay.cpp b/Common/UI/UIScene_DebugOverlay.cpp index c285a73d6..d9dc7df48 100644 --- a/Common/UI/UIScene_DebugOverlay.cpp +++ b/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) { diff --git a/Common/UI/UIScene_DebugSetCamera.cpp b/Common/UI/UIScene_DebugSetCamera.cpp index b638e9a97..86eeed497 100644 --- a/Common/UI/UIScene_DebugSetCamera.cpp +++ b/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) { diff --git a/Common/UI/UIScene_DispenserMenu.cpp b/Common/UI/UIScene_DispenserMenu.cpp index 8e5899f5e..fc4a77b36 100644 --- a/Common/UI/UIScene_DispenserMenu.cpp +++ b/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) diff --git a/Common/UI/UIScene_EULA.cpp b/Common/UI/UIScene_EULA.cpp index 735eb3f6c..18e80fbe7 100644 --- a/Common/UI/UIScene_EULA.cpp +++ b/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) { diff --git a/Common/UI/UIScene_EnchantingMenu.cpp b/Common/UI/UIScene_EnchantingMenu.cpp index 5a3016dea..bd8cc8730 100644 --- a/Common/UI/UIScene_EnchantingMenu.cpp +++ b/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) diff --git a/Common/UI/UIScene_EndPoem.cpp b/Common/UI/UIScene_EndPoem.cpp index 967623160..b0f87c106 100644 --- a/Common/UI/UIScene_EndPoem.cpp +++ b/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) { diff --git a/Common/UI/UIScene_FullscreenProgress.cpp b/Common/UI/UIScene_FullscreenProgress.cpp index 07e728355..32030e2f0 100644 --- a/Common/UI/UIScene_FullscreenProgress.cpp +++ b/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) diff --git a/Common/UI/UIScene_FurnaceMenu.cpp b/Common/UI/UIScene_FurnaceMenu.cpp index 92fec78b6..2ec2facb1 100644 --- a/Common/UI/UIScene_FurnaceMenu.cpp +++ b/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) diff --git a/Common/UI/UIScene_HUD.cpp b/Common/UI/UIScene_HUD.cpp index aed555e1c..bcf0568e7 100644 --- a/Common/UI/UIScene_HUD.cpp +++ b/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) { diff --git a/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Common/UI/UIScene_HelpAndOptionsMenu.cpp index 14a1a7fb1..20430a4a2 100644 --- a/Common/UI/UIScene_HelpAndOptionsMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_HowToPlay.cpp b/Common/UI/UIScene_HowToPlay.cpp index 55a990bfa..72c746286 100644 --- a/Common/UI/UIScene_HowToPlay.cpp +++ b/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 ] = { diff --git a/Common/UI/UIScene_HowToPlayMenu.cpp b/Common/UI/UIScene_HowToPlayMenu.cpp index b1925931f..9548da0b8 100644 --- a/Common/UI/UIScene_HowToPlayMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Common/UI/UIScene_InGameHostOptionsMenu.cpp index b692c7544..e8260d4f4 100644 --- a/Common/UI/UIScene_InGameHostOptionsMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_InGameInfoMenu.cpp b/Common/UI/UIScene_InGameInfoMenu.cpp index a51ee4e32..adba1de48 100644 --- a/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/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) { diff --git a/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp index a3805f13f..03ce04f9d 100644 --- a/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp +++ b/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 diff --git a/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Common/UI/UIScene_InGameSaveManagementMenu.cpp index e6d544918..5bec6ce1d 100644 --- a/Common/UI/UIScene_InGameSaveManagementMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_Intro.cpp b/Common/UI/UIScene_Intro.cpp index 25b57cc40..44d363151 100644 --- a/Common/UI/UIScene_Intro.cpp +++ b/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" diff --git a/Common/UI/UIScene_InventoryMenu.cpp b/Common/UI/UIScene_InventoryMenu.cpp index 35f0d7480..9080fb596 100644 --- a/Common/UI/UIScene_InventoryMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_InventoryMenu.h b/Common/UI/UIScene_InventoryMenu.h index 40ec78429..0549b2ae6 100644 --- a/Common/UI/UIScene_InventoryMenu.h +++ b/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; diff --git a/Common/UI/UIScene_JoinMenu.cpp b/Common/UI/UIScene_JoinMenu.cpp index 66604e90c..90341d583 100644 --- a/Common/UI/UIScene_JoinMenu.cpp +++ b/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 diff --git a/Common/UI/UIScene_Keyboard.cpp b/Common/UI/UIScene_Keyboard.cpp index 530f7b754..5e5b2f090 100644 --- a/Common/UI/UIScene_Keyboard.cpp +++ b/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" diff --git a/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp index 0852d0ba4..2c186adeb 100644 --- a/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_LeaderboardsMenu.cpp b/Common/UI/UIScene_LeaderboardsMenu.cpp index 327b7838a..7a45dd360 100644 --- a/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/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 diff --git a/Common/UI/UIScene_LoadMenu.cpp b/Common/UI/UIScene_LoadMenu.cpp index 398709c0d..cda3139a1 100644 --- a/Common/UI/UIScene_LoadMenu.cpp +++ b/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 #endif diff --git a/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Common/UI/UIScene_LoadOrJoinMenu.cpp index 2bbf7566a..59b1d007e 100644 --- a/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/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" diff --git a/Common/UI/UIScene_MainMenu.cpp b/Common/UI/UIScene_MainMenu.cpp index dfd485a4b..768dfd381 100644 --- a/Common/UI/UIScene_MainMenu.cpp +++ b/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__ diff --git a/Common/UI/UIScene_MessageBox.cpp b/Common/UI/UIScene_MessageBox.cpp index b0f8c6415..05e5b6d11 100644 --- a/Common/UI/UIScene_MessageBox.cpp +++ b/Common/UI/UIScene_MessageBox.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_MessageBox.h" diff --git a/Common/UI/UIScene_PauseMenu.cpp b/Common/UI/UIScene_PauseMenu.cpp index 82fdb60ab..271bcf2b3 100644 --- a/Common/UI/UIScene_PauseMenu.cpp +++ b/Common/UI/UIScene_PauseMenu.cpp @@ -1,22 +1,22 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_PauseMenu.h" -#include "../../../MinecraftServer.h" -#include "../../../Player/MultiPlayerLocalPlayer.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/MinecraftServer.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.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" #ifdef __ORBIS__ #include #endif #ifdef _DURANGO -#include "../../../Platform/Durango/Leaderboards/DurangoStatsDebugger.h" +#include "../../Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.h" #endif #ifdef __PSVITA__ -#include "../../../Platform/PSVita/Network/SonyCommerce_Vita.h" +#include "../../Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h" #endif #if defined __PS3__ || defined __ORBIS__ diff --git a/Common/UI/UIScene_QuadrantSignin.cpp b/Common/UI/UIScene_QuadrantSignin.cpp index 0c822b3d6..a4817e218 100644 --- a/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Common/UI/UIScene_QuadrantSignin.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_QuadrantSignin.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #if defined(__ORBIS__) #include "../Network/Sony/SonyHttp.h" #endif diff --git a/Common/UI/UIScene_ReinstallMenu.cpp b/Common/UI/UIScene_ReinstallMenu.cpp index fb7a1a5b4..5fe0d9fe1 100644 --- a/Common/UI/UIScene_ReinstallMenu.cpp +++ b/Common/UI/UIScene_ReinstallMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_ReinstallMenu.h" diff --git a/Common/UI/UIScene_SaveMessage.cpp b/Common/UI/UIScene_SaveMessage.cpp index 4a59279c8..eddb1a021 100644 --- a/Common/UI/UIScene_SaveMessage.cpp +++ b/Common/UI/UIScene_SaveMessage.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SaveMessage.h" diff --git a/Common/UI/UIScene_SettingsAudioMenu.cpp b/Common/UI/UIScene_SettingsAudioMenu.cpp index e6733eedd..1e66c195b 100644 --- a/Common/UI/UIScene_SettingsAudioMenu.cpp +++ b/Common/UI/UIScene_SettingsAudioMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsAudioMenu.h" diff --git a/Common/UI/UIScene_SettingsControlMenu.cpp b/Common/UI/UIScene_SettingsControlMenu.cpp index 3d6d00f74..dffb78398 100644 --- a/Common/UI/UIScene_SettingsControlMenu.cpp +++ b/Common/UI/UIScene_SettingsControlMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsControlMenu.h" diff --git a/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Common/UI/UIScene_SettingsGraphicsMenu.cpp index 16bc39ccd..7b8b56b8c 100644 --- a/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsGraphicsMenu.h" diff --git a/Common/UI/UIScene_SettingsMenu.cpp b/Common/UI/UIScene_SettingsMenu.cpp index 5f5b1651d..92834fa30 100644 --- a/Common/UI/UIScene_SettingsMenu.cpp +++ b/Common/UI/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsMenu.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Common/UI/UIScene_SettingsOptionsMenu.cpp b/Common/UI/UIScene_SettingsOptionsMenu.cpp index 0021d1341..6fefc60b9 100644 --- a/Common/UI/UIScene_SettingsOptionsMenu.cpp +++ b/Common/UI/UIScene_SettingsOptionsMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsOptionsMenu.h" diff --git a/Common/UI/UIScene_SettingsUIMenu.cpp b/Common/UI/UIScene_SettingsUIMenu.cpp index 4f37bb184..cf6485457 100644 --- a/Common/UI/UIScene_SettingsUIMenu.cpp +++ b/Common/UI/UIScene_SettingsUIMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SettingsUIMenu.h" diff --git a/Common/UI/UIScene_SignEntryMenu.cpp b/Common/UI/UIScene_SignEntryMenu.cpp index e31f4064e..09bc4c86e 100644 --- a/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Common/UI/UIScene_SignEntryMenu.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SignEntryMenu.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Level/MultiPlayerLevel.h" -#include "../../../Network/ClientConnection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Common/UI/UIScene_SkinSelectMenu.cpp b/Common/UI/UIScene_SkinSelectMenu.cpp index faf32fc3d..6dffcc13d 100644 --- a/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_SkinSelectMenu.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #ifdef __ORBIS__ #include #elif defined __PSVITA__ diff --git a/Common/UI/UIScene_SkinSelectMenu.h b/Common/UI/UIScene_SkinSelectMenu.h index 7a69b02b4..3704a54a4 100644 --- a/Common/UI/UIScene_SkinSelectMenu.h +++ b/Common/UI/UIScene_SkinSelectMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../../Minecraft.World/Util/Definitions.h" +#include "../../Minecraft.World/Util/Definitions.h" #include "UIScene.h" #include "UIControl_PlayerSkinPreview.h" diff --git a/Common/UI/UIScene_TeleportMenu.cpp b/Common/UI/UIScene_TeleportMenu.cpp index 2f4ecb409..d48be8d1d 100644 --- a/Common/UI/UIScene_TeleportMenu.cpp +++ b/Common/UI/UIScene_TeleportMenu.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_TeleportMenu.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Network/ClientConnection.h" -#include "../../../Commands/TeleportCommand.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" +#include "../../Minecraft.Client/Commands/TeleportCommand.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Common/UI/UIScene_Timer.cpp b/Common/UI/UIScene_Timer.cpp index ffbdf0200..9ad58e1f3 100644 --- a/Common/UI/UIScene_Timer.cpp +++ b/Common/UI/UIScene_Timer.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_Timer.h" diff --git a/Common/UI/UIScene_TradingMenu.cpp b/Common/UI/UIScene_TradingMenu.cpp index d2624d35c..5227ca7b6 100644 --- a/Common/UI/UIScene_TradingMenu.cpp +++ b/Common/UI/UIScene_TradingMenu.cpp @@ -1,10 +1,10 @@ -#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.trading.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.trading.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_TradingMenu.h" UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Common/UI/UIScene_TrialExitUpsell.cpp b/Common/UI/UIScene_TrialExitUpsell.cpp index 3894bc0f8..971832763 100644 --- a/Common/UI/UIScene_TrialExitUpsell.cpp +++ b/Common/UI/UIScene_TrialExitUpsell.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" #include "UIScene_TrialExitUpsell.h" diff --git a/Common/UI/UITTFFont.cpp b/Common/UI/UITTFFont.cpp index e51ecdd34..95130ec11 100644 --- a/Common/UI/UITTFFont.cpp +++ b/Common/UI/UITTFFont.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "UI.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/IO/Files/File.h" #include "UITTFFont.h" UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter) diff --git a/Common/XUI/SlotProgressControl.cpp b/Common/XUI/SlotProgressControl.cpp index 10a0474f8..dc89ed84d 100644 --- a/Common/XUI/SlotProgressControl.cpp +++ b/Common/XUI/SlotProgressControl.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/Slot.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Containers/Slot.h" +#include "../../Minecraft.World/Items/ItemInstance.h" #include "SlotItemControlBase.h" #include "SlotProgressControl.h" diff --git a/Common/XUI/XUI_BasePlayer.cpp b/Common/XUI/XUI_BasePlayer.cpp index 53d4701f5..f77e377bb 100644 --- a/Common/XUI/XUI_BasePlayer.cpp +++ b/Common/XUI/XUI_BasePlayer.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_BasePlayer.h" diff --git a/Common/XUI/XUI_Chat.cpp b/Common/XUI/XUI_Chat.cpp index c3651a58f..98af3b750 100644 --- a/Common/XUI/XUI_Chat.cpp +++ b/Common/XUI/XUI_Chat.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Chat.h" -#include "../../../Minecraft.h" -#include "../../../UI/Gui.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/UI/Gui.h" HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Common/XUI/XUI_ConnectingProgress.cpp b/Common/XUI/XUI_ConnectingProgress.cpp index 9d56d702d..84cd74d3f 100644 --- a/Common/XUI/XUI_ConnectingProgress.cpp +++ b/Common/XUI/XUI_ConnectingProgress.cpp @@ -1,11 +1,11 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../Minecraft.h" -#include "../../../../Minecraft.World/Network/Packets/DisconnectPacket.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.World/Network/Packets/DisconnectPacket.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Common/XUI/XUI_Control_ComboBox.cpp b/Common/XUI/XUI_Control_ComboBox.cpp index ea2ee7b50..e197c8603 100644 --- a/Common/XUI/XUI_Control_ComboBox.cpp +++ b/Common/XUI/XUI_Control_ComboBox.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Control_ComboBox.h" -#include "../../../Platform/Xbox/Xbox_App.h" +#include "../../Minecraft.Client/Platform/Xbox/Xbox_App.h" HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) { diff --git a/Common/XUI/XUI_Ctrl_4JEdit.cpp b/Common/XUI/XUI_Ctrl_4JEdit.cpp index d4dd3bf06..1cc91d201 100644 --- a/Common/XUI/XUI_Ctrl_4JEdit.cpp +++ b/Common/XUI/XUI_Ctrl_4JEdit.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_4JEdit.h" diff --git a/Common/XUI/XUI_Ctrl_4JIcon.cpp b/Common/XUI/XUI_Ctrl_4JIcon.cpp index bd94d491a..c930f0b12 100644 --- a/Common/XUI/XUI_Ctrl_4JIcon.cpp +++ b/Common/XUI/XUI_Ctrl_4JIcon.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_4JIcon.h" HRESULT CXuiCtrl4JIcon::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) diff --git a/Common/XUI/XUI_Ctrl_4JList.cpp b/Common/XUI/XUI_Ctrl_4JList.cpp index d0493d649..e3693b5bf 100644 --- a/Common/XUI/XUI_Ctrl_4JList.cpp +++ b/Common/XUI/XUI_Ctrl_4JList.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_4JList.h" static bool TimeSortFn(const void *a, const void *b); diff --git a/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Common/XUI/XUI_Ctrl_BrewProgress.cpp index fa6edd38e..fcae1573e 100644 --- a/Common/XUI/XUI_Ctrl_BrewProgress.cpp +++ b/Common/XUI/XUI_Ctrl_BrewProgress.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" -#include "../../../../Minecraft.World/Util/SharedConstants.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.alchemy.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.World/Util/SharedConstants.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.alchemy.h" #include "XUI_Ctrl_BrewProgress.h" int CXuiCtrlBrewProgress::GetValue() diff --git a/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Common/XUI/XUI_Ctrl_BubblesProgress.cpp index 615fbe151..648a4ec45 100644 --- a/Common/XUI/XUI_Ctrl_BubblesProgress.cpp +++ b/Common/XUI/XUI_Ctrl_BubblesProgress.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "XUI_Ctrl_BubblesProgress.h" int CXuiCtrlBubblesProgress::GetValue() diff --git a/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Common/XUI/XUI_Ctrl_BurnProgress.cpp index 6bb9a7e04..80e413e80 100644 --- a/Common/XUI/XUI_Ctrl_BurnProgress.cpp +++ b/Common/XUI/XUI_Ctrl_BurnProgress.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/FurnaceMenu.h" -#include "../../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" +#include "../../Minecraft.World/Containers/FurnaceMenu.h" +#include "../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_BurnProgress.h" diff --git a/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp index 4833b9fad..ee0778998 100644 --- a/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp +++ b/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_CraftIngredientSlot.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" //----------------------------------------------------------------------------- // CXuiCtrlMinecraftSlot class diff --git a/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Common/XUI/XUI_Ctrl_EnchantButton.cpp index e9f0cee4c..94a4690b2 100644 --- a/Common/XUI/XUI_Ctrl_EnchantButton.cpp +++ b/Common/XUI/XUI_Ctrl_EnchantButton.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../UI/Font.h" -#include "../../../Rendering/Lighting.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/UI/Font.h" +#include "../../Minecraft.Client/Rendering/Lighting.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" diff --git a/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp index c1823ab77..ee07462e5 100644 --- a/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp +++ b/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp @@ -1,21 +1,21 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.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.level.tile.entity.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../Minecraft.h" -#include "../../../UI/ScreenSizeCalculator.h" -#include "../../../Rendering/EntityRenderers/TileEntityRenderDispatcher.h" -#include "../../../Rendering/EntityRenderers/EnchantTableRenderer.h" -#include "../../../Rendering/Lighting.h" -#include "../../../Player/LocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/EnchantTableRenderer.h" +#include "../../Minecraft.Client/Rendering/Lighting.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantmentBook.h" -#include "../../../Rendering/Models/BookModel.h" -#include "../../../GameState/Options.h" +#include "../../Minecraft.Client/Rendering/Models/BookModel.h" +#include "../../Minecraft.Client/GameState/Options.h" //----------------------------------------------------------------------------- // CXuiCtrlEnchantmentBook class diff --git a/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Common/XUI/XUI_Ctrl_EnchantmentBook.h index bfd572bec..f3fa638ed 100644 --- a/Common/XUI/XUI_Ctrl_EnchantmentBook.h +++ b/Common/XUI/XUI_Ctrl_EnchantmentBook.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.World/Util/Random.h" using namespace std; diff --git a/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp index 0feed592e..eca653179 100644 --- a/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp +++ b/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp @@ -1,15 +1,15 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../UI/Font.h" -#include "../../../Rendering/Lighting.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/UI/Font.h" +#include "../../Minecraft.Client/Rendering/Lighting.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" #include "XUI_Ctrl_EnchantmentButtonText.h" -#include "../../../Minecraft.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" #include #include diff --git a/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Common/XUI/XUI_Ctrl_FireProgress.cpp index 3d8a31910..74507cda2 100644 --- a/Common/XUI/XUI_Ctrl_FireProgress.cpp +++ b/Common/XUI/XUI_Ctrl_FireProgress.cpp @@ -1,7 +1,7 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/FurnaceMenu.h" -#include "../../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" +#include "../../Minecraft.World/Containers/FurnaceMenu.h" +#include "../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_FireProgress.h" diff --git a/Common/XUI/XUI_Ctrl_LoadingProgress.cpp b/Common/XUI/XUI_Ctrl_LoadingProgress.cpp index 90f2e3689..02b056361 100644 --- a/Common/XUI/XUI_Ctrl_LoadingProgress.cpp +++ b/Common/XUI/XUI_Ctrl_LoadingProgress.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_LoadingProgress.h" -#include "../../../Minecraft.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" int CXuiCtrlLoadingProgress::GetValue() { diff --git a/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp index 329140257..777af44f7 100644 --- a/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp +++ b/Common/XUI/XUI_Ctrl_MinecraftPlayer.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/Lighting.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/Lighting.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_MinecraftPlayer.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "../../../GameState/Options.h" +#include "../../Minecraft.Client/GameState/Options.h" //----------------------------------------------------------------------------- // CXuiCtrlMinecraftPlayer class diff --git a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp index b718d574f..c57dd1984 100644 --- a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp +++ b/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp @@ -1,18 +1,18 @@ -#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 "../../../../Minecraft.World/Util/Class.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.World/Util/Class.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" #include "XUI_Ctrl_MinecraftSkinPreview.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "../../../GameState/Options.h" -#include "../../stubs.h" -#include "../../../Rendering/Models/ModelPart.h" +#include "../../Minecraft.Client/GameState/Options.h" +#include "../../Minecraft.Client/Build/stubs.h" +#include "../../Minecraft.Client/Rendering/Models/ModelPart.h" //#define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h index 75871d694..e7da00912 100644 --- a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h +++ b/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h @@ -2,9 +2,9 @@ #include #include -#include "../../../Textures/Textures.h" +#include "../../Minecraft.Client/Textures/Textures.h" //#include "../../Xbox/DLC/DLCSkinFile.h" -#include "../../../Rendering/Models/Model.h" +#include "../../Minecraft.Client/Rendering/Models/Model.h" using namespace std; diff --git a/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp index b32098213..0a296ee63 100644 --- a/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp +++ b/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp @@ -1,14 +1,14 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../Rendering/EntityRenderers/ItemRenderer.h" -#include "../../../Rendering/GameRenderer.h" -#include "../../../Rendering/EntityRenderers/TileRenderer.h" -#include "../../../Rendering/Lighting.h" -#include "../../../UI/ScreenSizeCalculator.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" -#include "../../../../Minecraft.World/Items/Item.h" -#include "../../../../Minecraft.World/Blocks/Tile.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.h" +#include "../../Minecraft.Client/Rendering/GameRenderer.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/TileRenderer.h" +#include "../../Minecraft.Client/Rendering/Lighting.h" +#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Items/Item.h" +#include "../../Minecraft.World/Blocks/Tile.h" #include "XUI_Ctrl_MinecraftSlot.h" //----------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_Ctrl_MobEffect.cpp b/Common/XUI/XUI_Ctrl_MobEffect.cpp index 0e87be823..7ea76750d 100644 --- a/Common/XUI/XUI_Ctrl_MobEffect.cpp +++ b/Common/XUI/XUI_Ctrl_MobEffect.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_MobEffect.h" LPCWSTR CXuiCtrlMobEffect::iconFrameNames[MobEffect::e_MobEffectIcon_COUNT]= diff --git a/Common/XUI/XUI_Ctrl_MobEffect.h b/Common/XUI/XUI_Ctrl_MobEffect.h index 860d780e6..70faf2b4e 100644 --- a/Common/XUI/XUI_Ctrl_MobEffect.h +++ b/Common/XUI/XUI_Ctrl_MobEffect.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "../../../../Minecraft.World/Entities/MobEffect.h" +#include "../../Minecraft.World/Entities/MobEffect.h" class CXuiCtrlMobEffect : public CXuiControlImpl { diff --git a/Common/XUI/XUI_Ctrl_PassThroughList.cpp b/Common/XUI/XUI_Ctrl_PassThroughList.cpp index ad6777208..c4e1fb72c 100644 --- a/Common/XUI/XUI_Ctrl_PassThroughList.cpp +++ b/Common/XUI/XUI_Ctrl_PassThroughList.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_PassThroughList.h" HRESULT CXuiCtrlPassThroughList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) diff --git a/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp b/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp index 8d9fc6caa..3ff644249 100644 --- a/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp +++ b/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_ProgressCtrlBase.h" diff --git a/Common/XUI/XUI_Ctrl_SliderWrapper.cpp b/Common/XUI/XUI_Ctrl_SliderWrapper.cpp index c2ad28d77..a0626bfbb 100644 --- a/Common/XUI/XUI_Ctrl_SliderWrapper.cpp +++ b/Common/XUI/XUI_Ctrl_SliderWrapper.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Ctrl_SliderWrapper.h" #define NO_SOUND_TIMER 0 diff --git a/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp index ff204392c..85ba6b20d 100644 --- a/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp +++ b/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp @@ -1,10 +1,10 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Containers/Slot.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Containers/Slot.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotItemCtrlBase.h" diff --git a/Common/XUI/XUI_Ctrl_SlotList.cpp b/Common/XUI/XUI_Ctrl_SlotList.cpp index baf85af1e..bf98e5d50 100644 --- a/Common/XUI/XUI_Ctrl_SlotList.cpp +++ b/Common/XUI/XUI_Ctrl_SlotList.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h" +#include "../../Minecraft.World/Containers/AbstractContainerMenu.h" #include "XUI_Ctrl_SlotItemListItem.h" #include "XUI_Ctrl_SlotList.h" diff --git a/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Common/XUI/XUI_Ctrl_SplashPulser.cpp index 7cd96d26a..6894b7f39 100644 --- a/Common/XUI/XUI_Ctrl_SplashPulser.cpp +++ b/Common/XUI/XUI_Ctrl_SplashPulser.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" -#include "../../../UI/ScreenSizeCalculator.h" -#include "../../../Rendering/Lighting.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h" +#include "../../Minecraft.Client/Rendering/Lighting.h" #include "XUI_Ctrl_SplashPulser.h" -#include "../../../UI/Font.h" -#include "../../../../Minecraft.World/Util/Mth.h" -#include "../../../../Minecraft.World/Build/System.h" +#include "../../Minecraft.Client/UI/Font.h" +#include "../../Minecraft.World/Util/Mth.h" +#include "../../Minecraft.World/Build/System.h" //----------------------------------------------------------------------------- // CXuiCtrlSplashPulser class diff --git a/Common/XUI/XUI_DLCOffers.cpp b/Common/XUI/XUI_DLCOffers.cpp index d23245495..d883d0f57 100644 --- a/Common/XUI/XUI_DLCOffers.cpp +++ b/Common/XUI/XUI_DLCOffers.cpp @@ -1,15 +1,15 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/IO/Streams/ByteArrayInputStream.h" -#include "../../../../Minecraft.World/IO/Streams/BufferedReader.h" -#include "../../../../Minecraft.World/IO/Streams/InputStreamReader.h" -#include "../../../../Minecraft.World/Util/ArrayWithLength.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/IO/Streams/ByteArrayInputStream.h" +#include "../../Minecraft.World/IO/Streams/BufferedReader.h" +#include "../../Minecraft.World/IO/Streams/InputStreamReader.h" +#include "../../Minecraft.World/Util/ArrayWithLength.h" #include #include "XUI_Ctrl_4JIcon.h" #include "XUI_DLCOffers.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #ifdef _XBOX #include #endif diff --git a/Common/XUI/XUI_Death.cpp b/Common/XUI/XUI_Death.cpp index 97ff68ad0..de8af9132 100644 --- a/Common/XUI/XUI_Death.cpp +++ b/Common/XUI/XUI_Death.cpp @@ -1,26 +1,26 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_Death.h" #include -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../GameState/StatsCounter.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../../Minecraft.World/Level/ChunkSource.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../Rendering/GameRenderer.h" -#include "../../../Rendering/LevelRenderer.h" -#include "../../../../Minecraft.World/Util/Pos.h" -#include "../../../../Minecraft.World/Level/Dimensions/Dimension.h" -#include "../../../Minecraft.h" -#include "../../../GameState/Options.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.World/Level/ChunkSource.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.Client/Rendering/GameRenderer.h" +#include "../../Minecraft.Client/Rendering/LevelRenderer.h" +#include "../../Minecraft.World/Util/Pos.h" +#include "../../Minecraft.World/Level/Dimensions/Dimension.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/Options.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_DebugItemEditor.cpp b/Common/XUI/XUI_DebugItemEditor.cpp index 7cfcb0286..c9d8ace9e 100644 --- a/Common/XUI/XUI_DebugItemEditor.cpp +++ b/Common/XUI/XUI_DebugItemEditor.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.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.network.packet.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Network/ClientConnection.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.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.network.packet.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" #include "../GameRules/ConsoleGameRules.h" #include "XUI_DebugItemEditor.h" diff --git a/Common/XUI/XUI_DebugItemEditor.h b/Common/XUI/XUI_DebugItemEditor.h index facc0f683..a6edd5e49 100644 --- a/Common/XUI/XUI_DebugItemEditor.h +++ b/Common/XUI/XUI_DebugItemEditor.h @@ -4,7 +4,7 @@ using namespace std; #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_4JEdit.h" -#include "../../../../Minecraft.World/Items/ItemInstance.h" +#include "../../Minecraft.World/Items/ItemInstance.h" class CScene_DebugItemEditor : public CXuiSceneImpl { diff --git a/Common/XUI/XUI_DebugOverlay.cpp b/Common/XUI/XUI_DebugOverlay.cpp index 458dc8955..180e57ed9 100644 --- a/Common/XUI/XUI_DebugOverlay.cpp +++ b/Common/XUI/XUI_DebugOverlay.cpp @@ -1,32 +1,32 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../MultiplayerLevel.h" -#include "../../../GameState/GameMode.h" -#include "../../../GameState/SurvivalMode.h" -#include "../../../GameState/CreativeMode.h" -#include "../../../Network/ClientConnection.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Util/ArrayWithLength.h" -#include "../../../../Minecraft.World/Headers/com.mojang.nbt.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.saveddata.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.storage.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.storage.h" -#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/GameState/GameMode.h" +#include "../../Minecraft.Client/GameState/SurvivalMode.h" +#include "../../Minecraft.Client/GameState/CreativeMode.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Util/ArrayWithLength.h" +#include "../../Minecraft.World/Headers/com.mojang.nbt.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.animal.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.monster.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.saveddata.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.storage.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.storage.h" +#include "../../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h" #include "XUI_DebugOverlay.h" -#include "../../../Rendering/GameRenderer.h" -#include "../../../MinecraftServer.h" +#include "../../Minecraft.Client/Rendering/GameRenderer.h" +#include "../../Minecraft.Client/MinecraftServer.h" #include "../Tutorial/Tutorial.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.commands.common.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h" +#include "../../Minecraft.World/Headers/net.minecraft.commands.common.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h" #ifdef _DEBUG_MENUS_ENABLED HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Common/XUI/XUI_DebugOverlay.h b/Common/XUI/XUI_DebugOverlay.h index 15dd6e897..82bb1542c 100644 --- a/Common/XUI/XUI_DebugOverlay.h +++ b/Common/XUI/XUI_DebugOverlay.h @@ -7,8 +7,8 @@ using namespace std; class RegionFile; class DataOutputStream; class ConsoleSaveFile; -#include "../../../../Minecraft.World/IO/Files/File.h" -#include "../../../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/Entities/Entity.h" class CScene_DebugOverlay : public CXuiSceneImpl { diff --git a/Common/XUI/XUI_DebugSchematicCreator.cpp b/Common/XUI/XUI_DebugSchematicCreator.cpp index fee23f35a..680fa6283 100644 --- a/Common/XUI/XUI_DebugSchematicCreator.cpp +++ b/Common/XUI/XUI_DebugSchematicCreator.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XUI_DebugSchematicCreator.h" -#include "../../../../Minecraft.World/Level/ChunkSource.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Level/ChunkSource.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSchematicCreator::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Common/XUI/XUI_DebugSetCamera.cpp b/Common/XUI/XUI_DebugSetCamera.cpp index 93bc257d8..743066ad6 100644 --- a/Common/XUI/XUI_DebugSetCamera.cpp +++ b/Common/XUI/XUI_DebugSetCamera.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XUI_DebugSetCamera.h" -#include "../../../../Minecraft.World/Level/ChunkSource.h" +#include "../../Minecraft.World/Level/ChunkSource.h" -// #include "../../../Platform/Xbox/4JLibs/inc/4J_Input.h" +// #include "../../Minecraft.Client/Platform/Xbox/4JLibs/inc/4J_Input.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Common/XUI/XUI_DebugTips.cpp b/Common/XUI/XUI_DebugTips.cpp index b3452a63a..93baefcf9 100644 --- a/Common/XUI/XUI_DebugTips.cpp +++ b/Common/XUI/XUI_DebugTips.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_DebugTips.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Common/XUI/XUI_FullscreenProgress.cpp b/Common/XUI/XUI_FullscreenProgress.cpp index 1628780c1..2800d6849 100644 --- a/Common/XUI/XUI_FullscreenProgress.cpp +++ b/Common/XUI/XUI_FullscreenProgress.cpp @@ -1,12 +1,12 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../Minecraft.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "../Tutorial/TutorialMode.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_FullscreenProgress.h b/Common/XUI/XUI_FullscreenProgress.h index 23183f559..cdbde9afb 100644 --- a/Common/XUI/XUI_FullscreenProgress.h +++ b/Common/XUI/XUI_FullscreenProgress.h @@ -1,6 +1,6 @@ #pragma once #include "../media/xuiscene_fullscreenprogress.h" -#include "../../../../Minecraft.World/Util/C4JThread.h" +#include "../../Minecraft.World/Util/C4JThread.h" #define ERROR_FULLSCREENPROGRESS_ diff --git a/Common/XUI/XUI_HUD.cpp b/Common/XUI/XUI_HUD.cpp index 0c893477f..c945cfcb6 100644 --- a/Common/XUI/XUI_HUD.cpp +++ b/Common/XUI/XUI_HUD.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_HUD.h" -#include "../../../Minecraft.h" -#include "../../../UI/Gui.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Util/Random.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.material.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/UI/Gui.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.material.h" HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Common/XUI/XUI_HelpAndOptions.cpp b/Common/XUI/XUI_HelpAndOptions.cpp index 8fb6b151d..34e482a5c 100644 --- a/Common/XUI/XUI_HelpAndOptions.cpp +++ b/Common/XUI/XUI_HelpAndOptions.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_HelpAndOptions.h" diff --git a/Common/XUI/XUI_HelpControls.cpp b/Common/XUI/XUI_HelpControls.cpp index ea5167684..51103b42e 100644 --- a/Common/XUI/XUI_HelpControls.cpp +++ b/Common/XUI/XUI_HelpControls.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_HelpControls.h" #include "XUI_Ctrl_4JList.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Level/LevelData.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Level/LevelData.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #define ALIGN_START 0 #define ALIGN_END 1 diff --git a/Common/XUI/XUI_HelpCredits.cpp b/Common/XUI/XUI_HelpCredits.cpp index 4ac083a84..c640f53fc 100644 --- a/Common/XUI/XUI_HelpCredits.cpp +++ b/Common/XUI/XUI_HelpCredits.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_HelpCredits.h" diff --git a/Common/XUI/XUI_HelpHowToPlay.cpp b/Common/XUI/XUI_HelpHowToPlay.cpp index c01ea68c9..ef104baa2 100644 --- a/Common/XUI/XUI_HelpHowToPlay.cpp +++ b/Common/XUI/XUI_HelpHowToPlay.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_HelpHowToPlay.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] = { diff --git a/Common/XUI/XUI_HowToPlayMenu.cpp b/Common/XUI/XUI_HowToPlayMenu.cpp index 13a215eae..98dcf89c3 100644 --- a/Common/XUI/XUI_HowToPlayMenu.cpp +++ b/Common/XUI/XUI_HowToPlayMenu.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_HowToPlayMenu.h" diff --git a/Common/XUI/XUI_InGameHostOptions.cpp b/Common/XUI/XUI_InGameHostOptions.cpp index ff7020390..8929fa422 100644 --- a/Common/XUI/XUI_InGameHostOptions.cpp +++ b/Common/XUI/XUI_InGameHostOptions.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGameHostOptions.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" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Common/XUI/XUI_InGameInfo.cpp b/Common/XUI/XUI_InGameInfo.cpp index 461ab00c5..258ba2f2f 100644 --- a/Common/XUI/XUI_InGameInfo.cpp +++ b/Common/XUI/XUI_InGameInfo.cpp @@ -1,19 +1,19 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_InGameInfo.h" -#include "../../../Player/ServerPlayer.h" -#include "../../../Network/PlayerConnection.h" -#include "../../../Network/PlayerList.h" -#include "../../../MinecraftServer.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Rendering/EntityRenderers/PlayerRenderer.h" +#include "../../Minecraft.Client/Player/ServerPlayer.h" +#include "../../Minecraft.Client/Network/PlayerConnection.h" +#include "../../Minecraft.Client/Network/PlayerList.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Network/ClientConnection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" -#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.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" +#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" #define IGNORE_KEYPRESS_TIMERID 0 #define TOOLTIP_TIMERID 1 diff --git a/Common/XUI/XUI_InGamePlayerOptions.cpp b/Common/XUI/XUI_InGamePlayerOptions.cpp index 3f11e5595..21311b74a 100644 --- a/Common/XUI/XUI_InGamePlayerOptions.cpp +++ b/Common/XUI/XUI_InGamePlayerOptions.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGamePlayerOptions.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.World/Headers/net.minecraft.world.entity.player.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" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h" #include "XUI_InGameInfo.h" diff --git a/Common/XUI/XUI_Intro.cpp b/Common/XUI/XUI_Intro.cpp index 9c47b7dd9..84037fbef 100644 --- a/Common/XUI/XUI_Intro.cpp +++ b/Common/XUI/XUI_Intro.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_Intro.h" diff --git a/Common/XUI/XUI_Leaderboards.cpp b/Common/XUI/XUI_Leaderboards.cpp index cf48a57bd..f7c343185 100644 --- a/Common/XUI/XUI_Leaderboards.cpp +++ b/Common/XUI/XUI_Leaderboards.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include "XUI_Leaderboards.h" -#include "../../../../Minecraft.World/Blocks/Tile.h" -#include "../../../../Minecraft.World/Items/Item.h" +#include "../../Minecraft.World/Blocks/Tile.h" +#include "../../Minecraft.World/Items/Item.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Common/XUI/XUI_LoadSettings.cpp b/Common/XUI/XUI_LoadSettings.cpp index 9107a3575..ed935dee4 100644 --- a/Common/XUI/XUI_LoadSettings.cpp +++ b/Common/XUI/XUI_LoadSettings.cpp @@ -1,30 +1,30 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "../Tutorial/TutorialMode.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../Minecraft.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Util/ArrayWithLength.h" -#include "../../../../Minecraft.World/IO/Files/File.h" -#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h" -#include "../../../MinecraftServer.h" -#include "../../../GameState/Options.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Util/ArrayWithLength.h" +#include "../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/GameState/Options.h" #include "XUI_Ctrl_4JList.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" #include "../GameRules/ConsoleGameRules.h" -#include "../../../Utils/StringTable.h" -#include "../../../Textures/Packs/DLCTexturePack.h" +#include "../../Minecraft.Client/Utils/StringTable.h" +#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Common/XUI/XUI_MainMenu.cpp b/Common/XUI/XUI_MainMenu.cpp index 278dec9fa..d47e6934e 100644 --- a/Common/XUI/XUI_MainMenu.cpp +++ b/Common/XUI/XUI_MainMenu.cpp @@ -1,23 +1,23 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_MainMenu.h" -#include "../../../GameState/SurvivalMode.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../Player/User.h" +#include "../../Minecraft.Client/GameState/SurvivalMode.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.Client/Player/User.h" //#include "XUI_CreateLoad.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Util/Random.h" -#include "../../../MinecraftServer.h" -#include "../../../Minecraft.h" -#include "../../../GameState/Options.h" -#include "../../../UI/Font.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/Options.h" +#include "../../Minecraft.Client/UI/Font.h" #include "../GameRules/ConsoleGameRules.h" #define DLC_INSTALLED_TIMER_ID 1 diff --git a/Common/XUI/XUI_MultiGameCreate.cpp b/Common/XUI/XUI_MultiGameCreate.cpp index dfa05cba5..56c864147 100644 --- a/Common/XUI/XUI_MultiGameCreate.cpp +++ b/Common/XUI/XUI_MultiGameCreate.cpp @@ -1,21 +1,21 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Util/Random.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XUI_MultiGameCreate.h" #include "XUI_Controls.h" -#include "../../../MinecraftServer.h" -#include "../../../Minecraft.h" -#include "../../../GameState/Options.h" -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/Options.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "../../../../Minecraft.World/WorldGen/Biomes/BiomeSource.h" -#include "../../../../Minecraft.World/Util/IntCache.h" -#include "../../../../Minecraft.World/Level/Storage/LevelType.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.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/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" #include "../DLC/DLCLocalisationFile.h" -#include "../../../Utils/StringTable.h" -#include "../../../Textures/Packs/DLCTexturePack.h" +#include "../../Minecraft.Client/Utils/StringTable.h" +#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Common/XUI/XUI_MultiGameInfo.cpp b/Common/XUI/XUI_MultiGameInfo.cpp index 61b36e000..abfc1d2ef 100644 --- a/Common/XUI/XUI_MultiGameInfo.cpp +++ b/Common/XUI/XUI_MultiGameInfo.cpp @@ -1,13 +1,13 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../../Minecraft.World/Util/Difficulty.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.World/Util/Difficulty.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Common/XUI/XUI_MultiGameJoinLoad.cpp index a2237716a..cfa9ed8ea 100644 --- a/Common/XUI/XUI_MultiGameJoinLoad.cpp +++ b/Common/XUI/XUI_MultiGameJoinLoad.cpp @@ -1,31 +1,31 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "../Tutorial/TutorialMode.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../Minecraft.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Util/ArrayWithLength.h" -#include "../../../../Minecraft.World/IO/Files/File.h" -#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Util/ArrayWithLength.h" +#include "../../Minecraft.World/IO/Files/File.h" +#include "../../Minecraft.World/IO/Streams/InputOutputStream.h" #include "XUI_Ctrl_4JList.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" #include "XUI_MultiGameCreate.h" -#include "../../../MinecraftServer.h" -#include "../../../GameState/Options.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/GameState/Options.h" #include "../GameRules/LevelGenerationOptions.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" -#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" +#include "../../Minecraft.World/Level/Storage/LevelSettings.h" #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100 diff --git a/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp index 2c164ff37..a04c5411a 100644 --- a/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp +++ b/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Minecraft.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Common/XUI/XUI_NewUpdateMessage.cpp b/Common/XUI/XUI_NewUpdateMessage.cpp index 41ac335d2..681b392c5 100644 --- a/Common/XUI/XUI_NewUpdateMessage.cpp +++ b/Common/XUI/XUI_NewUpdateMessage.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" // #include "XUI_Ctrl_4JIcon.h" #include "XUI_NewUpdateMessage.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/StringHelpers.h" HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Common/XUI/XUI_PartnernetPassword.cpp b/Common/XUI/XUI_PartnernetPassword.cpp index a320fdf49..17377e869 100644 --- a/Common/XUI/XUI_PartnernetPassword.cpp +++ b/Common/XUI/XUI_PartnernetPassword.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_PartnernetPassword.h" #include "XUI_Ctrl_4JList.h" diff --git a/Common/XUI/XUI_PauseMenu.cpp b/Common/XUI/XUI_PauseMenu.cpp index ccf798f92..2dddad130 100644 --- a/Common/XUI/XUI_PauseMenu.cpp +++ b/Common/XUI/XUI_PauseMenu.cpp @@ -1,26 +1,26 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../GameState/StatsCounter.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../MinecraftServer.h" -#include "../../../Level/MultiPlayerLevel.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../../Minecraft.World/Network/Packets/DisconnectPacket.h" -#include "../../../Minecraft.h" -#include "../../../GameState/Options.h" -#include "../../../../Minecraft.World/IO/Streams/Compression.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" -#include "../../../Textures/Packs/DLCTexturePack.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.World/Network/Packets/DisconnectPacket.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/Options.h" +#include "../../Minecraft.World/IO/Streams/Compression.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" +#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #define IGNORE_KEYPRESS_TIMERID 0 #define IGNORE_KEYPRESS_TIME 100 diff --git a/Common/XUI/XUI_Reinstall.cpp b/Common/XUI/XUI_Reinstall.cpp index d1d502a1a..4d2a87fdc 100644 --- a/Common/XUI/XUI_Reinstall.cpp +++ b/Common/XUI/XUI_Reinstall.cpp @@ -1,22 +1,22 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_Reinstall.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../GameState/StatsCounter.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../MinecraftServer.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" -#include "../../../../Minecraft.World/Network/Packets/DisconnectPacket.h" -#include "../../../Minecraft.h" -#include "../../../GameState/Options.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.World/Network/Packets/DisconnectPacket.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/Options.h" diff --git a/Common/XUI/XUI_SaveMessage.cpp b/Common/XUI/XUI_SaveMessage.cpp index 53693c564..3fee0afb3 100644 --- a/Common/XUI/XUI_SaveMessage.cpp +++ b/Common/XUI/XUI_SaveMessage.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_SaveMessage.h" diff --git a/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Common/XUI/XUI_Scene_AbstractContainer.cpp index 9c75520e9..655459024 100644 --- a/Common/XUI/XUI_Scene_AbstractContainer.cpp +++ b/Common/XUI/XUI_Scene_AbstractContainer.cpp @@ -1,21 +1,21 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include -#include "../../../../Minecraft.World/Player/Player.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../Minecraft.h" -#include "../../../GameState/GameMode.h" -#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../../../Minecraft.World/Blocks/Tile.h" -#include "../../../../Minecraft.World/Recipes/FurnaceRecipes.h" -#include "../../../../Minecraft.World/Recipes/Recipy.h" -#include "../../../../Minecraft.World/Recipes/Recipes.h" -#include "../../../../Minecraft.World/Recipes/ArmorRecipes.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Player/Player.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/GameState/GameMode.h" +#include "../../Minecraft.World/Containers/AbstractContainerMenu.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.h" +#include "../../Minecraft.World/Blocks/Tile.h" +#include "../../Minecraft.World/Recipes/FurnaceRecipes.h" +#include "../../Minecraft.World/Recipes/Recipy.h" +#include "../../Minecraft.World/Recipes/Recipes.h" +#include "../../Minecraft.World/Recipes/ArmorRecipes.h" +#include "../../Minecraft.World/Util/StringHelpers.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" diff --git a/Common/XUI/XUI_Scene_Anvil.cpp b/Common/XUI/XUI_Scene_Anvil.cpp index 8f06d3119..0e7eccd54 100644 --- a/Common/XUI/XUI_Scene_Anvil.cpp +++ b/Common/XUI/XUI_Scene_Anvil.cpp @@ -1,12 +1,12 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Anvil.h" diff --git a/Common/XUI/XUI_Scene_Base.cpp b/Common/XUI/XUI_Scene_Base.cpp index a8e63aab6..14e0be9a3 100644 --- a/Common/XUI/XUI_Scene_Base.cpp +++ b/Common/XUI/XUI_Scene_Base.cpp @@ -1,24 +1,24 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../MultiplayerLevel.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../GameState/StatsCounter.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Level/MultiPlayerLevel.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/Minecraft.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h" -#include "../../../../Minecraft.World/Level/LevelData.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.h" +#include "../../Minecraft.World/Level/LevelData.h" #include "XUI_CustomMessages.h" -#include "../../../../Minecraft.World/Level/Dimensions/Dimension.h" -#include "../../../../Minecraft.World/Util/SharedConstants.h" -#include "../../../GameState/GameMode.h" -#include "../../../Rendering/EntityRenderers/EnderDragonRenderer.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../../Textures/Packs/TexturePackRepository.h" -#include "../../../Textures/Packs/TexturePack.h" -#include "../../../Textures/Packs/DLCTexturePack.h" +#include "../../Minecraft.World/Level/Dimensions/Dimension.h" +#include "../../Minecraft.World/Util/SharedConstants.h" +#include "../../Minecraft.Client/GameState/GameMode.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/EnderDragonRenderer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" +#include "../../Minecraft.Client/Textures/Packs/TexturePack.h" +#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" #define PRESS_START_TIMER 0 diff --git a/Common/XUI/XUI_Scene_Base.h b/Common/XUI/XUI_Scene_Base.h index a9aaa445a..ab8f4122b 100644 --- a/Common/XUI/XUI_Scene_Base.h +++ b/Common/XUI/XUI_Scene_Base.h @@ -4,7 +4,7 @@ #include "XUI_Ctrl_SlotItem.h" #include "XUI_CustomMessages.h" #include "../UI/UIEnums.h" -#include "../../../../Minecraft.World/Util/SoundTypes.h" +#include "../../Minecraft.World/Util/SoundTypes.h" #define BUTTON_TOOLTIP_A 0 #define BUTTON_TOOLTIP_B 1 diff --git a/Common/XUI/XUI_Scene_BrewingStand.cpp b/Common/XUI/XUI_Scene_BrewingStand.cpp index e8b7b5649..b030290f2 100644 --- a/Common/XUI/XUI_Scene_BrewingStand.cpp +++ b/Common/XUI/XUI_Scene_BrewingStand.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_BrewingStand.h" #include "XUI_Ctrl_BrewProgress.h" diff --git a/Common/XUI/XUI_Scene_Container.cpp b/Common/XUI/XUI_Scene_Container.cpp index 3e4a6f72b..cbd9648d2 100644 --- a/Common/XUI/XUI_Scene_Container.cpp +++ b/Common/XUI/XUI_Scene_Container.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/Container.h" -#include "../../../../Minecraft.World/Containers/ContainerMenu.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Containers/Container.h" +#include "../../Minecraft.World/Containers/ContainerMenu.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Container.h" #include "XUI_Ctrl_SlotItemListItem.h" diff --git a/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Common/XUI/XUI_Scene_CraftingPanel.cpp index 505b24aba..439f7a54d 100644 --- a/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -1,19 +1,19 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include -#include "../../../Player/MultiPlayerLocalPlayer.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.inventory.h" -#include "../../../../Minecraft.World/Blocks/Tile.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.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.inventory.h" +#include "../../Minecraft.World/Blocks/Tile.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_SlotList.h" diff --git a/Common/XUI/XUI_Scene_CraftingPanel.h b/Common/XUI/XUI_Scene_CraftingPanel.h index 5eec55653..f3f3d8273 100644 --- a/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Common/XUI/XUI_Scene_CraftingPanel.h @@ -3,9 +3,9 @@ using namespace std; #include "../media/xuiscene_craftingpanel_2x2.h" #include "XUI_Ctrl_MinecraftSlot.h" -#include "../../../../Minecraft.World/Recipes/Recipy.h" +#include "../../Minecraft.World/Recipes/Recipy.h" #include "XUI_Ctrl_CraftIngredientSlot.h" -#include "../../../../Minecraft.World/Items/Item.h" +#include "../../Minecraft.World/Items/Item.h" #include "XUI_CustomMessages.h" #include "../Tutorial/TutorialEnum.h" #include "../UI/IUIScene_CraftingMenu.h" diff --git a/Common/XUI/XUI_Scene_Enchant.cpp b/Common/XUI/XUI_Scene_Enchant.cpp index b41f343fa..3135322dd 100644 --- a/Common/XUI/XUI_Scene_Enchant.cpp +++ b/Common/XUI/XUI_Scene_Enchant.cpp @@ -1,16 +1,16 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h" -#include "../../../../Minecraft.World/Containers/Slot.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" +#include "../../Minecraft.World/Containers/AbstractContainerMenu.h" +#include "../../Minecraft.World/Containers/Slot.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h" -//#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +//#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Enchant.h" diff --git a/Common/XUI/XUI_Scene_Enchant.h b/Common/XUI/XUI_Scene_Enchant.h index 038f5dd0f..72357d09d 100644 --- a/Common/XUI/XUI_Scene_Enchant.h +++ b/Common/XUI/XUI_Scene_Enchant.h @@ -3,7 +3,7 @@ using namespace std; #include "../Media/xuiscene_enchant.h" -#include "../../../Rendering/Models/BookModel.h" +#include "../../Minecraft.Client/Rendering/Models/BookModel.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_EnchantmentBook.h" @@ -13,8 +13,8 @@ using namespace std; #include "XUI_Scene_Enchant.h" -#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h" -#include "../../../../Minecraft.World/Containers/SimpleContainer.h" +#include "../../Minecraft.World/Containers/AbstractContainerMenu.h" +#include "../../Minecraft.World/Containers/SimpleContainer.h" class Level; class CXuiCtrlEnchantmentButton; diff --git a/Common/XUI/XUI_Scene_Furnace.cpp b/Common/XUI/XUI_Scene_Furnace.cpp index 9e38b15b1..fdb5d7ee1 100644 --- a/Common/XUI/XUI_Scene_Furnace.cpp +++ b/Common/XUI/XUI_Scene_Furnace.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Containers/FurnaceMenu.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Containers/FurnaceMenu.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_BurnProgress.h" diff --git a/Common/XUI/XUI_Scene_Inventory.cpp b/Common/XUI/XUI_Scene_Inventory.cpp index debbdd2c2..b522edacf 100644 --- a/Common/XUI/XUI_Scene_Inventory.cpp +++ b/Common/XUI/XUI_Scene_Inventory.cpp @@ -1,13 +1,13 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.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 "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Controls.h" #include "XUI_Scene_Inventory.h" diff --git a/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Common/XUI/XUI_Scene_Inventory_Creative.cpp index 7b29096f7..e1af048f6 100644 --- a/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -1,19 +1,19 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Containers/Container.h" -#include "../../../../Minecraft.World/Containers/Slot.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.entity.player.h" +#include "../../Minecraft.World/Containers/Container.h" +#include "../../Minecraft.World/Containers/Slot.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.entity.player.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.stats.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Ctrl_SlotItem.h" diff --git a/Common/XUI/XUI_Scene_Inventory_Creative.h b/Common/XUI/XUI_Scene_Inventory_Creative.h index d8e2f5733..59db96bc2 100644 --- a/Common/XUI/XUI_Scene_Inventory_Creative.h +++ b/Common/XUI/XUI_Scene_Inventory_Creative.h @@ -4,8 +4,8 @@ using namespace std; #include "../Media/xuiscene_inventory_creative.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "../../../../Minecraft.World/Containers/AbstractContainerMenu.h" -#include "../../../../Minecraft.World/Containers/SimpleContainer.h" +#include "../../Minecraft.World/Containers/AbstractContainerMenu.h" +#include "../../Minecraft.World/Containers/SimpleContainer.h" #include "../UI/IUIScene_CreativeMenu.h" diff --git a/Common/XUI/XUI_Scene_Trading.cpp b/Common/XUI/XUI_Scene_Trading.cpp index 0b863e4a2..b2ff4baeb 100644 --- a/Common/XUI/XUI_Scene_Trading.cpp +++ b/Common/XUI/XUI_Scene_Trading.cpp @@ -1,16 +1,16 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.trading.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" +#include "../../Minecraft.World/Headers/net.minecraft.world.item.trading.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../Tutorial/Tutorial.h" #include "../Tutorial/TutorialMode.h" #include "../Tutorial/TutorialEnum.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trading.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" //-------------------------------------------------------------------------------------- // Name: CXuiSceneTrading::OnInit diff --git a/Common/XUI/XUI_Scene_Trap.cpp b/Common/XUI/XUI_Scene_Trap.cpp index 3f4afd0d6..e1b2b0c5a 100644 --- a/Common/XUI/XUI_Scene_Trap.cpp +++ b/Common/XUI/XUI_Scene_Trap.cpp @@ -1,8 +1,8 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" -#include "../../../../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" -#include "../../../../Minecraft.World/Containers/TrapMenu.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" +#include "../../Minecraft.World/Containers/TrapMenu.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trap.h" #include "../Tutorial/Tutorial.h" diff --git a/Common/XUI/XUI_Scene_Win.cpp b/Common/XUI/XUI_Scene_Win.cpp index 1235c13e8..8f47f2c10 100644 --- a/Common/XUI/XUI_Scene_Win.cpp +++ b/Common/XUI/XUI_Scene_Win.cpp @@ -1,14 +1,14 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../Minecraft.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/Minecraft.h" #include "../Tutorial/TutorialMode.h" -#include "../../../UI/Font.h" -#include "../../../../Minecraft.World/Util/Random.h" -#include "../../../../Minecraft.World/Util/SharedConstants.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/UI/Font.h" +#include "../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.World/Util/SharedConstants.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_Scene_Win.h" BYTE CScene_Win::s_winUserIndex = 0; diff --git a/Common/XUI/XUI_SettingsAll.cpp b/Common/XUI/XUI_SettingsAll.cpp index 21584c033..4da531d8d 100644 --- a/Common/XUI/XUI_SettingsAll.cpp +++ b/Common/XUI/XUI_SettingsAll.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsAll.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_SettingsAudio.cpp b/Common/XUI/XUI_SettingsAudio.cpp index 81dd38355..3b21ffdf3 100644 --- a/Common/XUI/XUI_SettingsAudio.cpp +++ b/Common/XUI/XUI_SettingsAudio.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsAudio.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_SettingsControl.cpp b/Common/XUI/XUI_SettingsControl.cpp index 3f56e2e04..489494086 100644 --- a/Common/XUI/XUI_SettingsControl.cpp +++ b/Common/XUI/XUI_SettingsControl.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsControl.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_SettingsGraphics.cpp b/Common/XUI/XUI_SettingsGraphics.cpp index dfdc8636a..a26cd46e0 100644 --- a/Common/XUI/XUI_SettingsGraphics.cpp +++ b/Common/XUI/XUI_SettingsGraphics.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsGraphics.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_SettingsOptions.cpp b/Common/XUI/XUI_SettingsOptions.cpp index b9ae1f973..51461795f 100644 --- a/Common/XUI/XUI_SettingsOptions.cpp +++ b/Common/XUI/XUI_SettingsOptions.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsOptions.h" int CScene_SettingsOptions::m_iDifficultySettingA[4]= diff --git a/Common/XUI/XUI_SettingsUI.cpp b/Common/XUI/XUI_SettingsUI.cpp index 1e81dfaf9..1109ba4ae 100644 --- a/Common/XUI/XUI_SettingsUI.cpp +++ b/Common/XUI/XUI_SettingsUI.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SettingsUI.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_SignEntry.cpp b/Common/XUI/XUI_SignEntry.cpp index 5a7e9cde2..629f8a495 100644 --- a/Common/XUI/XUI_SignEntry.cpp +++ b/Common/XUI/XUI_SignEntry.cpp @@ -1,11 +1,11 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" -#include "../../../MultiplayerLevel.h" -#include "../../../../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" -#include "../../../../Minecraft.World/Entities/Entity.h" -#include "../../../../Minecraft.World/Level/Level.h" -#include "../../../Player/LocalPlayer.h" -#include "../../../Network/ClientConnection.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.Client/MultiplayerLevel.h" +#include "../../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" +#include "../../Minecraft.World/Entities/Entity.h" +#include "../../Minecraft.World/Level/Level.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" +#include "../../Minecraft.Client/Network/ClientConnection.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "XUI_SignEntry.h" HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Common/XUI/XUI_SkinSelect.cpp b/Common/XUI/XUI_SkinSelect.cpp index d3275680e..8b9b28f4f 100644 --- a/Common/XUI/XUI_SkinSelect.cpp +++ b/Common/XUI/XUI_SkinSelect.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_SkinSelect.h" #include "XUI_Ctrl_MinecraftSkinPreview.h" diff --git a/Common/XUI/XUI_SkinSelect.h b/Common/XUI/XUI_SkinSelect.h index 4c2e062ad..018d8e753 100644 --- a/Common/XUI/XUI_SkinSelect.h +++ b/Common/XUI/XUI_SkinSelect.h @@ -2,8 +2,8 @@ #include "../media/xuiscene_skinselect.h" #include "XUI_CustomMessages.h" -#include "../../../../Minecraft.World/Util/Definitions.h" -#include "../../../Textures/Textures.h" +#include "../../Minecraft.World/Util/Definitions.h" +#include "../../Minecraft.Client/Textures/Textures.h" class DLCPack; diff --git a/Common/XUI/XUI_SocialPost.cpp b/Common/XUI/XUI_SocialPost.cpp index 1a0214cac..de30159cb 100644 --- a/Common/XUI/XUI_SocialPost.cpp +++ b/Common/XUI/XUI_SocialPost.cpp @@ -1,19 +1,19 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_SocialPost.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Util/SharedConstants.h" -#include "../../../../Minecraft.World/Util/Random.h" -#include "../../../GameState/SurvivalMode.h" -#include "../../../UI/Screens/CreateWorldScreen.h" -#include "../../../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" -#include "../../../../Minecraft.World/Util/AABB.h" -#include "../../../../Minecraft.World/Util/Vec3.h" -#include "../../../Player/LocalPlayer.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Util/SharedConstants.h" +#include "../../Minecraft.World/Util/Random.h" +#include "../../Minecraft.Client/GameState/SurvivalMode.h" +#include "../../Minecraft.Client/UI/Screens/CreateWorldScreen.h" +#include "../../Minecraft.World/IO/Files/ConsoleSaveFileIO.h" +#include "../../Minecraft.World/Util/AABB.h" +#include "../../Minecraft.World/Util/Vec3.h" +#include "../../Minecraft.Client/Player/LocalPlayer.h" //---------------------------------------------------------------------------------- diff --git a/Common/XUI/XUI_Teleport.cpp b/Common/XUI/XUI_Teleport.cpp index 40e1384cf..b41181da9 100644 --- a/Common/XUI/XUI_Teleport.cpp +++ b/Common/XUI/XUI_Teleport.cpp @@ -1,20 +1,20 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_Teleport.h" -#include "../../../Player/ServerPlayer.h" -#include "../../../Network/PlayerConnection.h" -#include "../../../Network/PlayerList.h" -#include "../../../MinecraftServer.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Rendering/EntityRenderers/PlayerRenderer.h" +#include "../../Minecraft.Client/Player/ServerPlayer.h" +#include "../../Minecraft.Client/Network/PlayerConnection.h" +#include "../../Minecraft.Client/Network/PlayerList.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "../../../Minecraft.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../Network/ClientConnection.h" -#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h" -#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.h" -#include "../../../Commands/TeleportCommand.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" +#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" +#include "../../Minecraft.Client/Commands/TeleportCommand.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Common/XUI/XUI_TextEntry.cpp b/Common/XUI/XUI_TextEntry.cpp index 6a7caeb0c..004e47101 100644 --- a/Common/XUI/XUI_TextEntry.cpp +++ b/Common/XUI/XUI_TextEntry.cpp @@ -1,6 +1,6 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_TextEntry.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]= diff --git a/Common/XUI/XUI_TransferToXboxOne.cpp b/Common/XUI/XUI_TransferToXboxOne.cpp index 1b97e7531..fd6121351 100644 --- a/Common/XUI/XUI_TransferToXboxOne.cpp +++ b/Common/XUI/XUI_TransferToXboxOne.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include #include @@ -6,7 +6,7 @@ #include "XUI_Ctrl_4JList.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" -#include "../../../Rendering/EntityRenderers/ProgressRenderer.h" +#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h" #include "XUI_TransferToXboxOne.h" diff --git a/Common/XUI/XUI_TrialExitUpsell.cpp b/Common/XUI/XUI_TrialExitUpsell.cpp index 7e15901b8..f6786dacf 100644 --- a/Common/XUI/XUI_TrialExitUpsell.cpp +++ b/Common/XUI/XUI_TrialExitUpsell.cpp @@ -1,4 +1,4 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "XUI_TrialExitUpsell.h" // wchImages[TRIAL_EXIT_UPSELL_IMAGE_COUNT] diff --git a/Common/XUI/XUI_TutorialPopup.cpp b/Common/XUI/XUI_TutorialPopup.cpp index 7a0926d0c..aac50d6db 100644 --- a/Common/XUI/XUI_TutorialPopup.cpp +++ b/Common/XUI/XUI_TutorialPopup.cpp @@ -1,9 +1,9 @@ -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include "../Tutorial/Tutorial.h" -#include "../../../Player/MultiPlayerLocalPlayer.h" -#include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../../Minecraft.World/Blocks/Tile.h" -#include "../../../../Minecraft.World/Items/Item.h" +#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" +#include "../../Minecraft.World/Util/StringHelpers.h" +#include "../../Minecraft.World/Blocks/Tile.h" +#include "../../Minecraft.World/Items/Item.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Common/XUI/XUI_debug.cpp b/Common/XUI/XUI_debug.cpp index 592d3c5b9..e1fa1b120 100644 --- a/Common/XUI/XUI_debug.cpp +++ b/Common/XUI/XUI_debug.cpp @@ -1,11 +1,11 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "../../../../Minecraft.World/Build/stdafx.h" +#include "../../Minecraft.World/Build/stdafx.h" #include #include "XUI_Debug.h" -#include "../../../GameState/StatsCounter.h" +#include "../../Minecraft.Client/GameState/StatsCounter.h" LPCWSTR CScene_Debug::m_DebugCheckboxTextA[eDebugSetting_Max+1]= { diff --git a/Minecraft.Client/Build/stdafx.h b/Minecraft.Client/Build/stdafx.h index 7e54de33f..076f25cff 100644 --- a/Minecraft.Client/Build/stdafx.h +++ b/Minecraft.Client/Build/stdafx.h @@ -215,25 +215,25 @@ typedef XUID GameSessionUID; #include "stubs.h" #include "../Textures/BufferedImage.h" -#include "Common/Network/GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" #ifdef _XBOX -#include "Common/XUI/XUI_Helper.h" -#include "Common/XUI/XUI_Scene_Base.h" +#include "../../Common/XUI/XUI_Helper.h" +#include "../../Common/XUI/XUI_Scene_Base.h" #endif -#include "Common/UI/UIEnums.h" -#include "Common/UI/UIStructs.h" +#include "../../Common/UI/UIEnums.h" +#include "../../Common/UI/UIStructs.h" // #ifdef _XBOX -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Common/Tutorial/TutorialEnum.h" -#include "Common/App_structs.h" +#include "../../Common/App_Defines.h" +#include "../../Common/App_enums.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Common/App_structs.h" //#endif -#include "Common/Consoles_App.h" -#include "Common/Minecraft_Macros.h" -#include "Common/BuildVer.h" +#include "../../Common/Consoles_App.h" +#include "../../Common/Minecraft_Macros.h" +#include "../../Common/BuildVer.h" #ifdef _XBOX #include "../Platform/Xbox/Xbox_App.h" @@ -261,7 +261,7 @@ typedef XUID GameSessionUID; #include "../Platform/PS3Media/4J_strings.h" #include "../Platform/PS3/XML/ATGXmlParser.h" #include "../Platform/PS3/Social/SocialManager.h" - #include "Common/Audio/SoundEngine.h" + #include "../../Common/Audio/SoundEngine.h" #include "../Platform/PS3/Iggy/include/iggy.h" #include "../Platform/PS3/Iggy/gdraw/gdraw_ps3gcm.h" #include "../Platform/PS3/PS3_UIController.h" @@ -276,7 +276,7 @@ typedef XUID GameSessionUID; #include "../Platform/DurangoMedia/4J_strings.h" #include "../Platform/Durango/XML/ATGXmlParser.h" #include "../Platform/Durango/Social/SocialManager.h" -#include "Common/Audio/SoundEngine.h" +#include "../../Common/Audio/SoundEngine.h" #include "../Platform/Durango/Iggy/include/iggy.h" #include "../Platform/Durango/Iggy/gdraw/gdraw_d3d11.h" #include "../Platform/Durango/Durango_UIController.h" @@ -289,7 +289,7 @@ typedef XUID GameSessionUID; #include "../Platform/Windows64/GameConfig/Minecraft.spa.h" #include "../Platform/Windows64/XML/ATGXmlParser.h" #include "../Platform/Windows64/Social/SocialManager.h" - #include "Common/Audio/SoundEngine.h" + #include "../../Common/Audio/SoundEngine.h" #include "../Platform/Windows64/Iggy/include/iggy.h" #include "../Platform/Windows64/Iggy/gdraw/gdraw_d3d11.h" #include "../Platform/Windows64/Windows64_UIController.h" @@ -301,7 +301,7 @@ typedef XUID GameSessionUID; #include "../Platform/Orbis/Sentient/SentientTelemetryCommon.h" #include "../Platform/Orbis/Sentient/DynamicConfigurations.h" #include "../Platform/Orbis/GameConfig/Minecraft.spa.h" - #include "Common/Audio/SoundEngine.h" + #include "../../Common/Audio/SoundEngine.h" #include "../Platform/Linux/Linux_UIController.h" #include "../Platform/Linux/Social/SocialManager.h" #elif defined __PSVITA__ @@ -313,7 +313,7 @@ typedef XUID GameSessionUID; #include "../Platform/PSVita/GameConfig/Minecraft.spa.h" #include "../Platform/PSVita/XML/ATGXmlParser.h" #include "../Platform/PSVita/Social/SocialManager.h" - #include "Common/Audio/SoundEngine.h" + #include "../../Common/Audio/SoundEngine.h" #include "../Platform/PSVita/Iggy/include/iggy.h" #include "../Platform/PSVita/Iggy/gdraw/gdraw_psp2.h" #include "../Platform/PSVita/PSVita_UIController.h" @@ -327,35 +327,35 @@ typedef XUID GameSessionUID; #include "../Platform/OrbisMedia/4J_strings.h" #include "../Platform/Orbis/XML/ATGXmlParser.h" #include "../Platform/Windows64/Social/SocialManager.h" - #include "Common/Audio/SoundEngine.h" + #include "../../Common/Audio/SoundEngine.h" #include "../Platform/Orbis/Iggy/include/iggy.h" #include "../Platform/Orbis/Iggy/gdraw/gdraw_orbis.h" #include "../Platform/Orbis/Orbis_UIController.h" #endif #ifdef _XBOX -#include "Common/XUI/XUI_CustomMessages.h" -#include "Common/XUI/XUI_Scene_Inventory_Creative.h" -#include "Common/XUI/XUI_FullscreenProgress.h" -#include "Common/XUI/XUI_ConnectingProgress.h" -#include "Common/XUI/XUI_Scene_CraftingPanel.h" -#include "Common/XUI/XUI_TutorialPopup.h" -#include "Common/XUI/XUI_PauseMenu.h" +#include "../../Common/XUI/XUI_CustomMessages.h" +#include "../../Common/XUI/XUI_Scene_Inventory_Creative.h" +#include "../../Common/XUI/XUI_FullscreenProgress.h" +#include "../../Common/XUI/XUI_ConnectingProgress.h" +#include "../../Common/XUI/XUI_Scene_CraftingPanel.h" +#include "../../Common/XUI/XUI_TutorialPopup.h" +#include "../../Common/XUI/XUI_PauseMenu.h" #endif -#include "Common/ConsoleGameMode.h" -#include "Common/Console_Debug_enum.h" -#include "Common/Console_Awards_enum.h" -#include "Common/Tutorial/TutorialMode.h" -#include "Common/Tutorial/Tutorial.h" -#include "Common/Tutorial/FullTutorialMode.h" -#include "Common/Trial/TrialMode.h" -#include "Common/GameRules/ConsoleGameRules.h" -#include "Common/GameRules/ConsoleSchematicFile.h" -#include "Common/Colours/ColourTable.h" -#include "Common/DLC/DLCSkinFile.h" -#include "Common/DLC/DLCManager.h" -#include "Common/DLC/DLCPack.h" -#include "Common/Telemetry/TelemetryManager.h" +#include "../../Common/ConsoleGameMode.h" +#include "../../Common/Console_Debug_enum.h" +#include "../../Common/Console_Awards_enum.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/FullTutorialMode.h" +#include "../../Common/Trial/TrialMode.h" +#include "../../Common/GameRules/ConsoleGameRules.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" +#include "../../Common/Colours/ColourTable.h" +#include "../../Common/DLC/DLCSkinFile.h" +#include "../../Common/DLC/DLCManager.h" +#include "../../Common/DLC/DLCPack.h" +#include "../../Common/Telemetry/TelemetryManager.h" #ifdef _XBOX //#include "../Platform/Xbox/Xbox_App.h" diff --git a/Minecraft.Client/GameState/StatsCounter.cpp b/Minecraft.Client/GameState/StatsCounter.cpp index df944f326..562dcb63f 100644 --- a/Minecraft.Client/GameState/StatsCounter.cpp +++ b/Minecraft.Client/GameState/StatsCounter.cpp @@ -9,7 +9,7 @@ #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" Stat** StatsCounter::LARGE_STATS[] = { &Stats::walkOneM, diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 4956e35e5..45ef7cd99 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -65,8 +65,8 @@ #ifdef _XBOX #include "Platform/Xbox/Network/NetworkPlayerXbox.h" #endif -#include "Build/Common/UI/IUIScene_CreativeMenu.h" -#include "Build/Common/UI/UIFontData.h" +#include "../Common/UI/IUIScene_CreativeMenu.h" +#include "../Common/UI/UIFontData.h" #include "Textures/Packs/DLCTexturePack.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index d63fb7933..9739b093b 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -41,13 +41,13 @@ #include "../Minecraft.World/Level/Storage/SparseDataStorage.h" #include "../Minecraft.World/IO/Streams/Compression.h" #ifdef _XBOX -#include "Build/Common/XUI/XUI_DebugSetCamera.h" +#include "../Common/XUI/XUI_DebugSetCamera.h" #endif #include "Platform/PS3/PS3Extras/ShutdownManager.h" #include "Network/ServerCommandDispatcher.h" #include "../Minecraft.World/WorldGen/Biomes/BiomeSource.h" #include "Network/PlayerChunkMap.h" -#include "Build/Common/Telemetry/TelemetryManager.h" +#include "../Common/Telemetry/TelemetryManager.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/Minecraft.Client/Network/ClientConnection.cpp b/Minecraft.Client/Network/ClientConnection.cpp index 425f3f5d6..4e9816155 100644 --- a/Minecraft.Client/Network/ClientConnection.cpp +++ b/Minecraft.Client/Network/ClientConnection.cpp @@ -43,9 +43,9 @@ #include "../../Minecraft.World/Util/SoundTypes.h" #include "../Textures/Packs/TexturePackRepository.h" #ifdef _XBOX -#include "../Build/Common/XUI/XUI_Scene_Trading.h" +#include "../../Common/XUI/XUI_Scene_Trading.h" #else -#include "../Build/Common/UI/UI.h" +#include "../../Common/UI/UI.h" #endif #ifdef __PS3__ #include "../Platform/PS3/Network/SonyVoiceChat.h" diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp index c5975fcaf..f3e371561 100644 --- a/Minecraft.Client/Network/PlayerList.cpp +++ b/Minecraft.Client/Network/PlayerList.cpp @@ -27,7 +27,7 @@ #ifdef _XBOX #include "../Platform/Xbox/Network/NetworkPlayerXbox.h" #elif defined(__PS3__) || defined(__ORBIS__) -#include "../Build/Common/Network/Sony/NetworkPlayerSony.h" +#include "../../Common/Network/Sony/NetworkPlayerSony.h" #endif // 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc. diff --git a/Minecraft.Client/Platform/Durango/Durango_App.cpp b/Minecraft.Client/Platform/Durango/Durango_App.cpp index aa81ef0b0..bf485af60 100644 --- a/Minecraft.Client/Platform/Durango/Durango_App.cpp +++ b/Minecraft.Client/Platform/Durango/Durango_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Durango/Durango_UIController.h b/Minecraft.Client/Platform/Durango/Durango_UIController.h index 7affffca3..bb0c90f03 100644 --- a/Minecraft.Client/Platform/Durango/Durango_UIController.h +++ b/Minecraft.Client/Platform/Durango/Durango_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h index 3b0c005f6..0147545d9 100644 --- a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h +++ b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" namespace P = Platform; namespace PC = Platform::Collections; diff --git a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp index a9d4294a4..a366f6a06 100644 --- a/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -9,7 +9,7 @@ #include "../../../../Minecraft.World/Util/StringHelpers.h" -#include "../../../Build/Common/Console_Awards_enum.h" +#include "../../../../Common/Console_Awards_enum.h" #include "DurangoStatsDebugger.h" diff --git a/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h index e4051b1ed..fad16effb 100644 --- a/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h +++ b/Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Network/NetworkPlayerInterface.h" +#include "../../../../Common/Network/NetworkPlayerInterface.h" #include "DQRNetworkPlayer.h" // This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way. diff --git a/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h b/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h index 40d662f00..1d00c1257 100644 --- a/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h +++ b/Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h @@ -2,9 +2,9 @@ using namespace std; #include #include "../../../../Minecraft.World/Util/C4JThread.h" -#include "../../../Build/Common/Network/NetworkPlayerInterface.h" -#include "../../../Build/Common/Network/PlatformNetworkManagerInterface.h" -#include "../../../Build/Common/Network/SessionInfo.h" +#include "../../../../Common/Network/NetworkPlayerInterface.h" +#include "../../../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../../../Common/Network/SessionInfo.h" #include "DQRNetworkManager.h" #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp index bfe8ea271..b72a150ae 100644 --- a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp +++ b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp @@ -7,7 +7,7 @@ #include "../../../../Minecraft.World/Level/LevelData.h" #include "../../../../Minecraft.World/Level/Storage/LevelSettings.h" -#include "../../../Build/Common/Network/GameNetworkManager.h" +#include "../../../../Common/Network/GameNetworkManager.h" #include "../../../Player/MultiPlayerLocalPlayer.h" #include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h" diff --git a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h index 57421e991..7bf43acb7 100644 --- a/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h +++ b/Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h @@ -2,7 +2,7 @@ #include "../../../../Minecraft.World/Stats/DurangoStats.h" -#include "../../../Build/Common/Telemetry/TelemetryManager.h" +#include "../../../../Common/Telemetry/TelemetryManager.h" class CDurangoTelemetryManager : public CTelemetryManager { diff --git a/Minecraft.Client/Platform/Durango/XboxGameMode.cpp b/Minecraft.Client/Platform/Durango/XboxGameMode.cpp index 6067006ef..30c06f1c1 100644 --- a/Minecraft.Client/Platform/Durango/XboxGameMode.cpp +++ b/Minecraft.Client/Platform/Durango/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Build/stdafx.h" #include "XboxGameMode.h" -#include "../../Build/Common/Tutorial/Tutorial.h" +#include "../../../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Platform/Durango/XboxGameMode.h b/Minecraft.Client/Platform/Durango/XboxGameMode.h index af97c2167..b1baff5d7 100644 --- a/Minecraft.Client/Platform/Durango/XboxGameMode.h +++ b/Minecraft.Client/Platform/Durango/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Build/Common/Tutorial/TutorialMode.h" +#include "../../../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/Platform/Linux/Linux_App.cpp b/Minecraft.Client/Platform/Linux/Linux_App.cpp index 5c94c4fc8..8039dfcdd 100644 --- a/Minecraft.Client/Platform/Linux/Linux_App.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp index d5b2a669f..b46968ae1 100644 --- a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp @@ -51,8 +51,8 @@ static void sigsegv_handler(int sig) { #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "../Durango/Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Linux/Linux_UIController.h b/Minecraft.Client/Platform/Linux/Linux_UIController.h index 7ee1be05d..c261a5a82 100644 --- a/Minecraft.Client/Platform/Linux/Linux_UIController.h +++ b/Minecraft.Client/Platform/Linux/Linux_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp index 6f116f0b4..47b92fa5a 100644 --- a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp +++ b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp @@ -6,7 +6,7 @@ #include #include "Stubs/LinuxStubs.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" void Display::update() {} diff --git a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp index 858c85d20..fad081884 100644 --- a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../Orbis_App.h" -#include "../../../Build/Common/Consoles_App.h" +#include "../../../../Common/Consoles_App.h" -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h index 4d682d463..2aacbabbb 100644 --- a/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h +++ b/Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" class OrbisLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp index 63c5c7853..7ebb2cfc4 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -12,7 +12,7 @@ #include "../ps4__np_conf.h" #include "Orbis_NPToolkit.h" #include "SonyVoiceChat_Orbis.h" -#include "../../../Build/Common/Network/Sony/SonyHttp.h" +#include "../../../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" // #include "../../PS3/PS3Extras/PS3Strings.h" diff --git a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h index 1aa68562e..315247334 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h @@ -8,7 +8,7 @@ #include // #include "SonyVoiceChat_Orbis.h" -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h index d5c450f15..ec39a9eb4 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Network/Sony/SonyCommerce.h" +#include "../../../../Common/Network/Sony/SonyCommerce.h" class OrbisNPToolkit; class SonyCommerce_Orbis : public SonyCommerce diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h index 0191c38bb..afde7777b 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../../Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Orbis : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h b/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h index 8ff872d2a..62d4da52b 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h +++ b/Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h @@ -4,7 +4,7 @@ #include #include #include -#include "../../../Build/Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" static const int sc_maxVoiceDataSize = 2048; diff --git a/Minecraft.Client/Platform/Orbis/Orbis_App.cpp b/Minecraft.Client/Platform/Orbis/Orbis_App.cpp index 0b3e29495..fcea61cf8 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_App.cpp +++ b/Minecraft.Client/Platform/Orbis/Orbis_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" @@ -16,7 +16,7 @@ #include "Network/SonyRemoteStorage_Orbis.h" #include -#include "../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../Common/Network/Sony/SonyRemoteStorage.h" #include #include diff --git a/Minecraft.Client/Platform/Orbis/Orbis_App.h b/Minecraft.Client/Platform/Orbis/Orbis_App.h index 6c0bac012..fc3c953d9 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_App.h +++ b/Minecraft.Client/Platform/Orbis/Orbis_App.h @@ -3,8 +3,8 @@ class C4JStringTable; #include -#include "../../Build/Common/Network/Sony/SonyCommerce.h" -#include "../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../Common/Network/Sony/SonyCommerce.h" +#include "../../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp index 9c8cf469c..c0991c427 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp @@ -27,8 +27,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Orbis/Orbis_UIController.h b/Minecraft.Client/Platform/Orbis/Orbis_UIController.h index 2e3f28a8d..237ba1bb9 100644 --- a/Minecraft.Client/Platform/Orbis/Orbis_UIController.h +++ b/Minecraft.Client/Platform/Orbis/Orbis_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp index 9510f85ce..63c07a712 100644 --- a/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp +++ b/Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp @@ -5,8 +5,8 @@ #include #include #include -#include "../../../Build/Common/Audio/SoundEngine.h" -#include "../../../Build/Common/Consoles_App.h" +#include "../../../../Common/Audio/SoundEngine.h" +#include "../../../../Common/Consoles_App.h" #include "../Miles/include/mss.h" // This file has the platform specific functions required for PS3 audio diff --git a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp index a00908f7d..0a9c5dff0 100644 --- a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp +++ b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../PS3_App.h" -#include "../../../Build/Common/Consoles_App.h" +#include "../../../../Common/Consoles_App.h" -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h index 3b109ac95..eeee79735 100644 --- a/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" #include "../../../../Minecraft.World/Build/x64headers/extraX64.h" #include "../Passphrase/ps3__np_conf.h" diff --git a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp index 5ca3129af..1c57ed35e 100644 --- a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Build/stdafx.h" #include "SQRNetworkManager_PS3.h" -#include "../../../Build/Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" #ifdef __PS3__ #include #include @@ -13,7 +13,7 @@ #include "../Passphrase/ps3__np_conf.h" #ifdef __PS3__ #include "SonyVoiceChat.h" -#include "../../../Build/Common/Network/Sony/SonyHttp.h" +#include "../../../../Common/Network/Sony/SonyHttp.h" #endif #include "../../../../Minecraft.World/Util/C4JThread.h" #include "../PS3Extras/PS3Strings.h" diff --git a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h index 0e17d249f..94080f4f6 100644 --- a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h @@ -9,7 +9,7 @@ #endif #include -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h index b167303dd..0dee251d5 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h @@ -6,7 +6,7 @@ #include #include #include -#include "../../../Build/Common/Network/Sony/SonyCommerce.h" +#include "../../../../Common/Network/Sony/SonyCommerce.h" #define SCE_TOOLKIT_NP_SKU_PRICE_LEN (SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \ + SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \ diff --git a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h index e01b1e4eb..cc91b0b74 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h +++ b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../Build/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" +#include "../../../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage_PS3 : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp b/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp index 94b2eb5a6..8844d3b53 100644 --- a/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp +++ b/Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Build/stdafx.h" #include "ShutdownManager.h" -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" #include "../../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/Platform/PS3/PS3_App.cpp b/Minecraft.Client/Platform/PS3/PS3_App.cpp index 575336597..3959227fa 100644 --- a/Minecraft.Client/Platform/PS3/PS3_App.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/PS3/PS3_App.h b/Minecraft.Client/Platform/PS3/PS3_App.h index bfd699700..48d05cdc5 100644 --- a/Minecraft.Client/Platform/PS3/PS3_App.h +++ b/Minecraft.Client/Platform/PS3/PS3_App.h @@ -1,7 +1,7 @@ #pragma once -#include "../../Build/Common/Network/Sony/SonyCommerce.h" -#include "../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../Common/Network/Sony/SonyCommerce.h" +#include "../../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp b/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp index 956c038e9..50526d9f3 100644 --- a/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp @@ -80,11 +80,11 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" -#include "../../Build/Common/Console_Awards_enum.h" +#include "../../../Common/Console_Awards_enum.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" #include "../../../Minecraft.World/Util/IntCache.h" @@ -94,8 +94,8 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = #include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h" #include "PS3Extras/EdgeZLib.h" #include "PS3Extras/C4JThread_SPU.h" -#include "../../Build/Common/Network/Sony/SQRNetworkManager.h" -#include "../../Build/Common/UI/IUIScene_PauseMenu.h" +#include "../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../../Common/UI/IUIScene_PauseMenu.h" #include diff --git a/Minecraft.Client/Platform/PS3/PS3_UIController.cpp b/Minecraft.Client/Platform/PS3/PS3_UIController.cpp index ed63a95d3..83a7d51dc 100644 --- a/Minecraft.Client/Platform/PS3/PS3_UIController.cpp +++ b/Minecraft.Client/Platform/PS3/PS3_UIController.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Build/stdafx.h" #include "PS3_UIController.h" -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" #include // Temp diff --git a/Minecraft.Client/Platform/PS3/PS3_UIController.h b/Minecraft.Client/Platform/PS3/PS3_UIController.h index eebbf3783..97958b09d 100644 --- a/Minecraft.Client/Platform/PS3/PS3_UIController.h +++ b/Minecraft.Client/Platform/PS3/PS3_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/PS3/XboxGameMode.cpp b/Minecraft.Client/Platform/PS3/XboxGameMode.cpp index 6067006ef..30c06f1c1 100644 --- a/Minecraft.Client/Platform/PS3/XboxGameMode.cpp +++ b/Minecraft.Client/Platform/PS3/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "../../../Minecraft.World/Build/stdafx.h" #include "XboxGameMode.h" -#include "../../Build/Common/Tutorial/Tutorial.h" +#include "../../../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Platform/PS3/XboxGameMode.h b/Minecraft.Client/Platform/PS3/XboxGameMode.h index af97c2167..b1baff5d7 100644 --- a/Minecraft.Client/Platform/PS3/XboxGameMode.h +++ b/Minecraft.Client/Platform/PS3/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Build/Common/Tutorial/TutorialMode.h" +#include "../../../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp index d46389a06..e8b0c146c 100644 --- a/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp @@ -28,8 +28,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "QNetManager.h" #include "../../Rendering/Tesselator.h" #include "Xbox_Awards_enum.h" diff --git a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index e4db28b58..7c96e5ff3 100644 --- a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -5,9 +5,9 @@ #include "base64.h" #include "../PSVita_App.h" -#include "../../../Build/Common/Consoles_App.h" +#include "../../../../Common/Consoles_App.h" -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" #include "../../../../Minecraft.World/Util/StringHelpers.h" diff --git a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h index 34029b0ec..6f4f686ea 100644 --- a/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h +++ b/Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" #include "../PSVitaExtras/Conf.h" class PSVitaLeaderboardManager : public LeaderboardManager diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 1cc1b63d1..985516b21 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -1,7 +1,7 @@ #include "../../../../Minecraft.World/Build/stdafx.h" #include "SQRNetworkManager_AdHoc_Vita.h" #include "SonyVoiceChat_Vita.h" -#include "../../../Build/Common/Network/Sony/PlatformNetworkManagerSony.h" +#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h" #include #include @@ -12,7 +12,7 @@ #include #include "../PSVitaExtras/Conf.h" -#include "../../../Build/Common/Network/Sony/SonyHttp.h" +#include "../../../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h index 3799abfd2..f8f80f205 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h @@ -8,7 +8,7 @@ #include -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" // class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp index 3cb16bfd8..17b4eb837 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -1,7 +1,7 @@ #include "../../../../Minecraft.World/Build/stdafx.h" #include "SQRNetworkManager_Vita.h" #include "SonyVoiceChat_Vita.h" -#include "../../../Build/Common/Network/Sony/PlatformNetworkManagerSony.h" +#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h" #include #include @@ -10,7 +10,7 @@ #include #include "../PSVitaExtras/Conf.h" -#include "../../../Build/Common/Network/Sony/SonyHttp.h" +#include "../../../../Common/Network/Sony/SonyHttp.h" #include "../../../../Minecraft.World/Util/C4JThread.h" // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K ) diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h index 68358c616..328e8d9a0 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h @@ -8,7 +8,7 @@ #include -#include "../../../Build/Common/Network/Sony/SQRNetworkManager.h" +#include "../../../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h index f7e3f2aec..ab5129bf3 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Network/Sony/SonyCommerce.h" +#include "../../../../Common/Network/Sony/SonyCommerce.h" #include #include #include diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h index 93ace1c4b..c69302644 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../../Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Vita : public SonyRemoteStorage { diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h b/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h index 5d3c41363..a80558ee9 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h +++ b/Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h @@ -4,7 +4,7 @@ #include #include #include -#include "../../../Build/Common/Network/Sony/SQRNetworkPlayer.h" +#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h" static const int sc_maxVoiceDataSize = 2048; diff --git a/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp index cf55bfecb..6449d43ca 100644 --- a/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp @@ -1,6 +1,6 @@ #include "../../../../Minecraft.World/Build/stdafx.h" #include "ShutdownManager.h" -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" #include "../../../MinecraftServer.h" #ifdef __PS3__ #include "../../PS3/PS3Extras/C4JSpursJob.h" diff --git a/Minecraft.Client/Platform/PSVita/PSVita_App.cpp b/Minecraft.Client/Platform/PSVita/PSVita_App.cpp index 3696778f3..738ef8c9f 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVita_App.cpp @@ -1,6 +1,6 @@  #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" @@ -13,7 +13,7 @@ #include "../../../Minecraft.World/Util/StringHelpers.h" #include "Network/SonyRemoteStorage_Vita.h" #include "Network/SonyCommerce_Vita.h" -#include "../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../Common/Network/Sony/SonyRemoteStorage.h" #include "Network/PSVita_NPToolkit.h" #include #include diff --git a/Minecraft.Client/Platform/PSVita/PSVita_App.h b/Minecraft.Client/Platform/PSVita/PSVita_App.h index 29612614b..fa3f7ab38 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_App.h +++ b/Minecraft.Client/Platform/PSVita/PSVita_App.h @@ -3,8 +3,8 @@ class C4JStringTable; //#include -#include "../../Build/Common/Network/Sony/SonyCommerce.h" -#include "../../Build/Common/Network/Sony/SonyRemoteStorage.h" +#include "../../../Common/Network/Sony/SonyCommerce.h" +#include "../../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp index 4d25c6aa7..ed9c98f3b 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp @@ -40,11 +40,11 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" -#include "../../Build/Common/Console_Awards_enum.h" +#include "../../../Common/Console_Awards_enum.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" #include "../../../Minecraft.World/Util/IntCache.h" @@ -54,8 +54,8 @@ #include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h" //#include "../PS3/PS3Extras/EdgeZLib.h" #include "../../../Minecraft.World/Util/C4JThread.h" -#include "../../Build/Common/Network/Sony/SQRNetworkManager.h" -#include "../../Build/Common/UI/IUIScene_PauseMenu.h" +#include "../../../Common/Network/Sony/SQRNetworkManager.h" +#include "../../../Common/UI/IUIScene_PauseMenu.h" #include "PSVitaExtras/Conf.h" #include "Network/PSVita_NPToolkit.h" #include "Network/SonyVoiceChat_Vita.h" diff --git a/Minecraft.Client/Platform/PSVita/PSVita_UIController.h b/Minecraft.Client/Platform/PSVita/PSVita_UIController.h index 240326b61..21a6d9715 100644 --- a/Minecraft.Client/Platform/PSVita/PSVita_UIController.h +++ b/Minecraft.Client/Platform/PSVita/PSVita_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h index 79b28974b..75d8d3ce5 100644 --- a/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h +++ b/Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp index 9ce653fb9..38237c76d 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp @@ -1,5 +1,5 @@ #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/Consoles_App.h" +#include "../../../Common/Consoles_App.h" #include "../../Player/User.h" #include "../../Minecraft.h" #include "../../MinecraftServer.h" diff --git a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp index 75c36cbce..c5034bcbf 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp @@ -25,8 +25,8 @@ #include "../../GameState/StatsCounter.h" #include "../../UI/Screens/ConnectScreen.h" //#include "Social/SocialManager.h" -//#include "../../Build/Common/Leaderboards/LeaderboardManager.h" -//#include "../../Build/Common/XUI/XUI_Scene_Container.h" +//#include "../../../Common/Leaderboards/LeaderboardManager.h" +//#include "../../../Common/XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" diff --git a/Minecraft.Client/Platform/Windows64/Windows64_UIController.h b/Minecraft.Client/Platform/Windows64/Windows64_UIController.h index 0eb64d6d2..3827f266d 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_UIController.h +++ b/Minecraft.Client/Platform/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/UIController.h" +#include "../../../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp index 38f84e5d9..3a702ae44 100644 --- a/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp @@ -8,7 +8,7 @@ #include "SoundEngine.h" #include "../../../Textures/Packs/TexturePackRepository.h" #include "../../../Textures/Packs/TexturePack.h" -#include "../../../Build/Common/DLC/DLCAudioFile.h" +#include "../../../../Common/DLC/DLCAudioFile.h" #include "../../../Textures/Packs/DLCTexturePack.h" diff --git a/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h index f094db171..b654ab4a7 100644 --- a/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h +++ b/Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h @@ -2,7 +2,7 @@ using namespace std; #include -#include "../../../Build/Common/UI/UIFontData.h" +#include "../../../../Common/UI/UIFontData.h" // 4J This class is partially based of the ATG font implementation //-------------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h index a12994eb8..f394d9644 100644 --- a/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h +++ b/Minecraft.Client/Platform/Xbox/Leaderboards/XboxLeaderboardManager.h @@ -3,7 +3,7 @@ #include #include -#include "../../../Build/Common/Leaderboards/LeaderboardManager.h" +#include "../../../../Common/Leaderboards/LeaderboardManager.h" class XboxLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h index e1bddd14e..26142c688 100644 --- a/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h +++ b/Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Build/Common/Network/NetworkPlayerInterface.h" +#include "../../../../Common/Network/NetworkPlayerInterface.h" // This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is // managed by PlatformNetworkManagerXbox. diff --git a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp index 3d9b0f561..e25c4c33c 100644 --- a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp +++ b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.cpp @@ -3,7 +3,7 @@ #include "../../../../Minecraft.World/Util/StringHelpers.h" #include "PlatformNetworkManagerXbox.h" #include "NetworkPlayerXbox.h" -#include "../../../Build/Common/Network/GameNetworkManager.h" +#include "../../../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerXbox *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h index 5c9dd0c92..90b7ed0b4 100644 --- a/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h +++ b/Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h @@ -3,9 +3,9 @@ using namespace std; #include #include #include "../../../../Minecraft.World/Util/C4JThread.h" -#include "../../../Build/Common/Network/NetworkPlayerInterface.h" -#include "../../../Build/Common/Network/PlatformNetworkManagerInterface.h" -#include "../../../Build/Common/Network/SessionInfo.h" +#include "../../../../Common/Network/NetworkPlayerInterface.h" +#include "../../../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../../../Common/Network/SessionInfo.h" // This is how often we allow a search for new games #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Platform/Xbox/Xbox_App.cpp b/Minecraft.Client/Platform/Xbox/Xbox_App.cpp index 404e7e037..9f486982d 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_App.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_App.cpp @@ -1,64 +1,64 @@ #include "../../../Minecraft.World/Build/stdafx.h" -#include "../../Build/Common/UI/UIStructs.h" +#include "../../../Common/UI/UIStructs.h" -#include "../../Build/Common/XUI/XUI_Intro.h" -#include "../../Build/Common/XUI/XUI_MainMenu.h" -#include "../../Build/Common/XUI/XUI_NewUpdateMessage.h" -#include "../../Build/Common/XUI/XUI_HelpAndOptions.h" -#include "../../Build/Common/XUI/XUI_TextEntry.h" -#include "../../Build/Common/XUI/XUI_HelpHowToPlay.h" -#include "../../Build/Common/XUI/XUI_HowToPlayMenu.h" -#include "../../Build/Common/XUI/XUI_HelpControls.h" -#include "../../Build/Common/XUI/XUI_TextEntry.h" -#include "../../Build/Common/XUI/XUI_LoadSettings.h" -#include "../../Build/Common/XUI/XUI_SettingsAll.h" -#include "../../Build/Common/XUI/XUI_SettingsOptions.h" -#include "../../Build/Common/XUI/XUI_SettingsAudio.h" -#include "../../Build/Common/XUI/XUI_SettingsControl.h" -#include "../../Build/Common/XUI/XUI_SettingsGraphics.h" -#include "../../Build/Common/XUI/XUI_SettingsUI.h" -#include "../../Build/Common/XUI/XUI_Leaderboards.h" -#include "../../Build/Common/XUI/XUI_Debug.h" -#include "../../Build/Common/XUI/XUI_DebugTips.h" -#include "../../Build/Common/XUI/XUI_Reinstall.h" -#include "../../Build/Common/XUI/XUI_Death.h" -#include "../../Build/Common/XUI/XUI_DebugOverlay.h" -#include "../../Build/Common/XUI/XUI_DLCOffers.h" -#include "../../Build/Common/XUI/XUI_SocialPost.h" -#include "../../Build/Common/XUI/XUI_Scene_Container.h" -#include "../../Build/Common/XUI/XUI_Scene_Furnace.h" -#include "../../Build/Common/XUI/XUI_Scene_Inventory.h" -#include "../../Build/Common/XUI/XUI_Scene_Trap.h" -#include "../../Build/Common/XUI/XUI_Control_ComboBox.h" -#include "../../Build/Common/XUI/XUI_MultiGameInfo.h" -#include "../../Build/Common/XUI/XUI_MultiGameJoinLoad.h" -#include "../../Build/Common/XUI/XUI_MultiGameCreate.h" -#include "../../Build/Common/XUI/XUI_MultiGameLaunchMoreOptions.h" -#include "../../Build/Common/XUI/XUI_SignEntry.h" -#include "../../Build/Common/XUI/XUI_InGameInfo.h" -#include "../../Build/Common/XUI/XUI_TrialExitUpsell.h" -#include "../../Build/Common/XUI/XUI_BasePlayer.h" -#include "../../Build/Common/XUI/XUI_PartnernetPassword.h" -#include "../../Build/Common/XUI/XUI_SaveMessage.h" -#include "../../Build/Common/XUI/XUI_Chat.h" -#include "../../Build/Common/XUI/XUI_SkinSelect.h" -#include "../../Build/Common/XUI/XUI_InGameHostOptions.h" -#include "../../Build/Common/XUI/XUI_InGamePlayerOptions.h" -#include "../../Build/Common/XUI/XUI_Scene_Enchant.h" -#include "../../Build/Common/XUI/XUI_Scene_BrewingStand.h" -#include "../../Build/Common/XUI/XUI_XZP_Icons.h" -#include "../../Build/Common/XUI/XUI_Controls.h" -#include "../../Build/Common/XUI/XUI_Scene_Win.h" -#include "../../Build/Common/XUI/XUI_HUD.h" -#include "../../Build/Common/XUI/XUI_DebugSetCamera.h" -//#include "../../Build/Common/XUI/XUI_TransferToXboxOne.h" +#include "../../../Common/XUI/XUI_Intro.h" +#include "../../../Common/XUI/XUI_MainMenu.h" +#include "../../../Common/XUI/XUI_NewUpdateMessage.h" +#include "../../../Common/XUI/XUI_HelpAndOptions.h" +#include "../../../Common/XUI/XUI_TextEntry.h" +#include "../../../Common/XUI/XUI_HelpHowToPlay.h" +#include "../../../Common/XUI/XUI_HowToPlayMenu.h" +#include "../../../Common/XUI/XUI_HelpControls.h" +#include "../../../Common/XUI/XUI_TextEntry.h" +#include "../../../Common/XUI/XUI_LoadSettings.h" +#include "../../../Common/XUI/XUI_SettingsAll.h" +#include "../../../Common/XUI/XUI_SettingsOptions.h" +#include "../../../Common/XUI/XUI_SettingsAudio.h" +#include "../../../Common/XUI/XUI_SettingsControl.h" +#include "../../../Common/XUI/XUI_SettingsGraphics.h" +#include "../../../Common/XUI/XUI_SettingsUI.h" +#include "../../../Common/XUI/XUI_Leaderboards.h" +#include "../../../Common/XUI/XUI_Debug.h" +#include "../../../Common/XUI/XUI_DebugTips.h" +#include "../../../Common/XUI/XUI_Reinstall.h" +#include "../../../Common/XUI/XUI_Death.h" +#include "../../../Common/XUI/XUI_DebugOverlay.h" +#include "../../../Common/XUI/XUI_DLCOffers.h" +#include "../../../Common/XUI/XUI_SocialPost.h" +#include "../../../Common/XUI/XUI_Scene_Container.h" +#include "../../../Common/XUI/XUI_Scene_Furnace.h" +#include "../../../Common/XUI/XUI_Scene_Inventory.h" +#include "../../../Common/XUI/XUI_Scene_Trap.h" +#include "../../../Common/XUI/XUI_Control_ComboBox.h" +#include "../../../Common/XUI/XUI_MultiGameInfo.h" +#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h" +#include "../../../Common/XUI/XUI_MultiGameCreate.h" +#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "../../../Common/XUI/XUI_SignEntry.h" +#include "../../../Common/XUI/XUI_InGameInfo.h" +#include "../../../Common/XUI/XUI_TrialExitUpsell.h" +#include "../../../Common/XUI/XUI_BasePlayer.h" +#include "../../../Common/XUI/XUI_PartnernetPassword.h" +#include "../../../Common/XUI/XUI_SaveMessage.h" +#include "../../../Common/XUI/XUI_Chat.h" +#include "../../../Common/XUI/XUI_SkinSelect.h" +#include "../../../Common/XUI/XUI_InGameHostOptions.h" +#include "../../../Common/XUI/XUI_InGamePlayerOptions.h" +#include "../../../Common/XUI/XUI_Scene_Enchant.h" +#include "../../../Common/XUI/XUI_Scene_BrewingStand.h" +#include "../../../Common/XUI/XUI_XZP_Icons.h" +#include "../../../Common/XUI/XUI_Controls.h" +#include "../../../Common/XUI/XUI_Scene_Win.h" +#include "../../../Common/XUI/XUI_HUD.h" +#include "../../../Common/XUI/XUI_DebugSetCamera.h" +//#include "../../../Common/XUI/XUI_TransferToXboxOne.h" #ifdef _DEBUG_MENUS_ENABLED -#include "../../Build/Common/XUI/XUI_DebugItemEditor.h" +#include "../../../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "../../Build/Common/XUI/XUI_DebugSchematicCreator.h" +#include "../../../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "../../../Minecraft.World/Recipes/Recipy.h" @@ -88,16 +88,16 @@ #include "../../GameState/GameMode.h" #include "Social/SocialManager.h" #include -#include "../../Build/Common/Tutorial/TutorialMode.h" +#include "../../../Common/Tutorial/TutorialMode.h" #include "XML/ATGXmlParser.h" #include "XML/xmlFilesCallback.h" #include "4JLibs/inc/4J_Input.h" #include "Font/XUI_FontRenderer.h" -#include "../../Build/Common/Minecraft_Macros.h" +#include "../../../Common/Minecraft_Macros.h" #include "../../Network/PlayerList.h" #include "../../Player/ServerPlayer.h" -#include "../../Build/Common/GameRules/ConsoleGameRules.h" -#include "../../Build/Common/GameRules/ConsoleSchematicFile.h" +#include "../../../Common/GameRules/ConsoleGameRules.h" +#include "../../../Common/GameRules/ConsoleSchematicFile.h" #include "../../../Minecraft.World/IO/Streams/InputOutputStream.h" #include "../../../Minecraft.World/Level/Storage/LevelSettings.h" #include "../../Player/User.h" @@ -109,67 +109,67 @@ #include "../../../Minecraft.World/IO/Streams/Compression.h" #include "../../Textures/Packs/TexturePackRepository.h" #include "../../Textures/Packs/TexturePack.h" -#include "../../Build/Common/DLC/DLCAudioFile.h" +#include "../../../Common/DLC/DLCAudioFile.h" #include "../../Textures/Packs/DLCTexturePack.h" -#include "../../Build/Common/XUI/XUI_Intro.h" -#include "../../Build/Common/XUI/XUI_MainMenu.h" -#include "../../Build/Common/XUI/XUI_NewUpdateMessage.h" -#include "../../Build/Common/XUI/XUI_HelpAndOptions.h" -#include "../../Build/Common/XUI/XUI_TextEntry.h" -#include "../../Build/Common/XUI/XUI_HelpHowToPlay.h" -#include "../../Build/Common/XUI/XUI_HowToPlayMenu.h" -#include "../../Build/Common/XUI/XUI_HelpControls.h" -#include "../../Build/Common/XUI/XUI_TextEntry.h" -#include "../../Build/Common/XUI/XUI_LoadSettings.h" -#include "../../Build/Common/XUI/XUI_SettingsAll.h" -#include "../../Build/Common/XUI/XUI_SettingsOptions.h" -#include "../../Build/Common/XUI/XUI_SettingsAudio.h" -#include "../../Build/Common/XUI/XUI_SettingsControl.h" -#include "../../Build/Common/XUI/XUI_SettingsGraphics.h" -#include "../../Build/Common/XUI/XUI_SettingsUI.h" -#include "../../Build/Common/XUI/XUI_Leaderboards.h" -#include "../../Build/Common/XUI/XUI_Debug.h" -#include "../../Build/Common/XUI/XUI_DebugTips.h" -#include "../../Build/Common/XUI/XUI_Reinstall.h" -#include "../../Build/Common/XUI/XUI_Death.h" -#include "../../Build/Common/XUI/XUI_DebugOverlay.h" -#include "../../Build/Common/XUI/XUI_DLCOffers.h" -#include "../../Build/Common/XUI/XUI_SocialPost.h" -#include "../../Build/Common/XUI/XUI_Scene_Container.h" -#include "../../Build/Common/XUI/XUI_Scene_Furnace.h" -#include "../../Build/Common/XUI/XUI_Scene_Inventory.h" -#include "../../Build/Common/XUI/XUI_Scene_Trap.h" -#include "../../Build/Common/XUI/XUI_Control_ComboBox.h" -#include "../../Build/Common/XUI/XUI_MultiGameInfo.h" -#include "../../Build/Common/XUI/XUI_MultiGameJoinLoad.h" -#include "../../Build/Common/XUI/XUI_MultiGameCreate.h" -#include "../../Build/Common/XUI/XUI_MultiGameLaunchMoreOptions.h" -#include "../../Build/Common/XUI/XUI_SignEntry.h" -#include "../../Build/Common/XUI/XUI_InGameInfo.h" -#include "../../Build/Common/XUI/XUI_TrialExitUpsell.h" -#include "../../Build/Common/XUI/XUI_BasePlayer.h" -#include "../../Build/Common/XUI/XUI_PartnernetPassword.h" -#include "../../Build/Common/XUI/XUI_SaveMessage.h" -#include "../../Build/Common/XUI/XUI_Chat.h" -#include "../../Build/Common/XUI/XUI_SkinSelect.h" -#include "../../Build/Common/XUI/XUI_InGameHostOptions.h" -#include "../../Build/Common/XUI/XUI_InGamePlayerOptions.h" -#include "../../Build/Common/XUI/XUI_Scene_Enchant.h" -#include "../../Build/Common/XUI/XUI_Scene_BrewingStand.h" -#include "../../Build/Common/XUI/XUI_XZP_Icons.h" -#include "../../Build/Common/XUI/XUI_Controls.h" -#include "../../Build/Common/XUI/XUI_Scene_Win.h" -#include "../../Build/Common/XUI/XUI_HUD.h" -#include "../../Build/Common/XUI/XUI_Scene_Anvil.h" -#include "../../Build/Common/XUI/XUI_Scene_Trading.h" -#include "../../Build/Common/XUI/XUI_Teleport.h" +#include "../../../Common/XUI/XUI_Intro.h" +#include "../../../Common/XUI/XUI_MainMenu.h" +#include "../../../Common/XUI/XUI_NewUpdateMessage.h" +#include "../../../Common/XUI/XUI_HelpAndOptions.h" +#include "../../../Common/XUI/XUI_TextEntry.h" +#include "../../../Common/XUI/XUI_HelpHowToPlay.h" +#include "../../../Common/XUI/XUI_HowToPlayMenu.h" +#include "../../../Common/XUI/XUI_HelpControls.h" +#include "../../../Common/XUI/XUI_TextEntry.h" +#include "../../../Common/XUI/XUI_LoadSettings.h" +#include "../../../Common/XUI/XUI_SettingsAll.h" +#include "../../../Common/XUI/XUI_SettingsOptions.h" +#include "../../../Common/XUI/XUI_SettingsAudio.h" +#include "../../../Common/XUI/XUI_SettingsControl.h" +#include "../../../Common/XUI/XUI_SettingsGraphics.h" +#include "../../../Common/XUI/XUI_SettingsUI.h" +#include "../../../Common/XUI/XUI_Leaderboards.h" +#include "../../../Common/XUI/XUI_Debug.h" +#include "../../../Common/XUI/XUI_DebugTips.h" +#include "../../../Common/XUI/XUI_Reinstall.h" +#include "../../../Common/XUI/XUI_Death.h" +#include "../../../Common/XUI/XUI_DebugOverlay.h" +#include "../../../Common/XUI/XUI_DLCOffers.h" +#include "../../../Common/XUI/XUI_SocialPost.h" +#include "../../../Common/XUI/XUI_Scene_Container.h" +#include "../../../Common/XUI/XUI_Scene_Furnace.h" +#include "../../../Common/XUI/XUI_Scene_Inventory.h" +#include "../../../Common/XUI/XUI_Scene_Trap.h" +#include "../../../Common/XUI/XUI_Control_ComboBox.h" +#include "../../../Common/XUI/XUI_MultiGameInfo.h" +#include "../../../Common/XUI/XUI_MultiGameJoinLoad.h" +#include "../../../Common/XUI/XUI_MultiGameCreate.h" +#include "../../../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "../../../Common/XUI/XUI_SignEntry.h" +#include "../../../Common/XUI/XUI_InGameInfo.h" +#include "../../../Common/XUI/XUI_TrialExitUpsell.h" +#include "../../../Common/XUI/XUI_BasePlayer.h" +#include "../../../Common/XUI/XUI_PartnernetPassword.h" +#include "../../../Common/XUI/XUI_SaveMessage.h" +#include "../../../Common/XUI/XUI_Chat.h" +#include "../../../Common/XUI/XUI_SkinSelect.h" +#include "../../../Common/XUI/XUI_InGameHostOptions.h" +#include "../../../Common/XUI/XUI_InGamePlayerOptions.h" +#include "../../../Common/XUI/XUI_Scene_Enchant.h" +#include "../../../Common/XUI/XUI_Scene_BrewingStand.h" +#include "../../../Common/XUI/XUI_XZP_Icons.h" +#include "../../../Common/XUI/XUI_Controls.h" +#include "../../../Common/XUI/XUI_Scene_Win.h" +#include "../../../Common/XUI/XUI_HUD.h" +#include "../../../Common/XUI/XUI_Scene_Anvil.h" +#include "../../../Common/XUI/XUI_Scene_Trading.h" +#include "../../../Common/XUI/XUI_Teleport.h" #ifdef _DEBUG_MENUS_ENABLED -#include "../../Build/Common/XUI/XUI_DebugItemEditor.h" +#include "../../../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "../../Build/Common/XUI/XUI_DebugSchematicCreator.h" +#include "../../../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "Xbox_App.h" diff --git a/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp index c59e677f7..808387923 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp @@ -25,7 +25,7 @@ #include "../../UI/Screens/ConnectScreen.h" #include "Social/SocialManager.h" #include "Leaderboards/XboxLeaderboardManager.h" -#include "../../Build/Common/XUI/XUI_Scene_Container.h" +#include "../../../Common/XUI/XUI_Scene_Container.h" #include "../../Rendering/Tesselator.h" #include "../../GameState/Options.h" #include "Sentient/SentientManager.h" diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp index 32d84617a..185a317ec 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp +++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp @@ -1,7 +1,7 @@ #include "../../../Minecraft.World/Build/stdafx.h" #include "Xbox_UIController.h" -#include "../../Build/Common/XUI/XUI_Scene_Base.h" -#include "../../Build/Common/XUI/XUI_Scene_Win.h" +#include "../../../Common/XUI/XUI_Scene_Base.h" +#include "../../../Common/XUI/XUI_Scene_Win.h" ConsoleUIController ui; diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h index 5ec996554..4a29637e7 100644 --- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h +++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Build/Common/UI/IUIController.h" +#include "../../../Common/UI/IUIController.h" class ConsoleUIController : public IUIController { diff --git a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp index 00fc395cc..b3e35337e 100644 --- a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp @@ -1,15 +1,15 @@ #include "../../Build/stdafx.h" -#include "../../Build/Common/DLC/DLCGameRulesFile.h" -#include "../../Build/Common/DLC/DLCGameRulesHeader.h" -#include "../../Build/Common/DLC/DLCGameRules.h" +#include "../../../Common/DLC/DLCGameRulesFile.h" +#include "../../../Common/DLC/DLCGameRulesHeader.h" +#include "../../../Common/DLC/DLCGameRules.h" #include "DLCTexturePack.h" -#include "../../Build/Common/DLC/DLCColourTableFile.h" -#include "../../Build/Common/DLC/DLCUIDataFile.h" -#include "../../Build/Common/DLC/DLCTextureFile.h" -#include "../../Build/Common/DLC/DLCLocalisationFile.h" +#include "../../../Common/DLC/DLCColourTableFile.h" +#include "../../../Common/DLC/DLCUIDataFile.h" +#include "../../../Common/DLC/DLCTextureFile.h" +#include "../../../Common/DLC/DLCLocalisationFile.h" #include "../../../Minecraft.World/Util/StringHelpers.h" #include "../../Utils/StringTable.h" -#include "../../Build/Common/DLC/DLCAudioFile.h" +#include "../../../Common/DLC/DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 #include "../../Platform/Xbox/XML/ATGXmlParser.h" diff --git a/Minecraft.Client/Textures/Packs/TexturePack.h b/Minecraft.Client/Textures/Packs/TexturePack.h index 16f877b8a..8984f9a11 100644 --- a/Minecraft.Client/Textures/Packs/TexturePack.h +++ b/Minecraft.Client/Textures/Packs/TexturePack.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "../../Build/Common/App_enums.h" +#include "../../../Common/App_enums.h" class InputStream; class Minecraft; diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index f9e00e7ec..3bf55e2a6 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -1,9 +1,9 @@ # sources that shouldn't be compiled for whatever reason exclude_sources = [ ' ! -path "*/Platform/*"', - ' ! -path "*/Build/Common/Network/Sony/*"', - ' ! -path "*/Build/Common/XUI/*"', - ' ! -path "*/Build/Common/zlib/*"', + ' ! -path "*/../Common/Network/Sony/*"', + ' ! -path "*/../Common/XUI/*"', + ' ! -path "*/../Common/zlib/*"', ] # get all those files @@ -16,6 +16,24 @@ client_sources = run_command( check : true, ).stdout().strip().split('\n') +# Common/ sources (previously lived in Minecraft.Client/Build/Common/) +common_exclude = [ + ' ! -path "*/Network/Sony/*"', + ' ! -path "*/XUI/*"', + ' ! -path "*/zlib/*"', + ' ! -path "*/Media/*"', + ' ! -path "*/DummyTexturePack/*"', +] + +common_sources = run_command( + 'sh', '-c', + 'find "' + + meson.current_source_dir() / '../Common' + + '" \\( -name "*.cpp" -o -name "*.c" \\) ' + + ' '.join(common_exclude), + check : true, +).stdout().strip().split('\n') + platform_sources = [] # linux-specific files (everything in Platform/Linux) @@ -30,8 +48,8 @@ if host_machine.system() == 'linux' endif executable('Minecraft.Client', - client_sources + platform_sources, - include_directories : include_directories('Build'), + client_sources + platform_sources + common_sources, + include_directories : include_directories('Build', '..'), dependencies : [ render_dep, input_dep, diff --git a/Minecraft.World/Blocks/StemTile.cpp b/Minecraft.World/Blocks/StemTile.cpp index 966e28049..181aa0b88 100644 --- a/Minecraft.World/Blocks/StemTile.cpp +++ b/Minecraft.World/Blocks/StemTile.cpp @@ -4,7 +4,7 @@ #include "../Headers/net.minecraft.world.level.h" #include "../Headers/net.minecraft.world.h" #include "../../Minecraft.Client/Minecraft.h" -#include "../../Minecraft.Client/Build/Common/Colours/ColourTable.h" +#include "../../Common/Colours/ColourTable.h" #include "StemTile.h" const wstring StemTile::TEXTURE_ANGLED = L"stem_bent"; diff --git a/Minecraft.World/Build/stdafx.h b/Minecraft.World/Build/stdafx.h index c5c28f6ae..23e4b7eed 100644 --- a/Minecraft.World/Build/stdafx.h +++ b/Minecraft.World/Build/stdafx.h @@ -187,25 +187,25 @@ void MemSect(int sect); #include "../../Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h" #endif -#include "../../Minecraft.Client/Build/Common/Network/GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" // #ifdef _XBOX -#include "../../Minecraft.Client/Build/Common/UI/UIEnums.h" -#include "../../Minecraft.Client/Build/Common/App_Defines.h" -#include "../../Minecraft.Client/Build/Common/App_enums.h" -#include "../../Minecraft.Client/Build/Common/Tutorial/TutorialEnum.h" -#include "../../Minecraft.Client/Build/Common/App_structs.h" +#include "../../Common/UI/UIEnums.h" +#include "../../Common/App_Defines.h" +#include "../../Common/App_enums.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Common/App_structs.h" //#endif #ifdef _XBOX -#include "../../Minecraft.Client/Build/Common/XUI/XUI_Helper.h" -#include "../../Minecraft.Client/Build/Common/XUI/XUI_Scene_Base.h" +#include "../../Common/XUI/XUI_Helper.h" +#include "../../Common/XUI/XUI_Scene_Base.h" #endif -#include "../../Minecraft.Client/Build/Common/Consoles_App.h" -#include "../../Minecraft.Client/Build/Common/Minecraft_Macros.h" -#include "../../Minecraft.Client/Build/Common/Colours/ColourTable.h" +#include "../../Common/Consoles_App.h" +#include "../../Common/Minecraft_Macros.h" +#include "../../Common/Colours/ColourTable.h" -#include "../../Minecraft.Client/Build/Common/BuildVer.h" +#include "../../Common/BuildVer.h" #ifdef _XBOX #include "../../Minecraft.Client/Platform/Xbox/Xbox_App.h" @@ -255,10 +255,10 @@ void MemSect(int sect); #include "../../Minecraft.Client/Platform/Orbis/Sentient/MinecraftTelemetry.h" #endif -#include "../../Minecraft.Client/Build/Common/DLC/DLCSkinFile.h" -#include "../../Minecraft.Client/Build/Common/Console_Awards_enum.h" -#include "../../Minecraft.Client/Build/Common/Potion_Macros.h" -#include "../../Minecraft.Client/Build/Common/Console_Debug_enum.h" -#include "../../Minecraft.Client/Build/Common/GameRules/ConsoleGameRulesConstants.h" -#include "../../Minecraft.Client/Build/Common/GameRules/ConsoleGameRules.h" -#include "../../Minecraft.Client/Build/Common/Telemetry/TelemetryManager.h" +#include "../../Common/DLC/DLCSkinFile.h" +#include "../../Common/Console_Awards_enum.h" +#include "../../Common/Potion_Macros.h" +#include "../../Common/Console_Debug_enum.h" +#include "../../Common/GameRules/ConsoleGameRulesConstants.h" +#include "../../Common/GameRules/ConsoleGameRules.h" +#include "../../Common/Telemetry/TelemetryManager.h" diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp index 950475d41..8a4207a2a 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp @@ -9,7 +9,7 @@ #include "../../../Minecraft.Client/Level/ServerLevel.h" #include "../../Headers/net.minecraft.world.level.h" #include "../../Level/LevelData.h" -#include "../../../Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.h" +#include "../../../Common/GameRules/LevelGenerationOptions.h" #include "../../Headers/net.minecraft.world.level.chunk.storage.h" #ifdef _XBOX diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp index 2bc246ab3..9ffe120f7 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp @@ -10,7 +10,7 @@ #include "../../../Minecraft.Client/Level/ServerLevel.h" #include "../../Headers/net.minecraft.world.level.h" #include "../../Level/LevelData.h" -#include "../../../Minecraft.Client/Build/Common/GameRules/LevelGenerationOptions.h" +#include "../../../Common/GameRules/LevelGenerationOptions.h" #include "../../Headers/net.minecraft.world.level.chunk.storage.h" #define RESERVE_ALLOCATION MEM_RESERVE diff --git a/Minecraft.World/Level/Dimensions/Dimension.cpp b/Minecraft.World/Level/Dimensions/Dimension.cpp index 5e77a3b9f..ac62c6874 100644 --- a/Minecraft.World/Level/Dimensions/Dimension.cpp +++ b/Minecraft.World/Level/Dimensions/Dimension.cpp @@ -11,7 +11,7 @@ #include "TheEndDimension.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Minecraft.Client/Build/Common/Colours/ColourTable.h" +#include "../../../Common/Colours/ColourTable.h" void Dimension::init(Level *level) { diff --git a/Minecraft.World/Level/Dimensions/HellDimension.cpp b/Minecraft.World/Level/Dimensions/HellDimension.cpp index 2979a3199..ab7f49022 100644 --- a/Minecraft.World/Level/Dimensions/HellDimension.cpp +++ b/Minecraft.World/Level/Dimensions/HellDimension.cpp @@ -6,7 +6,7 @@ #include "../../Headers/net.minecraft.world.level.biome.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Minecraft.Client/Build/Common/Colours/ColourTable.h" +#include "../../../Common/Colours/ColourTable.h" void HellDimension::init() { diff --git a/Minecraft.World/Level/Dimensions/TheEndDimension.cpp b/Minecraft.World/Level/Dimensions/TheEndDimension.cpp index 879e24ad4..0c7a1e3a1 100644 --- a/Minecraft.World/Level/Dimensions/TheEndDimension.cpp +++ b/Minecraft.World/Level/Dimensions/TheEndDimension.cpp @@ -5,7 +5,7 @@ #include "../../Headers/net.minecraft.world.level.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Minecraft.Client/Build/Common/Colours/ColourTable.h" +#include "../../../Common/Colours/ColourTable.h" void TheEndDimension::init() { diff --git a/Minecraft.World/Level/Level.cpp b/Minecraft.World/Level/Level.cpp index 590f76410..c676647fc 100644 --- a/Minecraft.World/Level/Level.cpp +++ b/Minecraft.World/Level/Level.cpp @@ -39,7 +39,7 @@ #include "../../Minecraft.Client/Textures/Textures.h" #include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" -#include "../../Minecraft.Client/Build/Common/DLC/DLCPack.h" +#include "../../Common/DLC/DLCPack.h" #include "../../Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.h" diff --git a/Minecraft.World/Network/Packets/SetHealthPacket.cpp b/Minecraft.World/Network/Packets/SetHealthPacket.cpp index 9152b2c96..da134b8c8 100644 --- a/Minecraft.World/Network/Packets/SetHealthPacket.cpp +++ b/Minecraft.World/Network/Packets/SetHealthPacket.cpp @@ -3,7 +3,7 @@ #include "../../IO/Streams/InputOutputStream.h" #include "PacketListener.h" #include "SetHealthPacket.h" -#include "../../../Minecraft.Client/Build/Common/Telemetry/TelemetryManager.h" +#include "../../../Common/Telemetry/TelemetryManager.h" SetHealthPacket::SetHealthPacket() diff --git a/Minecraft.World/Stats/GenericStats.h b/Minecraft.World/Stats/GenericStats.h index 914477916..a81175248 100644 --- a/Minecraft.World/Stats/GenericStats.h +++ b/Minecraft.World/Stats/GenericStats.h @@ -5,7 +5,7 @@ //#include "../Util/DamageSource.h" -//#include "../../Minecraft.Client/Build/Common/Console_Awards_enum.h" +//#include "../../Common/Console_Awards_enum.h" /** 4J-JEV: