diff --git a/.gitignore b/.gitignore index 6c81ca77e..830932518 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # .gitignore build/ .cache/ +.idea/ diff --git a/CMakeLists.txt b/CMakeLists.txt index a0fcade4f..4832ae6be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(MinecraftConsoles C CXX) # Set target arch type if empty. Visual studio solution generator provides it. ################################################################################ set(CMAKE_VS_PLATFORM_NAME "Linux") +set(CMAKE_CXX_STANDARD 11) ################################################################################ # Global configuration types diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp index 2b3e08374..109bbaaba 100644 --- a/Minecraft.Client/AbstractContainerScreen.cpp +++ b/Minecraft.Client/AbstractContainerScreen.cpp @@ -6,9 +6,9 @@ #include "GameMode.h" #include "KeyMapping.h" #include "Options.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.item.h" ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/Minecraft.Client/AbstractTexturePack.cpp b/Minecraft.Client/AbstractTexturePack.cpp index a4eb7f011..3c282abe7 100644 --- a/Minecraft.Client/AbstractTexturePack.cpp +++ b/Minecraft.Client/AbstractTexturePack.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "Textures.h" #include "AbstractTexturePack.h" -#include "..\Minecraft.World\InputOutputStream.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/InputOutputStream.h" +#include "../Minecraft.World/StringHelpers.h" AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name) { diff --git a/Minecraft.Client/AchievementPopup.cpp b/Minecraft.Client/AchievementPopup.cpp index 04f822aba..5466ca61c 100644 --- a/Minecraft.Client/AchievementPopup.cpp +++ b/Minecraft.Client/AchievementPopup.cpp @@ -4,10 +4,10 @@ #include "Font.h" #include "Textures.h" #include "Lighting.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\SharedConstants.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/SharedConstants.h" AchievementPopup::AchievementPopup(Minecraft *mc) { diff --git a/Minecraft.Client/AchievementScreen.cpp b/Minecraft.Client/AchievementScreen.cpp index 26f203262..a48b53da3 100644 --- a/Minecraft.Client/AchievementScreen.cpp +++ b/Minecraft.Client/AchievementScreen.cpp @@ -8,10 +8,10 @@ #include "Textures.h" #include "StatsCounter.h" #include "ItemRenderer.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/JavaMath.h" diff --git a/Minecraft.Client/AchievementScreen.h b/Minecraft.Client/AchievementScreen.h index 3c4412e35..254b2de03 100644 --- a/Minecraft.Client/AchievementScreen.h +++ b/Minecraft.Client/AchievementScreen.h @@ -1,6 +1,6 @@ #pragma once #include "Screen.h" -#include "..\Minecraft.World\net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.stats.h" class StatsCounter; class AchievementScreen : public Screen diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp index 642471a47..cdb881e03 100644 --- a/Minecraft.Client/ArchiveFile.cpp +++ b/Minecraft.Client/ArchiveFile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\compression.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/compression.h" #include "ArchiveFile.h" diff --git a/Minecraft.Client/ArrowRenderer.cpp b/Minecraft.Client/ArrowRenderer.cpp index 65c4ee715..5a7d9e866 100644 --- a/Minecraft.Client/ArrowRenderer.cpp +++ b/Minecraft.Client/ArrowRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ArrowRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/Mth.h" void ArrowRenderer::render(shared_ptr _arrow, double x, double y, double z, float rot, float a) { diff --git a/Minecraft.Client/BlazeModel.cpp b/Minecraft.Client/BlazeModel.cpp index 5af894acd..c32d64722 100644 --- a/Minecraft.Client/BlazeModel.cpp +++ b/Minecraft.Client/BlazeModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "BlazeModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BlazeRenderer.cpp b/Minecraft.Client/BlazeRenderer.cpp index 7d5210dc6..d76fc14ef 100644 --- a/Minecraft.Client/BlazeRenderer.cpp +++ b/Minecraft.Client/BlazeRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "BlazeModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" #include "BlazeRenderer.h" BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f) diff --git a/Minecraft.Client/BoatRenderer.cpp b/Minecraft.Client/BoatRenderer.cpp index f1367ae47..eb6637f55 100644 --- a/Minecraft.Client/BoatRenderer.cpp +++ b/Minecraft.Client/BoatRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "BoatRenderer.h" #include "BoatModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/Mth.h" BoatRenderer::BoatRenderer() : EntityRenderer() { diff --git a/Minecraft.Client/BookModel.cpp b/Minecraft.Client/BookModel.cpp index bc4769bd6..7e0a4031f 100644 --- a/Minecraft.Client/BookModel.cpp +++ b/Minecraft.Client/BookModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "BookModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp index 51b721f51..d599a139a 100644 --- a/Minecraft.Client/BreakingItemParticle.cpp +++ b/Minecraft.Client/BreakingItemParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "BreakingItemParticle.h" #include "Tesselator.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.h" void BreakingItemParticle::_init(Item *item, Textures *textures, int data) { diff --git a/Minecraft.Client/BubbleParticle.cpp b/Minecraft.Client/BubbleParticle.cpp index 2d1380eb5..f1ddfe6cb 100644 --- a/Minecraft.Client/BubbleParticle.cpp +++ b/Minecraft.Client/BubbleParticle.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "BubbleParticle.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) { diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp index 658e93418..bde55bb0c 100644 --- a/Minecraft.Client/BufferedImage.cpp +++ b/Minecraft.Client/BufferedImage.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "Textures.h" -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" #include "BufferedImage.h" #ifdef _XBOX diff --git a/Minecraft.Client/Camera.cpp b/Minecraft.Client/Camera.cpp index db6072b2f..5ea093132 100644 --- a/Minecraft.Client/Camera.cpp +++ b/Minecraft.Client/Camera.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "Camera.h" #include "MemoryTracker.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\TilePos.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/TilePos.h" float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; diff --git a/Minecraft.Client/Camera.h b/Minecraft.Client/Camera.h index cccb0b2d3..4636b39e8 100644 --- a/Minecraft.Client/Camera.h +++ b/Minecraft.Client/Camera.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\FloatBuffer.h" -#include "..\Minecraft.World\IntBuffer.h" +#include "../Minecraft.World/FloatBuffer.h" +#include "../Minecraft.World/IntBuffer.h" class TilePos; diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp index b68e6cac0..8c65cd5dc 100644 --- a/Minecraft.Client/ChatScreen.cpp +++ b/Minecraft.Client/ChatScreen.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "ChatScreen.h" #include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/StringHelpers.h" const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/Minecraft.Client/ChestRenderer.cpp b/Minecraft.Client/ChestRenderer.cpp index d1b5cf918..0fc36ec68 100644 --- a/Minecraft.Client/ChestRenderer.cpp +++ b/Minecraft.Client/ChestRenderer.cpp @@ -3,8 +3,8 @@ #include "ChestModel.h" #include "LargeChestModel.h" #include "ModelPart.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" ChestRenderer::ChestRenderer() { diff --git a/Minecraft.Client/ChickenModel.cpp b/Minecraft.Client/ChickenModel.cpp index 21dc2059a..7517d009f 100644 --- a/Minecraft.Client/ChickenModel.cpp +++ b/Minecraft.Client/ChickenModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ChickenModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/ChickenRenderer.cpp b/Minecraft.Client/ChickenRenderer.cpp index 908ba5060..3ca1cb4aa 100644 --- a/Minecraft.Client/ChickenRenderer.cpp +++ b/Minecraft.Client/ChickenRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ChickenRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow) { diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index 99933db32..cd79128e8 100644 --- a/Minecraft.Client/Chunk.cpp +++ b/Minecraft.Client/Chunk.cpp @@ -2,16 +2,16 @@ #include "Chunk.h" #include "TileRenderer.h" #include "TileEntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "LevelRenderer.h" #ifdef __PS3__ -#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" -#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h" -#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" +#include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h" +#include "PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h" +#include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h" #include "C4JThread_SPU.h" #include "C4JSpursJob.h" diff --git a/Minecraft.Client/Chunk.h b/Minecraft.Client/Chunk.h index f7947156f..7d731dec7 100644 --- a/Minecraft.Client/Chunk.h +++ b/Minecraft.Client/Chunk.h @@ -1,7 +1,7 @@ #pragma once #include "AllowAllCuller.h" #include "Tesselator.h" -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" #include "LevelRenderer.h" class Level; diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index b80eaed9c..bd633aae5 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -9,43 +9,43 @@ #include "TakeAnimationParticle.h" #include "CritParticle.h" #include "User.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\Minecraft.World\net.minecraft.world.food.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\AABB.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\Socket.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.npc.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.effect.h" +#include "../Minecraft.World/net.minecraft.world.food.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/AABB.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/Socket.h" #include "Minecraft.h" #include "ProgressRenderer.h" #include "LevelRenderer.h" #include "Options.h" #include "MinecraftServer.h" #include "ClientConstants.h" -#include "..\Minecraft.World\SoundTypes.h" +#include "../Minecraft.World/SoundTypes.h" #include "TexturePackRepository.h" #ifdef _XBOX -#include "Common\XUI\XUI_Scene_Trading.h" +#include "Common/XUI/XUI_Scene_Trading.h" #else -#include "Common\UI\UI.h" +#include "Common/UI/UI.h" #endif #ifdef __PS3__ #include "PS3/Network/SonyVoiceChat.h" @@ -53,8 +53,8 @@ #include "DLCTexturePack.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" -#include "..\Minecraft.World\GenericStats.h" +#include "../Minecraft.World/DurangoStats.h" +#include "../Minecraft.World/GenericStats.h" #endif ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port) diff --git a/Minecraft.Client/ClientConnection.h b/Minecraft.Client/ClientConnection.h index 2ce46ce02..ee73e911c 100644 --- a/Minecraft.Client/ClientConnection.h +++ b/Minecraft.Client/ClientConnection.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.network.h" +#include "../Minecraft.World/net.minecraft.network.h" class Minecraft; class MultiPlayerLevel; class SavedDataStorage; diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp index d8abb785f..66d4b7a1a 100644 --- a/Minecraft.Client/ClockTexture.cpp +++ b/Minecraft.Client/ClockTexture.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "Minecraft.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "Texture.h" #include "ClockTexture.h" diff --git a/Minecraft.Client/Common/App_Defines.h b/Minecraft.Client/Common/App_Defines.h index 88b37b88e..41c239f8d 100644 --- a/Minecraft.Client/Common/App_Defines.h +++ b/Minecraft.Client/Common/App_Defines.h @@ -104,13 +104,6 @@ #define MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13 #define MINECRAFT_LANGUAGE_GREEK 0x14 -#if defined(__linux__) -#define __debugbreak() -#define __int32 int -typedef unsigned long ULONG; -inline void InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION CriticalSection, ULONG SpinCount) {} -#endif // __linux__ - /* Match these const int XC_LANGUAGE_ENGLISH =1; diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h index ea19fa77c..52ff1dbb9 100644 --- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h +++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h @@ -7,22 +7,22 @@ #elif defined (__PS3__) #undef __in #undef __out -#include "..\..\PS3\Miles\include\mss.h" +#include "../../PS3/Miles/include/mss.h" #elif defined (__PSVITA__) -#include "..\..\PSVITA\Miles\include\mss.h" +#include "../../PSVITA/Miles/include/mss.h" #elif defined _DURANGO // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT -#include "..\..\Durango\Miles\include\mss.h" +#include "../../Durango/Miles/include/mss.h" #elif defined _WINDOWS64 -#include "..\..\windows64\Miles\include\mss.h" +#include "../../windows64/Miles/include/mss.h" #elif defined(__linux__) // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones // #include "../../windows64/Miles/include/mss.h" #else // PS4 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT2 -#include "..\..\Orbis\Miles\include\mss.h" +#include "../../Orbis/Miles/include/mss.h" #endif typedef struct diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 4eaf7df78..226c7c741 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -1,22 +1,22 @@ #include "stdafx.h" #include "SoundEngine.h" -#include "..\Consoles_App.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\Minecraft.World\leveldata.h" -#include "..\..\Minecraft.World\mth.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\DLCTexturePack.h" -#include "Common\DLC\DLCAudioFile.h" +#include "../Consoles_App.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../Minecraft.World/leveldata.h" +#include "../../Minecraft.World/mth.h" +#include "../../TexturePackRepository.h" +#include "../../DLCTexturePack.h" +#include "Common/DLC/DLCAudioFile.h" #ifdef __PSVITA__ #include #endif #ifdef _WINDOWS64 -#include "..\..\Minecraft.Client\Windows64\Windows64_App.h" -#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h" +#include "../../Minecraft.Client/Windows64/Windows64_App.h" +#include "../../Minecraft.Client/Windows64/Miles/include/imssapi.h" #endif #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h index 92c99d236..0c8107963 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Common/Audio/SoundEngine.h @@ -2,7 +2,13 @@ class Mob; class Options; using namespace std; -#include "..\..\Minecraft.World\SoundTypes.h" +#include "../../../Minecraft.World/SoundTypes.h" +#ifdef __linux__ +typedef float F32; +typedef HANDLE HMSOUNDBANK; +typedef HANDLE HDIGDRIVER; +typedef unsigned int HSTREAM; +#endif // __linux__ enum eMUSICFILES { diff --git a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h index a46cc76db..3fb158fb0 100644 --- a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h +++ b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.Client\Common\C4JMemoryPool.h" +#include "../Minecraft.Client/Common/C4JMemoryPool.h" // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations. diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp index dc58cfb1a..1901bf9ed 100644 --- a/Minecraft.Client/Common/Colours/ColourTable.cpp +++ b/Minecraft.Client/Common/Colours/ColourTable.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ColourTable.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" unordered_map ColourTable::s_colourNamesMap; diff --git a/Minecraft.Client/Common/ConsoleGameMode.cpp b/Minecraft.Client/Common/ConsoleGameMode.cpp index b080e6284..a7b3597b4 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.cpp +++ b/Minecraft.Client/Common/ConsoleGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ConsoleGameMode.h" -#include "..\Common\Tutorial\Tutorial.h" +#include "../Common/Tutorial/Tutorial.h" ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Common/ConsoleGameMode.h b/Minecraft.Client/Common/ConsoleGameMode.h index 3e486cbf3..b2ba19667 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.h +++ b/Minecraft.Client/Common/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Common\Tutorial\TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class ConsoleGameMode : public TutorialMode { diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 12aecb3d4..dd7d3eb91 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -1,64 +1,64 @@  #include "stdafx.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\MinecraftServer.h" -#include "..\MultiPlayerLevel.h" -#include "..\GameRenderer.h" -#include "..\ProgressRenderer.h" -#include "..\..\Minecraft.Client\LevelRenderer.h" -#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\ClientConnection.h" -#include "..\MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\Minecraft.World\Player.h" -#include "..\..\Minecraft.World\Inventory.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\FurnaceTileEntity.h" -#include "..\..\Minecraft.World\Container.h" -#include "..\..\Minecraft.World\DispenserTileEntity.h" -#include "..\..\Minecraft.World\SignTileEntity.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\GameMode.h" -#include "..\Xbox\Social\SocialManager.h" -#include "Tutorial\TutorialMode.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.Client/Options.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../MinecraftServer.h" +#include "../MultiPlayerLevel.h" +#include "../GameRenderer.h" +#include "../ProgressRenderer.h" +#include "../../Minecraft.Client/LevelRenderer.h" +#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../ClientConnection.h" +#include "../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/LocalPlayer.h" +#include "../../Minecraft.World/Player.h" +#include "../../Minecraft.World/Inventory.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/FurnaceTileEntity.h" +#include "../../Minecraft.World/Container.h" +#include "../../Minecraft.World/DispenserTileEntity.h" +#include "../../Minecraft.World/SignTileEntity.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../GameMode.h" +#include "../Xbox/Social/SocialManager.h" +#include "Tutorial/TutorialMode.h" #if defined _XBOX || defined _WINDOWS64 -#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h" -#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h" +#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h" +#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h" #endif #include "Minecraft_Macros.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "GameRules\ConsoleGameRules.h" -#include "GameRules\ConsoleSchematicFile.h" -#include "..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\User.h" -#include "..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\Minecraft.Client\EntityRenderDispatcher.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\TexturePackRepository.h" -#include "..\DLCTexturePack.h" -#include "DLC\DLCPack.h" -#include "..\StringTable.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "GameRules/ConsoleGameRules.h" +#include "GameRules/ConsoleSchematicFile.h" +#include "../../Minecraft.World/InputOutputStream.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../User.h" +#include "../../Minecraft.World/LevelData.h" +#include "../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../Minecraft.Client/EntityRenderDispatcher.h" +#include "../../Minecraft.World/compression.h" +#include "../TexturePackRepository.h" +#include "../DLCTexturePack.h" +#include "DLC/DLCPack.h" +#include "../StringTable.h" #ifndef _XBOX -#include "..\ArchiveFile.h" +#include "../ArchiveFile.h" #endif -#include "..\Minecraft.h" +#include "../Minecraft.h" #ifdef _XBOX -#include "..\Xbox\GameConfig\Minecraft.spa.h" -#include "..\Xbox\Network\NetworkPlayerXbox.h" -#include "XUI\XUI_TextEntry.h" -#include "XUI\XUI_XZP_Icons.h" -#include "XUI\XUI_PauseMenu.h" +#include "../Xbox/GameConfig/Minecraft.spa.h" +#include "../Xbox/Network/NetworkPlayerXbox.h" +#include "XUI/XUI_TextEntry.h" +#include "XUI/XUI_XZP_Icons.h" +#include "XUI/XUI_PauseMenu.h" #else -#include "UI\UI.h" -#include "UI\UIScene_PauseMenu.h" +#include "UI/UI.h" +#include "UI/UIScene_PauseMenu.h" #endif #ifdef __PS3__ #include @@ -67,7 +67,7 @@ #include #endif -#include "..\Common\Leaderboards\LeaderboardManager.h" +#include "../Common/Leaderboards/LeaderboardManager.h" //CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h index 6a0fb55d6..732386897 100644 --- a/Minecraft.Client/Common/Consoles_App.h +++ b/Minecraft.Client/Common/Consoles_App.h @@ -9,8 +9,8 @@ using namespace std; #include "../Common/Tutorial/TutorialEnum.h" #ifdef _XBOX -#include "..\Common\XUI\XUI_Helper.h" -#include "..\Common\XUI\XUI_HelpCredits.h" +#include "../Common/XUI/XUI_Helper.h" +#include "../Common/XUI/XUI_HelpCredits.h" #endif #include "UI/UIStructs.h" diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp index 49ba52cda..a2c537f67 100644 --- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp @@ -2,8 +2,8 @@ #include "DLCManager.h" #include "DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 -#include "..\..\Xbox\XML\ATGXmlParser.h" -#include "..\..\Xbox\XML\xmlFilesCallback.h" +#include "../../Xbox/XML/ATGXmlParser.h" +#include "../../Xbox/XML/xmlFilesCallback.h" #endif DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp index ec800dacf..fa7321773 100644 --- a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCColourTableFile.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path) { diff --git a/Minecraft.Client/Common/DLC/DLCGameRules.h b/Minecraft.Client/Common/DLC/DLCGameRules.h index 9d3bbaad4..a1998b1dd 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRules.h +++ b/Minecraft.Client/Common/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "..\GameRules\LevelGenerationOptions.h" +#include "../GameRules/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp index 39b852190..507b9a019 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp +++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp @@ -2,9 +2,9 @@ #include -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/InputOutputStream.h" #include "DLCManager.h" #include "DLCGameRulesHeader.h" diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h index 4521ae110..f73b817b8 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h +++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h @@ -1,7 +1,7 @@ #pragma once #include "DLCGameRules.h" -#include "..\GameRules\LevelGenerationOptions.h" +#include "../GameRules/LevelGenerationOptions.h" class DLCGameRulesHeader : public DLCGameRules, public JustGrSource { diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp index 358a93e50..70ec965ee 100644 --- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCLocalisationFile.h" -#include "..\..\StringTable.h" +#include "../../StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path) { diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp index 123e4266a..553ddd6e9 100644 --- a/Minecraft.Client/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Common/DLC/DLCManager.cpp @@ -3,9 +3,9 @@ #include "DLCManager.h" #include "DLCPack.h" #include "DLCFile.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" WCHAR *DLCManager::wchTypeNamesA[]= { diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp index 23a2e44ac..c2ee26bd7 100644 --- a/Minecraft.Client/Common/DLC/DLCPack.cpp +++ b/Minecraft.Client/Common/DLC/DLCPack.cpp @@ -9,7 +9,7 @@ #include "DLCGameRulesHeader.h" #include "DLCAudioFile.h" #include "DLCColourTableFile.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask) { diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp index f3768a341..165d8108e 100644 --- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCSkinFile.h" -#include "..\..\ModelPart.h" -#include "..\..\EntityRenderer.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\..\Minecraft.World\Player.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../ModelPart.h" +#include "../../EntityRenderer.h" +#include "../../EntityRenderDispatcher.h" +#include "../../../Minecraft.World/Player.h" +#include "../../../Minecraft.World/StringHelpers.h" DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path) { diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp index eabc14011..1521bd652 100644 --- a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" #include "AddEnchantmentRuleDefinition.h" AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() diff --git a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp index 0d14884a7..5cd69019a 100644 --- a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "AddItemRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h" diff --git a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp index aa4a8fb25..1e719614b 100644 --- a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "ApplySchematicRuleDefinition.h" #include "LevelGenerationOptions.h" #include "ConsoleSchematicFile.h" diff --git a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp index 22cc0c7ab..fb29443b7 100644 --- a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp +++ b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "BiomeOverride.h" BiomeOverride::BiomeOverride() diff --git a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp index 66abefbbe..564bab578 100644 --- a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\WstringLookup.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../WstringLookup.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "CollectItemRuleDefinition.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\Connection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/Connection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp index adaf70c81..4e5488012 100644 --- a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "CompleteAllRuleDefinition.h" #include "ConsoleGameRules.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Connection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Connection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" void CompleteAllRuleDefinition::getChildren(vector *children) { diff --git a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp index 0481a54b2..29227ce23 100644 --- a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #include "CompoundGameRuleDefinition.h" #include "ConsoleGameRules.h" diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp index 0476b0e36..6b2b30e91 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp +++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "ConsoleGenerateStructure.h" #include "ConsoleGameRules.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../../../Minecraft.World/net.minecraft.world.level.levelgen.structure.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.h" ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) { diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp index 4a4e27b20..fcfcb1827 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp +++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" #include -#include "..\..\..\Minecraft.World\com.mojang.nbt.h" -#include "..\..\..\Minecraft.World\System.h" +#include "../../../Minecraft.World/com.mojang.nbt.h" +#include "../../../Minecraft.World/System.h" #include "ConsoleSchematicFile.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\..\Minecraft.World\compression.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/compression.h" ConsoleSchematicFile::ConsoleSchematicFile() { diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp index b63687c22..7d94a3df9 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\WstringLookup.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../WstringLookup.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "ConsoleGameRules.h" GameRuleDefinition::GameRuleDefinition() diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp index 0c6a7804c..347fe9ec1 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\DLC\DLCPack.h" -#include "..\DLC\DLCLocalisationFile.h" -#include "..\DLC\DLCGameRulesFile.h" -#include "..\DLC\DLCGameRules.h" -#include "..\DLC\DLCGameRulesHeader.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/compression.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/compression.h" +#include "../DLC/DLCPack.h" +#include "../DLC/DLCLocalisationFile.h" +#include "../DLC/DLCGameRulesFile.h" +#include "../DLC/DLCGameRules.h" +#include "../DLC/DLCGameRulesHeader.h" +#include "../../StringTable.h" #include "ConsoleGameRules.h" #include "GameRuleManager.h" diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp index 717b066e5..acae58fd2 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp @@ -2,12 +2,12 @@ #include -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Pos.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Pos.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../../StringTable.h" #include "LevelGenerationOptions.h" #include "ConsoleGameRules.h" diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h index cff00be23..9abed66fb 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#pragma message("LevelGenerationOptions.h ") +// #pragma message("LevelGenerationOptions.h ") #include "GameRuleDefinition.h" #include "../../../Minecraft.World/StructureFeature.h" diff --git a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp index 1c7ecd475..ba78b0a12 100644 --- a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp +++ b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../StringTable.h" #include "ConsoleGameRules.h" #include "LevelRuleset.h" diff --git a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp index 41ff15e86..aa3b92bf6 100644 --- a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "NamedAreaRuleDefinition.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { diff --git a/Minecraft.Client/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Common/GameRules/StartFeature.cpp index 9d5f15c0f..c7c228099 100644 --- a/Minecraft.Client/Common/GameRules/StartFeature.cpp +++ b/Minecraft.Client/Common/GameRules/StartFeature.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "StartFeature.h" StartFeature::StartFeature() diff --git a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp index 6e55cd459..7f41cd8a2 100644 --- a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UpdatePlayerRuleDefinition.h" #include "ConsoleGameRules.h" -#include "..\..\..\Minecraft.World\Pos.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.food.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/Pos.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/net.minecraft.world.food.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() { diff --git a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp index 965405ae6..747038e5d 100644 --- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "UseTileRuleDefinition.h" UseTileRuleDefinition::UseTileRuleDefinition() diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp index 6d687b360..a5bd83176 100644 --- a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp +++ b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "XboxStructureActionGenerateBox.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.level.levelgen.structure.h" XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() { diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp index b816d5b67..6b0e75093 100644 --- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp +++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "XboxStructureActionPlaceBlock.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.level.levelgen.structure.h" XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() { diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp index 8184f45b4..d08afff31 100644 --- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp +++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XboxStructureActionPlaceContainer.h" #include "AddItemRuleDefinition.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.levelgen.structure.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp index 1eca33422..bd0b5a5fa 100644 --- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp +++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XboxStructureActionPlaceSpawner.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.level.levelgen.structure.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp index 33707b14c..c66dc04b2 100644 --- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "LeaderboardManager.h" diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp index 2a80f80a5..adfec96fd 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -1,43 +1,43 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\ThreadName.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\ClientConnection.h" -#include "..\..\Minecraft.h" -#include "..\..\User.h" -#include "..\..\MinecraftServer.h" -#include "..\..\PlayerList.h" -#include "..\..\ServerPlayer.h" -#include "..\..\PlayerConnection.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\..\..\Minecraft.World\OldChunkStorage.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/ThreadName.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../ClientConnection.h" +#include "../../Minecraft.h" +#include "../../User.h" +#include "../../MinecraftServer.h" +#include "../../PlayerList.h" +#include "../../ServerPlayer.h" +#include "../../PlayerConnection.h" +#include "../../MultiPlayerLevel.h" +#include "../../ProgressRenderer.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../../Minecraft.World/compression.h" +#include "../../../Minecraft.World/OldChunkStorage.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" -#include "..\..\Gui.h" -#include "..\..\LevelRenderer.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\GameRules\ConsoleGameRules.h" +#include "../../Gui.h" +#include "../../LevelRenderer.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" #ifdef _XBOX -#include "Common\XUI\XUI_PauseMenu.h" +#include "Common/XUI/XUI_PauseMenu.h" #elif !(defined __PSVITA__) -#include "Common\UI\UI.h" -#include "Common\UI\UIScene_PauseMenu.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "Common/UI/UI.h" +#include "Common/UI/UIScene_PauseMenu.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #endif #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif // Global instance diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h index 9971cd194..5cf106a8d 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.h +++ b/Minecraft.Client/Common/Network/GameNetworkManager.h @@ -7,18 +7,18 @@ using namespace std; #include "../../../Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #ifdef _XBOX -#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h" +#include "../../Xbox/Network/PlatformNetworkManagerXbox.h" #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ -#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h" +#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h" #elif defined _DURANGO -#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h" +#include "../../Durango/Network/PlatformNetworkManagerDurango.h" #else #include "PlatformNetworkManagerStub.h" #endif #include "SessionInfo.h" #ifdef __ORBIS__ -#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h" +#include "../../Orbis/Network/PsPlusUpsellWrapper_Orbis.h" #endif class ClientConnection; diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp index b6b0fe122..7eb576146 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerStub.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" // TODO - stub version of this? +#include "../../Xbox/Network/NetworkPlayerXbox.h" // TODO - stub version of this? CPlatformNetworkManagerStub *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h index 31472a19a..677e218b9 100644 --- a/Minecraft.Client/Common/Network/SessionInfo.h +++ b/Minecraft.Client/Common/Network/SessionInfo.h @@ -1,7 +1,7 @@ #pragma once #if defined(__PS3__) || defined(__ORBIS__) -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" #endif diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h index 5c8605fb6..0298f5a17 100644 --- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h +++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" #include "SQRNetworkPlayer.h" // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way. diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp index 009993cb0..75a31dce7 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerSony.h" #include "NetworkPlayerSony.h" -#include "..\..\Common\Network\GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerSony *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h index 258acd833..ee33b9514 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h @@ -1,10 +1,10 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" #include "SQRNetworkPlayer.h" // This is how often we allow a search for new games diff --git a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp index 8435cd562..061135899 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp +++ b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce.h" -#include "..\PS3Extras\ShutdownManager.h" +#include "../PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp index f0095885c..4e90e10b0 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp +++ b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp @@ -3,15 +3,15 @@ #ifdef __PS3__ -#include "PS3\Network\SonyHttp_PS3.h" +#include "PS3/Network/SonyHttp_PS3.h" SonyHttp_PS3 g_SonyHttp; #elif defined __ORBIS__ -#include "Orbis\Network\SonyHttp_Orbis.h" +#include "Orbis/Network/SonyHttp_Orbis.h" SonyHttp_Orbis g_SonyHttp; #elif defined __PSVITA__ -#include "PSVita\Network\SonyHttp_Vita.h" +#include "PSVita/Network/SonyHttp_Vita.h" SonyHttp_Vita g_SonyHttp; #endif diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h index f435848e8..fd48885a2 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h +++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h @@ -1,7 +1,7 @@ #pragma once -#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h" +#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage { diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp index 4b04b19c1..03a27910b 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp @@ -2,9 +2,9 @@ #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\LevelSettings.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.World/LevelSettings.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/Level.h" #include "TelemetryManager.h" @@ -428,7 +428,7 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId) /* Refers to the highest level performance metric for your game. For example, a performance metric could points earned, race time, total kills, etc. -This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. +This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. How far did users progress before failing/exiting the level? */ INT CTelemetryManager::GetLevelExitProgressStat1() @@ -440,7 +440,7 @@ INT CTelemetryManager::GetLevelExitProgressStat1() /* Refers to the highest level performance metric for your game. For example, a performance metric could points earned, race time, total kills, etc. -This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. +This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. How far did users progress before failing/exiting the level? */ INT CTelemetryManager::GetLevelExitProgressStat2() diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h index e6c18dccd..b3e3cc55f 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h @@ -1,9 +1,75 @@ #pragma once -#include "../../Common/UI/UIEnums.h" -#include "../../Xbox/Sentient/SentientTelemetryCommon.h" -enum ETelemetryChallenges {}; +#include "../../Common/UI/UIEnums.h" + +enum ETelemetryChallenges +{ + eTelemetryChallenges_Unknown = 0, + + eTelemetryTutorial_TrialStart, + eTelemetryTutorial_Halfway, + eTelemetryTutorial_Complete, + + eTelemetryTutorial_Inventory, + eTelemetryTutorial_Crafting, + eTelemetryTutorial_Furnace, + eTelemetryTutorial_Fishing, + eTelemetryTutorial_Minecart, + eTelemetryTutorial_Boat, + eTelemetryTutorial_Bed, + + eTelemetryTutorial_Redstone_And_Pistons, + eTelemetryTutorial_Portal, + eTelemetryTutorial_FoodBar, + eTelemetryTutorial_CreativeMode, + eTelemetryTutorial_BrewingMenu, + + eTelemetryInGame_Ride_Minecart, + eTelemetryInGame_Ride_Boat, + eTelemetryInGame_Ride_Pig, + eTelemetryInGame_UseBed, + + eTelemetryTutorial_CreativeInventory, // Added TU5 + + eTelemetryTutorial_EnchantingMenu, + eTelemetryTutorial_Brewing, + eTelemetryTutorial_Enchanting, + eTelemetryTutorial_Farming, + + eTelemetryPlayerDeathSource_Fall, + eTelemetryPlayerDeathSource_Lava, + eTelemetryPlayerDeathSource_Fire, + eTelemetryPlayerDeathSource_Water, + eTelemetryPlayerDeathSource_Suffocate, + eTelemetryPlayerDeathSource_OutOfWorld, + eTelemetryPlayerDeathSource_Cactus, + + eTelemetryPlayerDeathSource_Player_Weapon, + eTelemetryPlayerDeathSource_Player_Arrow, + + eTelemetryPlayerDeathSource_Explosion_Tnt, + eTelemetryPlayerDeathSource_Explosion_Creeper, + + eTelemetryPlayerDeathSource_Wolf, + eTelemetryPlayerDeathSource_Zombie, + eTelemetryPlayerDeathSource_Skeleton, + eTelemetryPlayerDeathSource_Spider, + eTelemetryPlayerDeathSource_Slime, + eTelemetryPlayerDeathSource_Ghast, + eTelemetryPlayerDeathSource_ZombiePigman, + + eTelemetryTutorial_Breeding, + eTelemetryTutorial_Golem, + + eTelemetryTutorial_Anvil, // Added TU14 + eTelemetryTutorial_AnvilMenu, + eTelemetryTutorial_Trading, + eTelemetryTutorial_TradingMenu, + eTelemetryTutorial_Enderchest, + + // Sent over network as a byte +}; class CTelemetryManager { diff --git a/Minecraft.Client/Common/Trial/TrialMode.cpp b/Minecraft.Client/Common/Trial/TrialMode.cpp index e81491389..5d3092c94 100644 --- a/Minecraft.Client/Common/Trial/TrialMode.cpp +++ b/Minecraft.Client/Common/Trial/TrialMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "TrialMode.h" -#include "..\Tutorial\FullTutorial.h" +#include "../Tutorial/FullTutorial.h" TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : FullTutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Common/Trial/TrialMode.h b/Minecraft.Client/Common/Trial/TrialMode.h index a1034acf5..2feed67b4 100644 --- a/Minecraft.Client/Common/Trial/TrialMode.h +++ b/Minecraft.Client/Common/Trial/TrialMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Tutorial\FullTutorialMode.h" +#include "../Tutorial/FullTutorialMode.h" class TrialMode : public FullTutorialMode { diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp index f133d604b..59c840299 100644 --- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "AreaConstraint.h" -#include "..\..\..\Minecraft.World\AABB.h" +#include "../../../Minecraft.World/AABB.h" AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ ) : TutorialConstraint( descriptionId ) diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp index 8b711c880..2d001b6d1 100644 --- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "AreaHint.h" -#include "..\..\..\Minecraft.World\AABB.h" +#include "../../../Minecraft.World/AABB.h" #include "Tutorial.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp index f01db84e9..1439c8d2f 100644 --- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "Tutorial.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" #include "ChangeStateConstraint.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ ) diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp index c03166b50..2be9e9566 100644 --- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ChoiceTask.h" -#include "..\..\..\Minecraft.World\Material.h" +#include "../../../Minecraft.World/Material.h" ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/, diff --git a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp index 43b2f7f31..ca11c2557 100644 --- a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp +++ b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" #include "CompleteUsingItemTask.h" CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion) diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp index c5fe071bf..f2c35a896 100644 --- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ControllerTask.h" diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp index 6749d0302..d22c2bf32 100644 --- a/Minecraft.Client/Common/Tutorial/CraftTask.cpp +++ b/Minecraft.Client/Common/Tutorial/CraftTask.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "CraftTask.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" CraftTask::CraftTask( int itemId, int auxValue, int quantity, Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector *inConstraints /*= NULL*/, diff --git a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp index 1367f411a..2ed54380b 100644 --- a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp +++ b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.h" #include "Tutorial.h" #include "DiggerItemHint.h" diff --git a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp index 5f1b5b20b..6379d8f65 100644 --- a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp +++ b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" #include "EffectChangedTask.h" EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply, diff --git a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp index 123ab9dea..542b269b2 100644 --- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../GameRules/ConsoleGameRules.h" #include "DiggerItemHint.h" #include "TutorialTasks.h" #include "AreaHint.h" diff --git a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp index a5ee85b86..ce3f151ed 100644 --- a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp index 5330841fa..5967f7cb5 100644 --- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp +++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "InfoTask.h" -#include "..\..\..\Minecraft.World\Material.h" +#include "../../../Minecraft.World/Material.h" InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/) diff --git a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h index 991366919..cced69fa0 100644 --- a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h +++ b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\..\..\Minecraft.World\Class.h" +#include "../../../Minecraft.World/Class.h" #include "TutorialHint.h" class ItemInstance; diff --git a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp index 0a953a7bd..05a771cbc 100644 --- a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp +++ b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "Tutorial.h" #include "LookAtTileHint.h" diff --git a/Minecraft.Client/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Common/Tutorial/StatTask.cpp index 5f8b215e3..0fde58ccf 100644 --- a/Minecraft.Client/Common/Tutorial/StatTask.cpp +++ b/Minecraft.Client/Common/Tutorial/StatTask.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\LocalPlayer.h" -#include "..\..\StatsCounter.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" +#include "../../Minecraft.h" +#include "../../LocalPlayer.h" +#include "../../StatsCounter.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" #include "StatTask.h" StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/) diff --git a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp index a1a5c37a9..31304b5c8 100644 --- a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp +++ b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "Tutorial.h" #include "TakeItemHint.h" diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp index b0a0d665d..cff5d906b 100644 --- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\SurvivalMode.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" #include "TutorialTasks.h" diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp index 5f0808bf2..8295ee71a 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #include "Tutorial.h" #include "TutorialHint.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../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/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp index 82c81598f..e89e991d4 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\..\Minecraft.World\Inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../../Minecraft.World/Inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "TutorialMode.h" TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad ) diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h index 75e24edf0..d0778c037 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.h +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\..\MultiPlayerGameMode.h" +#include "../../MultiPlayerGameMode.h" #include "Tutorial.h" class TutorialMode : public MultiPlayerGameMode diff --git a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp index 09bac4d17..65359af07 100644 --- a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp +++ b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/ItemInstance.h" #include "UseItemTask.h" UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId, diff --git a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp index 1f4ed4cb3..574f3537b 100644 --- a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp +++ b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/ItemInstance.h" #include "UseTileTask.h" UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId, diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp index 71b884790..d6995e67b 100644 --- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp +++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" #if !(defined _XBOX) && !(defined __PSVITA__) -#include "..\UI\UI.h" +#include "../UI/UI.h" #endif #include "Tutorial.h" #include "XuiCraftingTask.h" diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h index 2dc48709d..25f9d8eb2 100644 --- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h +++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h @@ -1,6 +1,6 @@ #pragma once #include "TutorialTask.h" -#include "..\..\..\Minecraft.World\Recipy.h" +#include "../../../Minecraft.World/Recipy.h" class XuiCraftingTask : public TutorialTask { diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp index 29ddcf71d..adc7d3eb7 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -2,12 +2,12 @@ #include "IUIScene_AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" #ifdef __ORBIS__ #include diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp index 81451c7af..2bb62f9a4 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "IUIScene_AnvilMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" IUIScene_AnvilMenu::IUIScene_AnvilMenu() { diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h index 6c4348f2f..36c32285b 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h @@ -1,6 +1,6 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.ContainerListener.h" // The 0-indexed slot in the inventory list that lines up with the result slot #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5 diff --git a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp index 44bbdc44b..a1ffaedd7 100644 --- a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_BrewingMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp index c6a4df002..f1b7ba6ef 100644 --- a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "IUIScene_ContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp index f158b1741..fb155d7c8 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" #include "IUIScene_CraftingMenu.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]= diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h index 05227fff7..11c28eefa 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\..\Minecraft.World\Recipy.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../../Minecraft.World/Recipy.h" +#include "../../../Minecraft.World/Item.h" class LocalPlayer; diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 7ce33234b..d95038ea3 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "IUIScene_CreativeMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" // 4J JEV - Images for each tab. IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL; diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h index 7ab3ff7ea..ed305ace7 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h @@ -1,6 +1,6 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" // 4J Stu - This class is for code that is common between XUI and Iggy class SimpleContainer; diff --git a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp index ec8a73c35..be7fdac52 100644 --- a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_DispenserMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp index c73f7dc5c..4f4659cf9 100644 --- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) diff --git a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp index 4a6c6762a..927281b8b 100644 --- a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_FurnaceMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp index 7bed406ac..a4886003c 100644 --- a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_InventoryMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp index 79203e7c6..8bb655a18 100644 --- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "IUIScene_PauseMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MinecraftServer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" +#include "../../../Minecraft.World/StringHelpers.h" int IUIScene_PauseMenu::ExitGameDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp index 658bcdfb9..6e32abe80 100644 --- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" #include "IUIScene_TradingMenu.h" IUIScene_TradingMenu::IUIScene_TradingMenu() diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h index c8edda670..491ef29dd 100644 --- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\MerchantMenu.h" +#include "../Minecraft.World/MerchantMenu.h" class MerchantRecipe; diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp index 98b4f1654..45a2277ff 100644 --- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIComponent_Chat.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" +#include "../../Minecraft.h" +#include "../../Gui.h" UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp index a418fcda7..8ec8ff18b 100644 --- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp @@ -3,8 +3,8 @@ #include "UIComponent_Panorama.h" #include "Minecraft.h" #include "MultiPlayerLevel.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" UIComponent_Panorama::UIComponent_Panorama(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp index 2feb94c11..fe5087fab 100644 --- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIComponent_PressStartToPlay.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp index 858a8b43f..e21d3353e 100644 --- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UI.h" #include "UIComponent_TutorialPopup.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp index ec2e13d8e..a32485a65 100644 --- a/Minecraft.Client/Common/UI/UIControl.cpp +++ b/Minecraft.Client/Common/UI/UIControl.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIControl.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/JavaMath.h" UIControl::UIControl() { diff --git a/Minecraft.Client/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Common/UI/UIControl_Base.cpp index 18af2f632..eacebdae8 100644 --- a/Minecraft.Client/Common/UI/UIControl_Base.cpp +++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIControl.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/JavaMath.h" UIControl_Base::UIControl_Base() { diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp index ef7c0e948..a4f2f8080 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_EnchantmentBook.h" -#include "..\..\Minecraft.h" -#include "..\..\TileEntityRenderDispatcher.h" -#include "..\..\EnchantTableRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\BookModel.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../TileEntityRenderDispatcher.h" +#include "../../EnchantTableRenderer.h" +#include "../../Lighting.h" +#include "../../BookModel.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" UIControl_EnchantmentBook::UIControl_EnchantmentBook() { diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp index e1490e0bb..3725f5adc 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_EnchantmentButton.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp index 1481fea18..9f3782e0a 100644 --- a/Minecraft.Client/Common/UI/UIControl_Label.cpp +++ b/Minecraft.Client/Common/UI/UIControl_Label.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_Label.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" UIControl_Label::UIControl_Label() { diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp index 3a18ed53f..e8f36d54a 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../ModelPart.h" +#include "../../Options.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../MultiplayerLocalPlayer.h" #include "UI.h" #include "UIControl_MinecraftPlayer.h" diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp index 544b4da11..09c4ea62b 100644 --- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp +++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../ModelPart.h" +#include "../../Options.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "UIControl_PlayerSkinPreview.h" //#define SKIN_PREVIEW_BOB_ANIM diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h index a7c3126e1..974e5924b 100644 --- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h +++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h @@ -1,7 +1,7 @@ #pragma once #include "UIControl.h" -#include "..\..\Textures.h" +#include "../../Textures.h" class ModelPart; class EntityRenderer; diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index 7493ff06e..f777805e7 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -2,14 +2,14 @@ #include "UIController.h" #include "UI.h" #include "UIScene.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\LocalPlayer.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../LocalPlayer.h" +#include "../../DLCTexturePack.h" +#include "../../TexturePackRepository.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../EnderDragonRenderer.h" +#include "../../MultiPlayerLocalPlayer.h" #include "UIFontData.h" #ifdef __PSVITA__ #include @@ -21,7 +21,7 @@ //#define ENABLE_IGGY_EXPLORER #ifdef ENABLE_IGGY_EXPLORER -#include "Windows64\Iggy\include\iggyexpruntime.h" +#include "Windows64/Iggy/include/iggyexpruntime.h" #endif //#define ENABLE_IGGY_PERFMON @@ -31,18 +31,18 @@ #define PM_ORIGIN_Y 34 #ifdef __ORBIS__ -#include "Orbis\Iggy\include\iggyperfmon.h" -#include "Orbis\Iggy\include\iggyperfmon_orbis.h" +#include "Orbis/Iggy/include/iggyperfmon.h" +#include "Orbis/Iggy/include/iggyperfmon_orbis.h" #elif defined _DURANGO -#include "Durango\Iggy\include\iggyperfmon.h" +#include "Durango/Iggy/include/iggyperfmon.h" #elif defined __PS3__ -#include "PS3\Iggy\include\iggyperfmon.h" -#include "PS3\Iggy\include\iggyperfmon_ps3.h" +#include "PS3/Iggy/include/iggyperfmon.h" +#include "PS3/Iggy/include/iggyperfmon_ps3.h" #elif defined __PSVITA__ -#include "PSVita\Iggy\include\iggyperfmon.h" -#include "PSVita\Iggy\include\iggyperfmon_psp2.h" +#include "PSVita/Iggy/include/iggyperfmon.h" +#include "PSVita/Iggy/include/iggyperfmon_psp2.h" #elif defined __WINDOWS64 -#include "Windows64\Iggy\include\iggyperfmon.h" +#include "Windows64/Iggy/include/iggyperfmon.h" #endif #endif diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index e7d907ecc..b540f8616 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Common/UI/UIScene.cpp @@ -2,10 +2,10 @@ #include "UI.h" #include "UIScene.h" -#include "..\..\Lighting.h" -#include "..\..\LocalPlayer.h" -#include "..\..\ItemRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../Lighting.h" +#include "../../LocalPlayer.h" +#include "../../ItemRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" UIScene::UIScene(int iPad, UILayer *parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp index a1bd8270e..bada2e058 100644 --- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -2,9 +2,9 @@ #include "UI.h" #include "UIScene_AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../MultiplayerLocalPlayer.h" UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer) { @@ -106,8 +106,8 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex) #ifdef __ORBIS__ // we need to map the touchpad rectangle to the UI rectangle. While it works great for the creative menu, it is much too sensitive for the smaller menus. //X coordinate of the touch point (0 to 1919) - //Y coordinate of the touch point (0 to 941: DUALSHOCK®4 wireless controllers and the CUH-ZCT1J/CAP-ZCT1J/CAP-ZCT1U controllers for the PlayStation®4 development tool, - //0 to 753: JDX-1000x series controllers for the PlayStation®4 development tool,) + //Y coordinate of the touch point (0 to 941: DUALSHOCK®4 wireless controllers and the CUH-ZCT1J/CAP-ZCT1J/CAP-ZCT1U controllers for the PlayStation®4 development tool, + //0 to 753: JDX-1000x series controllers for the PlayStation®4 development tool,) m_fTouchPadMulX=fPanelWidth/1919.0f; m_fTouchPadMulY=fPanelHeight/941.0f; m_fTouchPadDeadZoneX=15.0f*m_fTouchPadMulX; diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp index 7b9886bc5..302cc9ff3 100644 --- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #include "UIScene_AnvilMenu.h" UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h index 3afc63338..494e4589c 100644 --- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h @@ -2,7 +2,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "IUIScene_AnvilMenu.h" -#include "..\Minecraft.World\MerchantMenu.h" +#include "../Minecraft.World/MerchantMenu.h" class InventoryMenu; diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp index cd56bd84b..e9d55e59c 100644 --- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.h" #include "UIScene_BrewingStandMenu.h" UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp index 0ea99a368..eacc333c6 100644 --- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_ConnectingProgress.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp index a0b25d18c..37e66e746 100644 --- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp @@ -2,14 +2,14 @@ #include "UI.h" #include "UIScene_ContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\Tutorial\TutorialEnum.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../Tutorial/TutorialEnum.h" UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp index c05b502e4..c9e8156d6 100644 --- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_ControlsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp index 5b7290693..21da9dd42 100644 --- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" #ifdef __PSVITA__ diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index fa41909df..d5c3f98e5 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -1,26 +1,26 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_CreateWorldMenu.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\BiomeSource.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\..\..\Minecraft.World\LevelType.h" -#include "..\..\DLCTexturePack.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/BiomeSource.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../../../Minecraft.World/LevelType.h" +#include "../../DLCTexturePack.h" #ifdef __PSVITA__ -#include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" +#include "PSVita/Network/SQRNetworkManager_AdHoc_Vita.h" #endif #ifdef _WINDOWS64 #include -#include "Xbox\Resource.h" +#include "Xbox/Resource.h" #endif #define GAME_CREATE_ONLINE_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp index 569cc8ba7..aac3268b2 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp @@ -2,12 +2,12 @@ #include "UI.h" #include "UIScene_CreativeMenu.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\..\LocalPlayer.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/JavaMath.h" +#include "../../LocalPlayer.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #ifdef __PSVITA__ #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp index 0d36dcdf4..a50d113ec 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #if defined(__PS3__) || defined(__ORBIS__) -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" #endif #include "UIScene_DLCMainMenu.h" diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp index 9dbdc3d43..0d2e3aff4 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_DLCOffersMenu.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif #ifdef __PSVITA__ -#include "PSVita\Network\SonyCommerce_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" #endif #define PLAYER_ONLINE_TIMER_ID 0 @@ -193,13 +193,13 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre switch(iTextC) { case 0: - m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des fêtes de fin d'année.

1-4 joueurs
2-8 joueurs en réseau

Cet article fait l’objet d’une licence ou d’une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions générales du service du réseau, au contrat d’utilisateur, aux restrictions d’utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne téléchargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. 

'Minecraft' est une marque commerciale de Notch Development AB."); + m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des fêtes de fin d'année.

1-4 joueurs
2-8 joueurs en réseau

Cet article fait l’objet d’une licence ou d’une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions générales du service du réseau, au contrat d’utilisateur, aux restrictions d’utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne téléchargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. 

'Minecraft' est une marque commerciale de Notch Development AB."); break; case 1: - m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.

1-4 jugadores
2-8 jugadores en red

Sony Computer Entertainment America le concede la licencia o sublicencia de este artículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así como otros términos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos términos, no descargue este artículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. 

'Minecraft' es una marca comercial de Notch Development AB."); + m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.

1-4 jugadores
2-8 jugadores en red

Sony Computer Entertainment America le concede la licencia o sublicencia de este artículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así como otros términos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos términos, no descargue este artículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. 

'Minecraft' es una marca comercial de Notch Development AB."); break; case 2: - m_labelHTMLSellText.init("Este é um incrível pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.

1-4 Jogadores
Jogadores em rede 2-8

Este item está sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estão localizados em www.us.playstation.com/support/useragreements. Caso não queira aceitar todos esses termos, não baixe este item. Este item pode ser usado com até 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. 

'Minecraft' é uma marca registrada da Notch Development AB"); + m_labelHTMLSellText.init("Este é um incrível pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.

1-4 Jogadores
Jogadores em rede 2-8

Este item está sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estão localizados em www.us.playstation.com/support/useragreements. Caso não queira aceitar todos esses termos, não baixe este item. Este item pode ser usado com até 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. 

'Minecraft' é uma marca registrada da Notch Development AB"); break; } iTextC++; diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp index 2026bfca3..07f76dc36 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -2,8 +2,8 @@ #include "UI.h" #include "UIScene_DeathMenu.h" #include "IUIScene_PauseMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp index 2a8ac9f8e..2a5fb93fa 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp @@ -4,8 +4,8 @@ #include "UI.h" #include "UIScene_DebugCreateSchematic.h" #include "Minecraft.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h index cbfe785d0..8f5897c86 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h +++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h @@ -1,7 +1,7 @@ #pragma once #ifdef _DEBUG_MENUS_ENABLED #include "UIScene.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class UIScene_DebugCreateSchematic : public UIScene { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp index 44a7e6c58..9fa8f652b 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp @@ -3,18 +3,18 @@ #ifdef _DEBUG_MENUS_ENABLED #include "UI.h" #include "UIScene_DebugOverlay.h" -#include "..\..\Minecraft.h" -#include "..\..\MinecraftServer.h" -#include "..\..\GameRenderer.h" -#include "..\..\MultiPlayerLevel.h" +#include "../../Minecraft.h" +#include "../../MinecraftServer.h" +#include "../../GameRenderer.h" +#include "../../MultiPlayerLevel.h" #include "ClientConnection.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../../../Minecraft.World/net.minecraft.commands.common.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp index dd5a429f0..b20830227 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp @@ -5,7 +5,7 @@ #include "UIScene_DebugSetCamera.h" #include "Minecraft.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp index 1eda16602..840c319fc 100644 --- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_DispenserMenu.h" UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp index 3177344df..26af2c133 100644 --- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_EULA.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp index 8a4f1c6df..c1a0c9573 100644 --- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_EnchantingMenu.h" UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp index f825efd01..37b458b41 100644 --- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp @@ -2,9 +2,9 @@ #include "UI.h" #include "UIScene_EndPoem.h" #include "UIBitmapFont.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp index ed31cfaf3..e9da64fbe 100644 --- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_FullscreenProgress.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp index 1ba4053d0..daa1fc06d 100644 --- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_FurnaceMenu.h" UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp index 27eeb76b6..2ae5eed14 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_HUD.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../EnderDragonRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp index 3fe033254..6fb3af951 100644 --- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_HelpAndOptionsMenu.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp index 68c7591f9..cbf2a69b2 100644 --- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_HowToPlay.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] = { diff --git a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp index de8af0ac7..79e1fc30a 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGameHostOptionsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp index 5c3f73f68..75fd05889 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGameInfoMenu.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp index 6eb22b095..bf58c2cda 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGamePlayerOptionsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" #define CHECKBOXES_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp index 723937d0c..05a8291ab 100644 --- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp @@ -2,18 +2,18 @@ #include "UI.h" #include "UIScene_InventoryMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\Lighting.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\Tutorial\TutorialEnum.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../EntityRenderDispatcher.h" +#include "../../Lighting.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../Tutorial/TutorialEnum.h" #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h index fb8d57a24..1b425a3a9 100644 --- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h @@ -3,7 +3,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "IUIScene_InventoryMenu.h" -#include "..\..\..\Minecraft.World\MobEffect.h" +#include "../../../Minecraft.World/MobEffect.h" class InventoryMenu; diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp index cad86dce3..acc83c1fd 100644 --- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_JoinMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Options.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../Options.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp index 80db57f81..5d8a8f21c 100644 --- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_LeaderboardsMenu.h" -#include "..\Leaderboards\LeaderboardManager.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../Leaderboards/LeaderboardManager.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h index 20bf0002f..728992ce7 100644 --- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene.h" -#include "..\Leaderboards\LeaderboardManager.h" +#include "../Leaderboards/LeaderboardManager.h" class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener { diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp index f08fc727f..08652e57a 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_LoadMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Options.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../Options.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/StringHelpers.h" #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif -#include "..\..\DLCTexturePack.h" +#include "../../DLCTexturePack.h" #if defined(__ORBIS__) || defined(__PSVITA__) #include #endif diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp index 1d90da775..6007f65ed 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -2,21 +2,21 @@ #include "UI.h" #include "UIScene_LoadOrJoinMenu.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFile.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileSplit.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\Network\SessionInfo.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h" +#include "../../../Minecraft.World/ConsoleSaveFile.h" +#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h" +#include "../../../Minecraft.World/ConsoleSaveFileSplit.h" +#include "../../ProgressRenderer.h" +#include "../../MinecraftServer.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../Network/SessionInfo.h" #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" #endif #if defined(__ORBIS__) || defined(__PSVITA__) #include diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index 7724aaaf2..1cc808625 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\User.h" -#include "..\..\MinecraftServer.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../User.h" +#include "../../MinecraftServer.h" #include "UI.h" #include "UIScene_MainMenu.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp index d9569cc93..3fb53baf6 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -1,22 +1,22 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_PauseMenu.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../MinecraftServer.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifdef __ORBIS__ #include #endif #ifdef _DURANGO -#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h" +#include "../../Durango/Leaderboards/DurangoStatsDebugger.h" #endif #ifdef __PSVITA__ -#include "PSVita\Network\SonyCommerce_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" #endif #if defined __PS3__ || defined __ORBIS__ diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp index 4f1b97425..f49e3ef76 100644 --- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_QuadrantSignin.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #if defined(__ORBIS__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp index 4ef7eb5d0..6ea0a1b28 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SettingsMenu.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp index c29bac2d3..8193b0aa3 100644 --- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SignEntryMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp index 6910dd658..f9c15da03 100644 --- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SkinSelectMenu.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifdef __ORBIS__ #include #elif defined __PSVITA__ diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h index c9ed66915..8d01354c5 100644 --- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "..\..\..\Minecraft.World\Definitions.h" +#include "../../../Minecraft.World/Definitions.h" #include "UIScene.h" #include "UIControl_PlayerSkinPreview.h" diff --git a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp index f6916d133..c6a134f54 100644 --- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_TeleportMenu.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" #include "TeleportCommand.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp index dc2bac487..818f1cb01 100644 --- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #include "UIScene_TradingMenu.h" UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIStructs.h b/Minecraft.Client/Common/UI/UIStructs.h index 2dd03c8c5..ea57b3a1f 100644 --- a/Minecraft.Client/Common/UI/UIStructs.h +++ b/Minecraft.Client/Common/UI/UIStructs.h @@ -1,6 +1,6 @@ #pragma once -#pragma message("UIStructs.h") +// #pragma message("UIStructs.h") #include "UIEnums.h" diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp index eb343382a..42ae041cd 100644 --- a/Minecraft.Client/Common/UI/UITTFFont.cpp +++ b/Minecraft.Client/Common/UI/UITTFFont.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\File.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/File.h" #include "UITTFFont.h" UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter) diff --git a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp index 91f362a3e..21866898f 100644 --- a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp +++ b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/ItemInstance.h" #include "SlotItemControlBase.h" #include "SlotProgressControl.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Common/XUI/XUI_Chat.cpp index 3e3faa773..bc2084154 100644 --- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "XUI_Chat.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" +#include "../../Minecraft.h" +#include "../../Gui.h" HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp index 9a82a7b3b..32adf3231 100644 --- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp @@ -4,8 +4,8 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/DisconnectPacket.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp index 0096da445..229b9f8ea 100644 --- a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_Control_ComboBox.h" -#include "..\Xbox_App.h" +#include "../Xbox_App.h" HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp index 074b7300b..04f535548 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h" #include "XUI_Ctrl_BrewProgress.h" int CXuiCtrlBrewProgress::GetValue() diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp index cc5d996f3..2cb6635ad 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "XUI_Ctrl_BubblesProgress.h" int CXuiCtrlBubblesProgress::GetValue() diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp index 8e514094c..b61ac80a5 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\FurnaceMenu.h" -#include "..\..\..\Minecraft.World\FurnaceTileEntity.h" +#include "../../../Minecraft.World/FurnaceMenu.h" +#include "../../../Minecraft.World/FurnaceTileEntity.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_BurnProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp index 82b6c3eda..76c4f3556 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "XUI_Ctrl_CraftIngredientSlot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" //----------------------------------------------------------------------------- // CXuiCtrlMinecraftSlot class diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp index dfb9b5ca9..0a1095e2f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Font.h" -#include "..\..\Lighting.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Font.h" +#include "../../Lighting.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp index 8a56a0ead..79a1d6d79 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp @@ -1,21 +1,21 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\TileEntityRenderDispatcher.h" -#include "..\..\EnchantTableRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../TileEntityRenderDispatcher.h" +#include "../../EnchantTableRenderer.h" +#include "../../Lighting.h" +#include "../../LocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantmentBook.h" -#include "..\..\BookModel.h" -#include "..\..\Options.h" +#include "../../BookModel.h" +#include "../../Options.h" //----------------------------------------------------------------------------- // CXuiCtrlEnchantmentBook class diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h index 93da07684..3ec502b09 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h @@ -1,5 +1,5 @@ #pragma once -#include "..\..\..\Minecraft.World\Random.h" +#include "../../../Minecraft.World/Random.h" using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp index 702ef15d7..025b9d4ba 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Font.h" -#include "..\..\Lighting.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Font.h" +#include "../../Lighting.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" #include "XUI_Ctrl_EnchantmentButtonText.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp index b125af39c..7c1584315 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\FurnaceMenu.h" -#include "..\..\..\Minecraft.World\FurnaceTileEntity.h" +#include "../../../Minecraft.World/FurnaceMenu.h" +#include "../../../Minecraft.World/FurnaceTileEntity.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_FireProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp index 3bb334400..0808e5c94 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "XUI_Ctrl_LoadingProgress.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" int CXuiCtrlLoadingProgress::GetValue() { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp index 02ee7c938..a82d43f88 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\Lighting.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../Lighting.h" +#include "../../MultiplayerLocalPlayer.h" #include "XUI_Ctrl_MinecraftPlayer.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "..\..\Options.h" +#include "../../Options.h" //----------------------------------------------------------------------------- // CXuiCtrlMinecraftPlayer class diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp index 80750deb8..8a7c480a3 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp @@ -1,18 +1,18 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\..\Minecraft.World\Class.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../../Minecraft.World/Class.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "XUI_Ctrl_MinecraftSkinPreview.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "..\..\Options.h" -#include "..\..\stubs.h" -#include "..\..\ModelPart.h" +#include "../../Options.h" +#include "../../stubs.h" +#include "../../ModelPart.h" //#define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h index 22f4991b2..254bc0432 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h @@ -2,9 +2,9 @@ #include #include -#include "..\..\Textures.h" -//#include "..\..\Xbox\DLC\DLCSkinFile.h" -#include "..\..\Model.h" +#include "../../Textures.h" +//#include "../../Xbox/DLC/DLCSkinFile.h" +#include "../../Model.h" using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp index 84273eb57..225db17e0 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\ItemRenderer.h" -#include "..\..\GameRenderer.h" -#include "..\..\TileRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" -#include "..\..\..\Minecraft.World\Item.h" -#include "..\..\..\Minecraft.World\Tile.h" +#include "../../ItemRenderer.h" +#include "../../GameRenderer.h" +#include "../../TileRenderer.h" +#include "../../Lighting.h" +#include "../../ScreenSizeCalculator.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/ItemInstance.h" +#include "../../../Minecraft.World/Item.h" +#include "../../../Minecraft.World/Tile.h" #include "XUI_Ctrl_MinecraftSlot.h" //----------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h index c43e7fe9e..4e223e3f4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\..\..\Minecraft.World\MobEffect.h" +#include "../../../Minecraft.World/MobEffect.h" class CXuiCtrlMobEffect : public CXuiControlImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp index 87abbcd35..db1e0c6bc 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotItemCtrlBase.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp index 7e51c8850..4478bf18b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" #include "XUI_Ctrl_SlotItemListItem.h" #include "XUI_Ctrl_SlotList.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp index 2e9717107..12858b79b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\Lighting.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../Lighting.h" #include "XUI_Ctrl_SplashPulser.h" -#include "..\..\Font.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\System.h" +#include "../../Font.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/System.h" //----------------------------------------------------------------------------- // CXuiCtrlSplashPulser class diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp index bd05ca146..b2bb53da7 100644 --- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp @@ -2,14 +2,14 @@ // #include "stdafx.h" -#include "..\..\..\Minecraft.World\ByteArrayInputStream.h" -#include "..\..\..\Minecraft.World\BufferedReader.h" -#include "..\..\..\Minecraft.World\InputStreamReader.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" +#include "../../../Minecraft.World/ByteArrayInputStream.h" +#include "../../../Minecraft.World/BufferedReader.h" +#include "../../../Minecraft.World/InputStreamReader.h" +#include "../../../Minecraft.World/ArrayWithLength.h" #include #include "XUI_Ctrl_4JIcon.h" #include "XUI_DLCOffers.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifdef _XBOX #include #endif diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h index 412446d00..0717846ee 100644 --- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h +++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h @@ -1,7 +1,7 @@ #pragma once -#include "../media\xuiscene_DLCOffers.h" -#include "../media\xuiscene_DLCMain.h" +#include "../media/xuiscene_DLCOffers.h" +#include "../media/xuiscene_DLCMain.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp index 83275c14c..a3696742a 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp @@ -2,25 +2,25 @@ // #include "stdafx.h" -#include "..\XUI\XUI_Death.h" +#include "../XUI/XUI_Death.h" #include -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\ChunkSource.h" -#include "..\..\..\Minecraft.Client\ProgressRenderer.h" -#include "..\..\..\Minecraft.Client\GameRenderer.h" -#include "..\..\..\Minecraft.Client\LevelRenderer.h" -#include "..\..\..\Minecraft.World\Pos.h" -#include "..\..\..\Minecraft.World\Dimension.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\compression.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/ChunkSource.h" +#include "../../../Minecraft.Client/ProgressRenderer.h" +#include "../../../Minecraft.Client/GameRenderer.h" +#include "../../../Minecraft.Client/LevelRenderer.h" +#include "../../../Minecraft.World/Pos.h" +#include "../../../Minecraft.World/Dimension.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/compression.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp index 56b41267e..9a4f930ab 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\Common\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../Common/GameRules/ConsoleGameRules.h" #include "XUI_DebugItemEditor.h" #ifdef _DEBUG_MENUS_ENABLED diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h index 2e2f5b5ae..c559b7ec4 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h +++ b/Minecraft.Client/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\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" class CScene_DebugItemEditor : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp index a23e97b7e..2d2bb6e7d 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp @@ -1,32 +1,32 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\MultiplayerLevel.h" -#include "..\..\GameMode.h" -#include "..\..\SurvivalMode.h" -#include "..\..\CreativeMode.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../MultiplayerLevel.h" +#include "../../GameMode.h" +#include "../../SurvivalMode.h" +#include "../../CreativeMode.h" #include "ClientConnection.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\com.mojang.nbt.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/com.mojang.nbt.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" #include "XUI_DebugOverlay.h" -#include "..\..\..\Minecraft.Client\GameRenderer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h" +#include "../../../Minecraft.Client/GameRenderer.h" +#include "../../MinecraftServer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../../Minecraft.World/net.minecraft.commands.common.h" +#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h" #ifdef _DEBUG_MENUS_ENABLED HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h index ed5f85c2a..a790e0fe6 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h @@ -7,8 +7,8 @@ using namespace std; class RegionFile; class DataOutputStream; class ConsoleSaveFile; -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\Entity.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/Entity.h" class CScene_DebugOverlay : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp index 66279d1f5..27fd43ac0 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_DebugSchematicCreator.h" -#include "..\..\..\Minecraft.World\ChunkSource.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "../../../Minecraft.World/ChunkSource.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSchematicCreator::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h index b502d1105..a3ee8b887 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Media\xuiscene_debug_schematic_create.h" +#include "../Media/xuiscene_debug_schematic_create.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class CScene_DebugSchematicCreator : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp index 2227e8956..ca689158c 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_DebugSetCamera.h" -#include "..\..\..\Minecraft.World\ChunkSource.h" +#include "../../../Minecraft.World/ChunkSource.h" -// #include "..\..\Xbox\4JLibs\inc\4J_Input.h" +// #include "../../Xbox/4JLibs/inc/4J_Input.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h index 1bc662e96..e8efbfb3e 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Media\xuiscene_debug_set_camera.h" +#include "../Media/xuiscene_debug_set_camera.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class CScene_DebugSetCamera : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp index aaa3b06f6..4266d6560 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp @@ -2,7 +2,7 @@ #include #include "XUI_DebugTips.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp index f66c0d70c..75d6e9130 100644 --- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp @@ -4,10 +4,10 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h index 271a57813..70fbe054f 100644 --- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h +++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h @@ -1,6 +1,6 @@ #pragma once #include "../media/xuiscene_fullscreenprogress.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "../../../Minecraft.World/C4JThread.h" #define ERROR_FULLSCREENPROGRESS_ diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp index 286f06a70..0b639566e 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "XUI_HUD.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h" +#include "../../Minecraft.h" +#include "../../Gui.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../../Minecraft.World/net.minecraft.world.level.material.h" HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp index 9ba49e9d4..734d847bd 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpAndOptions.h" +#include "../XUI/XUI_HelpAndOptions.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp index e7a8b0ca0..c089aacc1 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpControls.h" +#include "../XUI/XUI_HelpControls.h" #include "XUI_Ctrl_4JList.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\LevelData.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/LevelData.h" +#include "../../MultiplayerLocalPlayer.h" #define ALIGN_START 0 #define ALIGN_END 1 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h index e973286eb..3ac731573 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h @@ -5,7 +5,7 @@ #define MAX_CREDIT_STRINGS 360 // 213 -#include "..\UI\UIStructs.h" +#include "../UI/UIStructs.h" class CScene_Credits : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp index 5c750d030..0be09b20e 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpHowToPlay.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../XUI/XUI_HelpHowToPlay.h" +#include "../../../Minecraft.World/StringHelpers.h" static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] = { diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp index 14046f203..7d497c643 100644 --- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HowToPlayMenu.h" -#include "..\XUI\XUI_HelpHowToPlay.h" +#include "../XUI/XUI_HowToPlayMenu.h" +#include "../XUI/XUI_HelpHowToPlay.h" // strings for buttons in the list unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]= diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp index f05617451..575606c97 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGameHostOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h index cdc99f7c1..c3a617c5d 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_host_options.h" +#include "../Media/xuiscene_ingame_host_options.h" class CScene_InGameHostOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp index 4839013c9..ff19feaa4 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp @@ -2,18 +2,18 @@ #include #include "XUI_InGameInfo.h" -#include "..\..\ServerPlayer.h" -#include "..\..\PlayerConnection.h" -#include "..\..\PlayerList.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\PlayerRenderer.h" +#include "../../ServerPlayer.h" +#include "../../PlayerConnection.h" +#include "../../PlayerList.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #define IGNORE_KEYPRESS_TIMERID 0 #define TOOLTIP_TIMERID 1 diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp index 156cd0925..c00391a1b 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "XUI_InGameInfo.h" diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h index 87b9de138..487be5afc 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_player_options.h" +#include "../Media/xuiscene_ingame_player_options.h" class CScene_InGamePlayerOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.cpp b/Minecraft.Client/Common/XUI/XUI_Intro.cpp index 997abe5d5..fff495102 100644 --- a/Minecraft.Client/Common/XUI/XUI_Intro.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Intro.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_Intro.h" +#include "../XUI/XUI_Intro.h" #define TIMELINE_NORMAL 0 #define TIMELINE_ESRBFADE 1 @@ -23,7 +23,7 @@ HRESULT CScene_Intro::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) // 4J-PB - We can't check to see if the version is a trial or full game until after 5 seconds... // The reason that this is a requirement is that there is a problem that occasionally happens *only* in the production - // environment (not partnernet or cert), where if you don’t wait 5 seconds, you can run into an issue where the timing + // environment (not partnernet or cert), where if you don’t wait 5 seconds, you can run into an issue where the timing // of the call fails and the game is always identified as being the trial version even if you have upgraded to the full version. // -Joe Dunavant diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp index 428b3e88a..cefeb48d1 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp @@ -2,8 +2,8 @@ #include #include #include "XUI_Leaderboards.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/Item.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h index e06f13e18..2823cbe09 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h @@ -2,7 +2,7 @@ #include "XUI_Helper.h" #include "../media/xuiscene_leaderboards.h" -#include "..\Leaderboards\LeaderboardManager.h" +#include "../Leaderboards/LeaderboardManager.h" class CXuiCtrlCraftIngredientSlot; diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp index 7f32ff89e..18d6a0150 100644 --- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp +++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp @@ -2,29 +2,29 @@ #include #include #include -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Options.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../MinecraftServer.h" +#include "../../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\LevelSettings.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\GameRules\ConsoleGameRules.h" -#include "..\..\StringTable.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../GameRules/ConsoleGameRules.h" +#include "../../StringTable.h" +#include "../../DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp index 7b9c1a56e..21753e872 100644 --- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp @@ -4,21 +4,21 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_MainMenu.h" -#include "..\..\..\Minecraft.Client\SurvivalMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\User.h" +#include "../XUI/XUI_MainMenu.h" +#include "../../../Minecraft.Client/SurvivalMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../User.h" //#include "XUI_CreateLoad.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\Font.h" -#include "..\..\Common\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../Font.h" +#include "../../Common/GameRules/ConsoleGameRules.h" #define DLC_INSTALLED_TIMER_ID 1 #define DLC_INSTALLED_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp index b3608b068..39eba4a67 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp @@ -1,21 +1,21 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_MultiGameCreate.h" #include "XUI_Controls.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../../Minecraft.World/LevelSettings.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "..\..\..\Minecraft.World\BiomeSource.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\..\..\Minecraft.World\LevelType.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\DLC\DLCLocalisationFile.h" -#include "..\..\StringTable.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/BiomeSource.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../../../Minecraft.World/LevelType.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../DLC/DLCLocalisationFile.h" +#include "../../StringTable.h" +#include "../../DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h index 5b4e6ef7f..de99b0213 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_multi_create.h" +#include "../Media/xuiscene_multi_create.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_MultiGameLaunchMoreOptions.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp index bbfa243b2..6d45319c6 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\Difficulty.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/Difficulty.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h index 9664640b3..e06434558 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h @@ -2,7 +2,7 @@ using namespace std; #include #include -#include "..\Media\xuiscene_multi_gameinfo.h" +#include "../Media/xuiscene_multi_gameinfo.h" class FriendSessionInfo; diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp index 73f25da58..c6cd85b91 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp @@ -2,30 +2,30 @@ #include #include #include -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/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 "..\..\Options.h" +#include "../../MinecraftServer.h" +#include "../../Options.h" -#include "..\GameRules\LevelGenerationOptions.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "../GameRules/LevelGenerationOptions.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h index e91fbac23..b7d5ddc0f 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "..\Media\xuiscene_multi_joinload.h" +#include "../Media/xuiscene_multi_joinload.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp index 086561110..d4b9e02c7 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../Minecraft.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h index 928762405..1e5ebd029 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_multi_launch_more_options.h" +#include "../Media/xuiscene_multi_launch_more_options.h" class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp index 49b524ffe..e32eccad2 100644 --- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp +++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" // #include "XUI_Ctrl_4JIcon.h" #include "XUI_NewUpdateMessage.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h index 8c4fbb36c..b9685933c 100644 --- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h +++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../media\xuiscene_NewUpdateMessage.h" +#include "../media/xuiscene_NewUpdateMessage.h" class CScene_NewUpdateMessage : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp index 76b820d3e..fc4ca4860 100644 --- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_PartnernetPassword.h" -#include "..\XUI\XUI_Ctrl_4JList.h" +#include "../XUI/XUI_Ctrl_4JList.h" #ifdef _CONTENT_PACKAGE #ifndef _FINAL_BUILD diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h index b05206c0e..ea5d305e7 100644 --- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h +++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_partnernetpassword.h" +#include "../Media/xuiscene_partnernetpassword.h" #include "XUI_Ctrl_4JEdit.h" #ifdef _CONTENT_PACKAGE diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp index 4de74d1f2..2b83c7884 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp @@ -4,23 +4,23 @@ #include "stdafx.h" #include -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h" +#include "../../MinecraftServer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../../Minecraft.World/compression.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" #define IGNORE_KEYPRESS_TIMERID 0 #define IGNORE_KEYPRESS_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h index 9c0e0015c..c19fd4e8d 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h @@ -1,6 +1,6 @@ #pragma once #include "../media/xuiscene_Pause.h" -#include "..\UI\IUIScene_PauseMenu.h" +#include "../UI/IUIScene_PauseMenu.h" #include "XUI_CustomMessages.h" #define BUTTON_PAUSE_RESUMEGAME 0 diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp index c1e06c0d1..86934fca6 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp @@ -4,19 +4,19 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_Reinstall.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" +#include "../XUI/XUI_Reinstall.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/LocalPlayer.h" +#include "../../MinecraftServer.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../Options.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp index 7c8160337..5469cd0d6 100644 --- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_SaveMessage.h" +#include "../XUI/XUI_SaveMessage.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp index 10369d5ea..daac9fcb9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp @@ -3,22 +3,22 @@ #include #include -#include "..\..\..\Minecraft.World\Player.h" -#include "..\..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\..\Minecraft.Client\Minecraft.h" -#include "..\..\..\Minecraft.Client\GameMode.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\FurnaceRecipes.h" -#include "..\..\..\Minecraft.World\Recipy.h" -#include "..\..\..\Minecraft.World\Recipes.h" -#include "..\..\..\Minecraft.World\ArmorRecipes.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Player.h" +#include "../../../Minecraft.Client/LocalPlayer.h" +#include "../../../Minecraft.Client/Minecraft.h" +#include "../../../Minecraft.Client/GameMode.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/FurnaceRecipes.h" +#include "../../../Minecraft.World/Recipy.h" +#include "../../../Minecraft.World/Recipes.h" +#include "../../../Minecraft.World/ArmorRecipes.h" +#include "../../../Minecraft.World/StringHelpers.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_SlotItem.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h index ca191db5b..154b53680 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h @@ -1,7 +1,7 @@ #pragma once -#include "..\UI\IUIScene_AbstractContainerMenu.h" +#include "../UI/IUIScene_AbstractContainerMenu.h" #include "XUI_CustomMessages.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/TutorialEnum.h" class CXuiCtrlSlotList; class CXuiCtrlSlotItem; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp index 4a8617b47..35cc50f95 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Anvil.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h index 2b16c8ab8..025995507 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h @@ -1,9 +1,9 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_anvil.h" +#include "../Media/xuiscene_anvil.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_AnvilMenu.h" -#include "Common\XUI\XUI_Ctrl_4JEdit.h" +#include "../UI/IUIScene_AnvilMenu.h" +#include "Common/XUI/XUI_Ctrl_4JEdit.h" #define ANVIL_UPDATE_TIMER_ID (10) #define ANVIL_UPDATE_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp index 03782c79c..d37a37fd1 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp @@ -1,24 +1,24 @@ #include "stdafx.h" #include -#include "..\..\MultiplayerLevel.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\StatsCounter.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\Minecraft.h" +#include "../../MultiplayerLevel.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../StatsCounter.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../Minecraft.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\LevelData.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/LevelData.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\Dimension.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\GameMode.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/Dimension.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../GameMode.h" +#include "../../EnderDragonRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" #define PRESS_START_TIMER 0 diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h index 1a5b5d876..7b89a6e16 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h @@ -3,8 +3,8 @@ #include "../media/xuiscene_base.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_CustomMessages.h" -#include "..\UI\UIEnums.h" -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "../UI/UIEnums.h" +#include "../../../Minecraft.World/SoundTypes.h" #define BUTTON_TOOLTIP_A 0 #define BUTTON_TOOLTIP_B 1 diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp index cf6009661..076bdad97 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_BrewingStand.h" #include "XUI_Ctrl_BrewProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h index 370b6b189..96b414650 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_brewingstand.h" +#include "../Media/xuiscene_brewingstand.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_BrewingMenu.h" +#include "../UI/IUIScene_BrewingMenu.h" class CXuiCtrlSlotList; class CXuiCtrlBrewProgress; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp index 39b836d2c..c11281df4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Container.h" -#include "..\..\..\Minecraft.World\ContainerMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/Container.h" +#include "../../../Minecraft.World/ContainerMenu.h" +#include "../../MultiplayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Container.h" #include "XUI_Ctrl_SlotItemListItem.h" #include "XUI_Ctrl_SlotItem.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" // The height of one row of slots //#define ROW_HEIGHT 42.0f - comes from the pointer height in the xui diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h index 475a6974d..a1bb4d19d 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h @@ -1,8 +1,8 @@ #pragma once -#include "..\Media\xuiscene_container.h" +#include "../Media/xuiscene_container.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_ContainerMenu.h" +#include "../UI/IUIScene_ContainerMenu.h" //-------------------------------------------------------------------------------------- // Scene implementation class. diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp index a5dc65849..f2e9dde9f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -4,16 +4,16 @@ #include "stdafx.h" #include -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_SlotList.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h index 0c6e22ff7..77466402f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h @@ -3,12 +3,12 @@ using namespace std; #include "../media/xuiscene_craftingpanel_2x2.h" #include "XUI_Ctrl_MinecraftSlot.h" -#include "..\..\..\Minecraft.World\Recipy.h" +#include "../../../Minecraft.World/Recipy.h" #include "XUI_Ctrl_CraftIngredientSlot.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../../Minecraft.World/Item.h" #include "XUI_CustomMessages.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\UI\IUIScene_CraftingMenu.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../UI/IUIScene_CraftingMenu.h" class CXuiCtrlSlotList; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp index 5b3c72261..ef27f16a4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h" -//#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +//#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Enchant.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h index 5cab04a40..eb26041dd 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h @@ -1,20 +1,20 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_enchant.h" +#include "../Media/xuiscene_enchant.h" -#include "..\..\BookModel.h" +#include "../../BookModel.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_EnchantmentBook.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_EnchantingMenu.h" +#include "../UI/IUIScene_EnchantingMenu.h" #include "XUI_CustomMessages.h" #include "XUI_Scene_Enchant.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\SimpleContainer.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/SimpleContainer.h" class Level; class CXuiCtrlEnchantmentButton; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp index 832d6b4ce..709ce9057 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\FurnaceMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/FurnaceMenu.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_BurnProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h index 22cbf262e..8c965e8bf 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_furnace.h" +#include "../Media/xuiscene_furnace.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_FurnaceMenu.h" +#include "../UI/IUIScene_FurnaceMenu.h" class CXuiCtrlSlotList; class CXuiCtrlFireProgress; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp index 04e77e5e3..111ba95a6 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Controls.h" #include "XUI_Scene_Inventory.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h index 2a7b305c1..6cccad7fa 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h @@ -1,9 +1,9 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory.h" +#include "../Media/xuiscene_inventory.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_InventoryMenu.h" +#include "../UI/IUIScene_InventoryMenu.h" #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp index 0793fc9e0..21e3a6e95 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -1,26 +1,26 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Container.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/Container.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Minecraft.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_SlotItemListItem.h" -#include "..\..\Common\Potion_macros.h" +#include "../../Common/Potion_macros.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneInventoryCreative::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h index bb3ff9767..acccbe04d 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h @@ -1,13 +1,13 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory_creative.h" +#include "../Media/xuiscene_inventory_creative.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\SimpleContainer.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/SimpleContainer.h" -#include "..\UI\IUIScene_CreativeMenu.h" +#include "../UI/IUIScene_CreativeMenu.h" #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp index fec134609..dedd049b5 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trading.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/JavaMath.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneTrading::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h index 72194cbce..5916f713c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trading.h" -#include "..\UI\IUIScene_TradingMenu.h" +#include "../Media/xuiscene_trading.h" +#include "../UI/IUIScene_TradingMenu.h" #define TRADING_UPDATE_TIMER_ID (10) #define TRADING_UPDATE_TIMER_TIME (50) diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp index 99dc6e4c4..69a60a399 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\DispenserTileEntity.h" -#include "..\..\..\Minecraft.World\TrapMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/DispenserTileEntity.h" +#include "../../../Minecraft.World/TrapMenu.h" +#include "../../MultiplayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trap.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneTrap::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h index 3008a7ca3..233825afc 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trap.h" +#include "../Media/xuiscene_trap.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_DispenserMenu.h" +#include "../UI/IUIScene_DispenserMenu.h" #include "XUI_CustomMessages.h" class Container; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp index 0f0c678b3..6f523bac1 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp @@ -2,13 +2,13 @@ // #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Font.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Font.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiplayerLocalPlayer.h" #include "XUI_Scene_Win.h" BYTE CScene_Win::s_winUserIndex = 0; diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp index c6dc7118f..3f302363e 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsAll.h" +#include "../XUI/XUI_SettingsAll.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp index 0f0fe2e30..f55938f96 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\XUI\XUI_SettingsAudio.h" +#include "../XUI/XUI_SettingsAudio.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp index 7e2835a27..86f8863a3 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsControl.h" +#include "../XUI/XUI_SettingsControl.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp index 48a933e27..7b0f68a5c 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsGraphics.h" +#include "../XUI/XUI_SettingsGraphics.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp index 526847c7c..96098883b 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsOptions.h" +#include "../XUI/XUI_SettingsOptions.h" int CScene_SettingsOptions::m_iDifficultySettingA[4]= { diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp index da95d084d..802cafe53 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsUI.h" +#include "../XUI/XUI_SettingsUI.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp index 378ac147b..13fe2b910 100644 --- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\MultiplayerLevel.h" -#include "..\..\..\Minecraft.World\SignTileEntity.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\..\Minecraft.Client\ClientConnection.h" -#include "..\..\..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../../../MultiplayerLevel.h" +#include "../../../Minecraft.World/SignTileEntity.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/LocalPlayer.h" +#include "../../../Minecraft.Client/ClientConnection.h" +#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "XUI_SignEntry.h" HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h index dbbb388ce..e8e0f03d6 100644 --- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h +++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h @@ -2,8 +2,8 @@ #include "../media/xuiscene_skinselect.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\Definitions.h" -#include "..\..\Textures.h" +#include "../../../Minecraft.World/Definitions.h" +#include "../../Textures.h" class DLCPack; diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp index f237e7d87..2fae75979 100644 --- a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp @@ -4,16 +4,16 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_SocialPost.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.Client\SurvivalMode.h" -#include "..\..\..\Minecraft.Client\CreateWorldScreen.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\LocalPlayer.h" +#include "../XUI/XUI_SocialPost.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.Client/SurvivalMode.h" +#include "../../../Minecraft.Client/CreateWorldScreen.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../LocalPlayer.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Common/XUI/XUI_SocialPost.h index 0dd37fa68..5d39e41eb 100644 --- a/Minecraft.Client/Common/XUI/XUI_SocialPost.h +++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.h @@ -1,6 +1,6 @@ #pragma once -#include "../media\xuiscene_socialpost.h" +#include "../media/xuiscene_socialpost.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp index 1d6ac3bf6..1e00c0b71 100644 --- a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp @@ -2,18 +2,18 @@ #include #include "XUI_Teleport.h" -#include "..\..\ServerPlayer.h" -#include "..\..\PlayerConnection.h" -#include "..\..\PlayerList.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\PlayerRenderer.h" +#include "../../ServerPlayer.h" +#include "../../PlayerConnection.h" +#include "../../PlayerList.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #include "TeleportCommand.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp index 8934350d3..6c5c2fef9 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_TextEntry.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../MultiplayerLocalPlayer.h" CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]= diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Common/XUI/XUI_TextEntry.h index 70dcf30b2..884ec678e 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.h +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_text_entry.h" +#include "../Media/xuiscene_text_entry.h" #include "XUI_Ctrl_4JEdit.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp index 5a2e67b42..329ee26ef 100644 --- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp @@ -6,7 +6,7 @@ #include "XUI_Ctrl_4JList.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" -#include "..\..\ProgressRenderer.h" +#include "../../ProgressRenderer.h" #include "XUI_TransferToXboxOne.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h index f08de59ae..dc80495cf 100644 --- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h +++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h @@ -2,7 +2,7 @@ using namespace std; //#include -#include "..\Media\xuiscene_TransferToXboxOne.h" +#include "../Media/xuiscene_TransferToXboxOne.h" class CXuiCtrl4JList; diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp index 98951d81a..59bf3486b 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/Item.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp index 61b818a07..07ba59808 100644 --- a/Minecraft.Client/Common/XUI/XUI_debug.cpp +++ b/Minecraft.Client/Common/XUI/XUI_debug.cpp @@ -5,7 +5,7 @@ #include #include "XUI_Debug.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" +#include "../../../Minecraft.Client/StatsCounter.h" LPCWSTR CScene_Debug::m_DebugCheckboxTextA[eDebugSetting_Max+1]= { diff --git a/Minecraft.Client/CompassTexture.cpp b/Minecraft.Client/CompassTexture.cpp index 93d6a62c6..95a8e5085 100644 --- a/Minecraft.Client/CompassTexture.cpp +++ b/Minecraft.Client/CompassTexture.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "Minecraft.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "Texture.h" #include "CompassTexture.h" diff --git a/Minecraft.Client/ConfirmScreen.cpp b/Minecraft.Client/ConfirmScreen.cpp index b67ea19d8..13a89a4e3 100644 --- a/Minecraft.Client/ConfirmScreen.cpp +++ b/Minecraft.Client/ConfirmScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ConfirmScreen.h" #include "SmallButton.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" ConfirmScreen::ConfirmScreen(Screen *parent, const wstring& title1, const wstring& title2, int id) { diff --git a/Minecraft.Client/ConnectScreen.cpp b/Minecraft.Client/ConnectScreen.cpp index 2cf005b6d..6ac4ed0b3 100644 --- a/Minecraft.Client/ConnectScreen.cpp +++ b/Minecraft.Client/ConnectScreen.cpp @@ -5,7 +5,7 @@ #include "Button.h" #include "Minecraft.h" #include "User.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port) diff --git a/Minecraft.Client/ContainerScreen.cpp b/Minecraft.Client/ContainerScreen.cpp index 17b454063..4ec572aca 100644 --- a/Minecraft.Client/ContainerScreen.cpp +++ b/Minecraft.Client/ContainerScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ContainerScreen.h" #include "Textures.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" ContainerScreen::ContainerScreen(shared_ptr inventory, shared_ptr container) : AbstractContainerScreen(new ContainerMenu(inventory, container)) { diff --git a/Minecraft.Client/ControlsScreen.cpp b/Minecraft.Client/ControlsScreen.cpp index 487dbb160..c047327d7 100644 --- a/Minecraft.Client/ControlsScreen.cpp +++ b/Minecraft.Client/ControlsScreen.cpp @@ -2,7 +2,7 @@ #include "ControlsScreen.h" #include "Options.h" #include "SmallButton.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" ControlsScreen::ControlsScreen(Screen *lastScreen, Options *options) { diff --git a/Minecraft.Client/CraftingScreen.cpp b/Minecraft.Client/CraftingScreen.cpp index c28df18df..cc947c0cd 100644 --- a/Minecraft.Client/CraftingScreen.cpp +++ b/Minecraft.Client/CraftingScreen.cpp @@ -2,7 +2,7 @@ #include "CraftingScreen.h" #include "Textures.h" #include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" CraftingScreen::CraftingScreen(shared_ptr inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z)) { diff --git a/Minecraft.Client/CreateWorldScreen.cpp b/Minecraft.Client/CreateWorldScreen.cpp index b9856c7e3..d9709afb3 100644 --- a/Minecraft.Client/CreateWorldScreen.cpp +++ b/Minecraft.Client/CreateWorldScreen.cpp @@ -3,12 +3,12 @@ #include "EditBox.h" #include "Button.h" #include "SurvivalMode.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/Random.h" CreateWorldScreen::CreateWorldScreen(Screen *lastScreen) { diff --git a/Minecraft.Client/CreativeMode.cpp b/Minecraft.Client/CreativeMode.cpp index 48342ebc1..b78f53445 100644 --- a/Minecraft.Client/CreativeMode.cpp +++ b/Minecraft.Client/CreativeMode.cpp @@ -2,11 +2,11 @@ #include "CreativeMode.h" #include "User.h" #include "LocalPlayer.h" -#include "..\Minecraft.World\\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World//net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" CreativeMode::CreativeMode(Minecraft *minecraft) : GameMode(minecraft) { diff --git a/Minecraft.Client/CreeperModel.cpp b/Minecraft.Client/CreeperModel.cpp index 51237ce67..ee889d010 100644 --- a/Minecraft.Client/CreeperModel.cpp +++ b/Minecraft.Client/CreeperModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "CreeperModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/CreeperRenderer.cpp b/Minecraft.Client/CreeperRenderer.cpp index 483d14e35..56b9bd758 100644 --- a/Minecraft.Client/CreeperRenderer.cpp +++ b/Minecraft.Client/CreeperRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "CreeperRenderer.h" #include "CreeperModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/Mth.h" CreeperRenderer::CreeperRenderer() : MobRenderer( new CreeperModel(), 0.5f ) { diff --git a/Minecraft.Client/CritParticle.cpp b/Minecraft.Client/CritParticle.cpp index 6c71b027f..b3ed2f05e 100644 --- a/Minecraft.Client/CritParticle.cpp +++ b/Minecraft.Client/CritParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "CritParticle.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.world.level.h" void CritParticle::_init(Level *level, shared_ptr entity, ePARTICLE_TYPE type) { diff --git a/Minecraft.Client/CritParticle2.cpp b/Minecraft.Client/CritParticle2.cpp index 363e8f08d..2620d406e 100644 --- a/Minecraft.Client/CritParticle2.cpp +++ b/Minecraft.Client/CritParticle2.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "CritParticle2.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" void CritParticle2::_init(double xa, double ya, double za, float scale) { diff --git a/Minecraft.Client/Cube.h b/Minecraft.Client/Cube.h index 3aee2b650..2dd074e43 100644 --- a/Minecraft.Client/Cube.h +++ b/Minecraft.Client/Cube.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" #include "Vertex.h" #include "Polygon.h" diff --git a/Minecraft.Client/Culler.h b/Minecraft.Client/Culler.h index bd428ac0e..cb1f8a02c 100644 --- a/Minecraft.Client/Culler.h +++ b/Minecraft.Client/Culler.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\AABB.h" +#include "../Minecraft.World/AABB.h" class Culler { diff --git a/Minecraft.Client/DLCTexturePack.cpp b/Minecraft.Client/DLCTexturePack.cpp index 3d1e05a2d..ac4c3cf79 100644 --- a/Minecraft.Client/DLCTexturePack.cpp +++ b/Minecraft.Client/DLCTexturePack.cpp @@ -1,19 +1,19 @@ #include "stdafx.h" -#include "Common\DLC\DLCGameRulesFile.h" -#include "Common\DLC\DLCGameRulesHeader.h" -#include "Common\DLC\DLCGameRules.h" +#include "Common/DLC/DLCGameRulesFile.h" +#include "Common/DLC/DLCGameRulesHeader.h" +#include "Common/DLC/DLCGameRules.h" #include "DLCTexturePack.h" -#include "Common\DLC\DLCColourTableFile.h" -#include "Common\DLC\DLCUIDataFile.h" -#include "Common\DLC\DLCTextureFile.h" -#include "Common\DLC\DLCLocalisationFile.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "Common/DLC/DLCColourTableFile.h" +#include "Common/DLC/DLCUIDataFile.h" +#include "Common/DLC/DLCTextureFile.h" +#include "Common/DLC/DLCLocalisationFile.h" +#include "../Minecraft.World/StringHelpers.h" #include "StringTable.h" -#include "Common\DLC\DLCAudioFile.h" +#include "Common/DLC/DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 -#include "Xbox\XML\ATGXmlParser.h" -#include "Xbox\XML\xmlFilesCallback.h" +#include "Xbox/XML/ATGXmlParser.h" +#include "Xbox/XML/xmlFilesCallback.h" #endif DLCTexturePack::DLCTexturePack(DWORD id, DLCPack *pack, TexturePack *fallback) : AbstractTexturePack(id, NULL, pack->getName(), fallback) diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp index a06606ecf..36fa468dd 100644 --- a/Minecraft.Client/DeathScreen.cpp +++ b/Minecraft.Client/DeathScreen.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "DeathScreen.h" #include "Button.h" #include "MultiplayerLocalPlayer.h" diff --git a/Minecraft.Client/DefaultRenderer.cpp b/Minecraft.Client/DefaultRenderer.cpp index d4c157377..cfe889119 100644 --- a/Minecraft.Client/DefaultRenderer.cpp +++ b/Minecraft.Client/DefaultRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DefaultRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" void DefaultRenderer::render(shared_ptr entity, double x, double y, double z, float rot, float a) { diff --git a/Minecraft.Client/DefaultTexturePack.cpp b/Minecraft.Client/DefaultTexturePack.cpp index d2974b6d0..4a2e46f4c 100644 --- a/Minecraft.Client/DefaultTexturePack.cpp +++ b/Minecraft.Client/DefaultTexturePack.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DefaultTexturePack.h" #include "Textures.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" DefaultTexturePack::DefaultTexturePack() : AbstractTexturePack(0, NULL, L"Minecraft", NULL) diff --git a/Minecraft.Client/DemoLevel.cpp b/Minecraft.Client/DemoLevel.cpp index 52edc0ba2..7ae62af1b 100644 --- a/Minecraft.Client/DemoLevel.cpp +++ b/Minecraft.Client/DemoLevel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DemoLevel.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" DemoLevel::DemoLevel(shared_ptr levelStorage, const wstring& levelName) : Level(levelStorage, levelName, DEMO_LEVEL_SEED) { diff --git a/Minecraft.Client/DemoLevel.h b/Minecraft.Client/DemoLevel.h index 8364d5b49..8a61bbb6e 100644 --- a/Minecraft.Client/DemoLevel.h +++ b/Minecraft.Client/DemoLevel.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.h" class DemoLevel : public Level { diff --git a/Minecraft.Client/DemoMode.cpp b/Minecraft.Client/DemoMode.cpp index 3b24af7aa..75d0ab9f4 100644 --- a/Minecraft.Client/DemoMode.cpp +++ b/Minecraft.Client/DemoMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DemoMode.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.h" DemoMode::DemoMode(Minecraft *minecraft) : SurvivalMode(minecraft) { diff --git a/Minecraft.Client/DerivedServerLevel.cpp b/Minecraft.Client/DerivedServerLevel.cpp index a67408d70..b1788b2dc 100644 --- a/Minecraft.Client/DerivedServerLevel.cpp +++ b/Minecraft.Client/DerivedServerLevel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DerivedServerLevel.h" -#include "..\Minecraft.World\SavedDataStorage.h" -#include "..\Minecraft.World\DerivedLevelData.h" +#include "../Minecraft.World/SavedDataStorage.h" +#include "../Minecraft.World/DerivedLevelData.h" DerivedServerLevel::DerivedServerLevel(MinecraftServer *server, shared_ptr levelStorage, const wstring& levelName, int dimension, LevelSettings *levelSettings, ServerLevel *wrapped) : ServerLevel(server, levelStorage, levelName, dimension, levelSettings) diff --git a/Minecraft.Client/DisconnectedScreen.cpp b/Minecraft.Client/DisconnectedScreen.cpp index b445e4d07..815ce20ae 100644 --- a/Minecraft.Client/DisconnectedScreen.cpp +++ b/Minecraft.Client/DisconnectedScreen.cpp @@ -2,7 +2,7 @@ #include "DisconnectedScreen.h" #include "TitleScreen.h" #include "Button.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" DisconnectedScreen::DisconnectedScreen(const wstring& title, const wstring reason, void *reasonObjects, ...) { diff --git a/Minecraft.Client/DragonBreathParticle.cpp b/Minecraft.Client/DragonBreathParticle.cpp index 0d0f75f33..6bce3739c 100644 --- a/Minecraft.Client/DragonBreathParticle.cpp +++ b/Minecraft.Client/DragonBreathParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "DragonBreathParticle.h" void DragonBreathParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale) diff --git a/Minecraft.Client/DragonModel.cpp b/Minecraft.Client/DragonModel.cpp index 39861829f..a112b584a 100644 --- a/Minecraft.Client/DragonModel.cpp +++ b/Minecraft.Client/DragonModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DragonModel.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\Enderdragon.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/Enderdragon.h" DragonModel::DragonModel(float g) : Model() { diff --git a/Minecraft.Client/DripParticle.cpp b/Minecraft.Client/DripParticle.cpp index 9463976e6..2bdd922c5 100644 --- a/Minecraft.Client/DripParticle.cpp +++ b/Minecraft.Client/DripParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Mth.h" #include "DripParticle.h" DripParticle::DripParticle(Level *level, double x, double y, double z, Material *material) : Particle(level, x, y, z, 0, 0, 0) diff --git a/Minecraft.Client/Durango/Durango_App.cpp b/Minecraft.Client/Durango/Durango_App.cpp index 2ec81a29c..cde1b4a9e 100644 --- a/Minecraft.Client/Durango/Durango_App.cpp +++ b/Minecraft.Client/Durango/Durango_App.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "ServiceConfig\Events-XBLA.8-149E11AEEvents.h" -#include "..\..\Minecraft.World\DurangoStats.h" -#include "..\..\Minecraft.Client\Durango\XML\xmlFilesCallback.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "ServiceConfig/Events-XBLA.8-149E11AEEvents.h" +#include "../../Minecraft.World/DurangoStats.h" +#include "../../Minecraft.Client/Durango/XML/xmlFilesCallback.h" CConsoleMinecraftApp app; diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp index 48d5c3198..339cdb2fb 100644 --- a/Minecraft.Client/Durango/Durango_Minecraft.cpp +++ b/Minecraft.Client/Durango/Durango_Minecraft.cpp @@ -4,35 +4,35 @@ #include "stdafx.h" #include -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" -#include "Leaderboards\GameProgress.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -#include "Leaderboards\DurangoLeaderboardManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "Leaderboards/GameProgress.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +#include "Leaderboards/DurangoLeaderboardManager.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" #include //using namespace Windows::Xbox::Input; diff --git a/Minecraft.Client/Durango/Durango_UIController.h b/Minecraft.Client/Durango/Durango_UIController.h index 28fe08adb..4ad3410e1 100644 --- a/Minecraft.Client/Durango/Durango_UIController.h +++ b/Minecraft.Client/Durango/Durango_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp index cbedb0330..31f8a57c8 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp +++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DurangoLeaderboardManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" namespace WFC = Windows::Foundation::Collections; namespace CC = concurrency; diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h index 233d8b711..2425b949e 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h +++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" namespace P = Platform; namespace PC = Platform::Collections; diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp index caa5857e9..5e0f74f8f 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\Minecraft.World\Tile.h" -#include "..\Minecraft.World\Item.h" +#include "../Minecraft.World/Tile.h" +#include "../Minecraft.World/Item.h" -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" -#include "..\Minecraft.World\EntityIO.h" +#include "../Minecraft.World/EntityIO.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" -#include "Common\Console_Awards_enum.h" +#include "Common/Console_Awards_enum.h" #include "DurangoStatsDebugger.h" diff --git a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp index dd07f3e96..0ad923b06 100644 --- a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp +++ b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h" -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #include "GameProgress.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp index f13cc4aac..568ae180f 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Durango/Network/DQRNetworkManager.h index 5f7b8d908..770656137 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager.h +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.h @@ -1,7 +1,7 @@ #pragma once #include "DQRNetworkPlayer.h" -#include "..\Minecraft.World\C4JThread.h" +#include "../Minecraft.World/C4JThread.h" #include class IDQRNetworkManagerListener; diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp index 3a14a2d59..29cd5c9b8 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp index cf66ea6f6..ea353246a 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp index 9232d0959..d4b40ab18 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp index c985a191f..5054e66b4 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h index c95e8aefc..2fef6dfa6 100644 --- a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h +++ b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\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/Durango/Network/PlatformNetworkManagerDurango.cpp b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp index 3efba5edb..a3e4b52c2 100644 --- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp +++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerDurango.h" #include "NetworkPlayerDurango.h" diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h index 558072275..2d78657fa 100644 --- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h +++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h @@ -1,10 +1,10 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" #include "DQRNetworkManager.h" #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp index d51ce9666..1f1dff710 100644 --- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp +++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" -#include "..\Minecraft.World\Player.h" -#include "..\Minecraft.World\Level.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\LevelSettings.h" +#include "../Minecraft.World/Player.h" +#include "../Minecraft.World/Level.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/LevelSettings.h" -#include "Common\Network\GameNetworkManager.h" +#include "Common/Network/GameNetworkManager.h" #include "MultiPlayerLocalPlayer.h" -#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h" #include "DurangoTelemetry.h" diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h index 4f0866963..0bab9193a 100644 --- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h +++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h @@ -1,8 +1,8 @@ #pragma once -#include "..\..\..\Minecraft.World\DurangoStats.h" +#include "../../../Minecraft.World/DurangoStats.h" -#include "..\..\Common\Telemetry\TelemetryManager.h" +#include "../../Common/Telemetry/TelemetryManager.h" class CDurangoTelemetryManager : public CTelemetryManager { diff --git a/Minecraft.Client/Durango/XboxGameMode.cpp b/Minecraft.Client/Durango/XboxGameMode.cpp index 1b55fdd9f..709a6589d 100644 --- a/Minecraft.Client/Durango/XboxGameMode.cpp +++ b/Minecraft.Client/Durango/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XboxGameMode.h" -#include "..\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/Durango/XboxGameMode.h b/Minecraft.Client/Durango/XboxGameMode.h index 347cdf308..a9f0d6cd6 100644 --- a/Minecraft.Client/Durango/XboxGameMode.h +++ b/Minecraft.Client/Durango/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Common\Tutorial\TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EchantmentTableParticle.cpp index 5af7ef365..9cfdcda03 100644 --- a/Minecraft.Client/EchantmentTableParticle.cpp +++ b/Minecraft.Client/EchantmentTableParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "EchantmentTableParticle.h" EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd) diff --git a/Minecraft.Client/EditBox.cpp b/Minecraft.Client/EditBox.cpp index 54ee62ef3..e4d71cb96 100644 --- a/Minecraft.Client/EditBox.cpp +++ b/Minecraft.Client/EditBox.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "EditBox.h" -#include "..\Minecraft.World\SharedConstants.h" +#include "../Minecraft.World/SharedConstants.h" EditBox::EditBox(Screen *screen, Font *font, int x, int y, int width, int height, const wstring& value) { diff --git a/Minecraft.Client/EnchantTableRenderer.cpp b/Minecraft.Client/EnchantTableRenderer.cpp index 43f2b0401..41e016443 100644 --- a/Minecraft.Client/EnchantTableRenderer.cpp +++ b/Minecraft.Client/EnchantTableRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "BookModel.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/Mth.h" #include "EnchantTableRenderer.h" EnchantTableRenderer::EnchantTableRenderer() diff --git a/Minecraft.Client/EnderChestRenderer.cpp b/Minecraft.Client/EnderChestRenderer.cpp index 2996b65ff..8befdc99e 100644 --- a/Minecraft.Client/EnderChestRenderer.cpp +++ b/Minecraft.Client/EnderChestRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "ModelPart.h" #include "EnderChestRenderer.h" diff --git a/Minecraft.Client/EnderCrystalRenderer.cpp b/Minecraft.Client/EnderCrystalRenderer.cpp index 452206bcf..cde8a812b 100644 --- a/Minecraft.Client/EnderCrystalRenderer.cpp +++ b/Minecraft.Client/EnderCrystalRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "EnderCrystalModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" EnderCrystalRenderer::EnderCrystalRenderer() diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp index 8c531d4e0..961c00ca6 100644 --- a/Minecraft.Client/EnderDragonRenderer.cpp +++ b/Minecraft.Client/EnderDragonRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DragonModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" #include "Tesselator.h" #include "Lighting.h" #include "EnderDragonRenderer.h" diff --git a/Minecraft.Client/EnderParticle.cpp b/Minecraft.Client/EnderParticle.cpp index 3889bf920..efbad1377 100644 --- a/Minecraft.Client/EnderParticle.cpp +++ b/Minecraft.Client/EnderParticle.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "EnderParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Random.h" // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle // End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use this particle diff --git a/Minecraft.Client/EndermanRenderer.cpp b/Minecraft.Client/EndermanRenderer.cpp index 8802376ae..75f2a2d93 100644 --- a/Minecraft.Client/EndermanRenderer.cpp +++ b/Minecraft.Client/EndermanRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "EndermanRenderer.h" #include "EndermanModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" EndermanRenderer::EndermanRenderer() : MobRenderer(new EndermanModel(), 0.5f) { diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp index dfc9a11ed..cba92df01 100644 --- a/Minecraft.Client/EntityRenderDispatcher.cpp +++ b/Minecraft.Client/EntityRenderDispatcher.cpp @@ -1,18 +1,18 @@ #include "stdafx.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/net.minecraft.world.entity.npc.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.alchemy.h" #include "SpiderRenderer.h" #include "PigRenderer.h" #include "SheepRenderer.h" diff --git a/Minecraft.Client/EntityRenderDispatcher.h b/Minecraft.Client/EntityRenderDispatcher.h index 248be18fe..c1a3d4477 100644 --- a/Minecraft.Client/EntityRenderDispatcher.h +++ b/Minecraft.Client/EntityRenderDispatcher.h @@ -1,7 +1,7 @@ #pragma once #include "EntityRenderer.h" -#include "..\Minecraft.World\Entity.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/Entity.h" +#include "../Minecraft.World/JavaIntHash.h" class font; using namespace std; diff --git a/Minecraft.Client/EntityRenderer.cpp b/Minecraft.Client/EntityRenderer.cpp index 6c0247ed9..137379d1e 100644 --- a/Minecraft.Client/EntityRenderer.cpp +++ b/Minecraft.Client/EntityRenderer.cpp @@ -3,13 +3,13 @@ #include "HumanoidModel.h" #include "EntityRenderDispatcher.h" #include "Options.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\Entity.h" -#include "..\Minecraft.World\Level.h" -#include "..\Minecraft.World\AABB.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/Entity.h" +#include "../Minecraft.World/Level.h" +#include "../Minecraft.World/AABB.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "LocalPlayer.h" // 4J - added diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp index a2301d427..93cd95e62 100644 --- a/Minecraft.Client/EntityTileRenderer.cpp +++ b/Minecraft.Client/EntityTileRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "EntityTileRenderer.h" #include "TileEntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" EntityTileRenderer *EntityTileRenderer::instance = new EntityTileRenderer; diff --git a/Minecraft.Client/EntityTracker.cpp b/Minecraft.Client/EntityTracker.cpp index 8f1dbcd85..396f12859 100644 --- a/Minecraft.Client/EntityTracker.cpp +++ b/Minecraft.Client/EntityTracker.cpp @@ -5,19 +5,19 @@ #include "TrackedEntity.h" #include "ServerPlayer.h" #include "ServerLevel.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\BasicTypeContainers.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/BasicTypeContainers.h" #include "PlayerConnection.h" EntityTracker::EntityTracker(ServerLevel *level) diff --git a/Minecraft.Client/EntityTracker.h b/Minecraft.Client/EntityTracker.h index 82b01d07f..3c0184167 100644 --- a/Minecraft.Client/EntityTracker.h +++ b/Minecraft.Client/EntityTracker.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\HashExtension.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/HashExtension.h" +#include "../Minecraft.World/JavaIntHash.h" class Entity; class ServerPlayer; class TrackedEntity; diff --git a/Minecraft.Client/ExperienceOrbRenderer.cpp b/Minecraft.Client/ExperienceOrbRenderer.cpp index 1771f8330..f84311ae6 100644 --- a/Minecraft.Client/ExperienceOrbRenderer.cpp +++ b/Minecraft.Client/ExperienceOrbRenderer.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "ExperienceOrbRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" #include "Tesselator.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/JavaMath.h" ExperienceOrbRenderer::ExperienceOrbRenderer() { diff --git a/Minecraft.Client/ExplodeParticle.cpp b/Minecraft.Client/ExplodeParticle.cpp index fa950a03a..fb39d47c9 100644 --- a/Minecraft.Client/ExplodeParticle.cpp +++ b/Minecraft.Client/ExplodeParticle.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ExplodeParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Random.h" ExplodeParticle::ExplodeParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) { diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp index 334f01232..1bb6c3d53 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -4,33 +4,33 @@ #endif // __PS3__ #ifdef __PS3__ -#include "PS3\Sentient\SentientManager.h" +#include "PS3/Sentient/SentientManager.h" #include "StatsCounter.h" -#include "PS3\Social\SocialManager.h" +#include "PS3/Social/SocialManager.h" #include #include #elif defined _DURANGO -#include "Durango\Sentient\SentientManager.h" +#include "Durango/Sentient/SentientManager.h" #include "StatsCounter.h" -#include "Durango\Social\SocialManager.h" -#include "Durango\Sentient\DynamicConfigurations.h" -#include "Durango\DurangoExtras\xcompress.h" +#include "Durango/Social/SocialManager.h" +#include "Durango/Sentient/DynamicConfigurations.h" +#include "Durango/DurangoExtras/xcompress.h" #elif defined _WINDOWS64 -#include "Windows64\Sentient\SentientManager.h" +#include "Windows64/Sentient/SentientManager.h" #include "StatsCounter.h" -#include "Windows64\Social\SocialManager.h" -#include "Windows64\Sentient\DynamicConfigurations.h" +#include "Windows64/Social/SocialManager.h" +#include "Windows64/Sentient/DynamicConfigurations.h" #elif defined __PSVITA__ -#include "PSVita\Sentient\SentientManager.h" +#include "PSVita/Sentient/SentientManager.h" #include "StatsCounter.h" -#include "PSVita\Social\SocialManager.h" -#include "PSVita\Sentient\DynamicConfigurations.h" +#include "PSVita/Social/SocialManager.h" +#include "PSVita/Sentient/DynamicConfigurations.h" #include #else -#include "Orbis\Sentient\SentientManager.h" +#include "Orbis/Sentient/SentientManager.h" #include "StatsCounter.h" -#include "Orbis\Social\SocialManager.h" -#include "Orbis\Sentient\DynamicConfigurations.h" +#include "Orbis/Social/SocialManager.h" +#include "Orbis/Sentient/DynamicConfigurations.h" #include #endif diff --git a/Minecraft.Client/FallingTileRenderer.cpp b/Minecraft.Client/FallingTileRenderer.cpp index 02e23dadd..b5369ed89 100644 --- a/Minecraft.Client/FallingTileRenderer.cpp +++ b/Minecraft.Client/FallingTileRenderer.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "FallingTileRenderer.h" #include "TileRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" #include "EntityRenderDispatcher.h" FallingTileRenderer::FallingTileRenderer() : EntityRenderer() diff --git a/Minecraft.Client/FireballRenderer.cpp b/Minecraft.Client/FireballRenderer.cpp index 836e8be37..dc229b1f5 100644 --- a/Minecraft.Client/FireballRenderer.cpp +++ b/Minecraft.Client/FireballRenderer.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "FireballRenderer.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.world.h" FireballRenderer::FireballRenderer(float scale) { diff --git a/Minecraft.Client/FishingHookRenderer.cpp b/Minecraft.Client/FishingHookRenderer.cpp index 0408e96e8..4f7d964d2 100644 --- a/Minecraft.Client/FishingHookRenderer.cpp +++ b/Minecraft.Client/FishingHookRenderer.cpp @@ -2,10 +2,10 @@ #include "FishingHookRenderer.h" #include "EntityRenderDispatcher.h" #include "Options.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\Vec3.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/Vec3.h" +#include "../Minecraft.World/Mth.h" #include "MultiPlayerLocalPlayer.h" void FishingHookRenderer::render(shared_ptr _hook, double x, double y, double z, float rot, float a) diff --git a/Minecraft.Client/FlameParticle.cpp b/Minecraft.Client/FlameParticle.cpp index eb12dbfda..ce9aed591 100644 --- a/Minecraft.Client/FlameParticle.cpp +++ b/Minecraft.Client/FlameParticle.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Random.h" #include "FlameParticle.h" FlameParticle::FlameParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd) diff --git a/Minecraft.Client/Font.cpp b/Minecraft.Client/Font.cpp index 17f728536..cd1c2f1e1 100644 --- a/Minecraft.Client/Font.cpp +++ b/Minecraft.Client/Font.cpp @@ -3,10 +3,10 @@ #include "Font.h" #include "Options.h" #include "Tesselator.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/net.minecraft.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/Random.h" Font::Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, TEXTURE_NAME textureName, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[]/* = nullptr */) : textures(textures) { diff --git a/Minecraft.Client/FootstepParticle.cpp b/Minecraft.Client/FootstepParticle.cpp index 18331b32a..0b377c312 100644 --- a/Minecraft.Client/FootstepParticle.cpp +++ b/Minecraft.Client/FootstepParticle.cpp @@ -2,8 +2,8 @@ #include "FootstepParticle.h" #include "Textures.h" #include "Tesselator.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.level.h" FootstepParticle::FootstepParticle(Textures *textures, Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/Minecraft.Client/Frustum.cpp b/Minecraft.Client/Frustum.cpp index c40f7c6fa..74faa376b 100644 --- a/Minecraft.Client/Frustum.cpp +++ b/Minecraft.Client/Frustum.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\FloatBuffer.h" +#include "../Minecraft.World/FloatBuffer.h" #include "Frustum.h" Frustum *Frustum::frustum = new Frustum(); diff --git a/Minecraft.Client/FrustumData.h b/Minecraft.Client/FrustumData.h index 7285f145c..1801d983d 100644 --- a/Minecraft.Client/FrustumData.h +++ b/Minecraft.Client/FrustumData.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\AABB.h" +#include "../Minecraft.World/AABB.h" class FrustumData { diff --git a/Minecraft.Client/FurnaceScreen.cpp b/Minecraft.Client/FurnaceScreen.cpp index 20ec71040..915a8dbc6 100644 --- a/Minecraft.Client/FurnaceScreen.cpp +++ b/Minecraft.Client/FurnaceScreen.cpp @@ -3,8 +3,8 @@ #include "Textures.h" #include "LocalPlayer.h" #include "Font.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\FurnaceTileEntity.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/FurnaceTileEntity.h" FurnaceScreen::FurnaceScreen(shared_ptr inventory, shared_ptr furnace) : AbstractContainerScreen(new FurnaceMenu(inventory, furnace)) { diff --git a/Minecraft.Client/GameMode.cpp b/Minecraft.Client/GameMode.cpp index a11d6c07b..7d791d284 100644 --- a/Minecraft.Client/GameMode.cpp +++ b/Minecraft.Client/GameMode.cpp @@ -2,13 +2,13 @@ #include "GameMode.h" #include "LocalPlayer.h" #include "LevelRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" GameMode::GameMode(Minecraft *minecraft) { diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp index 508b3a1af..2de50f16f 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -17,34 +17,34 @@ #include "GuiParticles.h" #include "MultiPlayerLevel.h" #include "Chunk.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.biome.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\FloatBuffer.h" -#include "..\Minecraft.World\ThreadName.h" -#include "..\Minecraft.World\SparseLightStorage.h" -#include "..\Minecraft.World\CompressedTileStorage.h" -#include "..\Minecraft.World\SparseDataStorage.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Facing.h" -#include "..\Minecraft.World\MobEffect.h" -#include "..\Minecraft.World\IntCache.h" -#include "..\Minecraft.World\SmoothFloat.h" -#include "..\Minecraft.World\MobEffectInstance.h" -#include "..\Minecraft.World\Item.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.biome.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/FloatBuffer.h" +#include "../Minecraft.World/ThreadName.h" +#include "../Minecraft.World/SparseLightStorage.h" +#include "../Minecraft.World/CompressedTileStorage.h" +#include "../Minecraft.World/SparseDataStorage.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Facing.h" +#include "../Minecraft.World/MobEffect.h" +#include "../Minecraft.World/IntCache.h" +#include "../Minecraft.World/SmoothFloat.h" +#include "../Minecraft.World/MobEffectInstance.h" +#include "../Minecraft.World/Item.h" #include "Camera.h" -#include "..\Minecraft.World\SoundTypes.h" +#include "../Minecraft.World/SoundTypes.h" #include "HumanoidModel.h" -#include "..\Minecraft.World\Item.h" -#include "..\Minecraft.World\compression.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "../Minecraft.World/Item.h" +#include "../Minecraft.World/compression.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include "TexturePackRepository.h" #include "TexturePack.h" diff --git a/Minecraft.Client/GameRenderer.h b/Minecraft.Client/GameRenderer.h index 3729726ba..075ecfee5 100644 --- a/Minecraft.Client/GameRenderer.h +++ b/Minecraft.Client/GameRenderer.h @@ -9,8 +9,8 @@ class SparseLightStorage; class CompressedTileStorage; class SparseDataStorage; -#include "..\Minecraft.World\SmoothFloat.h" -#include "..\Minecraft.World\C4JThread.h" +#include "../Minecraft.World/SmoothFloat.h" +#include "../Minecraft.World/C4JThread.h" class GameRenderer { diff --git a/Minecraft.Client/GhastModel.cpp b/Minecraft.Client/GhastModel.cpp index 460c28ffe..c15daa802 100644 --- a/Minecraft.Client/GhastModel.cpp +++ b/Minecraft.Client/GhastModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/Mth.h" #include "GhastModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/GhastRenderer.cpp b/Minecraft.Client/GhastRenderer.cpp index 1d8a2833b..79474798d 100644 --- a/Minecraft.Client/GhastRenderer.cpp +++ b/Minecraft.Client/GhastRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "GhastRenderer.h" #include "GhastModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" GhastRenderer::GhastRenderer() : MobRenderer(new GhastModel(), 0.5f) { diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 7d76edbd0..176ad4c71 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -9,24 +9,24 @@ #include "Lighting.h" #include "ChatScreen.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\Minecraft.World\net.minecraft.world.food.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\Language.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.effect.h" +#include "../Minecraft.World/net.minecraft.world.food.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/Language.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\Dimension.h" -#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" +#include "../Minecraft.World/Dimension.h" +#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderDragonRenderer.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\LevelChunk.h" -#include "..\Minecraft.World\Biome.h" +#include "../Minecraft.World/net.minecraft.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/LevelChunk.h" +#include "../Minecraft.World/Biome.h" #define RENDER_HUD 0 //#ifndef _XBOX diff --git a/Minecraft.Client/GuiParticle.cpp b/Minecraft.Client/GuiParticle.cpp index 25859c707..1c47448bf 100644 --- a/Minecraft.Client/GuiParticle.cpp +++ b/Minecraft.Client/GuiParticle.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "GuiParticle.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/Random.h" Random *GuiParticle::random = new Random(); diff --git a/Minecraft.Client/HugeExplosionParticle.cpp b/Minecraft.Client/HugeExplosionParticle.cpp index 273eed2bc..616c53723 100644 --- a/Minecraft.Client/HugeExplosionParticle.cpp +++ b/Minecraft.Client/HugeExplosionParticle.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "HugeExplosionParticle.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/Random.h" #include "Textures.h" #include "Tesselator.h" #include "Lighting.h" diff --git a/Minecraft.Client/HugeExplosionSeedParticle.cpp b/Minecraft.Client/HugeExplosionSeedParticle.cpp index 7514cc44f..222bc7298 100644 --- a/Minecraft.Client/HugeExplosionSeedParticle.cpp +++ b/Minecraft.Client/HugeExplosionSeedParticle.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "HugeExplosionSeedParticle.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.level.h" HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0) { diff --git a/Minecraft.Client/HumanoidMobRenderer.cpp b/Minecraft.Client/HumanoidMobRenderer.cpp index 389116edc..404e4df0b 100644 --- a/Minecraft.Client/HumanoidMobRenderer.cpp +++ b/Minecraft.Client/HumanoidMobRenderer.cpp @@ -4,11 +4,11 @@ #include "HumanoidModel.h" #include "ModelPart.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.h" void HumanoidMobRenderer::_init(HumanoidModel *humanoidModel, float scale) { diff --git a/Minecraft.Client/HumanoidModel.cpp b/Minecraft.Client/HumanoidModel.cpp index 444d9c90e..3f7c75bd9 100644 --- a/Minecraft.Client/HumanoidModel.cpp +++ b/Minecraft.Client/HumanoidModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "HumanoidModel.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\Entity.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/Entity.h" #include "ModelPart.h" // 4J added diff --git a/Minecraft.Client/InBedChatScreen.cpp b/Minecraft.Client/InBedChatScreen.cpp index fca3d0228..5c3c068fc 100644 --- a/Minecraft.Client/InBedChatScreen.cpp +++ b/Minecraft.Client/InBedChatScreen.cpp @@ -2,8 +2,8 @@ #include "InBedChatScreen.h" #include "Button.h" #include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/StringHelpers.h" void InBedChatScreen::init() { diff --git a/Minecraft.Client/Input.cpp b/Minecraft.Client/Input.cpp index 645f34771..d2ea33ed0 100644 --- a/Minecraft.Client/Input.cpp +++ b/Minecraft.Client/Input.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "Minecraft.h" #include "GameMode.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" #include "Input.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.Client/LocalPlayer.h" #include "Options.h" Input::Input() diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp index 726a5e8dc..977ffe1c3 100644 --- a/Minecraft.Client/InventoryScreen.cpp +++ b/Minecraft.Client/InventoryScreen.cpp @@ -8,7 +8,7 @@ #include "Button.h" #include "AchievementScreen.h" #include "StatsScreen.h" -#include "..\Minecraft.World\net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.stats.h" InventoryScreen::InventoryScreen(shared_ptr player) : AbstractContainerScreen(player->inventoryMenu) { diff --git a/Minecraft.Client/ItemFrameRenderer.cpp b/Minecraft.Client/ItemFrameRenderer.cpp index 40769fb9b..aba7088b1 100644 --- a/Minecraft.Client/ItemFrameRenderer.cpp +++ b/Minecraft.Client/ItemFrameRenderer.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include "ItemRenderer.h" -#include "tileRenderer.h" -#include "entityRenderDispatcher.h" +#include "TileRenderer.h" +#include "EntityRenderDispatcher.h" //#include "ItemFrame" #include "ItemFrameRenderer.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.entity.Item.h" -#include "..\Minecraft.World\net.minecraft.world.Item.h" -#include "..\Minecraft.World\net.minecraft.world.Item.alchemy.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.alchemy.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/StringHelpers.h" #include "Minecraft.h" -#include "..\Minecraft.World\Item.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.h" +#include "../Minecraft.World/Item.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.h" #include "CompassTexture.h" #include "Minimap.h" diff --git a/Minecraft.Client/ItemInHandRenderer.cpp b/Minecraft.Client/ItemInHandRenderer.cpp index cee9254d9..a31246238 100644 --- a/Minecraft.Client/ItemInHandRenderer.cpp +++ b/Minecraft.Client/ItemInHandRenderer.cpp @@ -10,12 +10,12 @@ #include "MultiplayerLocalPlayer.h" #include "Minimap.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.h" int ItemInHandRenderer::list = -1; int ItemInHandRenderer::listGlint = -1; diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp index 03d0d3a53..8d599c17e 100644 --- a/Minecraft.Client/ItemRenderer.cpp +++ b/Minecraft.Client/ItemRenderer.cpp @@ -2,13 +2,13 @@ #include "ItemRenderer.h" #include "TileRenderer.h" #include "entityRenderDispatcher.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.alchemy.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.h" #include "Options.h" ItemRenderer::ItemRenderer() : EntityRenderer() diff --git a/Minecraft.Client/ItemSpriteRenderer.cpp b/Minecraft.Client/ItemSpriteRenderer.cpp index 5a1ea6206..b821280b2 100644 --- a/Minecraft.Client/ItemSpriteRenderer.cpp +++ b/Minecraft.Client/ItemSpriteRenderer.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "ItemSpriteRenderer.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.item.alchemy.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.h" ItemSpriteRenderer::ItemSpriteRenderer(Item *sourceItem, int sourceItemAuxValue /*= 0*/) : EntityRenderer() { diff --git a/Minecraft.Client/JoinMultiplayerScreen.cpp b/Minecraft.Client/JoinMultiplayerScreen.cpp index a98e7bee1..50f405e02 100644 --- a/Minecraft.Client/JoinMultiplayerScreen.cpp +++ b/Minecraft.Client/JoinMultiplayerScreen.cpp @@ -3,7 +3,7 @@ #include "Button.h" #include "EditBox.h" #include "Options.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" JoinMultiplayerScreen::JoinMultiplayerScreen(Screen *lastScreen) { diff --git a/Minecraft.Client/LavaParticle.cpp b/Minecraft.Client/LavaParticle.cpp index ac0608e59..85a03d8dd 100644 --- a/Minecraft.Client/LavaParticle.cpp +++ b/Minecraft.Client/LavaParticle.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "LavaParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.level.h" LavaParticle::LavaParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/Minecraft.Client/LavaSlimeModel.cpp b/Minecraft.Client/LavaSlimeModel.cpp index 427b95473..556ce518a 100644 --- a/Minecraft.Client/LavaSlimeModel.cpp +++ b/Minecraft.Client/LavaSlimeModel.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "LavaSlimeModel.h" #include "ModelPart.h" -#include "..\Minecraft.World\LavaSlime.h" +#include "../Minecraft.World/LavaSlime.h" LavaSlimeModel::LavaSlimeModel() diff --git a/Minecraft.Client/LavaSlimeRenderer.cpp b/Minecraft.Client/LavaSlimeRenderer.cpp index 3d2cbf476..38a40aa2d 100644 --- a/Minecraft.Client/LavaSlimeRenderer.cpp +++ b/Minecraft.Client/LavaSlimeRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" #include "LavaSlimeModel.h" #include "LavaSlimeRenderer.h" diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp index 983600783..2757daebd 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -39,30 +39,30 @@ #include "Lighting.h" #include "Options.h" #include "MultiPlayerChunkCache.h" -#include "..\Minecraft.World\ParticleTypes.h" -#include "..\Minecraft.World\IntCache.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/ParticleTypes.h" +#include "../Minecraft.World/IntCache.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.h" #include "MultiplayerLocalPlayer.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\SoundTypes.h" +#include "../Minecraft.World/SoundTypes.h" #include "FrustumCuller.h" -#include "..\Minecraft.World\BasicTypeContainers.h" +#include "../Minecraft.World/BasicTypeContainers.h" #ifdef __PS3__ -#include "PS3\SPU_Tasks\LevelRenderer_cull\LevelRenderer_cull.h" -#include "PS3\SPU_Tasks\LevelRenderer_FindNearestChunk\LevelRenderer_FindNearestChunk.h" +#include "PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h" +#include "PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h" #include "C4JSpursJob.h" static LevelRenderer_cull_DataIn g_cullDataIn[4] __attribute__((__aligned__(16))); @@ -3641,4 +3641,4 @@ int LevelRenderer::rebuildChunkThreadProc(LPVOID lpParam) void LevelRenderer::nonStackDirtyChunksAdded() { dirtyChunksLockFreeStack.Push((int *)1); -} \ No newline at end of file +} diff --git a/Minecraft.Client/LevelRenderer.h b/Minecraft.Client/LevelRenderer.h index 41eb3593f..e9849a021 100644 --- a/Minecraft.Client/LevelRenderer.h +++ b/Minecraft.Client/LevelRenderer.h @@ -1,10 +1,12 @@ #pragma once -#include "..\Minecraft.World\LevelListener.h" -#include "..\Minecraft.World\Definitions.h" +#include "../Minecraft.World/LevelListener.h" +#include "../Minecraft.World/Definitions.h" #include "OffsettedRenderList.h" -#include "..\Minecraft.World\JavaIntHash.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.World/JavaIntHash.h" +#include "../Minecraft.World/Level.h" +#ifndef __linux__ #include +#endif // __linux__ #ifdef __PS3__ #include "C4JSpursJob.h" #endif diff --git a/Minecraft.Client/Lighting.cpp b/Minecraft.Client/Lighting.cpp index 50529d516..738741a1e 100644 --- a/Minecraft.Client/Lighting.cpp +++ b/Minecraft.Client/Lighting.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Lighting.h" -#include "..\Minecraft.World\FloatBuffer.h" -#include "..\Minecraft.World\Vec3.h" +#include "../Minecraft.World/FloatBuffer.h" +#include "../Minecraft.World/Vec3.h" FloatBuffer *Lighting::lb = new FloatBuffer(16); diff --git a/Minecraft.Client/LightningBoltRenderer.cpp b/Minecraft.Client/LightningBoltRenderer.cpp index d02ea7f71..466b351ef 100644 --- a/Minecraft.Client/LightningBoltRenderer.cpp +++ b/Minecraft.Client/LightningBoltRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "LightningBoltRenderer.h" #include "Tesselator.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" void LightningBoltRenderer::render(shared_ptr _bolt, double x, double y, double z, float rot, float a) { diff --git a/Minecraft.Client/Linux/LinuxStubs.h b/Minecraft.Client/Linux/LinuxStubs.h new file mode 100644 index 000000000..3e5a0febe --- /dev/null +++ b/Minecraft.Client/Linux/LinuxStubs.h @@ -0,0 +1,697 @@ +#ifndef LINUXSTUBS_H +#define LINUXSTUBS_H + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TRUE true +#define FALSE false +#define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) +#define ZeroMemory RtlZeroMemory +#define WINAPI + +#define _vsnprintf_s vsnprintf; + +typedef unsigned int DWORD; +typedef const char *LPCSTR; +typedef bool BOOL; +typedef BOOL *PBOOL; +typedef BOOL *LPBOOL; +typedef void* LPVOID; +typedef wchar_t WCHAR; +typedef unsigned char BYTE; +typedef BYTE* PBYTE; +typedef const wchar_t* LPCWSTR; +typedef unsigned long long ULONGLONG; +typedef int HRESULT; +typedef unsigned int UINT; +typedef void* HANDLE; +typedef int INT; +typedef long* PLONG; +typedef unsigned int* LPDWORD; +typedef const void* LPCVOID; +typedef char CHAR; +typedef void* PVOID; +typedef uintptr_t ULONG_PTR; +typedef long LONG; +typedef long LONG64, *PLONG64; +typedef void VOID; +typedef ULONGLONG PlayerUID; +typedef DWORD WORD; +typedef DWORD* PDWORD; +typedef struct { + DWORD LowPart; + LONG HighPart; + long long QuadPart; +} LARGE_INTEGER; +typedef long long LONGLONG; +typedef size_t SIZE_T; +typedef std::wstring LPWSTR; +typedef unsigned char boolean; // java brainrot +#define __debugbreak() +#define __int32 int +#define CONST const +typedef int64_t __int64; +typedef uint64_t __uint64; +typedef unsigned long ULONG; +// typedef unsigned char byte; +typedef short SHORT; +typedef float FLOAT; + +#define ERROR_SUCCESS 0L +#define ERROR_IO_PENDING 997L // dderror +#define ERROR_CANCELLED 1223L +//#define S_OK ((HRESULT)0x00000000L) +#define S_FALSE ((HRESULT)0x00000001L) + +#define PAGE_READWRITE 0x04 +#define MEM_LARGE_PAGES 0x20000000 +#define MAXULONG_PTR ((ULONG_PTR)~0UL) +#define MAX_PATH 260 + +#define GENERIC_READ 0x80000000UL +#define GENERIC_WRITE 0x40000000UL +#define GENERIC_EXECUTE 0x20000000UL +#define GENERIC_ALL 0x10000000UL + +#define FILE_SHARE_READ 0x00000001 +#define FILE_SHARE_WRITE 0x00000002 +#define FILE_SHARE_DELETE 0x00000004 + +#define CREATE_NEW 1 +#define CREATE_ALWAYS 2 +#define OPEN_EXISTING 3 +#define OPEN_ALWAYS 4 +#define TRUNCATE_EXISTING 5 + +#define FILE_ATTRIBUTE_READONLY 0x00000001 +#define FILE_ATTRIBUTE_HIDDEN 0x00000002 +#define FILE_ATTRIBUTE_SYSTEM 0x00000004 +#define FILE_ATTRIBUTE_DIRECTORY 0x00000010 +#define FILE_ATTRIBUTE_ARCHIVE 0x00000020 +#define FILE_ATTRIBUTE_NORMAL 0x00000080 +#define FILE_ATTRIBUTE_TEMPORARY 0x00000100 +#define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#define INVALID_FILE_SIZE ((DWORD)-1) +#define INVALID_SET_FILE_POINTER ((DWORD)-1) + +#define FILE_BEGIN SEEK_SET +#define FILE_CURRENT SEEK_CUR +#define FILE_END SEEK_END + +#define INVALID_HANDLE_VALUE ((HANDLE)(ULONG_PTR)-1) + +// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime +typedef struct _FILETIME { + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME, *PFILETIME, *LPFILETIME; + +typedef struct _MEMORYSTATUS { + DWORD dwLength; + DWORD dwMemoryLoad; + SIZE_T dwTotalPhys; + SIZE_T dwAvailPhys; + SIZE_T dwTotalPageFile; + SIZE_T dwAvailPageFile; + SIZE_T dwTotalVirtual; + SIZE_T dwAvailVirtual; +} MEMORYSTATUS, *LPMEMORYSTATUS; + +typedef struct _WIN32_FIND_DATAA { + DWORD dwFileAttributes; + FILETIME ftCreationTime; + FILETIME ftLastAccessTime; + FILETIME ftLastWriteTime; + DWORD nFileSizeHigh; + DWORD nFileSizeLow; + DWORD dwReserved0; + DWORD dwReserved1; + char cFileName[MAX_PATH]; + char cAlternateFileName[14]; +} WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA; + +typedef WIN32_FIND_DATAA WIN32_FIND_DATA; +typedef PWIN32_FIND_DATAA PWIN32_FIND_DATA; +typedef LPWIN32_FIND_DATAA LPWIN32_FIND_DATA; + +typedef struct _WIN32_FILE_ATTRIBUTE_DATA { + DWORD dwFileAttributes; + FILETIME ftCreationTime; + FILETIME ftLastAccessTime; + FILETIME ftLastWriteTime; + DWORD nFileSizeHigh; + DWORD nFileSizeLow; +} WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA; + +typedef enum _GET_FILEEX_INFO_LEVELS { + GetFileExInfoStandard, + GetFileExMaxInfoLevel +} GET_FILEEX_INFO_LEVELS; + +typedef VOID* XMEMCOMPRESSION_CONTEXT; +typedef VOID* XMEMDECOMPRESSION_CONTEXT; + +// internal search state for FindFirstFile/FindNextFile +typedef struct _LINUXSTUBS_FIND_HANDLE { + DIR *dir; + char dirpath[MAX_PATH]; + char pattern[MAX_PATH]; +} _LINUXSTUBS_FIND_HANDLE; + +// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-systemtime +typedef struct _SYSTEMTIME { + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; +} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; + +#define TLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF) + +typedef pthread_mutex_t RTL_CRITICAL_SECTION; +typedef pthread_mutex_t* PRTL_CRITICAL_SECTION; + +typedef RTL_CRITICAL_SECTION CRITICAL_SECTION; +typedef PRTL_CRITICAL_SECTION PCRITICAL_SECTION; +typedef PRTL_CRITICAL_SECTION LPCRITICAL_SECTION; + +static inline void InitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) +{ + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(CriticalSection, &attr); + pthread_mutexattr_destroy(&attr); +} + +static inline void InitializeCriticalSectionAndSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) +{ + // no spin count required because we use a recursive mutex + InitializeCriticalSection(CriticalSection); +} + +static inline void DeleteCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) +{ + pthread_mutex_destroy(CriticalSection); +} + +static inline void EnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) +{ + pthread_mutex_lock(CriticalSection); +} + +static inline void LeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) +{ + pthread_mutex_unlock(CriticalSection); +} + +static inline ULONG TryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) +{ + return pthread_mutex_trylock(CriticalSection) == 0; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-tlsalloc +static inline DWORD TlsAlloc(VOID) +{ + pthread_key_t key; + if (pthread_key_create(&key, NULL) == 0) + return key; + return TLS_OUT_OF_INDEXES; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-tlsfree +static inline BOOL TlsFree(DWORD dwTlsIndex) +{ + return pthread_key_delete(dwTlsIndex) == 0; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-tlsgetvalue +static inline LPVOID TlsGetValue(DWORD dwTlsIndex) +{ + return pthread_getspecific(dwTlsIndex); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-tlssetvalue +static inline BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) +{ + return pthread_setspecific(dwTlsIndex, lpTlsValue) == 0; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-globalmemorystatus +static inline VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) +{ + // TODO: Parse /proc/meminfo and set lpBuffer based on that. Probably will also need another + // different codepath for macOS too. +} + +static inline DWORD GetLastError(VOID) +{ + return errno; +} + +static inline VOID Sleep(DWORD dwMilliseconds) +{ + struct timespec ts; + ts.tv_nsec = (dwMilliseconds * 1000000) % 1000000000; + ts.tv_sec = dwMilliseconds / 1000; + + int ret; + do { + ret = nanosleep(&ts, &ts); + } while (ret == -1 && errno == EINTR); +} + +static inline LONG64 InterlockedCompareExchangeRelease64( + LONG64 volatile *Destination, + LONG64 Exchange, + LONG64 Comperand) +{ + LONG64 expected = Comperand; + __atomic_compare_exchange_n(Destination, &expected, Exchange, false, __ATOMIC_RELEASE, __ATOMIC_RELAXED); + return expected; +} + +// internal helper: convert time_t to FILETIME (100ns intervals since 1601-01-01) +static inline FILETIME _TimeToFileTime(time_t t) +{ + const ULONGLONG EPOCH_DIFF = 11644473600ULL; + ULONGLONG val = ((ULONGLONG)t + EPOCH_DIFF) * 10000000ULL; + FILETIME ft; + ft.dwLowDateTime = (DWORD)(val & 0xFFFFFFFF); + ft.dwHighDateTime = (DWORD)(val >> 32); + return ft; +} + +// internal helper: fill WIN32_FIND_DATAA from stat + name +static inline void _FillFindData(const char *name, const struct stat *st, WIN32_FIND_DATAA *out) +{ + memset(out, 0, sizeof(*out)); + out->dwFileAttributes = S_ISDIR(st->st_mode) ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL; + if (!(st->st_mode & S_IWUSR)) out->dwFileAttributes |= FILE_ATTRIBUTE_READONLY; + if (name[0] == '.') out->dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN; + out->ftCreationTime = _TimeToFileTime(st->st_mtime); + out->ftLastAccessTime = _TimeToFileTime(st->st_atime); + out->ftLastWriteTime = _TimeToFileTime(st->st_mtime); + out->nFileSizeHigh = (DWORD)((st->st_size >> 32) & 0xFFFFFFFF); + out->nFileSizeLow = (DWORD)(st->st_size & 0xFFFFFFFF); + strncpy(out->cFileName, name, MAX_PATH - 1); +} + +static inline HANDLE CreateFileA(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, + void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) +{ + int flags = 0; + if ((dwDesiredAccess & GENERIC_READ) && (dwDesiredAccess & GENERIC_WRITE)) flags = O_RDWR; + else if (dwDesiredAccess & GENERIC_WRITE) flags = O_WRONLY; + else flags = O_RDONLY; + + switch (dwCreationDisposition) + { + case CREATE_NEW: flags |= O_CREAT | O_EXCL; break; + case CREATE_ALWAYS: flags |= O_CREAT | O_TRUNC; break; + case OPEN_EXISTING: break; + case OPEN_ALWAYS: flags |= O_CREAT; break; + case TRUNCATE_EXISTING: flags |= O_TRUNC; break; + } + + int fd = open(lpFileName, flags, 0644); + return fd == -1 ? INVALID_HANDLE_VALUE : (HANDLE)(intptr_t)fd; +} + +static inline HANDLE CreateFile(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, + void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) +{ + return CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); +} + +static inline BOOL CloseHandle(HANDLE hObject) +{ + if (hObject == INVALID_HANDLE_VALUE) return FALSE; + return close((int)(intptr_t)hObject) == 0; +} + +static inline DWORD GetFileSize(HANDLE hFile, DWORD *lpFileSizeHigh) +{ + struct stat st{}; + if (fstat((int)(intptr_t)hFile, &st) != 0) { if (lpFileSizeHigh) *lpFileSizeHigh = 0; return INVALID_FILE_SIZE; } + if (lpFileSizeHigh) *lpFileSizeHigh = (DWORD)((st.st_size >> 32) & 0xFFFFFFFF); + return (DWORD)(st.st_size & 0xFFFFFFFF); +} + +static inline BOOL GetFileSizeEx(HANDLE hFile, LARGE_INTEGER *lpFileSize) +{ + struct stat st{}; + if (fstat((int)(intptr_t)hFile, &st) != 0) return FALSE; + if (lpFileSize) { lpFileSize->QuadPart = st.st_size; lpFileSize->LowPart = (DWORD)(st.st_size & 0xFFFFFFFF); lpFileSize->HighPart = (LONG)(st.st_size >> 32); } + return TRUE; +} + +static inline BOOL ReadFile(HANDLE hFile, void *lpBuffer, DWORD nNumberOfBytesToRead, DWORD *lpNumberOfBytesRead, void *lpOverlapped) +{ + ssize_t n = read((int)(intptr_t)hFile, lpBuffer, nNumberOfBytesToRead); + if (lpNumberOfBytesRead) *lpNumberOfBytesRead = n >= 0 ? (DWORD)n : 0; + return n >= 0; +} + +static inline BOOL WriteFile(HANDLE hFile, const void *lpBuffer, DWORD nNumberOfBytesToWrite, DWORD *lpNumberOfBytesWritten, void *lpOverlapped) +{ + ssize_t n = write((int)(intptr_t)hFile, lpBuffer, nNumberOfBytesToWrite); + if (lpNumberOfBytesWritten) *lpNumberOfBytesWritten = n >= 0 ? (DWORD)n : 0; + return n >= 0; +} + +static inline DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, LONG *lpDistanceToMoveHigh, DWORD dwMoveMethod) +{ + off_t offset = lDistanceToMove; + if (lpDistanceToMoveHigh) offset |= ((off_t)*lpDistanceToMoveHigh << 32); + off_t result = lseek((int)(intptr_t)hFile, offset, dwMoveMethod); + if (result == (off_t)-1) { if (lpDistanceToMoveHigh) *lpDistanceToMoveHigh = -1; return INVALID_SET_FILE_POINTER; } + if (lpDistanceToMoveHigh) *lpDistanceToMoveHigh = (LONG)(result >> 32); + return (DWORD)(result & 0xFFFFFFFF); +} + +static inline DWORD GetFileAttributesA(const char *lpFileName) +{ + struct stat st{}; + if (stat(lpFileName, &st) != 0) return INVALID_FILE_ATTRIBUTES; + DWORD attrs = S_ISDIR(st.st_mode) ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL; + if (!(st.st_mode & S_IWUSR)) attrs |= FILE_ATTRIBUTE_READONLY; + const char *base = strrchr(lpFileName, '/'); base = base ? base + 1 : lpFileName; + if (base[0] == '.') attrs |= FILE_ATTRIBUTE_HIDDEN; + return attrs; +} + +static inline DWORD GetFileAttributes(const char *lpFileName) +{ + return GetFileAttributesA(lpFileName); +} + +static inline BOOL GetFileAttributesExA(const char *lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, void *lpFileInformation) +{ + if (fInfoLevelId != GetFileExInfoStandard || !lpFileInformation) return FALSE; + struct stat st{}; + if (stat(lpFileName, &st) != 0) return FALSE; + WIN32_FILE_ATTRIBUTE_DATA *out = (WIN32_FILE_ATTRIBUTE_DATA *)lpFileInformation; + out->dwFileAttributes = GetFileAttributesA(lpFileName); + out->ftCreationTime = _TimeToFileTime(st.st_mtime); + out->ftLastAccessTime = _TimeToFileTime(st.st_atime); + out->ftLastWriteTime = _TimeToFileTime(st.st_mtime); + out->nFileSizeHigh = (DWORD)((st.st_size >> 32) & 0xFFFFFFFF); + out->nFileSizeLow = (DWORD)(st.st_size & 0xFFFFFFFF); + return TRUE; +} + +static inline BOOL GetFileAttributesEx(const char *lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, void *lpFileInformation) +{ + return GetFileAttributesExA(lpFileName, fInfoLevelId, lpFileInformation); +} + +static inline BOOL CreateDirectoryA(const char *lpPathName, void *lpSecurityAttributes) +{ + return mkdir(lpPathName, 0755) == 0; +} + +static inline BOOL CreateDirectory(const char *lpPathName, void *lpSecurityAttributes) +{ + return CreateDirectoryA(lpPathName, lpSecurityAttributes); +} + +static inline BOOL DeleteFileA(const char *lpFileName) +{ + return unlink(lpFileName) == 0; +} + +static inline BOOL DeleteFile(const char *lpFileName) +{ + return DeleteFileA(lpFileName); +} + +static inline BOOL MoveFileA(const char *lpExistingFileName, const char *lpNewFileName) +{ + return rename(lpExistingFileName, lpNewFileName) == 0; +} + +static inline BOOL MoveFile(const char *lpExistingFileName, const char *lpNewFileName) +{ + return MoveFileA(lpExistingFileName, lpNewFileName); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findfirstfilea +static inline HANDLE FindFirstFileA(const char *lpFileName, WIN32_FIND_DATAA *lpFindFileData) +{ + if (!lpFileName || !lpFindFileData) return INVALID_HANDLE_VALUE; + + char dirpath[MAX_PATH], pattern[MAX_PATH]; + const char *sep = strrchr(lpFileName, '/'); + if (sep) + { + size_t len = sep - lpFileName; + if (len >= MAX_PATH) return INVALID_HANDLE_VALUE; + strncpy(dirpath, lpFileName, len); dirpath[len] = '\0'; + strncpy(pattern, sep + 1, MAX_PATH - 1); + } + else + { + strncpy(dirpath, ".", MAX_PATH - 1); + strncpy(pattern, lpFileName, MAX_PATH - 1); + } + + DIR *dir = opendir(dirpath); + if (!dir) return INVALID_HANDLE_VALUE; + + _LINUXSTUBS_FIND_HANDLE *fh = (_LINUXSTUBS_FIND_HANDLE *)malloc(sizeof(_LINUXSTUBS_FIND_HANDLE)); + if (!fh) { closedir(dir); return INVALID_HANDLE_VALUE; } + fh->dir = dir; + strncpy(fh->dirpath, dirpath, MAX_PATH - 1); + strncpy(fh->pattern, pattern, MAX_PATH - 1); + + struct dirent *ent; + while ((ent = readdir(fh->dir)) != NULL) + { + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) continue; + if (fnmatch(fh->pattern, ent->d_name, 0) == 0) + { + char fullpath[MAX_PATH * 2]; + snprintf(fullpath, sizeof(fullpath), "%s/%s", fh->dirpath, ent->d_name); + struct stat st{}; + if (stat(fullpath, &st) == 0) _FillFindData(ent->d_name, &st, lpFindFileData); + else { memset(lpFindFileData, 0, sizeof(*lpFindFileData)); strncpy(lpFindFileData->cFileName, ent->d_name, MAX_PATH - 1); } + return (HANDLE)fh; + } + } + + closedir(fh->dir); free(fh); + return INVALID_HANDLE_VALUE; +} + +static inline HANDLE FindFirstFile(const char *lpFileName, WIN32_FIND_DATAA *lpFindFileData) +{ + return FindFirstFileA(lpFileName, lpFindFileData); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findnextfilea +static inline BOOL FindNextFileA(HANDLE hFindFile, WIN32_FIND_DATAA *lpFindFileData) +{ + if (hFindFile == INVALID_HANDLE_VALUE || !lpFindFileData) return FALSE; + _LINUXSTUBS_FIND_HANDLE *fh = (_LINUXSTUBS_FIND_HANDLE *)hFindFile; + + struct dirent *ent; + while ((ent = readdir(fh->dir)) != NULL) + { + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) continue; + if (fnmatch(fh->pattern, ent->d_name, 0) == 0) + { + char fullpath[MAX_PATH * 2]; + snprintf(fullpath, sizeof(fullpath), "%s/%s", fh->dirpath, ent->d_name); + struct stat st{}; + if (stat(fullpath, &st) == 0) _FillFindData(ent->d_name, &st, lpFindFileData); + else { memset(lpFindFileData, 0, sizeof(*lpFindFileData)); strncpy(lpFindFileData->cFileName, ent->d_name, MAX_PATH - 1); } + return TRUE; + } + } + return FALSE; +} + +static inline BOOL FindNextFile(HANDLE hFindFile, WIN32_FIND_DATAA *lpFindFileData) +{ + return FindNextFileA(hFindFile, lpFindFileData); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findclose +static inline BOOL FindClose(HANDLE hFindFile) +{ + if (hFindFile == INVALID_HANDLE_VALUE) return FALSE; + _LINUXSTUBS_FIND_HANDLE *fh = (_LINUXSTUBS_FIND_HANDLE *)hFindFile; + closedir(fh->dir); free(fh); + return TRUE; +} + +// internal helper: convert FILETIME (100ns since 1601) to time_t (seconds since 1970) +static inline time_t _FileTimeToTimeT(const FILETIME& ft) +{ + ULONGLONG val = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; + const ULONGLONG EPOCH_DIFF = 116444736000000000ULL; // 100ns intervals between 1601-01-01 and 1970-01-01 + return (time_t)((val - EPOCH_DIFF) / 10000000ULL); +} + +// internal helper: read the current wall clock into a timespec +static inline void _CurrentTimeSpec(struct timespec *ts) +{ +#ifdef CLOCK_REALTIME + clock_gettime(CLOCK_REALTIME, ts); +#else + struct timeval tv; + gettimeofday(&tv, NULL); + ts->tv_sec = tv.tv_sec; + ts->tv_nsec = tv.tv_usec * 1000; +#endif +} + +// internal helper: fill SYSTEMTIME from a broken-down tm + nanosecond remainder +static inline void _FillSystemTime(const struct tm *tm, long tv_nsec, LPSYSTEMTIME lpSystemTime) +{ + lpSystemTime->wYear = tm->tm_year + 1900; + lpSystemTime->wMonth = tm->tm_mon + 1; + lpSystemTime->wDayOfWeek = tm->tm_wday; // 0 = Sunday + lpSystemTime->wDay = tm->tm_mday; + lpSystemTime->wHour = tm->tm_hour; + lpSystemTime->wMinute = tm->tm_min; + lpSystemTime->wSecond = tm->tm_sec; + lpSystemTime->wMilliseconds = (WORD)(tv_nsec / 1000000); // ns to ms +} + +// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtime +static inline VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) +{ + struct timespec ts; _CurrentTimeSpec(&ts); + struct tm tm; gmtime_r(&ts.tv_sec, &tm); // UTC + _FillSystemTime(&tm, ts.tv_nsec, lpSystemTime); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlocaltime +static inline VOID GetLocalTime(LPSYSTEMTIME lpSystemTime) +{ + struct timespec ts; _CurrentTimeSpec(&ts); + struct tm tm; localtime_r(&ts.tv_sec, &tm); // local time + _FillSystemTime(&tm, ts.tv_nsec, lpSystemTime); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-systemtimetofiletime +static inline BOOL SystemTimeToFileTime(const SYSTEMTIME *lpSystemTime, LPFILETIME lpFileTime) +{ + struct tm tm = {}; + tm.tm_year = lpSystemTime->wYear - 1900; + tm.tm_mon = lpSystemTime->wMonth - 1; + tm.tm_mday = lpSystemTime->wDay; + tm.tm_hour = lpSystemTime->wHour; + tm.tm_min = lpSystemTime->wMinute; + tm.tm_sec = lpSystemTime->wSecond; + + time_t t = timegm(&tm); + if (t == (time_t)-1) return FALSE; + + ULONGLONG ft = ((ULONGLONG)t + 11644473600ULL) * 10000000ULL; + ft += lpSystemTime->wMilliseconds * 10000ULL; + lpFileTime->dwLowDateTime = (DWORD)(ft & 0xFFFFFFFF); + lpFileTime->dwHighDateTime = (DWORD)(ft >> 32); + return TRUE; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-filetimetosystemtime +static inline BOOL FileTimeToSystemTime(const FILETIME *lpFileTime, LPSYSTEMTIME lpSystemTime) +{ + ULONGLONG ft = ((ULONGLONG)lpFileTime->dwHighDateTime << 32) | lpFileTime->dwLowDateTime; + time_t t = _FileTimeToTimeT(*lpFileTime); + long remainder_ns = (long)((ft % 10000000ULL) * 100); + + struct tm tm; gmtime_r(&t, &tm); // UTC + _FillSystemTime(&tm, remainder_ns, lpSystemTime); + return TRUE; +} +static inline DWORD GetTickCount() +{ + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + + // milliseconds + return (long long)ts.tv_sec * 1000 + (long long)ts.tv_nsec / 1000000; +} + +static inline BOOL QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency) +{ + // nanoseconds + lpFrequency->QuadPart = 1000000000; + return false; +} + + +static inline BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount) +{ + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + + // nanoseconds + lpPerformanceCount->QuadPart = ((long long)ts.tv_sec * 1000000000) + (long long)ts.tv_nsec; + + return true; +} + +// https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringa +static inline VOID OutputDebugStringA(LPCSTR lpOutputString) +{ + if (!lpOutputString) return; + fputs(lpOutputString, stderr); +} + +// https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringw +static inline VOID OutputDebugStringW(LPCWSTR lpOutputString) +{ + if (!lpOutputString) return; + fprintf(stderr, "%ls", lpOutputString); +} + +static inline VOID OutputDebugString(LPCSTR lpOutputString) +{ + return OutputDebugStringA(lpOutputString); +} + +typedef struct { + pthread_mutex_t mutex; + pthread_cond_t cond; + int signaled; + int manual_reset; +} Event; + +HANDLE CreateEvent(int manual_reset, int initial_state) { + Event* ev = (Event*)malloc(sizeof(Event)); + pthread_mutex_init(&ev->mutex, NULL); + pthread_cond_init(&ev->cond, NULL); + ev->signaled = initial_state; + ev->manual_reset = manual_reset; + return (HANDLE)ev; +} + +#endif // LINUXSTUBS_H \ No newline at end of file diff --git a/Minecraft.World/linux/xbox_valve.h b/Minecraft.Client/Linux/xbox_valve.h similarity index 97% rename from Minecraft.World/linux/xbox_valve.h rename to Minecraft.Client/Linux/xbox_valve.h index 2eff251a0..b242a4587 100644 --- a/Minecraft.World/linux/xbox_valve.h +++ b/Minecraft.Client/Linux/xbox_valve.h @@ -42,7 +42,7 @@ typedef long long int int64; #define XDEVICE_PORT1 1 #define XDEVICE_PORT2 2 #define XDEVICE_PORT3 3 -#define XUSER_MAX_COUNT 4 +// #define XUSER_MAX_COUNT 4 #define XUSER_INDEX_NONE 0x000000FE #define XBX_CLR_DEFAULT 0xFF000000 @@ -157,8 +157,8 @@ FORCEINLINE void XBX_SetStorageDeviceId( DWORD idx ) {} FORCEINLINE const char *XBX_GetLanguageString() { return ""; } FORCEINLINE bool XBX_IsLocalized() { return false; } -#define XCONTENT_MAX_DISPLAYNAME_LENGTH 128 -#define XCONTENT_MAX_FILENAME_LENGTH 42 +// #define XCONTENT_MAX_DISPLAYNAME_LENGTH 128 +// #define XCONTENT_MAX_FILENAME_LENGTH 42 #define XBX_INVALID_STORAGE_ID ((DWORD) -1) #define XBX_STORAGE_DECLINED ((DWORD) -2) diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index ea66b9e1a..53ac603bf 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -16,41 +16,41 @@ #include "CreativeMode.h" #include "GameRenderer.h" #include "ItemInHandRenderer.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\net.minecraft.world.damagesource.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.food.h" -#include "..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\ItemEntity.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\com.mojang.nbt.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/net.minecraft.world.damagesource.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.food.h" +#include "../Minecraft.World/net.minecraft.world.effect.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/ItemEntity.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/com.mojang.nbt.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/Mth.h" #include "AchievementPopup.h" #include "CritParticle.h" // 4J : WESTY : Added for new achievements. -#include "..\Minecraft.World\item.h" -#include "..\Minecraft.World\mapitem.h" -#include "..\Minecraft.World\tile.h" +#include "../Minecraft.World/item.h" +#include "../Minecraft.World/mapitem.h" +#include "../Minecraft.World/tile.h" // 4J Stu - Added for tutorial callbacks #include "Minecraft.h" -#include "..\Minecraft.World\Minecart.h" -#include "..\Minecraft.World\Boat.h" -#include "..\Minecraft.World\Pig.h" +#include "../Minecraft.World/Minecart.h" +#include "../Minecraft.World/Boat.h" +#include "../Minecraft.World/Pig.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "Options.h" -#include "..\Minecraft.World\Dimension.h" +#include "../Minecraft.World/Dimension.h" #ifndef _DURANGO -#include "..\Minecraft.World\CommonStats.h" +#include "../Minecraft.World/CommonStats.h" #endif @@ -1150,7 +1150,7 @@ void LocalPlayer::setAndBroadcastCustomCape(DWORD capeId) } // 4J TODO - Remove -#include "..\Minecraft.World\LevelChunk.h" +#include "../Minecraft.World/LevelChunk.h" void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType) { int cx = this->xChunk; diff --git a/Minecraft.Client/LocalPlayer.h b/Minecraft.Client/LocalPlayer.h index b1e8dd238..d7dc8a6f0 100644 --- a/Minecraft.Client/LocalPlayer.h +++ b/Minecraft.Client/LocalPlayer.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.World\SmoothFloat.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\Pos.h" +#include "../Minecraft.World/SmoothFloat.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/Pos.h" class Level; class User; class CompoundTag; diff --git a/Minecraft.Client/MemoryTracker.cpp b/Minecraft.Client/MemoryTracker.cpp index c1652d3b5..eda6b7fb7 100644 --- a/Minecraft.Client/MemoryTracker.cpp +++ b/Minecraft.Client/MemoryTracker.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "MemoryTracker.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\ByteBuffer.h" -#include "..\Minecraft.World\FloatBuffer.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/ByteBuffer.h" +#include "../Minecraft.World/FloatBuffer.h" unordered_map MemoryTracker::GL_LIST_IDS; vector MemoryTracker::TEXTURE_IDS; diff --git a/Minecraft.Client/MinecartRenderer.cpp b/Minecraft.Client/MinecartRenderer.cpp index 0cae83465..330418429 100644 --- a/Minecraft.Client/MinecartRenderer.cpp +++ b/Minecraft.Client/MinecartRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "MinecartRenderer.h" #include "MinecartModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" MinecartRenderer::MinecartRenderer() { diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 1892fb368..83b064439 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -34,43 +34,43 @@ #include "FrustumCuller.h" #include "Camera.h" -#include "..\Minecraft.World\MobEffect.h" -#include "..\Minecraft.World\Difficulty.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\ByteBuffer.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\Minecraft.World.h" +#include "../Minecraft.World/MobEffect.h" +#include "../Minecraft.World/Difficulty.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/ByteBuffer.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/Minecraft.World.h" #include "ClientConnection.h" -#include "..\Minecraft.World\HellRandomLevelSource.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\StrongholdFeature.h" -#include "..\Minecraft.World\IntCache.h" -#include "..\Minecraft.World\Villager.h" -#include "..\Minecraft.World\SparseLightStorage.h" -#include "..\Minecraft.World\SparseDataStorage.h" +#include "../Minecraft.World/HellRandomLevelSource.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/StrongholdFeature.h" +#include "../Minecraft.World/IntCache.h" +#include "../Minecraft.World/Villager.h" +#include "../Minecraft.World/SparseLightStorage.h" +#include "../Minecraft.World/SparseDataStorage.h" #include "TextureManager.h" #ifdef _XBOX -#include "Xbox\Network\NetworkPlayerXbox.h" +#include "Xbox/Network/NetworkPlayerXbox.h" #endif -#include "Common\UI\IUIScene_CreativeMenu.h" -#include "Common\UI\UIFontData.h" +#include "Common/UI/IUIScene_CreativeMenu.h" +#include "Common/UI/UIFontData.h" #include "DLCTexturePack.h" #ifdef __ORBIS__ -#include "Orbis\Network\PsPlusUpsellWrapper_Orbis.h" +#include "Orbis/Network/PsPlusUpsellWrapper_Orbis.h" #endif // 4J Turning this on will change the graph at the bottom of the debug overlay to show the number of packets of each type added per fram diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index ceb9554b2..6991cde8a 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -14,40 +14,40 @@ #include "Settings.h" #include "ServerChunkCache.h" #include "ServerLevelListener.h" -#include "..\Minecraft.World\AABB.h" -#include "..\Minecraft.World\Vec3.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/AABB.h" +#include "../Minecraft.World/Vec3.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/StringHelpers.h" #ifdef SPLIT_SAVES -#include "..\Minecraft.World\ConsoleSaveFileSplit.h" +#include "../Minecraft.World/ConsoleSaveFileSplit.h" #endif -#include "..\Minecraft.World\ConsoleSaveFileOriginal.h" -#include "..\Minecraft.World\Socket.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" +#include "../Minecraft.World/ConsoleSaveFileOriginal.h" +#include "../Minecraft.World/Socket.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" #include "ProgressRenderer.h" #include "ServerPlayer.h" #include "GameRenderer.h" -#include "..\Minecraft.World\ThreadName.h" -#include "..\Minecraft.World\IntCache.h" -#include "..\Minecraft.World\CompressedTileStorage.h" -#include "..\Minecraft.World\SparseLightStorage.h" -#include "..\Minecraft.World\SparseDataStorage.h" -#include "..\Minecraft.World\compression.h" +#include "../Minecraft.World/ThreadName.h" +#include "../Minecraft.World/IntCache.h" +#include "../Minecraft.World/CompressedTileStorage.h" +#include "../Minecraft.World/SparseLightStorage.h" +#include "../Minecraft.World/SparseDataStorage.h" +#include "../Minecraft.World/compression.h" #ifdef _XBOX -#include "Common\XUI\XUI_DebugSetCamera.h" +#include "Common/XUI/XUI_DebugSetCamera.h" #endif -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include "ServerCommandDispatcher.h" -#include "..\Minecraft.World\BiomeSource.h" +#include "../Minecraft.World/BiomeSource.h" #include "PlayerChunkMap.h" -#include "Common\Telemetry\TelemetryManager.h" +#include "Common/Telemetry/TelemetryManager.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 @@ -149,7 +149,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW //localIp = settings->getString(L"server-ip", L""); //onlineMode = settings->getBoolean(L"online-mode", true); //motd = settings->getString(L"motd", L"A Minecraft Server"); - //motd.replace('§', '$'); + //motd.replace('§', '$'); setAnimals(settings->getBoolean(L"spawn-animals", true)); setNpcsEnabled(settings->getBoolean(L"spawn-npcs", true)); diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp index c18cd267a..3cf6209e1 100644 --- a/Minecraft.Client/Minimap.cpp +++ b/Minecraft.Client/Minimap.cpp @@ -5,8 +5,8 @@ #include "Options.h" #include "Textures.h" #include "Tesselator.h" -#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" #ifdef __ORBIS__ short Minimap::LUT[256]; // 4J added diff --git a/Minecraft.Client/Minimap.h b/Minecraft.Client/Minimap.h index 758d8a8ad..84e439e64 100644 --- a/Minecraft.Client/Minimap.h +++ b/Minecraft.Client/Minimap.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\MapItem.h" +#include "../Minecraft.World/MapItem.h" class Options; class Font; class Textures; diff --git a/Minecraft.Client/MobRenderer.cpp b/Minecraft.Client/MobRenderer.cpp index 8874ab9c6..4188cd5a0 100644 --- a/Minecraft.Client/MobRenderer.cpp +++ b/Minecraft.Client/MobRenderer.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "MobRenderer.h" #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/Mth.h" #include "entityRenderDispatcher.h" MobRenderer::MobRenderer(Model *model, float shadow) : EntityRenderer() diff --git a/Minecraft.Client/MobSpawnerRenderer.cpp b/Minecraft.Client/MobSpawnerRenderer.cpp index 4ee772dda..f403aa2d1 100644 --- a/Minecraft.Client/MobSpawnerRenderer.cpp +++ b/Minecraft.Client/MobSpawnerRenderer.cpp @@ -2,8 +2,8 @@ #include "MobSpawnerRenderer.h" #include "TileEntityRenderDispatcher.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" void MobSpawnerRenderer::render(shared_ptr _spawner, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled) { diff --git a/Minecraft.Client/ModelPart.h b/Minecraft.Client/ModelPart.h index 65d6a03b4..f6ff59f63 100644 --- a/Minecraft.Client/ModelPart.h +++ b/Minecraft.Client/ModelPart.h @@ -1,9 +1,9 @@ #pragma once -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" #include "Vertex.h" #include "Polygon.h" #include "Model.h" -#include "..\Minecraft.Client\SkinBox.h" +#include "../Minecraft.Client/SkinBox.h" class Cube; diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp index 8c6c90e71..9241b22d5 100644 --- a/Minecraft.Client/MultiPlayerChunkCache.cpp +++ b/Minecraft.Client/MultiPlayerChunkCache.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" #include "MultiPlayerChunkCache.h" #include "ServerChunkCache.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\Arrays.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/Arrays.h" +#include "../Minecraft.World/StringHelpers.h" #include "MinecraftServer.h" #include "ServerLevel.h" -#include "..\Minecraft.World\Tile.h" -#include "..\Minecraft.World\WaterLevelChunk.h" +#include "../Minecraft.World/Tile.h" +#include "../Minecraft.World/WaterLevelChunk.h" MultiPlayerChunkCache::MultiPlayerChunkCache(Level *level) { diff --git a/Minecraft.Client/MultiPlayerChunkCache.h b/Minecraft.Client/MultiPlayerChunkCache.h index 8fc427a6b..a1496e322 100644 --- a/Minecraft.Client/MultiPlayerChunkCache.h +++ b/Minecraft.Client/MultiPlayerChunkCache.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\RandomLevelSource.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/RandomLevelSource.h" using namespace std; class ServerChunkCache; diff --git a/Minecraft.Client/MultiPlayerGameMode.cpp b/Minecraft.Client/MultiPlayerGameMode.cpp index 7de598039..696814d4a 100644 --- a/Minecraft.Client/MultiPlayerGameMode.cpp +++ b/Minecraft.Client/MultiPlayerGameMode.cpp @@ -6,12 +6,12 @@ #include "Minecraft.h" #include "ClientConnection.h" #include "LevelRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.h" MultiPlayerGameMode::MultiPlayerGameMode(Minecraft *minecraft, ClientConnection *connection) { diff --git a/Minecraft.Client/MultiPlayerLevel.cpp b/Minecraft.Client/MultiPlayerLevel.cpp index 24b12bcd3..b023d1dac 100644 --- a/Minecraft.Client/MultiPlayerLevel.cpp +++ b/Minecraft.Client/MultiPlayerLevel.cpp @@ -3,15 +3,15 @@ #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" #include "MultiPlayerChunkCache.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\Pos.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/Pos.h" #include "MinecraftServer.h" #include "ServerLevel.h" #include "Minecraft.h" -#include "..\Minecraft.World\PrimedTnt.h" -#include "..\Minecraft.World\Tile.h" -#include "..\Minecraft.World\TileEntity.h" +#include "../Minecraft.World/PrimedTnt.h" +#include "../Minecraft.World/Tile.h" +#include "../Minecraft.World/TileEntity.h" MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, int data) { diff --git a/Minecraft.Client/MultiPlayerLevel.h b/Minecraft.Client/MultiPlayerLevel.h index c07b55835..84938bab4 100644 --- a/Minecraft.Client/MultiPlayerLevel.h +++ b/Minecraft.Client/MultiPlayerLevel.h @@ -1,9 +1,9 @@ #pragma once using namespace std; -#include "..\Minecraft.World\HashExtension.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/HashExtension.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/JavaIntHash.h" class ClientConnection; class MultiPlayerChunkCache; diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/MultiPlayerLocalPlayer.cpp index bb2630e5d..6e5658a9a 100644 --- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp +++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -//#include "..\Minecraft.World\JavaMath.h" +//#include "../Minecraft.World/JavaMath.h" #include "MultiplayerLocalPlayer.h" #include "ClientConnection.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\AABB.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/AABB.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.effect.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.h b/Minecraft.Client/MultiPlayerLocalPlayer.h index 8687b36ae..6a97c7c49 100644 --- a/Minecraft.Client/MultiPlayerLocalPlayer.h +++ b/Minecraft.Client/MultiPlayerLocalPlayer.h @@ -1,6 +1,6 @@ #pragma once #include "LocalPlayer.h" -#include "..\Minecraft.World\SharedConstants.h" +#include "../Minecraft.World/SharedConstants.h" class ClientConnection; class Minecraft; diff --git a/Minecraft.Client/MushroomCowRenderer.cpp b/Minecraft.Client/MushroomCowRenderer.cpp index 688fab5c2..d7f0e7217 100644 --- a/Minecraft.Client/MushroomCowRenderer.cpp +++ b/Minecraft.Client/MushroomCowRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" #include "QuadrupedModel.h" #include "ModelPart.h" #include "MushroomCowRenderer.h" diff --git a/Minecraft.Client/NameEntryScreen.cpp b/Minecraft.Client/NameEntryScreen.cpp index c9df70245..d6b1e965d 100644 --- a/Minecraft.Client/NameEntryScreen.cpp +++ b/Minecraft.Client/NameEntryScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "NameEntryScreen.h" #include "Button.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" const wstring NameEntryScreen::allowedChars = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,.:-_'*!\"#%/()=+?[]{}<>"; diff --git a/Minecraft.Client/NetherPortalParticle.cpp b/Minecraft.Client/NetherPortalParticle.cpp index 4b70d38f5..b8fb1db66 100644 --- a/Minecraft.Client/NetherPortalParticle.cpp +++ b/Minecraft.Client/NetherPortalParticle.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "NetherPortalParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Random.h" #include "Minecraft.h" // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle diff --git a/Minecraft.Client/NoteParticle.cpp b/Minecraft.Client/NoteParticle.cpp index 2e2320c8a..b95cc9843 100644 --- a/Minecraft.Client/NoteParticle.cpp +++ b/Minecraft.Client/NoteParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "NoteParticle.h" void NoteParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale) diff --git a/Minecraft.Client/OffsettedRenderList.cpp b/Minecraft.Client/OffsettedRenderList.cpp index 729d26f92..cc81eab22 100644 --- a/Minecraft.Client/OffsettedRenderList.cpp +++ b/Minecraft.Client/OffsettedRenderList.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\IntBuffer.h" +#include "../Minecraft.World/IntBuffer.h" #include "OffsettedRenderList.h" // 4J added diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp index 9952fc8c7..fcc8468f3 100644 --- a/Minecraft.Client/Options.cpp +++ b/Minecraft.Client/Options.cpp @@ -3,16 +3,16 @@ #include "KeyMapping.h" #include "LevelRenderer.h" #include "Textures.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\Language.h" -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\BufferedReader.h" -#include "..\Minecraft.World\DataInputStream.h" -#include "..\Minecraft.World\InputStreamReader.h" -#include "..\Minecraft.World\FileInputStream.h" -#include "..\Minecraft.World\FileOutputStream.h" -#include "..\Minecraft.World\DataOutputStream.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/Language.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/BufferedReader.h" +#include "../Minecraft.World/DataInputStream.h" +#include "../Minecraft.World/InputStreamReader.h" +#include "../Minecraft.World/FileInputStream.h" +#include "../Minecraft.World/FileOutputStream.h" +#include "../Minecraft.World/DataOutputStream.h" +#include "../Minecraft.World/StringHelpers.h" // 4J - the Option sub-class used to be an java enumerated type, trying to emulate that functionality here const Options::Option Options::Option::options[17] = diff --git a/Minecraft.Client/Options.h b/Minecraft.Client/Options.h index 8be61ac6e..3cf1b82c9 100644 --- a/Minecraft.Client/Options.h +++ b/Minecraft.Client/Options.h @@ -2,7 +2,7 @@ using namespace std; class Minecraft; class KeyMapping; -#include "..\Minecraft.World\File.h" +#include "../Minecraft.World/File.h" class Options { diff --git a/Minecraft.Client/OptionsScreen.cpp b/Minecraft.Client/OptionsScreen.cpp index b5c2f5e60..d8e0c2e61 100644 --- a/Minecraft.Client/OptionsScreen.cpp +++ b/Minecraft.Client/OptionsScreen.cpp @@ -5,7 +5,7 @@ #include "Options.h" #include "ControlsScreen.h" #include "VideoSettingsScreen.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" OptionsScreen::OptionsScreen(Screen *lastScreen, Options *options) { diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp index b76621970..16ee326e3 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -4,19 +4,19 @@ #include "base64.h" -#include "..\Orbis_App.h" -#include "..\..\Common\Consoles_App.h" +#include "../Orbis_App.h" +#include "../../Common/Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include #include //#include -#include "Orbis\OrbisExtras\ShutdownManager.h" +#include "Orbis/OrbisExtras/ShutdownManager.h" LeaderboardManager *LeaderboardManager::m_instance = new OrbisLeaderboardManager(); //Singleton instance of the LeaderboardManager @@ -133,7 +133,7 @@ void OrbisLeaderboardManager::scoreboardThreadInternal() // The following NP call should be reserved for asynchronous multiplayer modes that require PS Plus to be accessed. // // Note 2: - // The message is not displayed with a user without PlayStation®Plus subscription and they are able to access the Leaderboards. + // The message is not displayed with a user without PlayStation®Plus subscription and they are able to access the Leaderboards. // NotifyAsyncPlusFeature(); diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h index c2243a93e..430d3c06a 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" class OrbisLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp index d1c9cf15f..a5e7fce97 100644 --- a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp +++ b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Orbis_NPToolkit.h" -#include "Orbis\ps4__np_conf.h" +#include "Orbis/ps4__np_conf.h" #include "Orbis/Network/SonyCommerce_Orbis.h" // #define NP_TITLE_ID "CUSA00265_00" diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp index 5c02cb08e..b2ef49bbb 100644 --- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -12,9 +12,9 @@ #include "../ps4__np_conf.h" #include "Orbis_NPToolkit.h" #include "SonyVoiceChat_Orbis.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" -// #include "..\PS3Extras\PS3Strings.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" +// #include "../PS3Extras/PS3Strings.h" int (* SQRNetworkManager_Orbis::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL; diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h index 5b19f63ec..8bc917a2e 100644 --- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h @@ -8,7 +8,7 @@ #include // #include "SonyVoiceChat_Orbis.h" -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp index 34ab67e40..4a576d7ba 100644 --- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp +++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce_Orbis.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include @@ -600,7 +600,7 @@ int SonyCommerce_Orbis::createSession() // // sce::Toolkit::NP::Commerce::Interface::CreateSession // - // This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned. + // This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned. int ret = sce::Toolkit::NP::Commerce::Interface::createSession(); @@ -1145,8 +1145,8 @@ void SonyCommerce_Orbis::CreateSession( CallbackFunc cb, LPVOID lpParam ) setCallback(cb,lpParam); // We don't need to create a session on PS4, from the Sony docs - -// This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 -// platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned. +// This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 +// platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned. diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h index a2a42d574..3942fa564 100644 --- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" class OrbisNPToolkit; class SonyCommerce_Orbis : public SonyCommerce diff --git a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h index 0b36c41d0..a04411b3b 100644 --- a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Orbis : public SonyRemoteStorage { diff --git a/Minecraft.Client/Orbis/Orbis_App.cpp b/Minecraft.Client/Orbis/Orbis_App.cpp index 9af5ee120..2a3d2f4a9 100644 --- a/Minecraft.Client/Orbis/Orbis_App.cpp +++ b/Minecraft.Client/Orbis/Orbis_App.cpp @@ -1,22 +1,22 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\Orbis\Network\SonyCommerce_Orbis.h" -#include "..\..\Minecraft.World\StringHelpers.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../Orbis/Network/SonyCommerce_Orbis.h" +#include "../../Minecraft.World/StringHelpers.h" #include "Network/Orbis_NPToolkit.h" -#include "Orbis\Network\SonyRemoteStorage_Orbis.h" +#include "Orbis/Network/SonyRemoteStorage_Orbis.h" #include -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #include #include diff --git a/Minecraft.Client/Orbis/Orbis_App.h b/Minecraft.Client/Orbis/Orbis_App.h index 1c09579f7..d00b0d3f2 100644 --- a/Minecraft.Client/Orbis/Orbis_App.h +++ b/Minecraft.Client/Orbis/Orbis_App.h @@ -3,8 +3,8 @@ class C4JStringTable; #include -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\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/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp index 947b9df8b..364ef2b5b 100644 --- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp @@ -6,41 +6,41 @@ #include #include #include -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -#include "Leaderboards\OrbisLeaderboardManager.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +#include "Leaderboards/OrbisLeaderboardManager.h" #include "Network/Orbis_NPToolkit.h" -#include "Orbis\Network\SonyVoiceChat_Orbis.h" +#include "Orbis/Network/SonyVoiceChat_Orbis.h" #define THEME_NAME "584111F70AAAAAAA" #define THEME_FILESIZE 2797568 diff --git a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp index 114e6ae8e..0dcd81c82 100644 --- a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp +++ b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "Orbis_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include diff --git a/Minecraft.Client/Orbis/Orbis_UIController.cpp b/Minecraft.Client/Orbis/Orbis_UIController.cpp index 38cc79e94..035894f7f 100644 --- a/Minecraft.Client/Orbis/Orbis_UIController.cpp +++ b/Minecraft.Client/Orbis/Orbis_UIController.cpp @@ -2,8 +2,8 @@ #include "Orbis_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Orbis/Orbis_UIController.h b/Minecraft.Client/Orbis/Orbis_UIController.h index fcd901e22..940769e1b 100644 --- a/Minecraft.Client/Orbis/Orbis_UIController.h +++ b/Minecraft.Client/Orbis/Orbis_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Orbis/user_malloc.cpp b/Minecraft.Client/Orbis/user_malloc.cpp index 6a85e83b5..67656ff0a 100644 --- a/Minecraft.Client/Orbis/user_malloc.cpp +++ b/Minecraft.Client/Orbis/user_malloc.cpp @@ -9,7 +9,7 @@ extern "C" #include #include #include -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/System.h" static size_t s_heapLength; static size_t s_memLength; diff --git a/Minecraft.Client/OzelotModel.cpp b/Minecraft.Client/OzelotModel.cpp index 9c22cc4b7..63ab51f64 100644 --- a/Minecraft.Client/OzelotModel.cpp +++ b/Minecraft.Client/OzelotModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ModelPart.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/Mth.h" #include "OzelotModel.h" const float OzelotModel::xo = 0; diff --git a/Minecraft.Client/OzelotRenderer.cpp b/Minecraft.Client/OzelotRenderer.cpp index d56b35f9b..455757674 100644 --- a/Minecraft.Client/OzelotRenderer.cpp +++ b/Minecraft.Client/OzelotRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "OzelotRenderer.h" OzelotRenderer::OzelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow) diff --git a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp index fcce5f05a..9e6f299cc 100644 --- a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp +++ b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp @@ -1,13 +1,13 @@ -#include "..\stdafx.h" +#include "../stdafx.h" #include #include #include #include #include #include -#include "..\..\Common\Audio\SoundEngine.h" -#include "..\..\Common\Consoles_App.h" -#include "..\..\PS3\Miles\include\mss.h" +#include "../../Common/Audio/SoundEngine.h" +#include "../../Common/Consoles_App.h" +#include "../../PS3/Miles/include/mss.h" // This file has the platform specific functions required for PS3 audio diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp index 38380bfb4..1f6ebd694 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp @@ -4,19 +4,19 @@ #include "base64.h" -#include "..\PS3_App.h" -#include "..\..\Common\Consoles_App.h" +#include "../PS3_App.h" +#include "../../Common/Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include #include #include -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #ifdef __PS3__ LeaderboardManager *LeaderboardManager::m_instance = new PS3LeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h index 7a85896da..dbe6bd721 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h @@ -1,9 +1,9 @@ #pragma once -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\..\Minecraft.World\x64headers\extraX64.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../../Minecraft.World/x64headers/extraX64.h" -#include "PS3\Passphrase\ps3__np_conf.h" +#include "PS3/Passphrase/ps3__np_conf.h" using namespace std; diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp index 46b1916d0..60362c97e 100644 --- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp @@ -15,9 +15,9 @@ #include "SonyVoiceChat.h" #include "Common/Network/Sony/SonyHttp.h" #endif -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\PS3Extras\PS3Strings.h" -#include "PS3\Network\SonyRemoteStorage_PS3.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../PS3Extras/PS3Strings.h" +#include "PS3/Network/SonyRemoteStorage_PS3.h" int (* SQRNetworkManager_PS3::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL; void * SQRNetworkManager_PS3::s_SignInCompleteParam = NULL; diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h index 6143bbb58..715e80b2b 100644 --- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h +++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h @@ -9,7 +9,7 @@ #endif #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp index 230e03099..cc82970fc 100644 --- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp +++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce_PS3.h" -#include "..\PS3Extras\ShutdownManager.h" +#include "../PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h index 1f43341a0..38857b0d0 100644 --- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h +++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h @@ -6,7 +6,7 @@ #include #include #include -#include "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/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h index ffbc57b0b..61518006d 100644 --- a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h +++ b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h" +#include "Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage_PS3 : public SonyRemoteStorage { diff --git a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp index fd8ddd9ad..f970ded20 100644 --- a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp +++ b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp @@ -7,7 +7,7 @@ #include #include "C4JSpursJob.h" #include "C4JThread_SPU.h" -// #include "PS3\SPU_Tasks\SPUMemTools\SPUMemTools.h" +// #include "PS3/SPU_Tasks/SPUMemTools/SPUMemTools.h" using namespace cell::Spurs::JobQueue; diff --git a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp index 94d7ef87d..aea6712b2 100644 --- a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp +++ b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp @@ -3,9 +3,9 @@ #include "stdafx.h" #include "C4JThread_SPU.h" -#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" -#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" -#include "PS3\SPU_Tasks\LevelRenderChunks\LevelRenderChunks.h" +#include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h" +#include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h" +#include "PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks.h" #define SPURS_MAX_SPU 6 #define SPURS_PPU_THREAD_PRIORITY 2 diff --git a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h index 3576d7ed0..f81fdeefc 100644 --- a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h +++ b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h @@ -157,7 +157,7 @@ #endif #if defined(_MSC_EXTENSIONS) && !defined( MIDL_PASS ) && !defined(__midl) && !defined(RC_INVOKED) -#include "codeanalysis\sourceannotations.h" +#include "codeanalysis/sourceannotations.h" #endif //============================================================================ diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h index b6cf351de..0d26e4f99 100644 --- a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h +++ b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h @@ -71,7 +71,7 @@ extern Cnullptr nullptr; // #include -// #include "DirectX\DirectXMath.h" +// #include "DirectX/DirectXMath.h" // using namespace DirectX; #define S_OK 0 diff --git a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp index e7eca53f4..ce7365e37 100644 --- a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp +++ b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ShutdownManager.h" -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\MinecraftServer.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PS3/PS3_App.cpp b/Minecraft.Client/PS3/PS3_App.cpp index d2ab71501..addea2aab 100644 --- a/Minecraft.Client/PS3/PS3_App.cpp +++ b/Minecraft.Client/PS3/PS3_App.cpp @@ -1,19 +1,19 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\PS3\Network\SonyCommerce_PS3.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "PS3Extras\ShutdownManager.h" -#include "PS3\Network\SonyRemoteStorage_PS3.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../PS3/Network/SonyCommerce_PS3.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "PS3Extras/ShutdownManager.h" +#include "PS3/Network/SonyRemoteStorage_PS3.h" diff --git a/Minecraft.Client/PS3/PS3_App.h b/Minecraft.Client/PS3/PS3_App.h index d1ecdb6f5..5c9873918 100644 --- a/Minecraft.Client/PS3/PS3_App.h +++ b/Minecraft.Client/PS3/PS3_App.h @@ -1,7 +1,7 @@ #pragma once -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\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/PS3/PS3_Minecraft.cpp b/Minecraft.Client/PS3/PS3_Minecraft.cpp index 821a47d95..82c89b151 100644 --- a/Minecraft.Client/PS3/PS3_Minecraft.cpp +++ b/Minecraft.Client/PS3/PS3_Minecraft.cpp @@ -17,9 +17,9 @@ SYS_PROCESS_PARAM(1001, 0x10000); // thread priority, and stack size #include //#include -#include "Leaderboards\PS3LeaderboardManager.h" -#include "PS3\PS3Extras\PS3Strings.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "Leaderboards/PS3LeaderboardManager.h" +#include "PS3/PS3Extras/PS3Strings.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include #include @@ -54,48 +54,48 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign --wrap _malloc_init #if HEAPINSPECTOR_PS3 -#include "HeapInspector\Server\HeapInspectorServer.h" -#include "HeapInspector\Server\PS3\HeapHooks.hpp" +#include "HeapInspector/Server/HeapInspectorServer.h" +#include "HeapInspector/Server/PS3/HeapHooks.hpp" #endif #include "PS3_App.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\Common\Console_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../Common/Console_Awards_enum.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -#include "PS3\PS3Extras\EdgeZLib.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +#include "PS3/PS3Extras/EdgeZLib.h" #include "C4JThread_SPU.h" -#include "Common\Network\Sony\SQRNetworkManager.h" -#include "Common\UI\IUIScene_PauseMenu.h" +#include "Common/Network/Sony/SQRNetworkManager.h" +#include "Common/UI/IUIScene_PauseMenu.h" #include @@ -961,10 +961,10 @@ int main() } else { - StorageManager.SetGameSaveFolderTitle((WCHAR *)app.GetString(IDS_GAMENAME));//"Minecraft: PlayStation®3 Edition");//GAMENAME); + StorageManager.SetGameSaveFolderTitle((WCHAR *)app.GetString(IDS_GAMENAME));//"Minecraft: PlayStation®3 Edition");//GAMENAME); } - StorageManager.SetSaveCacheFolderTitle((WCHAR *)app.GetString(IDS_SAVECACHEFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME); - StorageManager.SetOptionsFolderTitle((WCHAR *)app.GetString(IDS_OPTIONSFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME); + StorageManager.SetSaveCacheFolderTitle((WCHAR *)app.GetString(IDS_SAVECACHEFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME); + StorageManager.SetOptionsFolderTitle((WCHAR *)app.GetString(IDS_OPTIONSFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME); StorageManager.SetGameSaveFolderPrefix(app.GetSaveFolderPrefix()); StorageManager.SetMaxSaves(99); byteArray baOptionsIcon = app.getArchiveFile(L"DefaultOptionsImage320x176.png"); diff --git a/Minecraft.Client/PS3/PS3_PlayerUID.cpp b/Minecraft.Client/PS3/PS3_PlayerUID.cpp index 8256ac21b..9a2a8a0a7 100644 --- a/Minecraft.Client/PS3/PS3_PlayerUID.cpp +++ b/Minecraft.Client/PS3/PS3_PlayerUID.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "PS3_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" std::size_t PlayerUID::Hash::operator()(const PlayerUID& k) const { diff --git a/Minecraft.Client/PS3/PS3_UIController.cpp b/Minecraft.Client/PS3/PS3_UIController.cpp index 7b634e3b0..9d2f6a93b 100644 --- a/Minecraft.Client/PS3/PS3_UIController.cpp +++ b/Minecraft.Client/PS3/PS3_UIController.cpp @@ -4,8 +4,8 @@ #include // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PS3/PS3_UIController.h b/Minecraft.Client/PS3/PS3_UIController.h index 0077b8cf4..f8308a440 100644 --- a/Minecraft.Client/PS3/PS3_UIController.h +++ b/Minecraft.Client/PS3/PS3_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp index 1cb5e2eec..2ae796281 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #ifdef __PS3__ #ifndef SN_TARGET_PS3_SPU -// #include "..\..\..\stdafx.h" +// #include "../../../stdafx.h" #endif #endif @@ -10,24 +10,24 @@ #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\Level.h" -#include "..\..\..\..\Minecraft.World\Dimension.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/Level.h" +#include "../../../../Minecraft.World/Dimension.h" // -// #include "..\..\..\Chunk.h" -// #include "..\..\..\TileRenderer.h" -// #include "..\..\..\TileEntityRenderDispatcher.h" -// #include "..\..\..\LevelRenderer.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\..\Minecraft.World\Icon.h" -#include "..\..\..\..\Minecraft.World\BiomeSource.h" +// #include "../../../Chunk.h" +// #include "../../../TileRenderer.h" +// #include "../../../TileEntityRenderDispatcher.h" +// #include "../../../LevelRenderer.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../../Minecraft.World/Icon.h" +#include "../../../../Minecraft.World/BiomeSource.h" #else -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif //SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h index c733a9285..8262e41c3 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h @@ -1,13 +1,13 @@ #pragma once #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" -#include "..\..\..\Tesselator.h" -#include "..\..\..\..\Minecraft.World\LightLayer.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" +#include "../../../Tesselator.h" +#include "../../../../Minecraft.World/LightLayer.h" #endif // SN_TARGET_PS3_SPU -#include "..\..\..\..\Minecraft.World\LightLayer.h" +#include "../../../../Minecraft.World/LightLayer.h" #include "Tile_SPU.h" #include "Tesselator_SPU.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp index 7f13fd4f9..41a6b0764 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp @@ -4,7 +4,7 @@ #include "ChunkRebuildData.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif // const wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava"; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp index 3d1007af1..b5c1c3bdc 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp @@ -9,16 +9,16 @@ #include #include #include -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif // SN_TARGET_PS3_SPU #include "Tesselator_SPU.h" static const bool sc_verbose = false; -// #include "..\Minecraft.World\BasicTypeContainers.h" -// #include "..\Minecraft.World\FloatBuffer.h" -// #include "..\Minecraft.World\IntBuffer.h" -// #include "..\Minecraft.World\ByteBuffer.h" +// #include "../Minecraft.World/BasicTypeContainers.h" +// #include "../Minecraft.World/FloatBuffer.h" +// #include "../Minecraft.World/IntBuffer.h" +// #include "../Minecraft.World/ByteBuffer.h" #ifdef SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h index 66e8424ea..26acd43cf 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h @@ -6,7 +6,7 @@ typedef unsigned int DWORD; typedef unsigned char byte; #include #else -#include "..\..\..\stdafx.h" +#include "../../../stdafx.h" class ChunkRebuildData; #endif #endif diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp index ab9b2c94c..7d59c4e9d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp @@ -25,7 +25,7 @@ #include #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif static const float MATH_PI = 3.141592654f; @@ -33,12 +33,12 @@ static const float MATH_PI = 3.141592654f; // #include "GameRenderer.h" // #include "Minecraft.h" // #include "Textures.h" -// #include "..\Minecraft.World\net.minecraft.world.level.h" -// #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -// #include "..\Minecraft.World\net.minecraft.world.level.material.h" -// #include "..\Minecraft.World\net.minecraft.h" -// #include "..\Minecraft.World\net.minecraft.world.h" -// #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +// #include "../Minecraft.World/net.minecraft.world.level.h" +// #include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +// #include "../Minecraft.World/net.minecraft.world.level.material.h" +// #include "../Minecraft.World/net.minecraft.h" +// #include "../Minecraft.World/net.minecraft.world.h" +// #include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "Tesselator_SPU.h" @@ -46,7 +46,7 @@ static const float MATH_PI = 3.141592654f; #include "Stubs_SPU.h" #endif // SN_TARGET_PS3_SPU -// #include "..\..\Minecraft.World\SharedConstants.h" +// #include "../../Minecraft.World/SharedConstants.h" #include "Facing_SPU.h" // #include "EntityTileRenderer.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp index f2dfeaac7..77886f911 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp @@ -85,7 +85,7 @@ #include "WoolCarpetTile_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp index 24dd069aa..1fc3e58f7 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include "ChunkRebuildData.h" #include "TileRenderer_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" // #define SPU_HEAPSIZE (0*1024) // #define SPU_STACKSIZE (64*1024) diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp index dc134ecaf..402fae88a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "CompressedTileStorage_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #else -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\TilePos.h" -#include "..\..\..\..\Minecraft.World\LevelChunk.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/TilePos.h" +#include "../../../../Minecraft.World/LevelChunk.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h index 51937a873..2c8d8ec02 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h @@ -6,8 +6,8 @@ #include "SparseDataStorage_SPU.h" #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" #endif // SN_TARGET_PS3_SPU //#include "xmcore.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp index b25e04e0a..a02dbe099 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "CompressedTileStorage_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" // #define SPU_HEAPSIZE (128*1024) // #define SPU_STACKSIZE (16*1024) diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp index 7a05169a9..b699a022d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "CompressedTileStorage_compress.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp index fa52c3e19..a38f4e918 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "CompressedTileStorage_getData.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp index 7199b8fc1..2e6599498 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "GameRenderer_updateLightTexture.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp index 11c3604f8..4ddb89a76 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp @@ -15,7 +15,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "LevelRenderChunks.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp index 0912e33ae..093b1a0d6 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_FindNearestChunk.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp index f2a7bca0f..9cfde772d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_cull.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp index 0c56bd3e0..65db49a68 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_zSort.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp index 755c30d09..983d99d94 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "PerlinNoiseJob.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp index fc5322b13..65efc923a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp @@ -2,7 +2,7 @@ #include "PerlinNoise_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include int64_t lfloor(double v) diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp index 63259d33e..b6aa7467a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp index be3ebf149..ff4ec5f5b 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp @@ -1,11 +1,11 @@ include "stdafx.h" #include "CompressedTileStorage_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #else -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\TilePos.h" -#include "..\..\..\..\Minecraft.World\LevelChunk.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/TilePos.h" +#include "../../../../Minecraft.World/LevelChunk.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h index 46876c53d..547504bac 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h @@ -4,8 +4,8 @@ #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" #endif // SN_TARGET_PS3_SPU //#include "xmcore.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp index 10a9b611f..078142243 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "Renderer_TextureUpdate.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp index 1430aa278..24b072542 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "Texture_blit.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/XboxGameMode.cpp b/Minecraft.Client/PS3/XboxGameMode.cpp index 1b55fdd9f..709a6589d 100644 --- a/Minecraft.Client/PS3/XboxGameMode.cpp +++ b/Minecraft.Client/PS3/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XboxGameMode.h" -#include "..\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/PS3/XboxGameMode.h b/Minecraft.Client/PS3/XboxGameMode.h index 347cdf308..a9f0d6cd6 100644 --- a/Minecraft.Client/PS3/XboxGameMode.h +++ b/Minecraft.Client/PS3/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Common\Tutorial\TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/PS3/Xbox_Minecraft.cpp index fa9a33c7a..f4dbd7042 100644 --- a/Minecraft.Client/PS3/Xbox_Minecraft.cpp +++ b/Minecraft.Client/PS3/Xbox_Minecraft.cpp @@ -8,35 +8,35 @@ #include "4J_strings.h" #include "Minecraft_Controller_Actions.h" #include "Xbox_App.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "QNetManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" +#include "../../Minecraft.Client/Tesselator.h" #include "Xbox_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index 981d1f400..e3c3eb4fd 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -4,18 +4,18 @@ #include "base64.h" -#include "..\PSVita_App.h" -#include "..\..\Common\Consoles_App.h" +#include "../PSVita_App.h" +#include "../../Common/Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include #include -#include "PSVita\PSVitaExtras\ShutdownManager.h" +#include "PSVita/PSVitaExtras/ShutdownManager.h" LeaderboardManager *LeaderboardManager::m_instance = new PSVitaLeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h index 9038b277c..200f4c61f 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" #include "Conf.h" class PSVitaLeaderboardManager : public LeaderboardManager diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 2b2ccec87..0a720e847 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -11,9 +11,9 @@ #include #include -#include "PSVita\PSVitaExtras\Conf.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "PSVita/PSVitaExtras/Conf.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" #define MATCHING_PORT (1) diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h index 7d9948c91..4fa17dcec 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h @@ -8,7 +8,7 @@ #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" // class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp index 6a4e2c72b..4fb530b40 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -9,9 +9,9 @@ #include #include -#include "PSVita\PSVitaExtras\Conf.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "PSVita/PSVitaExtras/Conf.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K ) #define SESSION_IMAGE_PATH "app0:PSVita/session_image.png" diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h index 592919d4b..9c7975f96 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h @@ -8,7 +8,7 @@ #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h index ad1147962..de3529b57 100644 --- a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h +++ b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" #include #include #include diff --git a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h index 9c636e41b..e2d9b6a15 100644 --- a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h +++ b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Vita : public SonyRemoteStorage { diff --git a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp index e7eca53f4..ce7365e37 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp +++ b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ShutdownManager.h" -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\MinecraftServer.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp index a21699c01..43cc08e31 100644 --- a/Minecraft.Client/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/PSVita/PSVita_App.cpp @@ -1,24 +1,24 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "PSVita\Network\SonyRemoteStorage_Vita.h" -#include "PSVita\Network\SonyCommerce_Vita.h" -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "PSVita/Network/SonyRemoteStorage_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #include "PSVita/Network/PSVita_NPToolkit.h" #include #include -#include "PSVita\PSVitaExtras\PSVitaStrings.h" +#include "PSVita/PSVitaExtras/PSVitaStrings.h" #define VITA_COMMERCE_ENABLED CConsoleMinecraftApp app; diff --git a/Minecraft.Client/PSVita/PSVita_App.h b/Minecraft.Client/PSVita/PSVita_App.h index 9a01a6107..21b26113b 100644 --- a/Minecraft.Client/PSVita/PSVita_App.h +++ b/Minecraft.Client/PSVita/PSVita_App.h @@ -3,8 +3,8 @@ class C4JStringTable; //#include -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\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/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp index ee13a216b..d3f03190a 100644 --- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp @@ -3,62 +3,62 @@ #include "stdafx.h" -#include "Leaderboards\PSVitaLeaderboardManager.h" -#include "PSVita\PSVitaExtras\ShutdownManager.h" +#include "Leaderboards/PSVitaLeaderboardManager.h" +#include "PSVita/PSVitaExtras/ShutdownManager.h" //#define HEAPINSPECTOR_PS3 1 // when defining HEAPINSPECTOR_PS3, add this line to the linker settings // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign --wrap _malloc_init #if HEAPINSPECTOR_PS3 -#include "HeapInspector\Server\HeapInspectorServer.h" -#include "HeapInspector\Server\PS3\HeapHooks.hpp" +#include "HeapInspector/Server/HeapInspectorServer.h" +#include "HeapInspector/Server/PS3/HeapHooks.hpp" #endif //#define DISABLE_MILES_SOUND #include "PSVita_App.h" -#include "PSVitaExtras\PSVitaStrings.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "PSVitaExtras/PSVitaStrings.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\Common\Console_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../Common/Console_Awards_enum.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" //#include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -//#include "PS3\PS3Extras\EdgeZLib.h" -#include "..\..\Minecraft.World\C4JThread.h" -#include "Common\Network\Sony\SQRNetworkManager.h" -#include "Common\UI\IUIScene_PauseMenu.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +//#include "PS3/PS3Extras/EdgeZLib.h" +#include "../../Minecraft.World/C4JThread.h" +#include "Common/Network/Sony/SQRNetworkManager.h" +#include "Common/UI/IUIScene_PauseMenu.h" #include "Conf.h" #include "PSVita/Network/PSVita_NPToolkit.h" -#include "PSVita\Network\SonyVoiceChat_Vita.h" +#include "PSVita/Network/SonyVoiceChat_Vita.h" #include #include diff --git a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp index a678d0a07..0d7585830 100644 --- a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp +++ b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PSVita_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" // taken from Boost, there is no TR1 equivalent template diff --git a/Minecraft.Client/PSVita/PSVita_UIController.cpp b/Minecraft.Client/PSVita/PSVita_UIController.cpp index c3a03acea..6a42f47ff 100644 --- a/Minecraft.Client/PSVita/PSVita_UIController.cpp +++ b/Minecraft.Client/PSVita/PSVita_UIController.cpp @@ -2,8 +2,8 @@ #include "PSVita_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PSVita/PSVita_UIController.h b/Minecraft.Client/PSVita/PSVita_UIController.h index 0d1e934f6..6ddddb3ce 100644 --- a/Minecraft.Client/PSVita/PSVita_UIController.h +++ b/Minecraft.Client/PSVita/PSVita_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/PSVita/Social/SocialManager.h b/Minecraft.Client/PSVita/Social/SocialManager.h index 0b6f2b2d9..cad278fe3 100644 --- a/Minecraft.Client/PSVita/Social/SocialManager.h +++ b/Minecraft.Client/PSVita/Social/SocialManager.h @@ -7,7 +7,9 @@ #ifndef _SOCIAL_MANAGER_H #define _SOCIAL_MANAGER_H +#ifndef __linux__ #include +#endif // __linux__ #define MAX_SOCIALPOST_CAPTION 60 #define MAX_SOCIALPOST_DESC 100 diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp index 4238f7593..7e6ad1461 100644 --- a/Minecraft.Client/PaintingRenderer.cpp +++ b/Minecraft.Client/PaintingRenderer.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "PaintingRenderer.h" #include "entityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/Mth.h" PaintingRenderer::PaintingRenderer() { diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp index 90ef93bcb..200913a0a 100644 --- a/Minecraft.Client/Particle.cpp +++ b/Minecraft.Client/Particle.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "Particle.h" #include "Tesselator.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.h" /* protected int tex; diff --git a/Minecraft.Client/Particle.h b/Minecraft.Client/Particle.h index d9b0ba3a1..2bfcf2a45 100644 --- a/Minecraft.Client/Particle.h +++ b/Minecraft.Client/Particle.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Minecraft.World\Entity.h" -#include "..\Minecraft.World\ParticleTypes.h" +#include "../Minecraft.World/Entity.h" +#include "../Minecraft.World/ParticleTypes.h" #include "ParticleEngine.h" class Tesselator; class CompoundTag; diff --git a/Minecraft.Client/ParticleEngine.cpp b/Minecraft.Client/ParticleEngine.cpp index 3a34253a7..2e1b88fdc 100644 --- a/Minecraft.Client/ParticleEngine.cpp +++ b/Minecraft.Client/ParticleEngine.cpp @@ -5,11 +5,11 @@ #include "Tesselator.h" #include "TerrainParticle.h" #include "Camera.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" ParticleEngine::ParticleEngine(Level *level, Textures *textures) { diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp index 18d066b5a..e76fe6858 100644 --- a/Minecraft.Client/PauseScreen.cpp +++ b/Minecraft.Client/PauseScreen.cpp @@ -5,10 +5,10 @@ #include "OptionsScreen.h" #include "TitleScreen.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.Client/LocalPlayer.h" PauseScreen::PauseScreen() { diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index 841863b61..add5bf5bd 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -7,15 +7,15 @@ #include "ServerLevel.h" #include "PlayerList.h" #include "MinecraftServer.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\pos.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\SharedConstants.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/pos.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/SharedConstants.h" #include "Settings.h" // #ifdef __PS3__ -// #include "PS3\Network\NetworkPlayerSony.h" +// #include "PS3/Network/NetworkPlayerSony.h" // #endif Random *PendingConnection::random = new Random(); @@ -230,7 +230,7 @@ void PendingConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, void PendingConnection::handleGetInfo(shared_ptr packet) { //try { - //String message = server->motd + "§" + server->players->getPlayerCount() + "§" + server->players->getMaxPlayers(); + //String message = server->motd + "§" + server->players->getPlayerCount() + "§" + server->players->getMaxPlayers(); //connection->send(new DisconnectPacket(message)); connection->send(shared_ptr(new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull) ) ); connection->sendAndQuit(); diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h index 02d706f95..cf23e421a 100644 --- a/Minecraft.Client/PendingConnection.h +++ b/Minecraft.Client/PendingConnection.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\PacketListener.h" +#include "../Minecraft.World/PacketListener.h" class MinecraftServer; class Socket; class LoginPacket; diff --git a/Minecraft.Client/PigRenderer.cpp b/Minecraft.Client/PigRenderer.cpp index eb78cd20a..a4db6165a 100644 --- a/Minecraft.Client/PigRenderer.cpp +++ b/Minecraft.Client/PigRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PigRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" PigRenderer::PigRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model,shadow) { diff --git a/Minecraft.Client/PistonPieceRenderer.cpp b/Minecraft.Client/PistonPieceRenderer.cpp index 1ce084cfc..a7761bc8e 100644 --- a/Minecraft.Client/PistonPieceRenderer.cpp +++ b/Minecraft.Client/PistonPieceRenderer.cpp @@ -3,9 +3,9 @@ #include "Tesselator.h" #include "Lighting.h" #include "TileRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\PistonPieceEntity.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/PistonPieceEntity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" PistonPieceRenderer::PistonPieceRenderer() { diff --git a/Minecraft.Client/PlayerChunkMap.cpp b/Minecraft.Client/PlayerChunkMap.cpp index aedd5a9d7..c0fa317cf 100644 --- a/Minecraft.Client/PlayerChunkMap.cpp +++ b/Minecraft.Client/PlayerChunkMap.cpp @@ -5,11 +5,11 @@ #include "ServerChunkCache.h" #include "ServerPlayer.h" #include "MinecraftServer.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\ArrayWithLength.h" -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/ArrayWithLength.h" +#include "../Minecraft.World/System.h" #include "PlayerList.h" PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap *pcm) : pos(x,z) diff --git a/Minecraft.Client/PlayerChunkMap.h b/Minecraft.Client/PlayerChunkMap.h index 61324272f..7142349d7 100644 --- a/Minecraft.Client/PlayerChunkMap.h +++ b/Minecraft.Client/PlayerChunkMap.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\JavaIntHash.h" -#include "..\Minecraft.World\ChunkPos.h" +#include "../Minecraft.World/JavaIntHash.h" +#include "../Minecraft.World/ChunkPos.h" class ServerPlayer; class ServerLevel; class MinecraftServer; diff --git a/Minecraft.Client/PlayerCloudParticle.cpp b/Minecraft.Client/PlayerCloudParticle.cpp index 6976fbab9..2281cde6b 100644 --- a/Minecraft.Client/PlayerCloudParticle.cpp +++ b/Minecraft.Client/PlayerCloudParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "PlayerCloudParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" PlayerCloudParticle::PlayerCloudParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0) { diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp index f0e538a83..8a6d59bc4 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -5,31 +5,31 @@ #include "ServerPlayerGameMode.h" #include "PlayerList.h" #include "MinecraftServer.h" -#include "..\Minecraft.World\net.minecraft.commands.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\net.minecraft.world.food.h" -#include "..\Minecraft.World\AABB.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\Socket.h" -#include "..\Minecraft.World\Achievements.h" -#include "..\Minecraft.World\net.minecraft.h" +#include "../Minecraft.World/net.minecraft.commands.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/net.minecraft.world.food.h" +#include "../Minecraft.World/AABB.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/Socket.h" +#include "../Minecraft.World/Achievements.h" +#include "../Minecraft.World/net.minecraft.h" #include "EntityTracker.h" #include "ServerConnection.h" #include "..\Minecraft.World\GenericStats.h" #include "..\Minecraft.World\JavaMath.h" // 4J Added -#include "..\Minecraft.World\net.minecraft.world.item.crafting.h" +#include "../Minecraft.World/net.minecraft.world.item.crafting.h" #include "Options.h" Random PlayerConnection::random; @@ -126,7 +126,7 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason) send( shared_ptr( new DisconnectPacket(reason) )); connection->sendAndQuit(); // 4J-PB - removed, since it needs to be localised in the language the client is in - //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + player->name + L" left the game.") ) ); + //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + player->name + L" left the game.") ) ); if(getWasKicked()) { server->getPlayers()->broadcastAll( shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) ); @@ -569,7 +569,7 @@ void PlayerConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, if( done ) return; // logger.info(player.name + " lost connection: " + reason); // 4J-PB - removed, since it needs to be localised in the language the client is in - //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + player->name + L" left the game.") ) ); + //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + player->name + L" left the game.") ) ); if(getWasKicked()) { server->getPlayers()->broadcastAll( shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) ); @@ -740,13 +740,13 @@ int PlayerConnection::countDelayedPackets() void PlayerConnection::info(const wstring& string) { // 4J-PB - removed, since it needs to be localised in the language the client is in - //send( shared_ptr( new ChatPacket(L"§7" + string) ) ); + //send( shared_ptr( new ChatPacket(L"§7" + string) ) ); } void PlayerConnection::warn(const wstring& string) { // 4J-PB - removed, since it needs to be localised in the language the client is in - //send( shared_ptr( new ChatPacket(L"§9" + string) ) ); + //send( shared_ptr( new ChatPacket(L"§9" + string) ) ); } wstring PlayerConnection::getConsoleName() @@ -1714,4 +1714,4 @@ bool PlayerConnection::isGuest() } return isGuest; } -} +} \ No newline at end of file diff --git a/Minecraft.Client/PlayerConnection.h b/Minecraft.Client/PlayerConnection.h index 0d4ce2f68..619d030cc 100644 --- a/Minecraft.Client/PlayerConnection.h +++ b/Minecraft.Client/PlayerConnection.h @@ -1,6 +1,6 @@ #include "ConsoleInputSource.h" -#include "..\Minecraft.World\PacketListener.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/PacketListener.h" +#include "../Minecraft.World/JavaIntHash.h" class MinecraftServer; class Connection; @@ -135,4 +135,4 @@ private: vector m_texturesRequested; bool m_bWasKicked; -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp index 7921cbf89..51c260109 100644 --- a/Minecraft.Client/PlayerList.cpp +++ b/Minecraft.Client/PlayerList.cpp @@ -11,23 +11,23 @@ #include "PendingConnection.h" #include "PlayerConnection.h" #include "EntityTracker.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\ArrayWithLength.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\ProgressListener.h" -#include "..\Minecraft.World\HellRandomLevelSource.h" -#include "..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/ArrayWithLength.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/ProgressListener.h" +#include "../Minecraft.World/HellRandomLevelSource.h" +#include "../Minecraft.World/net.minecraft.world.phys.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../Minecraft.World/JavaMath.h" #ifdef _XBOX -#include "Xbox\Network\NetworkPlayerXbox.h" +#include "Xbox/Network/NetworkPlayerXbox.h" #elif defined(__PS3__) || defined(__ORBIS__) -#include "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. @@ -220,7 +220,7 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr sendLevelInfo(player, level); // 4J-PB - removed, since it needs to be localised in the language the client is in - //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) ); + //server->players->broadcastAll( shared_ptr( new ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) ); broadcastAll( shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame) ) ); MemSect(14); @@ -380,7 +380,7 @@ void PlayerList::add(shared_ptr player) // Some code from here has been moved to the above validatePlayerSpawnPosition function // 4J Stu - Swapped these lines about so that we get the chunk visiblity packet way ahead of all the add tracked entity packets - // Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”. + // Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”. changeDimension(player, NULL); level->addEntity(player); diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index c332b41c7..15af95ab4 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -6,12 +6,12 @@ #include "LocalPlayer.h" #include "MultiPlayerLocalPlayer.h" #include "entityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.h" +#include "../Minecraft.World/StringHelpers.h" const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = { diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h index 105641045..3cd4337aa 100644 --- a/Minecraft.Client/PlayerRenderer.h +++ b/Minecraft.Client/PlayerRenderer.h @@ -1,6 +1,6 @@ #pragma once #include "MobRenderer.h" -#include "..\Minecraft.World\Player.h" +#include "../Minecraft.World/Player.h" class HumanoidModel; using namespace std; diff --git a/Minecraft.Client/Polygon.h b/Minecraft.Client/Polygon.h index 24cb2218e..c07e1f8e8 100644 --- a/Minecraft.Client/Polygon.h +++ b/Minecraft.Client/Polygon.h @@ -1,7 +1,7 @@ #pragma once #include "Vertex.h" #include "Tesselator.h" -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" class _Polygon { diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp index b6c22223c..93c1ee51b 100644 --- a/Minecraft.Client/PreStitchedTextureMap.cpp +++ b/Minecraft.Client/PreStitchedTextureMap.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\ByteBuffer.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/ByteBuffer.h" #include "Minecraft.h" #include "LevelRenderer.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/PreStitchedTextureMap.h b/Minecraft.Client/PreStitchedTextureMap.h index 40a755f8b..6d84263cb 100644 --- a/Minecraft.Client/PreStitchedTextureMap.h +++ b/Minecraft.Client/PreStitchedTextureMap.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Minecraft.World\IconRegister.h" +#include "../Minecraft.World/IconRegister.h" class Icon; class StitchedTexture; diff --git a/Minecraft.Client/ProgressRenderer.cpp b/Minecraft.Client/ProgressRenderer.cpp index a7c3fd301..fa2995094 100644 --- a/Minecraft.Client/ProgressRenderer.cpp +++ b/Minecraft.Client/ProgressRenderer.cpp @@ -2,7 +2,7 @@ #include "Tesselator.h" #include "Textures.h" #include "ProgressRenderer.h" -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/System.h" CRITICAL_SECTION ProgressRenderer::s_progress; diff --git a/Minecraft.Client/ProgressRenderer.h b/Minecraft.Client/ProgressRenderer.h index 29c847d06..056547835 100644 --- a/Minecraft.Client/ProgressRenderer.h +++ b/Minecraft.Client/ProgressRenderer.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\ProgressListener.h" +#include "../Minecraft.World/ProgressListener.h" class ProgressRenderer : public ProgressListener { diff --git a/Minecraft.Client/QuadrupedModel.cpp b/Minecraft.Client/QuadrupedModel.cpp index fa7e3b4b8..8b0ec9852 100644 --- a/Minecraft.Client/QuadrupedModel.cpp +++ b/Minecraft.Client/QuadrupedModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "QuadrupedModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" QuadrupedModel::QuadrupedModel(int legSize, float g) : Model() diff --git a/Minecraft.Client/ReceivingLevelScreen.cpp b/Minecraft.Client/ReceivingLevelScreen.cpp index 0e9fe3ec0..74e9864ea 100644 --- a/Minecraft.Client/ReceivingLevelScreen.cpp +++ b/Minecraft.Client/ReceivingLevelScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ReceivingLevelScreen.h" #include "ClientConnection.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection *connection) { diff --git a/Minecraft.Client/RedDustParticle.cpp b/Minecraft.Client/RedDustParticle.cpp index 6a6ad1e1b..52df921fb 100644 --- a/Minecraft.Client/RedDustParticle.cpp +++ b/Minecraft.Client/RedDustParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "RedDustParticle.h" void RedDustParticle::init(Level *level, double x, double y, double z, float scale, float rCol, float gCol, float bCol) diff --git a/Minecraft.Client/RemotePlayer.cpp b/Minecraft.Client/RemotePlayer.cpp index c1b72864b..005a681d9 100644 --- a/Minecraft.Client/RemotePlayer.cpp +++ b/Minecraft.Client/RemotePlayer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "RemotePlayer.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/Mth.h" RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level) { diff --git a/Minecraft.Client/RemotePlayer.h b/Minecraft.Client/RemotePlayer.h index b55fab16e..42ee3af46 100644 --- a/Minecraft.Client/RemotePlayer.h +++ b/Minecraft.Client/RemotePlayer.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\SmoothFloat.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../Minecraft.World/SmoothFloat.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" class Input; diff --git a/Minecraft.Client/RenameWorldScreen.cpp b/Minecraft.Client/RenameWorldScreen.cpp index ea05039af..c0d3c47ba 100644 --- a/Minecraft.Client/RenameWorldScreen.cpp +++ b/Minecraft.Client/RenameWorldScreen.cpp @@ -2,9 +2,9 @@ #include "RenameWorldScreen.h" #include "EditBox.h" #include "Button.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" RenameWorldScreen::RenameWorldScreen(Screen *lastScreen, const wstring& levelId) { diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp index 0019b54d4..a84a3abe3 100644 --- a/Minecraft.Client/Screen.cpp +++ b/Minecraft.Client/Screen.cpp @@ -4,7 +4,7 @@ #include "GuiParticles.h" #include "Tesselator.h" #include "Textures.h" -#include "..\Minecraft.World\SoundTypes.h" +#include "../Minecraft.World/SoundTypes.h" diff --git a/Minecraft.Client/ScrolledSelectionList.cpp b/Minecraft.Client/ScrolledSelectionList.cpp index 9b7367ce0..246bc8f0b 100644 --- a/Minecraft.Client/ScrolledSelectionList.cpp +++ b/Minecraft.Client/ScrolledSelectionList.cpp @@ -3,7 +3,7 @@ #include "Button.h" #include "Tesselator.h" #include "Textures.h" -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/System.h" ScrolledSelectionList::ScrolledSelectionList(Minecraft *minecraft, int width, int height, int y0, int y1, int itemHeight) { diff --git a/Minecraft.Client/SelectWorldScreen.cpp b/Minecraft.Client/SelectWorldScreen.cpp index a07eb7b22..1655eee8c 100644 --- a/Minecraft.Client/SelectWorldScreen.cpp +++ b/Minecraft.Client/SelectWorldScreen.cpp @@ -5,9 +5,9 @@ #include "CreateWorldScreen.h" #include "RenameWorldScreen.h" #include "DemoMode.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" SelectWorldScreen::SelectWorldScreen(Screen *lastScreen) diff --git a/Minecraft.Client/ServerChunkCache.cpp b/Minecraft.Client/ServerChunkCache.cpp index 1fe1a86f7..f4362856c 100644 --- a/Minecraft.Client/ServerChunkCache.cpp +++ b/Minecraft.Client/ServerChunkCache.cpp @@ -2,15 +2,15 @@ #include "ServerChunkCache.h" #include "ServerLevel.h" #include "MinecraftServer.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\ProgressListener.h" -#include "..\Minecraft.World\ThreadName.h" -#include "..\Minecraft.World\compression.h" -#include "..\Minecraft.World\OldChunkStorage.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/ProgressListener.h" +#include "../Minecraft.World/ThreadName.h" +#include "../Minecraft.World/compression.h" +#include "../Minecraft.World/OldChunkStorage.h" ServerChunkCache::ServerChunkCache(ServerLevel *level, ChunkStorage *storage, ChunkSource *source) { diff --git a/Minecraft.Client/ServerChunkCache.h b/Minecraft.Client/ServerChunkCache.h index 058cecc42..f06947486 100644 --- a/Minecraft.Client/ServerChunkCache.h +++ b/Minecraft.Client/ServerChunkCache.h @@ -1,10 +1,10 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\JavaIntHash.h" -#include "..\Minecraft.World\RandomLevelSource.h" -#include "..\Minecraft.World\C4JThread.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/JavaIntHash.h" +#include "../Minecraft.World/RandomLevelSource.h" +#include "../Minecraft.World/C4JThread.h" using namespace std; class ServerLevel; diff --git a/Minecraft.Client/ServerCommandDispatcher.cpp b/Minecraft.Client/ServerCommandDispatcher.cpp index 51dd42fe9..a254ea630 100644 --- a/Minecraft.Client/ServerCommandDispatcher.cpp +++ b/Minecraft.Client/ServerCommandDispatcher.cpp @@ -2,8 +2,8 @@ #include "MinecraftServer.h" #include "PlayerList.h" #include "ServerPlayer.h" -#include "..\Minecraft.World\net.minecraft.commands.h" -#include "..\Minecraft.World\net.minecraft.commands.common.h" +#include "../Minecraft.World/net.minecraft.commands.h" +#include "../Minecraft.World/net.minecraft.commands.common.h" #include "TeleportCommand.h" #include "ServerCommandDispatcher.h" diff --git a/Minecraft.Client/ServerCommandDispatcher.h b/Minecraft.Client/ServerCommandDispatcher.h index 306d43842..d0e51ac62 100644 --- a/Minecraft.Client/ServerCommandDispatcher.h +++ b/Minecraft.Client/ServerCommandDispatcher.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.World\CommandDispatcher.h" -#include "..\Minecraft.World\AdminLogCommand.h" +#include "../Minecraft.World/CommandDispatcher.h" +#include "../Minecraft.World/AdminLogCommand.h" class ServerCommandDispatcher : public CommandDispatcher, public AdminLogCommand { diff --git a/Minecraft.Client/ServerConnection.cpp b/Minecraft.Client/ServerConnection.cpp index 9880a8c6b..2b93e4581 100644 --- a/Minecraft.Client/ServerConnection.cpp +++ b/Minecraft.Client/ServerConnection.cpp @@ -4,9 +4,9 @@ #include "PendingConnection.h" #include "PlayerConnection.h" #include "ServerPlayer.h" -#include "..\Minecraft.World\net.minecraft.network.h" -#include "..\Minecraft.World\Socket.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.network.h" +#include "../Minecraft.World/Socket.h" +#include "../Minecraft.World/net.minecraft.world.level.h" #include "MultiPlayerLevel.h" ServerConnection::ServerConnection(MinecraftServer *server) diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp index de8c66cdc..f27e19c0f 100644 --- a/Minecraft.Client/ServerLevel.cpp +++ b/Minecraft.Client/ServerLevel.cpp @@ -6,33 +6,33 @@ #include "ServerPlayer.h" #include "PlayerConnection.h" #include "EntityTracker.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.biome.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.ai.village.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" -#include "..\Minecraft.World\ItemEntity.h" -#include "..\Minecraft.World\Arrow.h" -#include "..\Minecraft.World\PrimedTnt.h" -#include "..\Minecraft.World\FallingTile.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.level.levelgen.feature.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\StructurePiece.h" -#include "..\Minecraft.Client\ServerLevelListener.h" -#include "..\Minecraft.World\WeighedTreasure.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.biome.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.ai.village.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.npc.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" +#include "../Minecraft.World/ItemEntity.h" +#include "../Minecraft.World/Arrow.h" +#include "../Minecraft.World/PrimedTnt.h" +#include "../Minecraft.World/FallingTile.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.level.levelgen.feature.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/StructurePiece.h" +#include "../Minecraft.Client/ServerLevelListener.h" +#include "../Minecraft.World/WeighedTreasure.h" #include "TexturePackRepository.h" #include "DLCTexturePack.h" -#include "..\Minecraft.World\ProgressListener.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "../Minecraft.World/ProgressListener.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include "PlayerChunkMap.h" WeighedTreasureArray ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/Minecraft.Client/ServerLevelListener.cpp b/Minecraft.Client/ServerLevelListener.cpp index 3b12630f4..336162446 100644 --- a/Minecraft.Client/ServerLevelListener.cpp +++ b/Minecraft.Client/ServerLevelListener.cpp @@ -7,9 +7,9 @@ #include "PlayerList.h" #include "PlayerChunkMap.h" #include "PlayerConnection.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\LevelData.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/LevelData.h" ServerLevelListener::ServerLevelListener(MinecraftServer *server, ServerLevel *level) diff --git a/Minecraft.Client/ServerLevelListener.h b/Minecraft.Client/ServerLevelListener.h index 1886a89d3..49e086017 100644 --- a/Minecraft.Client/ServerLevelListener.h +++ b/Minecraft.Client/ServerLevelListener.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\LevelListener.h" +#include "../Minecraft.World/LevelListener.h" class Player; class TileEntity; class Entity; diff --git a/Minecraft.Client/ServerPlayer.cpp b/Minecraft.Client/ServerPlayer.cpp index 489e6f342..d898abbd6 100644 --- a/Minecraft.Client/ServerPlayer.cpp +++ b/Minecraft.Client/ServerPlayer.cpp @@ -8,23 +8,23 @@ #include "Settings.h" #include "PlayerList.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.damagesource.h" -#include "..\Minecraft.World\LevelChunk.h" +#include "../Minecraft.World/Pos.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.damagesource.h" +#include "../Minecraft.World/LevelChunk.h" #include "LevelRenderer.h" ServerPlayer::ServerPlayer(MinecraftServer *server, Level *level, const wstring& name, ServerPlayerGameMode *gameMode) : Player(level) @@ -445,7 +445,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) for (unsigned int i = 0; i < tes->size(); i++) { // 4J Stu - Added delay param to ensure that these arrive after the BRUPs from above - // Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”. + // Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”. broadcast(tes->at(i), !connection->isLocal() && !dontDelayChunks); } delete tes; diff --git a/Minecraft.Client/ServerPlayerGameMode.cpp b/Minecraft.Client/ServerPlayerGameMode.cpp index 9b31df0d2..6552dcf52 100644 --- a/Minecraft.Client/ServerPlayerGameMode.cpp +++ b/Minecraft.Client/ServerPlayerGameMode.cpp @@ -3,13 +3,13 @@ #include "ServerLevel.h" #include "ServerPlayer.h" #include "PlayerConnection.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "MultiPlayerLevel.h" #include "LevelRenderer.h" diff --git a/Minecraft.Client/Settings.cpp b/Minecraft.Client/Settings.cpp index 89946773b..315f80794 100644 --- a/Minecraft.Client/Settings.cpp +++ b/Minecraft.Client/Settings.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "Settings.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" // 4J - TODO - serialise/deserialise from file Settings::Settings(File *file) diff --git a/Minecraft.Client/SheepFurModel.cpp b/Minecraft.Client/SheepFurModel.cpp index bb84e80dc..476496ce0 100644 --- a/Minecraft.Client/SheepFurModel.cpp +++ b/Minecraft.Client/SheepFurModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "SheepFurModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/SheepModel.cpp b/Minecraft.Client/SheepModel.cpp index 7d0933538..549267b9c 100644 --- a/Minecraft.Client/SheepModel.cpp +++ b/Minecraft.Client/SheepModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "SheepModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/SheepRenderer.cpp b/Minecraft.Client/SheepRenderer.cpp index 4af155d3d..fc9118d2f 100644 --- a/Minecraft.Client/SheepRenderer.cpp +++ b/Minecraft.Client/SheepRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SheepRenderer.h" #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" SheepRenderer::SheepRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow) { diff --git a/Minecraft.Client/SignRenderer.cpp b/Minecraft.Client/SignRenderer.cpp index 97eff4bd0..caa4c8e94 100644 --- a/Minecraft.Client/SignRenderer.cpp +++ b/Minecraft.Client/SignRenderer.cpp @@ -2,10 +2,10 @@ #include "SignRenderer.h" #include "SignModel.h" #include "ModelPart.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\Entity.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/Entity.h" +#include "../Minecraft.World/Level.h" SignRenderer::SignRenderer() diff --git a/Minecraft.Client/SilverfishModel.cpp b/Minecraft.Client/SilverfishModel.cpp index 128a7e795..dc7689217 100644 --- a/Minecraft.Client/SilverfishModel.cpp +++ b/Minecraft.Client/SilverfishModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SilverfishModel.h" #include "Cube.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = { diff --git a/Minecraft.Client/SilverfishRenderer.cpp b/Minecraft.Client/SilverfishRenderer.cpp index 9ed194caa..da522814d 100644 --- a/Minecraft.Client/SilverfishRenderer.cpp +++ b/Minecraft.Client/SilverfishRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SilverfishRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" #include "SilverfishModel.h" SilverfishRenderer::SilverfishRenderer() : MobRenderer(new SilverfishModel(), 0.3f) diff --git a/Minecraft.Client/SkeletonModel.cpp b/Minecraft.Client/SkeletonModel.cpp index ab4778ee1..4a9caf85b 100644 --- a/Minecraft.Client/SkeletonModel.cpp +++ b/Minecraft.Client/SkeletonModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SkeletonModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" void SkeletonModel::_init(float g) diff --git a/Minecraft.Client/SkullTileRenderer.cpp b/Minecraft.Client/SkullTileRenderer.cpp index 641a7a02c..6b5770ff2 100644 --- a/Minecraft.Client/SkullTileRenderer.cpp +++ b/Minecraft.Client/SkullTileRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\SkullTileEntity.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.h" +#include "../Minecraft.World/SkullTileEntity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.h" #include "SkeletonHeadModel.h" #include "SkullTileRenderer.h" diff --git a/Minecraft.Client/SlimeRenderer.cpp b/Minecraft.Client/SlimeRenderer.cpp index 23c9c16ec..e1469f822 100644 --- a/Minecraft.Client/SlimeRenderer.cpp +++ b/Minecraft.Client/SlimeRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SlimeRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" SlimeRenderer::SlimeRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow) { diff --git a/Minecraft.Client/SmokeParticle.cpp b/Minecraft.Client/SmokeParticle.cpp index a88558851..34fb96cda 100644 --- a/Minecraft.Client/SmokeParticle.cpp +++ b/Minecraft.Client/SmokeParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "SmokeParticle.h" void SmokeParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale) diff --git a/Minecraft.Client/SnowManModel.cpp b/Minecraft.Client/SnowManModel.cpp index 4344a17ac..3888db858 100644 --- a/Minecraft.Client/SnowManModel.cpp +++ b/Minecraft.Client/SnowManModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SnowmanModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" SnowManModel::SnowManModel() : Model() diff --git a/Minecraft.Client/SnowManRenderer.cpp b/Minecraft.Client/SnowManRenderer.cpp index 83edb3f5a..e3945e9e5 100644 --- a/Minecraft.Client/SnowManRenderer.cpp +++ b/Minecraft.Client/SnowManRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "SnowManModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" #include "ModelPart.h" #include "EntityRenderDispatcher.h" #include "SnowManRenderer.h" diff --git a/Minecraft.Client/SnowShovelParticle.cpp b/Minecraft.Client/SnowShovelParticle.cpp index 4417cb5d8..6473f6d52 100644 --- a/Minecraft.Client/SnowShovelParticle.cpp +++ b/Minecraft.Client/SnowShovelParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "SnowShovelParticle.h" void SnowShovelParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale) diff --git a/Minecraft.Client/SpellParticle.cpp b/Minecraft.Client/SpellParticle.cpp index ce8b975f1..7a81419b4 100644 --- a/Minecraft.Client/SpellParticle.cpp +++ b/Minecraft.Client/SpellParticle.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/JavaMath.h" #include "SpellParticle.h" SpellParticle::SpellParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) diff --git a/Minecraft.Client/SpiderModel.cpp b/Minecraft.Client/SpiderModel.cpp index 35c51d3e6..e9de7c843 100644 --- a/Minecraft.Client/SpiderModel.cpp +++ b/Minecraft.Client/SpiderModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SpiderModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" SpiderModel::SpiderModel() : Model() diff --git a/Minecraft.Client/SpiderRenderer.cpp b/Minecraft.Client/SpiderRenderer.cpp index 9c31eb9ef..3b325838f 100644 --- a/Minecraft.Client/SpiderRenderer.cpp +++ b/Minecraft.Client/SpiderRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SpiderRenderer.h" #include "SpiderModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" SpiderRenderer::SpiderRenderer() : MobRenderer(new SpiderModel(), 1.0f) { diff --git a/Minecraft.Client/SquidModel.cpp b/Minecraft.Client/SquidModel.cpp index 8ad20f8e2..e1b57c59a 100644 --- a/Minecraft.Client/SquidModel.cpp +++ b/Minecraft.Client/SquidModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SquidModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" SquidModel::SquidModel() : Model() diff --git a/Minecraft.Client/SquidRenderer.cpp b/Minecraft.Client/SquidRenderer.cpp index 135f6d9bd..c721ade2d 100644 --- a/Minecraft.Client/SquidRenderer.cpp +++ b/Minecraft.Client/SquidRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SquidRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" SquidRenderer::SquidRenderer(Model *model, float shadow) : MobRenderer(model, shadow) { diff --git a/Minecraft.Client/StatsCounter.cpp b/Minecraft.Client/StatsCounter.cpp index 4568c7db1..a4970b6f8 100644 --- a/Minecraft.Client/StatsCounter.cpp +++ b/Minecraft.Client/StatsCounter.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "StatsCounter.h" -#include "..\Minecraft.World\Stat.h" -#include "..\Minecraft.World\Stats.h" -#include "..\Minecraft.World\Achievement.h" -#include "..\Minecraft.World\Achievements.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.World/Stat.h" +#include "../Minecraft.World/Stats.h" +#include "../Minecraft.World/Achievement.h" +#include "../Minecraft.World/Achievements.h" +#include "../Minecraft.Client/LocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" -#include "..\Minecraft.Client\Common\Leaderboards\LeaderboardManager.h" +#include "../Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" Stat** StatsCounter::LARGE_STATS[] = { &Stats::walkOneM, diff --git a/Minecraft.Client/StatsScreen.cpp b/Minecraft.Client/StatsScreen.cpp index 01d041f0e..121fb25f5 100644 --- a/Minecraft.Client/StatsScreen.cpp +++ b/Minecraft.Client/StatsScreen.cpp @@ -5,9 +5,9 @@ #include "Button.h" #include "Font.h" #include "Lighting.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.World/net.minecraft.world.item.h" const float StatsScreen::SLOT_TEX_SIZE = 128.0f; ItemRenderer *StatsScreen::itemRenderer = NULL; diff --git a/Minecraft.Client/StitchSlot.cpp b/Minecraft.Client/StitchSlot.cpp index 5e9700b08..2ec1fe6bd 100644 --- a/Minecraft.Client/StitchSlot.cpp +++ b/Minecraft.Client/StitchSlot.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "TextureHolder.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "StitchSlot.h" StitchSlot::StitchSlot(int originX, int originY, int width, int height) : originX(originX), originY(originY), width(width), height(height) diff --git a/Minecraft.Client/StitchedTexture.cpp b/Minecraft.Client/StitchedTexture.cpp index d7e47b425..e9221ecd6 100644 --- a/Minecraft.Client/StitchedTexture.cpp +++ b/Minecraft.Client/StitchedTexture.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "Texture.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "ClockTexture.h" #include "CompassTexture.h" #include "StitchedTexture.h" diff --git a/Minecraft.Client/StitchedTexture.h b/Minecraft.Client/StitchedTexture.h index 99b1d4479..656351c1c 100644 --- a/Minecraft.Client/StitchedTexture.h +++ b/Minecraft.Client/StitchedTexture.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Minecraft.World\Icon.h" +#include "../Minecraft.World/Icon.h" class Texture; class StitchedTexture : public Icon diff --git a/Minecraft.Client/SurvivalMode.cpp b/Minecraft.Client/SurvivalMode.cpp index 27a992df0..317af52db 100644 --- a/Minecraft.Client/SurvivalMode.cpp +++ b/Minecraft.Client/SurvivalMode.cpp @@ -3,10 +3,10 @@ #include "DemoMode.h" #include "LevelRenderer.h" #include "LocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.item.h" #include "ClientConstants.h" SurvivalMode::SurvivalMode(Minecraft *minecraft) : GameMode(minecraft) diff --git a/Minecraft.Client/SuspendedParticle.cpp b/Minecraft.Client/SuspendedParticle.cpp index 70702de0f..2b46456a5 100644 --- a/Minecraft.Client/SuspendedParticle.cpp +++ b/Minecraft.Client/SuspendedParticle.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "SuspendedParticle.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" SuspendedParticle::SuspendedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x, y - 2 / 16.0f, z, xa, ya, za) { diff --git a/Minecraft.Client/SuspendedTownParticle.cpp b/Minecraft.Client/SuspendedTownParticle.cpp index a24bbc42a..4be1d0874 100644 --- a/Minecraft.Client/SuspendedTownParticle.cpp +++ b/Minecraft.Client/SuspendedTownParticle.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SuspendedTownParticle.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/JavaMath.h" SuspendedTownParticle::SuspendedTownParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) { diff --git a/Minecraft.Client/TakeAnimationParticle.cpp b/Minecraft.Client/TakeAnimationParticle.cpp index c9530b0a0..a95e415f1 100644 --- a/Minecraft.Client/TakeAnimationParticle.cpp +++ b/Minecraft.Client/TakeAnimationParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "TakeAnimationParticle.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/Mth.h" TakeAnimationParticle::TakeAnimationParticle(Level *level, shared_ptr item, shared_ptr target, float yOffs) : Particle(level, item->x, item->y, item->z, item->xd, item->yd, item->zd) { diff --git a/Minecraft.Client/TeleportCommand.cpp b/Minecraft.Client/TeleportCommand.cpp index 2132cfd4b..e746dd7d2 100644 --- a/Minecraft.Client/TeleportCommand.cpp +++ b/Minecraft.Client/TeleportCommand.cpp @@ -3,10 +3,10 @@ #include "PlayerList.h" #include "ServerPlayer.h" #include "PlayerConnection.h" -#include "..\Minecraft.World\net.minecraft.commands.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "../Minecraft.World/net.minecraft.commands.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "TeleportCommand.h" EGameCommand TeleportCommand::getId() diff --git a/Minecraft.Client/TeleportCommand.h b/Minecraft.Client/TeleportCommand.h index 9015a52db..0b37e6d15 100644 --- a/Minecraft.Client/TeleportCommand.h +++ b/Minecraft.Client/TeleportCommand.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\Command.h" +#include "../Minecraft.World/Command.h" class TeleportCommand : public Command { diff --git a/Minecraft.Client/TerrainParticle.cpp b/Minecraft.Client/TerrainParticle.cpp index 811ba840b..59ce920e3 100644 --- a/Minecraft.Client/TerrainParticle.cpp +++ b/Minecraft.Client/TerrainParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "TerrainParticle.h" #include "Tesselator.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.h" TerrainParticle::TerrainParticle(Level *level, double x, double y, double z, double xa, double ya, double za, Tile *tile, int face, int data, Textures *textures) : Particle(level, x, y, z, xa, ya, za) { diff --git a/Minecraft.Client/Tesselator.cpp b/Minecraft.Client/Tesselator.cpp index 366b09e39..cecdcad22 100644 --- a/Minecraft.Client/Tesselator.cpp +++ b/Minecraft.Client/Tesselator.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "Tesselator.h" -#include "..\Minecraft.World\BasicTypeContainers.h" -#include "..\Minecraft.World\FloatBuffer.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\ByteBuffer.h" +#include "../Minecraft.World/BasicTypeContainers.h" +#include "../Minecraft.World/FloatBuffer.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/ByteBuffer.h" bool Tesselator::TRIANGLE_MODE = false; bool Tesselator::USE_VBO = false; diff --git a/Minecraft.Client/TextEditScreen.cpp b/Minecraft.Client/TextEditScreen.cpp index 9537b969c..bae3cc214 100644 --- a/Minecraft.Client/TextEditScreen.cpp +++ b/Minecraft.Client/TextEditScreen.cpp @@ -4,11 +4,11 @@ #include "TileEntityRenderDispatcher.h" #include "ClientConnection.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\SignTileEntity.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/SignTileEntity.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" const wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters;; diff --git a/Minecraft.Client/Texture.cpp b/Minecraft.Client/Texture.cpp index e287c177d..540c23f2f 100644 --- a/Minecraft.Client/Texture.cpp +++ b/Minecraft.Client/Texture.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\Minecraft.World\ByteBuffer.h" +#include "../Minecraft.World/ByteBuffer.h" #include "Rect2i.h" #include "TextureManager.h" #include "Texture.h" #ifdef __PS3__ -#include "PS3\SPU_Tasks\Texture_blit\Texture_blit.h" +#include "PS3/SPU_Tasks/Texture_blit/Texture_blit.h" #include "C4JSpursJob.h" static const int sc_maxTextureBlits = 256; static Texture_blit_DataIn g_textureBlitDataIn[sc_maxTextureBlits] __attribute__((__aligned__(16))); diff --git a/Minecraft.Client/TextureHolder.cpp b/Minecraft.Client/TextureHolder.cpp index 9cbf5c46c..f1e596894 100644 --- a/Minecraft.Client/TextureHolder.cpp +++ b/Minecraft.Client/TextureHolder.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Stitcher.h" #include "Texture.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "TextureHolder.h" TextureHolder::TextureHolder(Texture *texture) diff --git a/Minecraft.Client/TextureManager.cpp b/Minecraft.Client/TextureManager.cpp index 84b164b4c..f05e86ee8 100644 --- a/Minecraft.Client/TextureManager.cpp +++ b/Minecraft.Client/TextureManager.cpp @@ -5,7 +5,7 @@ #include "TexturePackRepository.h" #include "Minecraft.h" #include "TextureManager.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" TextureManager *TextureManager::instance = NULL; diff --git a/Minecraft.Client/TextureMap.cpp b/Minecraft.Client/TextureMap.cpp index 836a853e5..4830c3ca1 100644 --- a/Minecraft.Client/TextureMap.cpp +++ b/Minecraft.Client/TextureMap.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" #include "Minecraft.h" #include "LevelRenderer.h" #include "EntityRenderDispatcher.h" diff --git a/Minecraft.Client/TextureMap.h b/Minecraft.Client/TextureMap.h index 2984e5321..13827ff54 100644 --- a/Minecraft.Client/TextureMap.h +++ b/Minecraft.Client/TextureMap.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Minecraft.World\IconRegister.h" +#include "../Minecraft.World/IconRegister.h" class StitchedTexture; class Texture; diff --git a/Minecraft.Client/TexturePack.h b/Minecraft.Client/TexturePack.h index 4763b8ab9..c83be2852 100644 --- a/Minecraft.Client/TexturePack.h +++ b/Minecraft.Client/TexturePack.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "Common\App_enums.h" +#include "Common/App_enums.h" class InputStream; class Minecraft; diff --git a/Minecraft.Client/TexturePackRepository.cpp b/Minecraft.Client/TexturePackRepository.cpp index 163ec7ba2..bc93735d5 100644 --- a/Minecraft.Client/TexturePackRepository.cpp +++ b/Minecraft.Client/TexturePackRepository.cpp @@ -5,8 +5,8 @@ #include "FolderTexturePack.h" #include "DLCTexturePack.h" #include "Options.h" -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/StringHelpers.h" #include "Minimap.h" TexturePack *TexturePackRepository::DEFAULT_TEXTURE_PACK = NULL; diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp index ce7a9bfc1..e0b05bfb5 100644 --- a/Minecraft.Client/Textures.cpp +++ b/Minecraft.Client/Textures.cpp @@ -3,19 +3,19 @@ #include "TexturePackRepository.h" #include "HttpTexture.h" #include "MemTexture.h" -#include "..\Minecraft.World\InputStream.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\ByteBuffer.h" +#include "../Minecraft.World/InputStream.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/ByteBuffer.h" #include "TexturePack.h" #include "Options.h" -#include "..\Minecraft.Client\MemTextureProcessor.h" +#include "../Minecraft.Client/MemTextureProcessor.h" #include "MobSkinMemTextureProcessor.h" #include "PreStitchedTextureMap.h" #include "StitchedTexture.h" #include "Texture.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/StringHelpers.h" bool Textures::MIPMAP = true; C4JRender::eTextureFormat Textures::TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw; diff --git a/Minecraft.Client/Textures.h b/Minecraft.Client/Textures.h index eb0799e2c..730b09f01 100644 --- a/Minecraft.Client/Textures.h +++ b/Minecraft.Client/Textures.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" class DynamicTexture; class BufferedImage; diff --git a/Minecraft.Client/TheEndPortalRenderer.cpp b/Minecraft.Client/TheEndPortalRenderer.cpp index 525815791..5c6922757 100644 --- a/Minecraft.Client/TheEndPortalRenderer.cpp +++ b/Minecraft.Client/TheEndPortalRenderer.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "Tesselator.h" #include "TileEntityRenderDispatcher.h" #include "Camera.h" -#include "..\Minecraft.World\FloatBuffer.h" +#include "../Minecraft.World/FloatBuffer.h" #include "TheEndPortalRenderer.h" void TheEndPortalRenderer::render(shared_ptr _table, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled) diff --git a/Minecraft.Client/TileEntityRenderDispatcher.cpp b/Minecraft.Client/TileEntityRenderDispatcher.cpp index 1708d215f..e687c4590 100644 --- a/Minecraft.Client/TileEntityRenderDispatcher.cpp +++ b/Minecraft.Client/TileEntityRenderDispatcher.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "TileEntityRenderDispatcher.h" #include "TileEntityRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\PistonPieceEntity.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/PistonPieceEntity.h" #include "SignRenderer.h" #include "MobSpawnerRenderer.h" #include "PistonPieceRenderer.h" diff --git a/Minecraft.Client/TileEntityRenderDispatcher.h b/Minecraft.Client/TileEntityRenderDispatcher.h index d86ddb01f..64790a1be 100644 --- a/Minecraft.Client/TileEntityRenderDispatcher.h +++ b/Minecraft.Client/TileEntityRenderDispatcher.h @@ -1,6 +1,6 @@ #pragma once #include "Textures.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/JavaIntHash.h" class Mob; class Level; class TileEntityRenderer; diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp index 3b8d4c4ea..d962ac789 100644 --- a/Minecraft.Client/TileRenderer.cpp +++ b/Minecraft.Client/TileRenderer.cpp @@ -4,11 +4,11 @@ #include "GameRenderer.h" #include "Minecraft.h" #include "Textures.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.h" +#include "../Minecraft.World/net.minecraft.world.h" #include "Tesselator.h" #include "EntityTileRenderer.h" #include "Options.h" diff --git a/Minecraft.Client/Timer.cpp b/Minecraft.Client/Timer.cpp index b451c0348..861940dbe 100644 --- a/Minecraft.Client/Timer.cpp +++ b/Minecraft.Client/Timer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "Timer.h" -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/System.h" Timer::Timer(float ticksPerSecond) { diff --git a/Minecraft.Client/TitleScreen.cpp b/Minecraft.Client/TitleScreen.cpp index 7d4260954..8bfd5d10b 100644 --- a/Minecraft.Client/TitleScreen.cpp +++ b/Minecraft.Client/TitleScreen.cpp @@ -5,11 +5,11 @@ #include "JoinMultiplayerScreen.h" #include "Tesselator.h" #include "Textures.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\InputOutputStream.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\System.h" -#include "..\Minecraft.World\Random.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/InputOutputStream.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/System.h" +#include "../Minecraft.World/Random.h" #include "TitleScreen.h" Random *TitleScreen::random = new Random(); diff --git a/Minecraft.Client/TntRenderer.cpp b/Minecraft.Client/TntRenderer.cpp index 3bb7484fc..1fc44c4ea 100644 --- a/Minecraft.Client/TntRenderer.cpp +++ b/Minecraft.Client/TntRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "TntRenderer.h" #include "TileRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" TntRenderer::TntRenderer() { diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp index 70f25c93e..49a0d49d4 100644 --- a/Minecraft.Client/TrackedEntity.cpp +++ b/Minecraft.Client/TrackedEntity.cpp @@ -2,17 +2,17 @@ #include "TrackedEntity.h" #include "ServerPlayer.h" #include "PlayerConnection.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.item.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.entity.global.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" -#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" +#include "../Minecraft.World/Mth.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" +#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.global.h" +#include "../Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "../Minecraft.World/net.minecraft.network.packet.h" +#include "../Minecraft.World/net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.saveddata.h" #include "MinecraftServer.h" #include "ServerLevel.h" #include "PlayerList.h" diff --git a/Minecraft.Client/TrapScreen.cpp b/Minecraft.Client/TrapScreen.cpp index c7eb1472c..f8fa084ce 100644 --- a/Minecraft.Client/TrapScreen.cpp +++ b/Minecraft.Client/TrapScreen.cpp @@ -2,9 +2,9 @@ #include "TrapScreen.h" #include "LocalPlayer.h" #include "Textures.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\Minecraft.World\DispenserTileEntity.h" -#include "..\Minecraft.World\net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.inventory.h" +#include "../Minecraft.World/DispenserTileEntity.h" +#include "../Minecraft.World/net.minecraft.world.h" TrapScreen::TrapScreen(shared_ptr inventory, shared_ptr trap) : AbstractContainerScreen(new TrapMenu(inventory, trap)) { diff --git a/Minecraft.Client/User.cpp b/Minecraft.Client/User.cpp index a359bfd33..98ea3a810 100644 --- a/Minecraft.Client/User.cpp +++ b/Minecraft.Client/User.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "User.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" vector User::allowedTiles; diff --git a/Minecraft.Client/Vertex.h b/Minecraft.Client/Vertex.h index c52f499f1..453f1c4e8 100644 --- a/Minecraft.Client/Vertex.h +++ b/Minecraft.Client/Vertex.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\Vec3.h" +#include "../Minecraft.World/Vec3.h" class Vertex { diff --git a/Minecraft.Client/VideoSettingsScreen.cpp b/Minecraft.Client/VideoSettingsScreen.cpp index 5c948cdd1..bde3518d0 100644 --- a/Minecraft.Client/VideoSettingsScreen.cpp +++ b/Minecraft.Client/VideoSettingsScreen.cpp @@ -4,7 +4,7 @@ #include "SlideButton.h" #include "Options.h" #include "ControlsScreen.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" VideoSettingsScreen::VideoSettingsScreen(Screen *lastScreen, Options *options) { diff --git a/Minecraft.Client/ViewportCuller.cpp b/Minecraft.Client/ViewportCuller.cpp index bc22faa67..ed0193451 100644 --- a/Minecraft.Client/ViewportCuller.cpp +++ b/Minecraft.Client/ViewportCuller.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ViewportCuller.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" ViewportCuller::Face::Face(double x, double y, double z, float yRot, float xRot) { diff --git a/Minecraft.Client/ViewportCuller.h b/Minecraft.Client/ViewportCuller.h index 2a975de9b..86498af07 100644 --- a/Minecraft.Client/ViewportCuller.h +++ b/Minecraft.Client/ViewportCuller.h @@ -1,6 +1,6 @@ #pragma once #include "Culler.h" -#include "..\Minecraft.World\mob.h" +#include "../Minecraft.World/mob.h" class Mob; class ViewportCuller : public Culler diff --git a/Minecraft.Client/VillagerGolemModel.cpp b/Minecraft.Client/VillagerGolemModel.cpp index aaeabd53a..bd1ad785b 100644 --- a/Minecraft.Client/VillagerGolemModel.cpp +++ b/Minecraft.Client/VillagerGolemModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "ModelPart.h" #include "VillagerGolemModel.h" diff --git a/Minecraft.Client/VillagerGolemRenderer.cpp b/Minecraft.Client/VillagerGolemRenderer.cpp index f03cea4c9..760ae2eae 100644 --- a/Minecraft.Client/VillagerGolemRenderer.cpp +++ b/Minecraft.Client/VillagerGolemRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" #include "VillagerGolemModel.h" #include "ModelPart.h" #include "VillagerGolemRenderer.h" diff --git a/Minecraft.Client/VillagerModel.cpp b/Minecraft.Client/VillagerModel.cpp index 8885484dc..d3da30f89 100644 --- a/Minecraft.Client/VillagerModel.cpp +++ b/Minecraft.Client/VillagerModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "VillagerModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" diff --git a/Minecraft.Client/VillagerRenderer.cpp b/Minecraft.Client/VillagerRenderer.cpp index b4c88173f..355ebc69e 100644 --- a/Minecraft.Client/VillagerRenderer.cpp +++ b/Minecraft.Client/VillagerRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" +#include "../Minecraft.World/net.minecraft.world.entity.npc.h" #include "VillagerModel.h" #include "VillagerRenderer.h" diff --git a/Minecraft.Client/VillagerZombieModel.cpp b/Minecraft.Client/VillagerZombieModel.cpp index d8338c891..7a06d94a2 100644 --- a/Minecraft.Client/VillagerZombieModel.cpp +++ b/Minecraft.Client/VillagerZombieModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ModelPart.h" #include "VillagerZombieModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) { diff --git a/Minecraft.Client/WaterDropParticle.cpp b/Minecraft.Client/WaterDropParticle.cpp index 90035243e..1c432e5e3 100644 --- a/Minecraft.Client/WaterDropParticle.cpp +++ b/Minecraft.Client/WaterDropParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "WaterDropParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" WaterDropParticle::WaterDropParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/Minecraft.Client/Windows64/Iggy/include/iggy.h b/Minecraft.Client/Windows64/Iggy/include/iggy.h index 56638a321..d38ccae67 100644 --- a/Minecraft.Client/Windows64/Iggy/include/iggy.h +++ b/Minecraft.Client/Windows64/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h index 4141e3f95..a66bc9cc3 100644 --- a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h +++ b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Windows64/Social/SocialManager.h b/Minecraft.Client/Windows64/Social/SocialManager.h index 0b6f2b2d9..cad278fe3 100644 --- a/Minecraft.Client/Windows64/Social/SocialManager.h +++ b/Minecraft.Client/Windows64/Social/SocialManager.h @@ -7,7 +7,9 @@ #ifndef _SOCIAL_MANAGER_H #define _SOCIAL_MANAGER_H +#ifndef __linux__ #include +#endif // __linux__ #define MAX_SOCIALPOST_CAPTION 60 #define MAX_SOCIALPOST_DESC 100 diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index d2251e4e3..85d5321ee 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -4,38 +4,38 @@ #include "stdafx.h" #include -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" #include "Xbox/resource.h" diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp index f4e9a9fcf..86a5ac79e 100644 --- a/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -2,8 +2,8 @@ #include "Windows64_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Windows64/Windows64_UIController.h b/Minecraft.Client/Windows64/Windows64_UIController.h index 2b2ccdbac..cab14ce8a 100644 --- a/Minecraft.Client/Windows64/Windows64_UIController.h +++ b/Minecraft.Client/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/WolfModel.cpp b/Minecraft.Client/WolfModel.cpp index f4835ec30..d70ab66f6 100644 --- a/Minecraft.Client/WolfModel.cpp +++ b/Minecraft.Client/WolfModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WolfModel.h" -#include "..\Minecraft.World\Wolf.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Wolf.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" WolfModel::WolfModel() diff --git a/Minecraft.Client/WolfModel.h b/Minecraft.Client/WolfModel.h index ab26a9e84..7375206cc 100644 --- a/Minecraft.Client/WolfModel.h +++ b/Minecraft.Client/WolfModel.h @@ -1,6 +1,6 @@ #pragma once #include "Model.h" -#include "..\Minecraft.World\Mob.h" +#include "../Minecraft.World/Mob.h" class WolfModel : public Model { diff --git a/Minecraft.Client/WolfRenderer.cpp b/Minecraft.Client/WolfRenderer.cpp index a21affa2b..b77ee36aa 100644 --- a/Minecraft.Client/WolfRenderer.cpp +++ b/Minecraft.Client/WolfRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WolfRenderer.h" #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" WolfRenderer::WolfRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow) { diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp index b088150c9..9d431fb55 100644 --- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/LevelData.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" #include "SoundEngine.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\Common\DLC\DLCAudioFile.h" -#include "..\..\DLCTexturePack.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../Common/DLC/DLCAudioFile.h" +#include "../../DLCTexturePack.h" IXAudio2* g_pXAudio2 = NULL; // pointer to XAudio2 instance used by QNet and XACT diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.h b/Minecraft.Client/Xbox/Audio/SoundEngine.h index e2f22869b..b1c78274a 100644 --- a/Minecraft.Client/Xbox/Audio/SoundEngine.h +++ b/Minecraft.Client/Xbox/Audio/SoundEngine.h @@ -2,7 +2,7 @@ class Mob; class Options; using namespace std; -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "../../../Minecraft.World/SoundTypes.h" #ifdef _XBOX extern IXAudio2* g_pXAudio2; // pointer to XAudio2 instance used by QNet and XACT diff --git a/Minecraft.Client/Xbox/Font/XUI_Font.cpp b/Minecraft.Client/Xbox/Font/XUI_Font.cpp index 8b1a624be..247b6d3eb 100644 --- a/Minecraft.Client/Xbox/Font/XUI_Font.cpp +++ b/Minecraft.Client/Xbox/Font/XUI_Font.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\Tesselator.h" +#include "../../Tesselator.h" #include "XUI_FontData.h" #include "XUI_Font.h" diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp index 7a70cdfbb..975c0b6de 100644 --- a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp +++ b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\stubs.h" -#include "..\..\Minecraft.h" -#include "..\..\Textures.h" +#include "../../stubs.h" +#include "../../Minecraft.h" +#include "../../Textures.h" #include "XUI_FontData.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #define USE_NEW 0 diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Xbox/Font/XUI_FontData.h index af18c7a65..fc2ac6cce 100644 --- a/Minecraft.Client/Xbox/Font/XUI_FontData.h +++ b/Minecraft.Client/Xbox/Font/XUI_FontData.h @@ -2,7 +2,7 @@ using namespace std; #include -#include "..\..\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/Xbox/Font/XUI_FontRenderer.cpp b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp index 485819057..269d2bd68 100644 --- a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp +++ b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp @@ -2,7 +2,7 @@ #include "XUI_FontRenderer.h" #include "XUI_Font.h" #include "XUI_FontData.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" extern IDirect3DDevice9 *g_pD3DDevice; extern void GetRenderAndSamplerStates(IDirect3DDevice9 *pDevice,DWORD *RenderStateA,DWORD *SamplerStateA); diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp index efa8a3dae..1f1395987 100644 --- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp +++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp @@ -2,7 +2,7 @@ #include "XboxLeaderboardManager.h" -#include "..\Network\NetworkPlayerXbox.h" +#include "../Network/NetworkPlayerXbox.h" #ifdef _XBOX LeaderboardManager *LeaderboardManager::m_instance = new XboxLeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h index c9990901c..32b1e8472 100644 --- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h +++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h @@ -3,7 +3,7 @@ #include #include -#include "..\..\Common\Leaderboards\LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" class XboxLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Xbox/MinecraftWindows.rc b/Minecraft.Client/Xbox/MinecraftWindows.rc index 69ce53342..774ea86c3 100644 Binary files a/Minecraft.Client/Xbox/MinecraftWindows.rc and b/Minecraft.Client/Xbox/MinecraftWindows.rc differ diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h index 1822717cf..7614db6f6 100644 --- a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h +++ b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\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/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp index a551725b0..22db1853e 100644 --- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp +++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerXbox.h" #include "NetworkPlayerXbox.h" -#include "..\..\Common\Network\GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerXbox *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h index 7c6112b4e..df632802a 100644 --- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h +++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h @@ -2,10 +2,10 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" // This is how often we allow a search for new games #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp index 5d2b97631..b5c4a42e3 100644 --- a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp +++ b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "Include\SenClientMain.h" -#include "Include\SenClientDynamicConfig.h" +#include "Include/SenClientMain.h" +#include "Include/SenClientDynamicConfig.h" #include "DynamicConfigurations.h" diff --git a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp index aade06bca..88a2f42c6 100644 --- a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp +++ b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "Include\SenClientCore.h" -#include "Include\SenClientMain.h" -#include "Include\SenClientMain.h" +#include "Include/SenClientCore.h" +#include "Include/SenClientMain.h" +#include "Include/SenClientMain.h" -#include "..\GameConfig\Minecraft.spa.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\Dimension.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../GameConfig/Minecraft.spa.h" +#include "../../Minecraft.h" +#include "../../MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/Dimension.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" #include "SentientManager.h" #include "MinecraftTelemetry.h" @@ -517,7 +517,7 @@ INT CSentientManager::GetAudioSettings(DWORD dwUserId) /* Refers to the highest level performance metric for your game. For example, a performance metric could points earned, race time, total kills, etc. -This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. +This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. How far did users progress before failing/exiting the level? */ INT CSentientManager::GetLevelExitProgressStat1() @@ -529,7 +529,7 @@ INT CSentientManager::GetLevelExitProgressStat1() /* Refers to the highest level performance metric for your game. For example, a performance metric could points earned, race time, total kills, etc. -This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. +This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. How far did users progress before failing/exiting the level? */ INT CSentientManager::GetLevelExitProgressStat2() diff --git a/Minecraft.Client/Xbox/Social/SocialManager.cpp b/Minecraft.Client/Xbox/Social/SocialManager.cpp index b7a108bc7..a070f8d48 100644 --- a/Minecraft.Client/Xbox/Social/SocialManager.cpp +++ b/Minecraft.Client/Xbox/Social/SocialManager.cpp @@ -9,7 +9,7 @@ #include "SocialManager.h" #include #include -#include "..\Sentient\SentientManager.h" +#include "../Sentient/SentientManager.h" /////////////////////////////////////////////////////////////////////////// // Constants. diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp index b252035e6..3f0330467 100644 --- a/Minecraft.Client/Xbox/Xbox_App.cpp +++ b/Minecraft.Client/Xbox/Xbox_App.cpp @@ -1,175 +1,175 @@ #include "stdafx.h" -#include "..\Common\UI\UIStructs.h" +#include "../Common/UI/UIStructs.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" +#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 "..\Common\XUI\XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif -#include "..\..\Minecraft.World\Recipy.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\MinecraftServer.h" -#include "..\GameRenderer.h" -#include "..\ProgressRenderer.h" -#include "..\..\Minecraft.Client\LevelRenderer.h" -#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h" +#include "../../Minecraft.World/Recipy.h" +#include "GameConfig/Minecraft.spa.h" +#include "../../Minecraft.Client/Options.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../MinecraftServer.h" +#include "../GameRenderer.h" +#include "../ProgressRenderer.h" +#include "../../Minecraft.Client/LevelRenderer.h" +#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h" -#include "..\..\Minecraft.Client\Minecraft.h" +#include "../../Minecraft.Client/Minecraft.h" -#include "..\ClientConnection.h" -#include "..\MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\Minecraft.World\Player.h" -#include "..\..\Minecraft.World\Inventory.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\FurnaceTileEntity.h" -#include "..\..\Minecraft.World\Container.h" -#include "..\..\Minecraft.World\DispenserTileEntity.h" -#include "..\..\Minecraft.World\SignTileEntity.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\GameMode.h" -#include "Social\SocialManager.h" +#include "../ClientConnection.h" +#include "../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/LocalPlayer.h" +#include "../../Minecraft.World/Player.h" +#include "../../Minecraft.World/Inventory.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/FurnaceTileEntity.h" +#include "../../Minecraft.World/Container.h" +#include "../../Minecraft.World/DispenserTileEntity.h" +#include "../../Minecraft.World/SignTileEntity.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../GameMode.h" +#include "Social/SocialManager.h" #include -#include "..\Common\Tutorial\TutorialMode.h" -#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h" -#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h" -#include "4JLibs\inc\4J_Input.h" -#include "Font\XUI_FontRenderer.h" -#include "..\Common\Minecraft_Macros.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\Common\GameRules\ConsoleGameRules.h" -#include "..\Common\GameRules\ConsoleSchematicFile.h" -#include "..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\User.h" +#include "../Common/Tutorial/TutorialMode.h" +#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h" +#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h" +#include "4JLibs/inc/4J_Input.h" +#include "Font/XUI_FontRenderer.h" +#include "../Common/Minecraft_Macros.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../Common/GameRules/ConsoleGameRules.h" +#include "../Common/GameRules/ConsoleSchematicFile.h" +#include "../../Minecraft.World/InputOutputStream.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../User.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\Minecraft.Client\EntityRenderDispatcher.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\TexturePackRepository.h" -#include "..\TexturePack.h" -#include "..\Common\DLC\DLCAudioFile.h" -#include "..\DLCTexturePack.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/LevelData.h" +#include "../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../Minecraft.Client/EntityRenderDispatcher.h" +#include "../../Minecraft.World/compression.h" +#include "../TexturePackRepository.h" +#include "../TexturePack.h" +#include "../Common/DLC/DLCAudioFile.h" +#include "../DLCTexturePack.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" +#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 "..\Common\XUI\XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "Xbox_App.h" diff --git a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp index 04e4a8d5a..69868a943 100644 --- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp @@ -4,36 +4,36 @@ #include "stdafx.h" #include #include -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -#include "Social\SocialManager.h" -#include "Leaderboards\XboxLeaderboardManager.h" -#include "..\Common\XUI\XUI_Scene_Container.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -//#include "..\..\Minecraft.Client\SoundEngine.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +#include "Social/SocialManager.h" +#include "Leaderboards/XboxLeaderboardManager.h" +#include "../Common/XUI/XUI_Scene_Container.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +//#include "../../Minecraft.Client/SoundEngine.h" #include diff --git a/Minecraft.Client/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Xbox/Xbox_UIController.cpp index 51d91ca49..7beb731c9 100644 --- a/Minecraft.Client/Xbox/Xbox_UIController.cpp +++ b/Minecraft.Client/Xbox/Xbox_UIController.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Xbox_UIController.h" -#include "..\Common\XUI\XUI_Scene_Base.h" -#include "..\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/Xbox/Xbox_UIController.h b/Minecraft.Client/Xbox/Xbox_UIController.h index 2b273ee52..998239dc5 100644 --- a/Minecraft.Client/Xbox/Xbox_UIController.h +++ b/Minecraft.Client/Xbox/Xbox_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\IUIController.h" +#include "../Common/UI/IUIController.h" class ConsoleUIController : public IUIController { diff --git a/Minecraft.Client/ZombieModel.cpp b/Minecraft.Client/ZombieModel.cpp index 2063b8308..e59e716ba 100644 --- a/Minecraft.Client/ZombieModel.cpp +++ b/Minecraft.Client/ZombieModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ZombieModel.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "ModelPart.h" ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) diff --git a/Minecraft.Client/ZombieRenderer.cpp b/Minecraft.Client/ZombieRenderer.cpp index 5408736d3..f041dc204 100644 --- a/Minecraft.Client/ZombieRenderer.cpp +++ b/Minecraft.Client/ZombieRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ZombieModel.h" #include "VillagerZombieModel.h" -#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "../Minecraft.World/net.minecraft.world.entity.monster.h" #include "ZombieRenderer.h" ZombieRenderer::ZombieRenderer() : HumanoidMobRenderer(new ZombieModel(), .5f, 1.0f) diff --git a/Minecraft.Client/glWrapper.cpp b/Minecraft.Client/glWrapper.cpp index b120d30bd..be24c02c6 100644 --- a/Minecraft.Client/glWrapper.cpp +++ b/Minecraft.Client/glWrapper.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\Minecraft.World\FloatBuffer.h" -#include "..\Minecraft.World\IntBuffer.h" -#include "..\Minecraft.World\ByteBuffer.h" +#include "../Minecraft.World/FloatBuffer.h" +#include "../Minecraft.World/IntBuffer.h" +#include "../Minecraft.World/ByteBuffer.h" void glViewport(int x, int y, int w, int h) { diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h index a7ba7b06a..2de47ad20 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -54,6 +54,15 @@ #include "PSVitaTypes.h" #include "PSVitaStubs.h" #include "PSVitaMaths.h" +#elif defined __linux__ +#define AUTO_VAR(_var, _val) auto _var = _val +#include +#include +#include +#include +#include +#include "Linux/LinuxStubs.h" +#include "Linux/xbox_valve.h" #else #define AUTO_VAR(_var, _val) auto _var = _val #include @@ -107,9 +116,9 @@ typedef XNKID SessionID; typedef XUID GameSessionUID; #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) -#include "..\Minecraft.Client\xbox\network\extra.h" +#include "../Minecraft.Client/xbox/network/extra.h" #else -#include "extraX64.h" +#include "../Minecraft.World/x64headers/extraX64.h" #endif #ifdef __PS3__ @@ -148,46 +157,52 @@ typedef XUID GameSessionUID; #include #endif -#include "..\Minecraft.World\Definitions.h" -#include "..\Minecraft.World\class.h" -#include "..\Minecraft.World\ArrayWithLength.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\compression.h" -#include "..\Minecraft.World\PerformanceTimer.h" +#include "../Minecraft.World/Definitions.h" +#include "../Minecraft.World/Class.h" +#include "../Minecraft.World/ArrayWithLength.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.World/compression.h" +#include "../Minecraft.World/PerformanceTimer.h" #ifdef _XBOX - #include "xbox\4JLibs\inc\4J_Input.h" - #include "xbox\4JLibs\inc\4J_Profile.h" - #include "xbox\4JLibs\inc\4J_Render.h" - #include "xbox\4JLibs\inc\4J_XTMS.h" - #include "xbox\4JLibs\inc\4J_Storage.h" + #include "xbox/4JLibs/inc/4J_Input.h" + #include "xbox/4JLibs/inc/4J_Profile.h" + #include "xbox/4JLibs/inc/4J_Render.h" + #include "xbox/4JLibs/inc/4J_XTMS.h" + #include "xbox/4JLibs/inc/4J_Storage.h" #elif defined (__PS3__) - #include "PS3\4JLibs\inc\4J_Input.h" - #include "PS3\4JLibs\inc\4J_Profile.h" - #include "PS3\4JLibs\inc\4J_Render.h" - #include "PS3\4JLibs\inc\4J_Storage.h" + #include "PS3/4JLibs/inc/4J_Input.h" + #include "PS3/4JLibs/inc/4J_Profile.h" + #include "PS3/4JLibs/inc/4J_Render.h" + #include "PS3/4JLibs/inc/4J_Storage.h" #elif defined _DURANGO - #include "Durango\4JLibs\inc\4J_Input.h" - #include "Durango\4JLibs\inc\4J_Profile.h" - #include "Durango\4JLibs\inc\4J_Render.h" - #include "Durango\4JLibs\inc\4J_Storage.h" + #include "Durango/4JLibs/inc/4J_Input.h" + #include "Durango/4JLibs/inc/4J_Profile.h" + #include "Durango/4JLibs/inc/4J_Render.h" + #include "Durango/4JLibs/inc/4J_Storage.h" #elif defined _WINDOWS64 - #include "Windows64\4JLibs\inc\4J_Input.h" - #include "Windows64\4JLibs\inc\4J_Profile.h" - #include "Windows64\4JLibs\inc\4J_Render.h" - #include "Windows64\4JLibs\inc\4J_Storage.h" + #include "Windows64/4JLibs/inc/4J_Input.h" + #include "Windows64/4JLibs/inc/4J_Profile.h" + #include "Windows64/4JLibs/inc/4J_Render.h" + #include "Windows64/4JLibs/inc/4J_Storage.h" +#elif defined __linux__ + // draw the rest of the owl + #include "Windows64/4JLibs/inc/4J_Input.h" + #include "Windows64/4JLibs/inc/4J_Profile.h" + #include "Windows64/4JLibs/inc/4J_Render.h" + #include "Windows64/4JLibs/inc/4J_Storage.h" #elif defined __PSVITA__ - #include "PSVita\4JLibs\inc\4J_Input.h" - #include "PSVita\4JLibs\inc\4J_Profile.h" - #include "PSVita\4JLibs\inc\4J_Render.h" - #include "PSVita\4JLibs\inc\4J_Storage.h" + #include "PSVita/4JLibs/inc/4J_Input.h" + #include "PSVita/4JLibs/inc/4J_Profile.h" + #include "PSVita/4JLibs/inc/4J_Render.h" + #include "PSVita/4JLibs/inc/4J_Storage.h" #else - #include "Orbis\4JLibs\inc\4J_Input.h" - #include "Orbis\4JLibs\inc\4J_Profile.h" - #include "Orbis\4JLibs\inc\4J_Render.h" - #include "Orbis\4JLibs\inc\4J_Storage.h" + #include "Orbis/4JLibs/inc/4J_Input.h" + #include "Orbis/4JLibs/inc/4J_Profile.h" + #include "Orbis/4JLibs/inc/4J_Render.h" + #include "Orbis/4JLibs/inc/4J_Storage.h" #endif #include "Textures.h" @@ -201,139 +216,153 @@ typedef XUID GameSessionUID; #include "stubs.h" #include "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 "Xbox\Xbox_App.h" - #include "Xbox\Sentient\MinecraftTelemetry.h" - #include "Xbox\Sentient\DynamicConfigurations.h" - #include "XboxMedia\strings.h" - #include "Xbox\Sentient\SentientTelemetryCommon.h" - #include "Xbox\Sentient\Include\SenClientStats.h" - #include "Xbox\GameConfig\Minecraft.spa.h" - #include "XboxMedia\4J_strings.h" - #include "Xbox\XML\ATGXmlParser.h" - #include "Xbox\Leaderboards\XboxLeaderboardManager.h" - #include "Xbox\Social\SocialManager.h" - #include "Xbox\Audio\SoundEngine.h" - #include "Xbox\Xbox_UIController.h" + #include "Xbox/Xbox_App.h" + #include "Xbox/Sentient/MinecraftTelemetry.h" + #include "Xbox/Sentient/DynamicConfigurations.h" + #include "XboxMedia/strings.h" + #include "Xbox/Sentient/SentientTelemetryCommon.h" + #include "Xbox/Sentient/Include/SenClientStats.h" + #include "Xbox/GameConfig/Minecraft.spa.h" + #include "XboxMedia/4J_strings.h" + #include "Xbox/XML/ATGXmlParser.h" + #include "Xbox/Leaderboards/XboxLeaderboardManager.h" + #include "Xbox/Social/SocialManager.h" + #include "Xbox/Audio/SoundEngine.h" + #include "Xbox/Xbox_UIController.h" #elif defined (__PS3__) #include "extraX64client.h" - #include "PS3\Sentient\MinecraftTelemetry.h" - #include "PS3\Sentient\DynamicConfigurations.h" - #include "PS3\Sentient\SentientTelemetryCommon.h" - #include "PS3Media\strings.h" - #include "PS3\PS3_App.h" - #include "PS3\GameConfig\Minecraft.spa.h" - #include "PS3Media\4J_strings.h" - #include "PS3\XML\ATGXmlParser.h" - #include "PS3\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "PS3\Iggy\include\iggy.h" - #include "PS3\Iggy\gdraw\gdraw_ps3gcm.h" - #include "PS3\PS3_UIController.h" + #include "PS3/Sentient/MinecraftTelemetry.h" + #include "PS3/Sentient/DynamicConfigurations.h" + #include "PS3/Sentient/SentientTelemetryCommon.h" + #include "PS3Media/strings.h" + #include "PS3/PS3_App.h" + #include "PS3/GameConfig/Minecraft.spa.h" + #include "PS3Media/4J_strings.h" + #include "PS3/XML/ATGXmlParser.h" + #include "PS3/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "PS3/Iggy/include/iggy.h" + #include "PS3/Iggy/gdraw/gdraw_ps3gcm.h" + #include "PS3/PS3_UIController.h" #elif defined _DURANGO - #include "Durango\Sentient\MinecraftTelemetry.h" - #include "DurangoMedia\strings.h" - #include "Durango\Durango_App.h" - #include "Durango\Sentient\DynamicConfigurations.h" - #include "Durango\Sentient\TelemetryEnum.h" - #include "Durango\Sentient\SentientTelemetryCommon.h" - #include "Durango\PresenceIds.h" - #include "DurangoMedia\4J_strings.h" - #include "Durango\XML\ATGXmlParser.h" - #include "Durango\Social\SocialManager.h" -#include "Common\Audio\SoundEngine.h" - #include "Durango\Iggy\include\iggy.h" - #include "Durango\Iggy\gdraw\gdraw_d3d11.h" - #include "Durango\Durango_UIController.h" + #include "Durango/Sentient/MinecraftTelemetry.h" + #include "DurangoMedia/strings.h" + #include "Durango/Durango_App.h" + #include "Durango/Sentient/DynamicConfigurations.h" + #include "Durango/Sentient/TelemetryEnum.h" + #include "Durango/Sentient/SentientTelemetryCommon.h" + #include "Durango/PresenceIds.h" + #include "DurangoMedia/4J_strings.h" + #include "Durango/XML/ATGXmlParser.h" + #include "Durango/Social/SocialManager.h" +#include "Common/Audio/SoundEngine.h" + #include "Durango/Iggy/include/iggy.h" + #include "Durango/Iggy/gdraw/gdraw_d3d11.h" + #include "Durango/Durango_UIController.h" #elif defined _WINDOWS64 - #include "Windows64\Sentient\MinecraftTelemetry.h" - #include "Windows64Media\strings.h" - #include "Windows64\Windows64_App.h" - #include "Windows64\Sentient\DynamicConfigurations.h" - #include "Windows64\Sentient\SentientTelemetryCommon.h" - #include "Windows64\GameConfig\Minecraft.spa.h" - #include "Windows64\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Windows64\Iggy\include\iggy.h" - #include "Windows64\Iggy\gdraw\gdraw_d3d11.h" - #include "Windows64\Windows64_UIController.h" + #include "Windows64/Sentient/MinecraftTelemetry.h" + #include "Windows64Media/strings.h" + #include "Windows64/Windows64_App.h" + #include "Windows64/Sentient/DynamicConfigurations.h" + #include "Windows64/Sentient/SentientTelemetryCommon.h" + #include "Windows64/GameConfig/Minecraft.spa.h" + #include "Windows64/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Windows64/Iggy/include/iggy.h" + #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" + #include "Windows64/Windows64_UIController.h" +#elif defined __linux__ + // FIXME: Make Linux/ versions of all of these + // #include "Windows64/Sentient/MinecraftTelemetry.h" // conflicts with Common/Telemetry/TelemetryManager.h, no idea whats up with that + #include "Windows64Media/strings.h" + #include "Windows64/Windows64_App.h" + #include "Windows64/Sentient/DynamicConfigurations.h" + #include "Windows64/Sentient/SentientTelemetryCommon.h" + #include "Windows64/GameConfig/Minecraft.spa.h" + #include "Windows64/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Windows64/Iggy/include/iggy.h" + #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" + #include "Windows64/Windows64_UIController.h" #elif defined __PSVITA__ - #include "PSVita\PSVita_App.h" - #include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this - #include "PSVita\Sentient\SentientManager.h" - #include "PSVita\Sentient\MinecraftTelemetry.h" - #include "PSVita\Sentient\DynamicConfigurations.h" - #include "PSVita\GameConfig\Minecraft.spa.h" - #include "PSVita\XML\ATGXmlParser.h" - #include "PSVita\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "PSVita\Iggy\include\iggy.h" - #include "PSVita\Iggy\gdraw\gdraw_psp2.h" - #include "PSVita\PSVita_UIController.h" + #include "PSVita/PSVita_App.h" + #include "PSVitaMedia/strings.h" // TODO - create PSVita-specific version of this + #include "PSVita/Sentient/SentientManager.h" + #include "PSVita/Sentient/MinecraftTelemetry.h" + #include "PSVita/Sentient/DynamicConfigurations.h" + #include "PSVita/GameConfig/Minecraft.spa.h" + #include "PSVita/XML/ATGXmlParser.h" + #include "PSVita/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "PSVita/Iggy/include/iggy.h" + #include "PSVita/Iggy/gdraw/gdraw_psp2.h" + #include "PSVita/PSVita_UIController.h" #else - #include "Orbis\Sentient\MinecraftTelemetry.h" - #include "OrbisMedia\strings.h" - #include "Orbis\Orbis_App.h" - #include "Orbis\Sentient\SentientTelemetryCommon.h" - #include "Orbis\Sentient\DynamicConfigurations.h" - #include "Orbis\GameConfig\Minecraft.spa.h" - #include "OrbisMedia\4J_strings.h" - #include "Orbis\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Orbis\Iggy\include\iggy.h" - #include "Orbis\Iggy\gdraw\gdraw_orbis.h" - #include "Orbis\Orbis_UIController.h" + #include "Orbis/Sentient/MinecraftTelemetry.h" + #include "OrbisMedia/strings.h" + #include "Orbis/Orbis_App.h" + #include "Orbis/Sentient/SentientTelemetryCommon.h" + #include "Orbis/Sentient/DynamicConfigurations.h" + #include "Orbis/GameConfig/Minecraft.spa.h" + #include "OrbisMedia/4J_strings.h" + #include "Orbis/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Orbis/Iggy/include/iggy.h" + #include "Orbis/Iggy/gdraw/gdraw_orbis.h" + #include "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 "Xbox\Xbox_App.h" +//#include "Xbox/Xbox_App.h" #elif !defined(__PS3__) #include "extraX64client.h" #endif diff --git a/Minecraft.World/AddEntityPacket.cpp b/Minecraft.World/AddEntityPacket.cpp index acacbb37a..1bb6549c5 100644 --- a/Minecraft.World/AddEntityPacket.cpp +++ b/Minecraft.World/AddEntityPacket.cpp @@ -16,8 +16,8 @@ void AddEntityPacket::_init(shared_ptr e, int type, int data, int xp, in x = xp;//(int) floor(e->x * 32); y = yp;//(int) floor(e->y * 32); z = zp;//(int) floor(e->z * 32); - yRot = static_cast(yRotp); - xRot = static_cast(xRotp); + yRot = static_cast(yRotp); + xRot = static_cast(xRotp); this->type = type; this->data = data; if (data > -1) // 4J - changed "no data" value to be -1, we can have a valid entity id of 0 @@ -55,7 +55,7 @@ AddEntityPacket::AddEntityPacket(shared_ptr e, int type, int data, int y void AddEntityPacket::read(DataInputStream *dis) // throws IOException TODO 4J JEV add throws statement { id = dis->readShort(); - type = std::to_integer(dis->readByte()); + type = dis->readByte(); #ifdef _LARGE_WORLDS x = dis->readInt(); y = dis->readInt(); @@ -79,7 +79,7 @@ void AddEntityPacket::read(DataInputStream *dis) // throws IOException TODO 4J void AddEntityPacket::write(DataOutputStream *dos) // throws IOException TODO 4J JEV add throws statement { dos->writeShort(id); - dos->writeByte(static_cast(type)); + dos->writeByte(static_cast(type)); #ifdef _LARGE_WORLDS dos->writeInt(x); dos->writeInt(y); diff --git a/Minecraft.World/AddGlobalEntityPacket.cpp b/Minecraft.World/AddGlobalEntityPacket.cpp index d1111aa4d..977d1952e 100644 --- a/Minecraft.World/AddGlobalEntityPacket.cpp +++ b/Minecraft.World/AddGlobalEntityPacket.cpp @@ -39,7 +39,7 @@ AddGlobalEntityPacket::AddGlobalEntityPacket(shared_ptr e) void AddGlobalEntityPacket::read(DataInputStream *dis) // throws IOException { id = dis->readInt(); - type = std::to_integer(dis->readByte()); + type = static_cast(dis->readByte()); x = dis->readInt(); y = dis->readInt(); z = dis->readInt(); @@ -48,7 +48,7 @@ void AddGlobalEntityPacket::read(DataInputStream *dis) // throws IOException void AddGlobalEntityPacket::write(DataOutputStream *dos) // throws IOException { dos->writeInt(id); - dos->writeByte(static_cast(type)); + dos->writeByte(static_cast(type)); dos->writeInt(x); dos->writeInt(y); dos->writeInt(z); diff --git a/Minecraft.World/AddMobPacket.cpp b/Minecraft.World/AddMobPacket.cpp index 05e37056e..777be938e 100644 --- a/Minecraft.World/AddMobPacket.cpp +++ b/Minecraft.World/AddMobPacket.cpp @@ -14,8 +14,8 @@ AddMobPacket::AddMobPacket() x = 0; y = 0; z = 0; - yRot = static_cast(0); - xRot = static_cast(0); + yRot = static_cast(0); + xRot = static_cast(0); entityData = nullptr; unpack = NULL; } @@ -36,9 +36,9 @@ AddMobPacket::AddMobPacket(shared_ptr mob, int yRotp, int xRotp, int xp, in y = yp;//Mth::floor(mob->y * 32); z = zp;//Mth::floor(mob->z * 32); // 4J - changed - send current "previously sent" value of rotations to put this in sync with other clients - yRot = static_cast(yRotp); - xRot = static_cast(xRotp); - yHeadRot = static_cast(yHeadRotp); + yRot = static_cast(yRotp); + xRot = static_cast(xRotp); + yHeadRot = static_cast(yHeadRotp); // yRot = (byte) (mob->yRot * 256 / 360); // xRot = (byte) (mob->xRot * 256 / 360); // yHeadRot = (byte) (mob->yHeadRot * 256 / 360); @@ -67,7 +67,7 @@ AddMobPacket::AddMobPacket(shared_ptr mob, int yRotp, int xRotp, int xp, in void AddMobPacket::read(DataInputStream *dis) //throws IOException { id = dis->readShort(); - type = std::to_integer(dis->readByte()) & 0xff; + type = static_cast(dis->readByte()) & 0xff; #ifdef _LARGE_WORLDS x = dis->readInt(); y = dis->readInt(); @@ -91,7 +91,7 @@ void AddMobPacket::read(DataInputStream *dis) //throws IOException void AddMobPacket::write(DataOutputStream *dos) //throws IOException { dos->writeShort(id); - dos->writeByte(static_cast(type & 0xff)); + dos->writeByte(static_cast(type & 0xff)); #ifdef _LARGE_WORLDS dos->writeInt(x); dos->writeInt(y); diff --git a/Minecraft.World/AddPlayerPacket.cpp b/Minecraft.World/AddPlayerPacket.cpp index 80275391c..097fcb1bd 100644 --- a/Minecraft.World/AddPlayerPacket.cpp +++ b/Minecraft.World/AddPlayerPacket.cpp @@ -44,7 +44,7 @@ AddPlayerPacket::AddPlayerPacket(shared_ptr player, PlayerUID xuid, Play // 4J - changed - send current "previously sent" value of rotations to put this in sync with other clients yRot = yRotp; xRot = xRotp; - yHeadRot = static_cast(yHeadRotp); // 4J Added + yHeadRot = static_cast(yHeadRotp); // 4J Added // yRot = (byte) (player->yRot * 256 / 360); // xRot = (byte) (player->xRot * 256 / 360); @@ -96,13 +96,13 @@ void AddPlayerPacket::write(DataOutputStream *dos) //throws IOException dos->writeInt(x); dos->writeInt(y); dos->writeInt(z); - dos->writeByte(static_cast(yRot)); - dos->writeByte(static_cast(xRot)); - dos->writeByte(static_cast(m_playerIndex)); // 4J Added + dos->writeByte(static_cast(yRot)); + dos->writeByte(static_cast(xRot)); + dos->writeByte(static_cast(m_playerIndex)); // 4J Added dos->writeShort(carriedItem); dos->writePlayerUID(xuid); dos->writePlayerUID(OnlineXuid); - dos->writeByte(static_cast(m_playerIndex)); // 4J Added + dos->writeByte(static_cast(m_playerIndex)); // 4J Added dos->writeInt(m_skinId); dos->writeInt(m_capeId); dos->writeInt(m_uiGamePrivileges); diff --git a/Minecraft.World/Animal.cpp b/Minecraft.World/Animal.cpp index 45fc304f5..c28d4bd4f 100644 --- a/Minecraft.World/Animal.cpp +++ b/Minecraft.World/Animal.cpp @@ -12,8 +12,6 @@ #include "Random.h" #include "Animal.h" - - Animal::Animal(Level *level) : AgableMob( level ) { // inLove = 0; // 4J removed - now synched data diff --git a/Minecraft.World/AnimatePacket.cpp b/Minecraft.World/AnimatePacket.cpp index 9a03cb05d..2f3948d78 100644 --- a/Minecraft.World/AnimatePacket.cpp +++ b/Minecraft.World/AnimatePacket.cpp @@ -28,7 +28,7 @@ void AnimatePacket::read(DataInputStream *dis) //throws IOException void AnimatePacket::write(DataOutputStream *dos) //throws IOException { dos->writeInt(id); - dos->writeByte(static_cast(action)); + dos->writeByte(static_cast(action)); } void AnimatePacket::handle(PacketListener *listener) diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp index 0b2c24e4b..717e83322 100644 --- a/Minecraft.World/ArmorItem.cpp +++ b/Minecraft.World/ArmorItem.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.world.h" #include "net.minecraft.world.entity.player.h" #include "com.mojang.nbt.h" diff --git a/Minecraft.World/Biome.cpp b/Minecraft.World/Biome.cpp index d2f4cd1c1..711aec04d 100644 --- a/Minecraft.World/Biome.cpp +++ b/Minecraft.World/Biome.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "Color.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.world.level.levelgen.feature.h" #include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.h" diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp index b16efd311..656419647 100644 --- a/Minecraft.World/BiomeSource.cpp +++ b/Minecraft.World/BiomeSource.cpp @@ -5,8 +5,8 @@ #include "net.minecraft.world.level.newbiome.layer.h" #include "System.h" #include "BiomeSource.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\ProgressRenderer.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/ProgressRenderer.h" // 4J - removal of separate temperature & downfall layers brought forward from 1.2.3 void BiomeSource::_init() diff --git a/Minecraft.World/Blaze.cpp b/Minecraft.World/Blaze.cpp index 57726363a..a62148b97 100644 --- a/Minecraft.World/Blaze.cpp +++ b/Minecraft.World/Blaze.cpp @@ -7,7 +7,7 @@ #include "net.minecraft.world.entity.h" #include "net.minecraft.world.entity.projectile.h" #include "SharedConstants.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "Blaze.h" #include "SoundTypes.h" diff --git a/Minecraft.World/BucketItem.cpp b/Minecraft.World/BucketItem.cpp index d3570cd70..313fc6da3 100644 --- a/Minecraft.World/BucketItem.cpp +++ b/Minecraft.World/BucketItem.cpp @@ -12,10 +12,10 @@ #include "Material.h" #include "ItemInstance.h" #include "BucketItem.h" -#include "..\Minecraft.Client\LocalPlayer.h" -#include "..\Minecraft.Client\ServerPlayer.h" -#include "..\Minecraft.Client\PlayerConnection.h" -#include "..\Minecraft.World\ChatPacket.h" +#include "../Minecraft.Client/LocalPlayer.h" +#include "../Minecraft.Client/ServerPlayer.h" +#include "../Minecraft.Client/PlayerConnection.h" +#include "../Minecraft.World/ChatPacket.h" #include "SoundTypes.h" BucketItem::BucketItem(int id, int content) : Item( id ) diff --git a/Minecraft.World/C4JThread.cpp b/Minecraft.World/C4JThread.cpp index 4b9760c17..4d521dcd4 100644 --- a/Minecraft.World/C4JThread.cpp +++ b/Minecraft.World/C4JThread.cpp @@ -3,8 +3,8 @@ #include "C4JThread.h" #ifdef __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVitaExtras\ShutdownManager.h" -#include "..\Minecraft.Client\PSVita\PSVitaExtras\PSVitaTLSStorage.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/PSVitaTLSStorage.h" // AP - this comes from the low level user_malloc.c file used to overide the default memory functions. These must be called when a thread is started/stopped extern "C" { @@ -12,7 +12,7 @@ extern void user_registerthread(); extern void user_removethread(); } #else -#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h" +#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h" #endif diff --git a/Minecraft.World/CMakeLists.txt b/Minecraft.World/CMakeLists.txt index e8d4de712..c1caf1e2d 100644 --- a/Minecraft.World/CMakeLists.txt +++ b/Minecraft.World/CMakeLists.txt @@ -1992,6 +1992,8 @@ target_compile_options(${PROJECT_NAME} PRIVATE -fpermissive -Wtemplate-body -Wshift-count-overflow + -pthread + -std=c++11 ) target_include_directories(${PROJECT_NAME} PRIVATE x64headers) diff --git a/Minecraft.World/CauldronTile.cpp b/Minecraft.World/CauldronTile.cpp index 4d5640ca0..8d45dc249 100644 --- a/Minecraft.World/CauldronTile.cpp +++ b/Minecraft.World/CauldronTile.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.h" -#include "..\Minecraft.Client\ServerPlayer.h" +#include "../Minecraft.Client/ServerPlayer.h" const wstring CauldronTile::TEXTURE_INSIDE = L"cauldron_inner"; const wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom"; diff --git a/Minecraft.World/CaveSpider.cpp b/Minecraft.World/CaveSpider.cpp index 5f7c6028e..b9a255db8 100644 --- a/Minecraft.World/CaveSpider.cpp +++ b/Minecraft.World/CaveSpider.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.effect.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "CaveSpider.h" diff --git a/Minecraft.World/Chicken.cpp b/Minecraft.World/Chicken.cpp index 0104b2bf9..ba08ce7fd 100644 --- a/Minecraft.World/Chicken.cpp +++ b/Minecraft.World/Chicken.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.level.h" #include "net.minecraft.world.item.h" #include "Chicken.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" #include "MobCategory.h" diff --git a/Minecraft.World/ChunkTilesUpdatePacket.cpp b/Minecraft.World/ChunkTilesUpdatePacket.cpp index 08d78146b..5dbd68c8b 100644 --- a/Minecraft.World/ChunkTilesUpdatePacket.cpp +++ b/Minecraft.World/ChunkTilesUpdatePacket.cpp @@ -21,7 +21,7 @@ ChunkTilesUpdatePacket::ChunkTilesUpdatePacket() shouldDelay = true; xc = 0; zc = 0; - count = (std::byte)0; + count = (byte)0; } ChunkTilesUpdatePacket::ChunkTilesUpdatePacket(int xc, int zc, shortArray positions, byte count, Level *level) @@ -35,7 +35,7 @@ ChunkTilesUpdatePacket::ChunkTilesUpdatePacket(int xc, int zc, shortArray positi this->blocks = byteArray((unsigned int)count); this->data = byteArray((unsigned int)count); LevelChunk *levelChunk = level->getChunk(xc, zc); - for (int i = 0; (std::byte)i < count; i++) + for (int i = 0; (byte)i < count; i++) { int x = (positions[i] >> 12) & 15; int z = (positions[i] >> 8) & 15; @@ -66,14 +66,14 @@ void ChunkTilesUpdatePacket::read(DataInputStream *dis) //throws IOException int countAndFlags = (int)dis->readByte(); bool dataAllZero = (( countAndFlags & 0x80 ) == 0x80 ); levelIdx = ( countAndFlags >> 5 ) & 3; - count = (std::byte)countAndFlags & (std::byte)0x1f; + count = (byte)countAndFlags & (byte)0x1f; positions = shortArray((short int)count); blocks = byteArray((unsigned int)count); data = byteArray((unsigned int)count); int currentBlockType = -1; - for( int i = 0; (std::byte)i < count; i++ ) + for( int i = 0; (byte)i < count; i++ ) { int xzAndFlag = dis->readShort(); int y = (int)dis->readByte(); @@ -82,14 +82,14 @@ void ChunkTilesUpdatePacket::read(DataInputStream *dis) //throws IOException { currentBlockType = dis->read(); } - blocks[i] = (std::byte)currentBlockType; + blocks[i] = (byte)currentBlockType; if( !dataAllZero) { - data[i] = (std::byte)dis->read(); + data[i] = (byte)dis->read(); } else { - data[i] = (std::byte)0; + data[i] = (byte)0; } } } diff --git a/Minecraft.World/ClientCommandPacket.cpp b/Minecraft.World/ClientCommandPacket.cpp index d0443b669..94f6deea9 100644 --- a/Minecraft.World/ClientCommandPacket.cpp +++ b/Minecraft.World/ClientCommandPacket.cpp @@ -19,7 +19,7 @@ void ClientCommandPacket::read(DataInputStream *dis) void ClientCommandPacket::write(DataOutputStream *dos) { - dos->writeByte((std::byte)action & (std::byte)0xff); + dos->writeByte((byte)action & (byte)0xff); } void ClientCommandPacket::handle(PacketListener *listener) diff --git a/Minecraft.World/ClockItem.cpp b/Minecraft.World/ClockItem.cpp index afe0544d2..2f0ea4978 100644 --- a/Minecraft.World/ClockItem.cpp +++ b/Minecraft.World/ClockItem.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ClockItem.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "net.minecraft.world.h" #ifdef __PSVITA__ diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index 5ad38d82a..d234c0d36 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "net.minecraft.world.Item.h" +#include "net.minecraft.world.item.h" #include "DyePowderItem.h" #include "Tile.h" #include "ClothTile.h" diff --git a/Minecraft.World/CompassItem.cpp b/Minecraft.World/CompassItem.cpp index 57ad65d04..f70828a3e 100644 --- a/Minecraft.World/CompassItem.cpp +++ b/Minecraft.World/CompassItem.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "CompassItem.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "net.minecraft.world.h" #ifdef __PSVITA__ diff --git a/Minecraft.World/CompoundTag.h b/Minecraft.World/CompoundTag.h index e8919cc69..ebc4a8ecb 100644 --- a/Minecraft.World/CompoundTag.h +++ b/Minecraft.World/CompoundTag.h @@ -117,7 +117,7 @@ public: void putBoolean(wchar_t * string, bool val) { - putByte(string, val?static_cast(1):static_cast(0)); + putByte(string, val?static_cast(1):static_cast(0)); } Tag *get(wchar_t *name) @@ -200,7 +200,7 @@ public: bool getBoolean(wchar_t *string) { - return getByte(string) != static_cast(0); + return getByte(string) != static_cast(0); } void remove(const wstring &name) diff --git a/Minecraft.World/CompressedTileStorage.cpp b/Minecraft.World/CompressedTileStorage.cpp index 896bd58d1..265ee21fd 100644 --- a/Minecraft.World/CompressedTileStorage.cpp +++ b/Minecraft.World/CompressedTileStorage.cpp @@ -6,7 +6,7 @@ #endif #ifdef __PS3__ -#include "..\SPU_Tasks\CompressedTileStorage_compress\CompressedTileStorage_compress.h" +#include "../SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.h" #include "C4JSpursJob.h" static const int sc_maxCompressTiles = 64; static CompressedTileStorage_compress_dataIn g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16))); diff --git a/Minecraft.World/ConsoleSaveFileInputStream.cpp b/Minecraft.World/ConsoleSaveFileInputStream.cpp index 4ea1f8ae2..5b70ae10d 100644 --- a/Minecraft.World/ConsoleSaveFileInputStream.cpp +++ b/Minecraft.World/ConsoleSaveFileInputStream.cpp @@ -25,7 +25,7 @@ ConsoleSaveFileInputStream::ConsoleSaveFileInputStream(ConsoleSaveFile *saveFile //the next byte of data, or -1 if the end of the file is reached. int ConsoleSaveFileInputStream::read() { - byte byteRead = static_cast(0); + byte byteRead = static_cast(0); DWORD numberOfBytesRead; BOOL result = m_saveFile->readFile( diff --git a/Minecraft.World/ConsoleSaveFileSplit.cpp b/Minecraft.World/ConsoleSaveFileSplit.cpp index 2d83f217e..8bc7180db 100644 --- a/Minecraft.World/ConsoleSaveFileSplit.cpp +++ b/Minecraft.World/ConsoleSaveFileSplit.cpp @@ -5,13 +5,13 @@ #include "File.h" #include #include "compression.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.Client\Common\GameRules\LevelGenerationOptions.h" -#include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/ServerLevel.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.Client/Common/GameRules/LevelGenerationOptions.h" +#include "../Minecraft.World/net.minecraft.world.level.chunk.storage.h" #define RESERVE_ALLOCATION MEM_RESERVE #define COMMIT_ALLOCATION MEM_COMMIT diff --git a/Minecraft.World/ContainerAckPacket.cpp b/Minecraft.World/ContainerAckPacket.cpp index de7b7324a..f296cc7ca 100644 --- a/Minecraft.World/ContainerAckPacket.cpp +++ b/Minecraft.World/ContainerAckPacket.cpp @@ -34,9 +34,9 @@ void ContainerAckPacket::read(DataInputStream *dis) //throws IOException void ContainerAckPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); dos->writeShort(uid); - dos->writeByte((std::byte)(accepted ? 1 : 0)); + dos->writeByte((byte)(accepted ? 1 : 0)); } int ContainerAckPacket::getEstimatedSize() diff --git a/Minecraft.World/ContainerButtonClickPacket.cpp b/Minecraft.World/ContainerButtonClickPacket.cpp index b1490cdd5..7c8145814 100644 --- a/Minecraft.World/ContainerButtonClickPacket.cpp +++ b/Minecraft.World/ContainerButtonClickPacket.cpp @@ -30,8 +30,8 @@ void ContainerButtonClickPacket::read(DataInputStream *dis) void ContainerButtonClickPacket::write(DataOutputStream *dos) { - dos->writeByte((std::byte)containerId); - dos->writeByte((std::byte)buttonId); + dos->writeByte((byte)containerId); + dos->writeByte((byte)buttonId); } int ContainerButtonClickPacket::getEstimatedSize() diff --git a/Minecraft.World/ContainerClickPacket.cpp b/Minecraft.World/ContainerClickPacket.cpp index 228907809..8eeaee051 100644 --- a/Minecraft.World/ContainerClickPacket.cpp +++ b/Minecraft.World/ContainerClickPacket.cpp @@ -50,9 +50,9 @@ void ContainerClickPacket::read(DataInputStream *dis) //throws IOException void ContainerClickPacket::write(DataOutputStream *dos) // throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); dos->writeShort(slotNum); - dos->writeByte((std::byte)buttonNum); + dos->writeByte((byte)buttonNum); dos->writeShort(uid); dos->writeBoolean(quickKey); diff --git a/Minecraft.World/ContainerClosePacket.cpp b/Minecraft.World/ContainerClosePacket.cpp index 45c09e31f..d63e12aaa 100644 --- a/Minecraft.World/ContainerClosePacket.cpp +++ b/Minecraft.World/ContainerClosePacket.cpp @@ -28,7 +28,7 @@ void ContainerClosePacket::read(DataInputStream *dis) //throws IOException void ContainerClosePacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); } int ContainerClosePacket::getEstimatedSize() diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp index 571900240..d67ab6195 100644 --- a/Minecraft.World/ContainerMenu.cpp +++ b/Minecraft.World/ContainerMenu.cpp @@ -3,9 +3,9 @@ #include "net.minecraft.world.item.h" #include "Slot.h" #include "GenericStats.h" -#include "..\Minecraft.Client\StatsCounter.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.Client/StatsCounter.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/LocalPlayer.h" #include "ContainerMenu.h" ContainerMenu::ContainerMenu(shared_ptr inventory, shared_ptr container) : AbstractContainerMenu() diff --git a/Minecraft.World/ContainerOpenPacket.cpp b/Minecraft.World/ContainerOpenPacket.cpp index e4a331367..231a2855c 100644 --- a/Minecraft.World/ContainerOpenPacket.cpp +++ b/Minecraft.World/ContainerOpenPacket.cpp @@ -28,18 +28,18 @@ void ContainerOpenPacket::handle(PacketListener *listener) void ContainerOpenPacket::read(DataInputStream *dis) //throws IOException { - containerId = (int)(dis->readByte() & (std::byte)0xff); - type = (int)(dis->readByte() & (std::byte)0xff); + containerId = (int)(dis->readByte() & (byte)0xff); + type = (int)(dis->readByte() & (byte)0xff); title = dis->readShort(); - size = (int)(dis->readByte() & (std::byte)0xff); + size = (int)(dis->readByte() & (byte)0xff); } void ContainerOpenPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)containerId & (std::byte)0xff); - dos->writeByte((std::byte)type & (std::byte)0xff); + dos->writeByte((byte)containerId & (byte)0xff); + dos->writeByte((byte)type & (byte)0xff); dos->writeShort(title & 0xffff); - dos->writeByte((std::byte)size & (std::byte)0xff); + dos->writeByte((byte)size & (byte)0xff); } int ContainerOpenPacket::getEstimatedSize() diff --git a/Minecraft.World/ContainerSetContentPacket.cpp b/Minecraft.World/ContainerSetContentPacket.cpp index bc05aa6c3..19e1c6918 100644 --- a/Minecraft.World/ContainerSetContentPacket.cpp +++ b/Minecraft.World/ContainerSetContentPacket.cpp @@ -41,7 +41,7 @@ void ContainerSetContentPacket::read(DataInputStream *dis) //throws IOException void ContainerSetContentPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); dos->writeShort(items.length); for (unsigned int i = 0; i < items.length; i++) { diff --git a/Minecraft.World/ContainerSetDataPacket.cpp b/Minecraft.World/ContainerSetDataPacket.cpp index f7ab48572..3acbf7375 100644 --- a/Minecraft.World/ContainerSetDataPacket.cpp +++ b/Minecraft.World/ContainerSetDataPacket.cpp @@ -34,7 +34,7 @@ void ContainerSetDataPacket::read(DataInputStream *dis) //throws IOException void ContainerSetDataPacket::write(DataOutputStream *dos) // throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); dos->writeShort(id); dos->writeShort(value); } diff --git a/Minecraft.World/ContainerSetSlotPacket.cpp b/Minecraft.World/ContainerSetSlotPacket.cpp index 2d44e551d..eae3de3ab 100644 --- a/Minecraft.World/ContainerSetSlotPacket.cpp +++ b/Minecraft.World/ContainerSetSlotPacket.cpp @@ -34,7 +34,7 @@ void ContainerSetSlotPacket::read(DataInputStream *dis) //throws IOException { // 4J Stu - TU-1 hotfix // Fix for #13142 - Holding down the A button on the furnace ingredient slot causes the UI to display incorrect item counts - std::byte byteId = dis->readByte(); + byte byteId = dis->readByte(); containerId = *(char *)&byteId; slot = dis->readShort(); item = readItem(dis); @@ -42,7 +42,7 @@ void ContainerSetSlotPacket::read(DataInputStream *dis) //throws IOException void ContainerSetSlotPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)containerId); + dos->writeByte((byte)containerId); dos->writeShort(slot); writeItem(item, dos); } diff --git a/Minecraft.World/ControlledByPlayerGoal.h b/Minecraft.World/ControlledByPlayerGoal.h index f49eaaf18..119390819 100644 --- a/Minecraft.World/ControlledByPlayerGoal.h +++ b/Minecraft.World/ControlledByPlayerGoal.h @@ -1,7 +1,7 @@ #pragma once #include "Goal.h" -#include "..\Minecraft.World\SharedConstants.h" +#include "SharedConstants.h" class Mob; @@ -29,4 +29,4 @@ public: bool isBoosting(); void boost(); bool canBoost(); -}; \ No newline at end of file +}; diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp index c259183ed..5a5beec7f 100644 --- a/Minecraft.World/Cow.cpp +++ b/Minecraft.World/Cow.cpp @@ -9,7 +9,7 @@ #include "net.minecraft.world.entity.player.h" #include "net.minecraft.stats.h" #include "Cow.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "MobCategory.h" diff --git a/Minecraft.World/Creeper.cpp b/Minecraft.World/Creeper.cpp index 3f6c66a74..9d6b02e74 100644 --- a/Minecraft.World/Creeper.cpp +++ b/Minecraft.World/Creeper.cpp @@ -13,7 +13,7 @@ #include "Skeleton.h" #include "Creeper.h" #include "Arrow.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/DataInputStream.cpp b/Minecraft.World/DataInputStream.cpp index 585d5e12d..b00b116e1 100644 --- a/Minecraft.World/DataInputStream.cpp +++ b/Minecraft.World/DataInputStream.cpp @@ -138,7 +138,7 @@ bool DataInputStream::readFully(byteArray b) } else { - b[i] = static_cast(byteRead); + b[i] = static_cast(byteRead); } } return true; diff --git a/Minecraft.World/Dimension.cpp b/Minecraft.World/Dimension.cpp index 35e66698b..a2a52aac3 100644 --- a/Minecraft.World/Dimension.cpp +++ b/Minecraft.World/Dimension.cpp @@ -2,7 +2,7 @@ #include "net.minecraft.world.level.levelgen.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.storage.h" -#include "dimension.h" +#include "Dimension.h" #include "BiomeSource.h" #include "FixedBiomeSource.h" #include "OldChunkStorage.h" @@ -10,8 +10,8 @@ #include "NormalDimension.h" #include "TheEndDimension.h" #include "net.minecraft.world.level.tile.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Common/Colours/ColourTable.h" void Dimension::init(Level *level) { diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp index c9b51c844..c72c91cba 100644 --- a/Minecraft.World/DurangoStats.cpp +++ b/Minecraft.World/DurangoStats.cpp @@ -12,16 +12,16 @@ #include "Item.h" #include "Level.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "LevelData.h" #include "LevelSettings.h" -#include "..\Minecraft.Client\LocalPlayer.h" -#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/LocalPlayer.h" +#include "../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "EntityIO.h" -#include "..\Minecraft.Client\Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "../Minecraft.Client/Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h" #include "DurangoStats.h" diff --git a/Minecraft.World/EnchantmentContainer.cpp b/Minecraft.World/EnchantmentContainer.cpp index 6e5541fb3..514fb9720 100644 --- a/Minecraft.World/EnchantmentContainer.cpp +++ b/Minecraft.World/EnchantmentContainer.cpp @@ -15,4 +15,4 @@ void EnchantmentContainer::setChanged() { SimpleContainer::setChanged(); m_menu->slotsChanged(); // Remove this param as it's not needed -} \ No newline at end of file +} diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp index 2ccd453cd..2211cdeb2 100644 --- a/Minecraft.World/EnderDragon.cpp +++ b/Minecraft.World/EnderDragon.cpp @@ -7,12 +7,14 @@ #include "net.minecraft.world.phys.h" #include "net.minecraft.world.damagesource.h" #include "BasicTypeContainers.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "net.minecraft.world.entity.boss.enderdragon.h" #include "net.minecraft.world.level.pathfinder.h" #include "SharedConstants.h" #include "EnderDragon.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" + #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index abfc5cb5b..39e4ebdb1 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -7,9 +7,9 @@ #include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.phys.h" #include "com.mojang.nbt.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "EnderMan.h" - +#include "../Minecraft.Client/Windows64/Windows64_App.h" bool EnderMan::MAY_TAKE[256]; @@ -408,4 +408,4 @@ bool EnderMan::isCreepy() void EnderMan::setCreepy(bool creepy) { entityData->set(DATA_CREEPY, (byte)(creepy ? 1 : 0)); -} \ No newline at end of file +} diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index 4c9d5cf6f..4841e697c 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -17,14 +17,17 @@ #include "EntityPos.h" #include "Entity.h" #include "SoundTypes.h" -#include "..\minecraft.Client\HumanoidModel.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\MultiPlayerLevel.h" -#include "..\Minecraft.Client\MultiplayerLocalPlayer.h" +#include "../Minecraft.Client/HumanoidModel.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/MultiPlayerLevel.h" +#include "../Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 as special unique smaller ids for things that need network tracked +#ifdef _WIN32 DWORD Entity::tlsIdx = TlsAlloc(); +#endif // _WIN32 // 4J - added getSmallId & freeSmallId methods unsigned int Entity::entityIdUsedFlags[2048/32] = {0}; @@ -44,7 +47,12 @@ int Entity::getSmallId() // for final notification to the client that the entities are removed. We can't go re-using these small Ids yet, as otherwise we will // potentially end up telling the client that the entity has been removed After we have already re-used its Id and created a new entity. // This ends up with newly created client-side entities being removed by accident, causing invisible mobs. +#ifdef _WIN32 if( ((size_t)TlsGetValue(tlsIdx) != 0 ) ) +#else + pthread_key_create(&tlsIdx, nullptr); + if ( ((size_t)pthread_getspecific(tlsIdx) != 0) ) +#endif { MinecraftServer *server = MinecraftServer::getInstance(); if( server ) @@ -125,7 +133,7 @@ void Entity::countFlagsForPIX() void Entity::resetSmallId() { freeSmallId(entityId); - if( ((size_t)TlsGetValue(tlsIdx) != 0 ) ) + if( ((size_t)pthread_getspecific(tlsIdx) != 0 ) ) { entityId = getSmallId(); } @@ -133,7 +141,7 @@ void Entity::resetSmallId() void Entity::freeSmallId(int index) { - if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread + if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread if( index >= 2048 ) return; // Don't do anything if this isn't a short id unsigned int i = index / 32; @@ -146,7 +154,7 @@ void Entity::freeSmallId(int index) void Entity::useSmallIds() { - TlsSetValue(tlsIdx,(LPVOID)1); + pthread_setspecific(tlsIdx,(LPVOID)1); } // Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to @@ -156,7 +164,7 @@ void Entity::useSmallIds() // Let the management system here know whether or not to consider this particular entity for some extra wandering void Entity::considerForExtraWandering(bool enable) { - if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread + if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread if( entityId >= 2048 ) return; // Don't do anything if this isn't a short id unsigned int i = entityId / 32; @@ -176,7 +184,7 @@ void Entity::considerForExtraWandering(bool enable) // Should this entity do wandering in addition to what the java code would have done? bool Entity::isExtraWanderingEnabled() { - if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return false; // Don't do anything with small ids if this isn't the server thread + if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return false; // Don't do anything with small ids if this isn't the server thread if( entityId >= 2048 ) return false; // Don't do anything if this isn't a short id for( int i = 0; i < extraWanderCount; i++ ) @@ -239,7 +247,7 @@ void Entity::_init(bool useSmallId) // 4J - changed to assign two different types of ids. A range from 0-2047 is used for things that we'll be wanting to identify over the network, // so we should only need 11 bits rather than 32 to uniquely identify them. The rest of the range is used for anything we don't need to track like this, // currently particles. We only ever want to allocate this type of id from the server thread, so using thread local storage to isolate this. - if( useSmallId && ((size_t)TlsGetValue(tlsIdx) != 0 ) ) + if( useSmallId && ((size_t)pthread_getspecific(tlsIdx) != 0 ) ) { entityId = getSmallId(); } diff --git a/Minecraft.World/Entity.h b/Minecraft.World/Entity.h index bde83e307..94873f899 100644 --- a/Minecraft.World/Entity.h +++ b/Minecraft.World/Entity.h @@ -5,6 +5,7 @@ using namespace std; #include "FloatTag.h" #include "Vec3.h" #include "Definitions.h" +#include class Mob; class LightningBolt; @@ -365,7 +366,11 @@ private: static int extraWanderIds[EXTRA_WANDER_MAX]; static int extraWanderCount; static int extraWanderTicks; +#if defined(_WIN32) static DWORD tlsIdx; +#else + static pthread_key_t tlsIdx; +#endif public: static void tickExtraWandering(); static void countFlagsForPIX(); diff --git a/Minecraft.World/EntityActionAtPositionPacket.cpp b/Minecraft.World/EntityActionAtPositionPacket.cpp index a68716f9b..f0ef85e9c 100644 --- a/Minecraft.World/EntityActionAtPositionPacket.cpp +++ b/Minecraft.World/EntityActionAtPositionPacket.cpp @@ -39,9 +39,9 @@ void EntityActionAtPositionPacket::read(DataInputStream *dis) //throws IOExcepti void EntityActionAtPositionPacket::write(DataOutputStream *dos) //throws IOException { dos->writeInt(id); - dos->writeByte((std::byte)action); + dos->writeByte((byte)action); dos->writeInt(x); - dos->writeByte((std::byte)y); + dos->writeByte((byte)y); dos->writeInt(z); } diff --git a/Minecraft.World/EntityEventPacket.cpp b/Minecraft.World/EntityEventPacket.cpp index 0a0c77915..bbac60631 100644 --- a/Minecraft.World/EntityEventPacket.cpp +++ b/Minecraft.World/EntityEventPacket.cpp @@ -9,7 +9,7 @@ EntityEventPacket::EntityEventPacket() { entityId = 0; - eventId = (std::byte)0; + eventId = (byte)0; } EntityEventPacket::EntityEventPacket(int entityId, byte eventId) diff --git a/Minecraft.World/ExplodePacket.cpp b/Minecraft.World/ExplodePacket.cpp index b1a5f031e..2c2118a7d 100644 --- a/Minecraft.World/ExplodePacket.cpp +++ b/Minecraft.World/ExplodePacket.cpp @@ -99,9 +99,9 @@ void ExplodePacket::write(DataOutputStream *dos) //throws IOException int xx = tp.x-xp; int yy = tp.y-yp; int zz = tp.z-zp; - dos->writeByte((std::byte)xx); - dos->writeByte((std::byte)yy); - dos->writeByte((std::byte)zz); + dos->writeByte((byte)xx); + dos->writeByte((byte)yy); + dos->writeByte((byte)zz); } } diff --git a/Minecraft.World/FileInputStream.cpp b/Minecraft.World/FileInputStream.cpp index ca7e4ccb1..62173f47d 100644 --- a/Minecraft.World/FileInputStream.cpp +++ b/Minecraft.World/FileInputStream.cpp @@ -85,7 +85,7 @@ ssize_t ReadFile(int fd, void* buffer, size_t byteRead, DWORD* numberOfBytesRead //the next byte of data, or -1 if the end of the file is reached. int FileInputStream::read() { - byte byteRead = static_cast(0); + byte byteRead = static_cast(0); DWORD numberOfBytesRead; BOOL bSuccess = ReadFile( diff --git a/Minecraft.World/FireChargeItem.cpp b/Minecraft.World/FireChargeItem.cpp index c4e47b0ca..77d81cf00 100644 --- a/Minecraft.World/FireChargeItem.cpp +++ b/Minecraft.World/FireChargeItem.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.h" #include "SoundTypes.h" #include "FireChargeItem.h" -#include "tile.h" +#include "Tile.h" FireChargeItem::FireChargeItem(int id) : Item(id) { diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp index 60f062dbe..22cb51881 100644 --- a/Minecraft.World/FireTile.cpp +++ b/Minecraft.World/FireTile.cpp @@ -5,12 +5,12 @@ #include "net.minecraft.world.level.tile.h" #include "FireTile.h" #include "SoundTypes.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\PlayerList.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/PlayerList.h" // AP - added for Vita to set Alpha Cut out #include "IntBuffer.h" -#include "..\Minecraft.Client\Tesselator.h" +#include "../Minecraft.Client/Tesselator.h" const wstring FireTile::TEXTURE_FIRST = L"fire_0"; diff --git a/Minecraft.World/Fireball.cpp b/Minecraft.World/Fireball.cpp index 46be68f74..d8be2d3b0 100644 --- a/Minecraft.World/Fireball.cpp +++ b/Minecraft.World/Fireball.cpp @@ -9,6 +9,7 @@ #include "Fireball.h" #include "net.minecraft.world.level.dimension.h" #include "SharedConstants.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" // 4J - added common ctor code. @@ -412,4 +413,4 @@ int Fireball::getIcon() ePARTICLE_TYPE Fireball::getTrailParticleType() { return eParticleType_smoke; -} \ No newline at end of file +} diff --git a/Minecraft.World/FoliageColor.cpp b/Minecraft.World/FoliageColor.cpp index 276bf9298..e8525ed8e 100644 --- a/Minecraft.World/FoliageColor.cpp +++ b/Minecraft.World/FoliageColor.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "FoliageColor.h" // 4J Stu - Don't use this any more diff --git a/Minecraft.World/GameEventPacket.cpp b/Minecraft.World/GameEventPacket.cpp index 6ed5324d6..34e0b2bf1 100644 --- a/Minecraft.World/GameEventPacket.cpp +++ b/Minecraft.World/GameEventPacket.cpp @@ -5,7 +5,6 @@ #include "GameEventPacket.h" - const int GameEventPacket::NO_RESPAWN_BED_AVAILABLE = 0; const int GameEventPacket::START_RAINING = 1; const int GameEventPacket::STOP_RAINING = 2; @@ -44,8 +43,8 @@ void GameEventPacket::read(DataInputStream *dis) //throws IOException void GameEventPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte((std::byte)_event); - dos->writeByte((std::byte)param); + dos->writeByte((byte)_event); + dos->writeByte((byte)param); } void GameEventPacket::handle(PacketListener *listener) diff --git a/Minecraft.World/GenericStats.h b/Minecraft.World/GenericStats.h index 541424db0..638b3283c 100644 --- a/Minecraft.World/GenericStats.h +++ b/Minecraft.World/GenericStats.h @@ -5,7 +5,7 @@ //#include "DamageSource.h" -//#include "..\Minecraft.Client\Common\Console_Awards_enum.h" +//#include "../Minecraft.Client/Common/Console_Awards_enum.h" /** 4J-JEV: diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp index fcf0b705e..cc41dbf79 100644 --- a/Minecraft.World/Ghast.cpp +++ b/Minecraft.World/Ghast.cpp @@ -9,7 +9,7 @@ #include "net.minecraft.world.damagesource.h" #include "net.minecraft.stats.h" #include "Ghast.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "LevelEvent.h" #include "SoundTypes.h" diff --git a/Minecraft.World/Giant.cpp b/Minecraft.World/Giant.cpp index 054394da3..96d3be18c 100644 --- a/Minecraft.World/Giant.cpp +++ b/Minecraft.World/Giant.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.world.level.h" #include "Giant.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp index 0e9550254..bf6c95048 100644 --- a/Minecraft.World/GrassTile.cpp +++ b/Minecraft.World/GrassTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "GrassTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" @@ -8,7 +8,7 @@ // AP - included for PSVita Alpha cut out optimisation #include "IntBuffer.h" -#include "..\Minecraft.Client\Tesselator.h" +#include "../Minecraft.Client/Tesselator.h" GrassTile::GrassTile(int id) : Tile(id, Material::grass) { diff --git a/Minecraft.World/HangingEntityItem.h b/Minecraft.World/HangingEntityItem.h index 51bd8b239..e927f24ed 100644 --- a/Minecraft.World/HangingEntityItem.h +++ b/Minecraft.World/HangingEntityItem.h @@ -1,6 +1,6 @@ #pragma once -#include "item.h" +#include "Item.h" class HangingEntity; diff --git a/Minecraft.World/Hasher.cpp b/Minecraft.World/Hasher.cpp index bbf47d418..ea94686f4 100644 --- a/Minecraft.World/Hasher.cpp +++ b/Minecraft.World/Hasher.cpp @@ -1,6 +1,12 @@ #include "stdafx.h" +#if defined(_WIN32) #include - +#else +#include +#include +#include +#include +#endif // _WIN32 #include "Hasher.h" Hasher::Hasher(wstring &salt) @@ -10,6 +16,7 @@ Hasher::Hasher(wstring &salt) wstring Hasher::getHash(wstring &name) { +#if defined(_WIN32) // 4J Stu - Removed try/catch //try { wstring s = wstring( salt ).append( name ); @@ -25,4 +32,21 @@ wstring Hasher::getHash(wstring &name) //{ // throw new RuntimeException(e); //} -} \ No newline at end of file +#else + // adapted from a SSL example + std::wstring combined = salt + name; + std::string combined_str(combined.begin(), combined.end()); + unsigned char result[MD5_DIGEST_LENGTH]; + MD5_CTX md5_ctx; + MD5_Init(&md5_ctx); + MD5_Update(&md5_ctx, combined_str.c_str(), combined_str.size()); + MD5_Final(result, &md5_ctx); + std::stringstream ss; + for (int i = 0; i < MD5_DIGEST_LENGTH; i++) + { + ss << std::setw(2) << std::setfill('0') << std::hex << (int)result[i]; + } + std::string hash_str = ss.str(); + return std::wstring(hash_str.begin(), hash_str.end()); +#endif +} diff --git a/Minecraft.World/HellDimension.cpp b/Minecraft.World/HellDimension.cpp index 85e2a25ae..42bb1a242 100644 --- a/Minecraft.World/HellDimension.cpp +++ b/Minecraft.World/HellDimension.cpp @@ -5,8 +5,8 @@ #include "net.minecraft.world.level.levelgen.h" #include "net.minecraft.world.level.biome.h" #include "net.minecraft.world.level.tile.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Common/Colours/ColourTable.h" void HellDimension::init() { diff --git a/Minecraft.World/InteractPacket.cpp b/Minecraft.World/InteractPacket.cpp index fadeee300..16703955c 100644 --- a/Minecraft.World/InteractPacket.cpp +++ b/Minecraft.World/InteractPacket.cpp @@ -27,14 +27,14 @@ void InteractPacket::read(DataInputStream *dis) //throws IOException { source = dis->readInt(); target = dis->readInt(); - action = dis->readByte(); + action = (int)dis->readByte(); } void InteractPacket::write(DataOutputStream *dos) // throws IOException { dos->writeInt(source); dos->writeInt(target); - dos->writeByte(action); + dos->writeByte((byte)action); } void InteractPacket::handle(PacketListener *listener) diff --git a/Minecraft.World/KickPlayerPacket.cpp b/Minecraft.World/KickPlayerPacket.cpp index cfef71e0b..eb679072c 100644 --- a/Minecraft.World/KickPlayerPacket.cpp +++ b/Minecraft.World/KickPlayerPacket.cpp @@ -23,12 +23,12 @@ void KickPlayerPacket::handle(PacketListener *listener) void KickPlayerPacket::read(DataInputStream *dis) //throws IOException { - m_networkSmallId = dis->readByte(); + m_networkSmallId = (int)dis->readByte(); } void KickPlayerPacket::write(DataOutputStream *dos) //throws IOException { - dos->writeByte(m_networkSmallId); + dos->writeByte((byte)m_networkSmallId); } int KickPlayerPacket::getEstimatedSize() diff --git a/Minecraft.World/LavaSlime.cpp b/Minecraft.World/LavaSlime.cpp index 3ab32d908..29df25255 100644 --- a/Minecraft.World/LavaSlime.cpp +++ b/Minecraft.World/LavaSlime.cpp @@ -2,7 +2,7 @@ #include "net.minecraft.world.level.h" #include "net.minecraft.world.h" #include "net.minecraft.world.item.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "LavaSlime.h" #include "SoundTypes.h" diff --git a/Minecraft.World/Layer.cpp b/Minecraft.World/Layer.cpp index 1d010e722..0b5046454 100644 --- a/Minecraft.World/Layer.cpp +++ b/Minecraft.World/Layer.cpp @@ -5,7 +5,7 @@ #ifdef __PSVITA__ // AP - this is used to perform fast 64bit divides of known values -#include "..\Minecraft.Client\PSVita\PSVitaExtras\libdivide.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/libdivide.h" libdivide::divider fast_d2(2); libdivide::divider fast_d3(3); diff --git a/Minecraft.World/LeafTile.cpp b/Minecraft.World/LeafTile.cpp index 8b7d381c9..453ed48fc 100644 --- a/Minecraft.World/LeafTile.cpp +++ b/Minecraft.World/LeafTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "LeafTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" diff --git a/Minecraft.World/Level.cpp b/Minecraft.World/Level.cpp index 4b6a64f57..89fa08d6a 100644 --- a/Minecraft.World/Level.cpp +++ b/Minecraft.World/Level.cpp @@ -32,15 +32,15 @@ #include "ConsoleSaveFile.h" #include -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\LevelRenderer.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/LevelRenderer.h" #include "SoundTypes.h" #include "SparseLightStorage.h" -#include "..\Minecraft.Client\Textures.h" -#include "..\Minecraft.Client\TexturePackRepository.h" -#include "..\Minecraft.Client\DLCTexturePack.h" -#include "..\Minecraft.Client\Common\DLC\DLCPack.h" -#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h" +#include "../Minecraft.Client/Textures.h" +#include "../Minecraft.Client/TexturePackRepository.h" +#include "../Minecraft.Client/DLCTexturePack.h" +#include "../Minecraft.Client/Common/DLC/DLCPack.h" +#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h" DWORD Level::tlsIdx = TlsAlloc(); @@ -4751,4 +4751,4 @@ bool Level::canCreateMore(eINSTANCEOF type, ESPAWN_TYPE spawnType) } } return count < max; -} \ No newline at end of file +} diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h index a6872350e..47d778c95 100644 --- a/Minecraft.World/Level.h +++ b/Minecraft.World/Level.h @@ -11,7 +11,7 @@ using namespace std; #include "C4JThread.h" #ifdef __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomSet.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h" #endif // 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites, diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp index 823c7c4cd..9b36ec3a6 100644 --- a/Minecraft.World/LevelChunk.cpp +++ b/Minecraft.World/LevelChunk.cpp @@ -11,10 +11,10 @@ #include "SparseLightStorage.h" #include "BlockReplacements.h" #include "LevelChunk.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.Client\ServerChunkCache.h" -#include "..\Minecraft.Client\GameRenderer.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/ServerLevel.h" +#include "../Minecraft.Client/ServerChunkCache.h" +#include "../Minecraft.Client/GameRenderer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.World/LevelEventPacket.cpp b/Minecraft.World/LevelEventPacket.cpp index a044aded8..ee5de2373 100644 --- a/Minecraft.World/LevelEventPacket.cpp +++ b/Minecraft.World/LevelEventPacket.cpp @@ -28,7 +28,7 @@ void LevelEventPacket::read(DataInputStream *dis) //throws IOException { type = dis->readInt(); x = dis->readInt(); - y = dis->readByte() & 0xff; + y = (int)(dis->readByte() & (byte)0xff); z = dis->readInt(); data = dis->readInt(); } @@ -37,7 +37,7 @@ void LevelEventPacket::write(DataOutputStream *dos) //throws IOException { dos->writeInt(type); dos->writeInt(x); - dos->writeByte(y & 0xff); + dos->writeByte((byte)(y & 0xff)); dos->writeInt(z); dos->writeInt(data); } diff --git a/Minecraft.World/LightningBolt.cpp b/Minecraft.World/LightningBolt.cpp index 901bedf11..bdcc17f03 100644 --- a/Minecraft.World/LightningBolt.cpp +++ b/Minecraft.World/LightningBolt.cpp @@ -4,8 +4,8 @@ #include "net.minecraft.world.phys.h" #include "LightningBolt.h" #include "SoundTypes.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\PlayerList.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/PlayerList.h" #include "net.minecraft.world.level.dimension.h" diff --git a/Minecraft.World/ListTag.h b/Minecraft.World/ListTag.h index ade58a37c..ce65e87f7 100644 --- a/Minecraft.World/ListTag.h +++ b/Minecraft.World/ListTag.h @@ -15,7 +15,7 @@ public: void write(DataOutput *dos) { if (list.size() > 0) type = (list[0])->getId(); - else type = static_cast(1); + else type = static_cast(1); dos->writeByte(type); dos->writeInt((int)list.size()); diff --git a/Minecraft.World/LoginPacket.cpp b/Minecraft.World/LoginPacket.cpp index bfe692264..92e998323 100644 --- a/Minecraft.World/LoginPacket.cpp +++ b/Minecraft.World/LoginPacket.cpp @@ -5,7 +5,7 @@ #include "PacketListener.h" #include "LoginPacket.h" #include "LevelType.h" - +#include "../Minecraft.Client/Windows64/Windows64_App.h" LoginPacket::LoginPacket() @@ -106,16 +106,16 @@ void LoginPacket::read(DataInputStream *dis) //throws IOException } seed = dis->readLong(); gameType = dis->readInt(); - dimension = dis->readByte(); - mapHeight = dis->readByte(); - maxPlayers = dis->readByte(); + dimension = (int)dis->readByte(); + mapHeight = (int)dis->readByte(); + maxPlayers = (int)dis->readByte(); m_offlineXuid = dis->readPlayerUID(); m_onlineXuid = dis->readPlayerUID(); m_friendsOnlyUGC = dis->readBoolean(); m_ugcPlayersVersion = dis->readInt(); - difficulty = dis->readByte(); + difficulty = (int)dis->readByte(); m_multiplayerInstanceId = dis->readInt(); - m_playerIndex = dis->readByte(); + m_playerIndex = (int)dis->readByte(); INT skinId = dis->readInt(); m_playerSkinId = *(DWORD *)&skinId; INT capeId = dis->readInt(); @@ -145,16 +145,16 @@ void LoginPacket::write(DataOutputStream *dos) //throws IOException } dos->writeLong(seed); dos->writeInt(gameType); - dos->writeByte(dimension); - dos->writeByte(mapHeight); - dos->writeByte(maxPlayers); + dos->writeByte((byte)dimension); + dos->writeByte((byte)mapHeight); + dos->writeByte((byte)maxPlayers); dos->writePlayerUID(m_offlineXuid); dos->writePlayerUID(m_onlineXuid); dos->writeBoolean(m_friendsOnlyUGC); dos->writeInt(m_ugcPlayersVersion); - dos->writeByte(difficulty); + dos->writeByte((byte)difficulty); dos->writeInt(m_multiplayerInstanceId); - dos->writeByte(m_playerIndex); + dos->writeByte((byte)m_playerIndex); dos->writeInt(m_playerSkinId); dos->writeInt(m_playerCapeId); dos->writeBoolean(m_isGuest); diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp index d69a7f532..df2a9ddec 100644 --- a/Minecraft.World/MapItemSavedData.cpp +++ b/Minecraft.World/MapItemSavedData.cpp @@ -3,12 +3,12 @@ #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.item.h" #include "MapItemSavedData.h" -#include "..\Minecraft.Client\PlayerList.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerPlayer.h" +#include "../Minecraft.Client/PlayerList.h" +#include "../Minecraft.Client/MinecraftServer.h" +#include "../Minecraft.Client/ServerPlayer.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.storage.h" -#include "..\Minecraft.Client\PlayerConnection.h" +#include "../Minecraft.Client/PlayerConnection.h" const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1; diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp index 2b8fbb95a..68f480d8c 100644 --- a/Minecraft.World/Minecart.cpp +++ b/Minecraft.World/Minecart.cpp @@ -12,8 +12,6 @@ #include "Minecart.h" #include "SharedConstants.h" - - const int Minecart::EXITS[][2][3] = { // // { @@ -1208,4 +1206,4 @@ void Minecart::setHurtDir(int hurtDir) int Minecart::getHurtDir() { return entityData->getInteger(DATA_ID_HURTDIR); -} \ No newline at end of file +} diff --git a/Minecraft.World/Mob.cpp b/Minecraft.World/Mob.cpp index d2dcddfbf..5311b56c9 100644 --- a/Minecraft.World/Mob.cpp +++ b/Minecraft.World/Mob.cpp @@ -18,7 +18,7 @@ #include "net.minecraft.world.item.enchantment.h" #include "com.mojang.nbt.h" #include "Mob.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" #include "BasicTypeContainers.h" #include "ParticleTypes.h" diff --git a/Minecraft.World/MobEffect.cpp b/Minecraft.World/MobEffect.cpp index f9687a15a..54a1e1ed0 100644 --- a/Minecraft.World/MobEffect.cpp +++ b/Minecraft.World/MobEffect.cpp @@ -267,4 +267,4 @@ bool MobEffect::isDisabled() eMinecraftColour MobEffect::getColor() { return color; -} \ No newline at end of file +} diff --git a/Minecraft.World/MobEffectInstance.cpp b/Minecraft.World/MobEffectInstance.cpp index 1e15e58cf..fca51e4bc 100644 --- a/Minecraft.World/MobEffectInstance.cpp +++ b/Minecraft.World/MobEffectInstance.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "net.minecraft.world.effect.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" void MobEffectInstance::_init(int id, int duration, int amplifier) { @@ -136,4 +137,4 @@ wstring MobEffectInstance::toString() bool MobEffectInstance::equals(MobEffectInstance *obj) { return this->id == obj->id && this->amplifier == obj->amplifier && this->duration == obj->duration; -} \ No newline at end of file +} diff --git a/Minecraft.World/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp index d2b4f6fda..31e333748 100644 --- a/Minecraft.World/MobSpawner.cpp +++ b/Minecraft.World/MobSpawner.cpp @@ -14,7 +14,7 @@ #include "Level.h" #include "ChunkPos.h" #include "TilePos.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "../Minecraft.Client/ServerLevel.h" #include "MobSpawner.h" #include "Dimension.h" diff --git a/Minecraft.World/MobSpawner.h b/Minecraft.World/MobSpawner.h index b5022a77d..9bfad88fb 100644 --- a/Minecraft.World/MobSpawner.h +++ b/Minecraft.World/MobSpawner.h @@ -3,7 +3,7 @@ #include "Mob.h" #ifdef __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomMap.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h" #endif class Player; diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp index 627ce8d1e..25ec4a5d6 100644 --- a/Minecraft.World/Monster.cpp +++ b/Minecraft.World/Monster.cpp @@ -7,8 +7,8 @@ #include "net.minecraft.world.effect.h" #include "net.minecraft.world.item.enchantment.h" #include "Monster.h" - -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" +#include "../Minecraft.Client/Minecraft.h" @@ -156,4 +156,4 @@ bool Monster::canSpawn() // 4J Stu // Fix for #8265 - AI: Monsters will flash briefly on the screen around Monster Spawners when the game settings are set to Peaceful. return isDarkEnoughToSpawn() && PathfinderMob::canSpawn() && level->difficulty > Difficulty::PEACEFUL; -} \ No newline at end of file +} diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp index a29700338..47e18a910 100644 --- a/Minecraft.World/MonsterPlacerItem.cpp +++ b/Minecraft.World/MonsterPlacerItem.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" diff --git a/Minecraft.World/MoveEntityPacket.cpp b/Minecraft.World/MoveEntityPacket.cpp index b52482f5e..6eada2877 100644 --- a/Minecraft.World/MoveEntityPacket.cpp +++ b/Minecraft.World/MoveEntityPacket.cpp @@ -82,21 +82,21 @@ MoveEntityPacket::PosRot::PosRot(int id, char xa, char ya, char za, char yRot, c void MoveEntityPacket::PosRot::read(DataInputStream *dis) //throws IOException { MoveEntityPacket::read(dis); - xa = dis->readByte(); - ya = dis->readByte(); - za = dis->readByte(); - yRot = dis->readByte(); - xRot = dis->readByte(); + xa = (int)dis->readByte(); + ya = (int)dis->readByte(); + za = (int)dis->readByte(); + yRot = (int)dis->readByte(); + xRot = (int)dis->readByte(); } void MoveEntityPacket::PosRot::write(DataOutputStream *dos) //throws IOException { MoveEntityPacket::write(dos); - dos->writeByte(xa); - dos->writeByte(ya); - dos->writeByte(za); - dos->writeByte(yRot); - dos->writeByte(xRot); + dos->writeByte((byte)xa); + dos->writeByte((byte)ya); + dos->writeByte((byte)za); + dos->writeByte((byte)yRot); + dos->writeByte((byte)xRot); } int MoveEntityPacket::PosRot::getEstimatedSize() @@ -118,17 +118,17 @@ MoveEntityPacket::Pos::Pos(int id, char xa, char ya, char za) : MoveEntityPacket void MoveEntityPacket::Pos::read(DataInputStream *dis) //throws IOException { MoveEntityPacket::read(dis); - xa = dis->readByte(); - ya = dis->readByte(); - za = dis->readByte(); + xa = (int)dis->readByte(); + ya = (int)dis->readByte(); + za = (int)dis->readByte(); } void MoveEntityPacket::Pos::write(DataOutputStream *dos) //throws IOException { MoveEntityPacket::write(dos); - dos->writeByte(xa); - dos->writeByte(ya); - dos->writeByte(za); + dos->writeByte((byte)xa); + dos->writeByte((byte)ya); + dos->writeByte((byte)za); } int MoveEntityPacket::Pos::getEstimatedSize() @@ -151,15 +151,15 @@ MoveEntityPacket::Rot::Rot(int id, char yRot, char xRot) : MoveEntityPacket(id) void MoveEntityPacket::Rot::read(DataInputStream *dis) //throws IOException { MoveEntityPacket::read(dis); - yRot = dis->readByte(); - xRot = dis->readByte(); + yRot = (int)dis->readByte(); + xRot = (int)dis->readByte(); } void MoveEntityPacket::Rot::write(DataOutputStream *dos) //throws IOException { MoveEntityPacket::write(dos); - dos->writeByte(yRot); - dos->writeByte(xRot); + dos->writeByte((byte)yRot); + dos->writeByte((byte)xRot); } int MoveEntityPacket::Rot::getEstimatedSize() diff --git a/Minecraft.World/MoveEntityPacketSmall.cpp b/Minecraft.World/MoveEntityPacketSmall.cpp index 8216478fa..c0a4399ec 100644 --- a/Minecraft.World/MoveEntityPacketSmall.cpp +++ b/Minecraft.World/MoveEntityPacketSmall.cpp @@ -146,7 +146,7 @@ void MoveEntityPacketSmall::Pos::write(DataOutputStream *dos) //throws IOExcepti short idAndY = id | ya << 11; dos->writeShort(idAndY); char XandZ = ( xa << 4 ) | ( za & 0x0f ); - dos->writeByte(XandZ); + dos->writeByte((byte)XandZ); } int MoveEntityPacketSmall::Pos::getEstimatedSize() diff --git a/Minecraft.World/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp index a2aef158c..be8b007ad 100644 --- a/Minecraft.World/MushroomCow.cpp +++ b/Minecraft.World/MushroomCow.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.item.h" #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.item.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "MushroomCow.h" #include "MobCategory.h" #include "AABB.h" diff --git a/Minecraft.World/NetherBridgeFeature.h b/Minecraft.World/NetherBridgeFeature.h index cd7f315fa..15e70af26 100644 --- a/Minecraft.World/NetherBridgeFeature.h +++ b/Minecraft.World/NetherBridgeFeature.h @@ -1,7 +1,7 @@ #pragma once #include "StructureFeature.h" #include "StructureStart.h" -#include "biome.h" +#include "Biome.h" class Random; class NetherBridgeFeature : public StructureFeature diff --git a/Minecraft.World/OldChunkStorage.cpp b/Minecraft.World/OldChunkStorage.cpp index 50c29a96d..98afdc677 100644 --- a/Minecraft.World/OldChunkStorage.cpp +++ b/Minecraft.World/OldChunkStorage.cpp @@ -65,7 +65,7 @@ File OldChunkStorage::getFile(int x, int z) wchar_t xRadix36[64]; wchar_t zRadix36[64]; -#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ ) +#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined __linux__ ) assert(0); // need a gcc verison of _itow ? #else _itow(x,xRadix36,36); diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp index 3c05f3578..a57917e0c 100644 --- a/Minecraft.World/Ozelot.cpp +++ b/Minecraft.World/Ozelot.cpp @@ -12,7 +12,7 @@ #include "net.minecraft.world.phys.h" #include "SynchedEntityData.h" #include "StringHelpers.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "GenericStats.h" #include "Ozelot.h" diff --git a/Minecraft.World/Packet.cpp b/Minecraft.World/Packet.cpp index 0a59204c2..70bbe83dd 100644 --- a/Minecraft.World/Packet.cpp +++ b/Minecraft.World/Packet.cpp @@ -6,10 +6,11 @@ #include "PacketListener.h" #include "Packet.h" #include "com.mojang.nbt.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" #ifndef _CONTENT_PACKAGE -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\Gui.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Gui.h" #endif void Packet::staticCtor() diff --git a/Minecraft.World/Path.cpp b/Minecraft.World/Path.cpp index 538917f6f..ff8a641ad 100644 --- a/Minecraft.World/Path.cpp +++ b/Minecraft.World/Path.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.world.entity.h" #include "net.minecraft.world.level.pathfinder.h" -#include "path.h" +#include "Path.h" Path::~Path() { diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp index b556a9365..a3d5f9348 100644 --- a/Minecraft.World/Pig.cpp +++ b/Minecraft.World/Pig.cpp @@ -13,7 +13,7 @@ #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.global.h" #include "Pig.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "MobCategory.h" diff --git a/Minecraft.World/PigZombie.cpp b/Minecraft.World/PigZombie.cpp index cc060484c..d1eae8b12 100644 --- a/Minecraft.World/PigZombie.cpp +++ b/Minecraft.World/PigZombie.cpp @@ -9,7 +9,7 @@ #include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.damagesource.h" #include "PigZombie.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp index cbad5cecd..0c978d4f3 100644 --- a/Minecraft.World/PistonBaseTile.cpp +++ b/Minecraft.World/PistonBaseTile.cpp @@ -5,8 +5,8 @@ #include "PistonExtensionTile.h" #include "Facing.h" #include "net.minecraft.world.level.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MultiPlayerLevel.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/MultiPlayerLevel.h" #include "net.minecraft.world.h" #include "LevelChunk.h" #include "Dimension.h" diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp index 05d977431..1c89c8582 100644 --- a/Minecraft.World/Player.cpp +++ b/Minecraft.World/Player.cpp @@ -32,11 +32,12 @@ #include "Inventory.h" #include "Player.h" #include "ParticleTypes.h" - -#include "..\Minecraft.Client\Textures.h" - -#include "..\Minecraft.Client\LocalPlayer.h" -#include "..\Minecraft.Client\HumanoidModel.h" +#include +#include +#include "../Minecraft.Client/Textures.h" +#include +#include "../Minecraft.Client/LocalPlayer.h" +#include "../Minecraft.Client/HumanoidModel.h" #include "SoundTypes.h" @@ -2555,14 +2556,14 @@ int Player::getTexture() } } -int Player::hash_fnct(const shared_ptr k) +int Player::hash_fnct(const std::shared_ptr k) { - // TODO 4J Stu - Should we just be using the pointers and hashing them? + // Hashing the player's name based on platform #ifdef __PS3__ - return (int)boost::hash_value( k->name ); // 4J Stu - Names are completely unique? + return (int)boost::hash_value(k->name); #else - return (int)std::hash_value( k->name ); // 4J Stu - Names are completely unique? -#endif //__PS3__ + return (int)std::hash()(k->name); +#endif // __PS3__ } bool Player::eq_test(const shared_ptr x, const shared_ptr y) diff --git a/Minecraft.World/PlayerEnderChestContainer.cpp b/Minecraft.World/PlayerEnderChestContainer.cpp index 466d97102..36cc82196 100644 --- a/Minecraft.World/PlayerEnderChestContainer.cpp +++ b/Minecraft.World/PlayerEnderChestContainer.cpp @@ -69,4 +69,4 @@ void PlayerEnderChestContainer::stopOpen() } SimpleContainer::stopOpen(); activeChest = nullptr; -} \ No newline at end of file +} diff --git a/Minecraft.World/PlayerInfoPacket.cpp b/Minecraft.World/PlayerInfoPacket.cpp index 9cbe5f7cc..70628e133 100644 --- a/Minecraft.World/PlayerInfoPacket.cpp +++ b/Minecraft.World/PlayerInfoPacket.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.world.entity.player.h" -#include "..\Minecraft.Client\ServerPlayer.h" -#include "..\Minecraft.Client\PlayerConnection.h" +#include "../Minecraft.Client/ServerPlayer.h" +#include "../Minecraft.Client/PlayerConnection.h" #include #include "PacketListener.h" #include "InputOutputStream.h" @@ -58,4 +58,4 @@ void PlayerInfoPacket::handle(PacketListener *listener) int PlayerInfoPacket::getEstimatedSize() { return 2 + 2 + 4 + 4; -} \ No newline at end of file +} diff --git a/Minecraft.World/PotionBrewing.cpp b/Minecraft.World/PotionBrewing.cpp index eb9736558..72a29bbed 100644 --- a/Minecraft.World/PotionBrewing.cpp +++ b/Minecraft.World/PotionBrewing.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.world.effect.h" #include "JavaMath.h" #include "SharedConstants.h" diff --git a/Minecraft.World/PreLoginPacket.cpp b/Minecraft.World/PreLoginPacket.cpp index 4b4742141..7079af8b5 100644 --- a/Minecraft.World/PreLoginPacket.cpp +++ b/Minecraft.World/PreLoginPacket.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include #include "PacketListener.h" -#include "PreloginPacket.h" +#include "PreLoginPacket.h" #include "InputOutputStream.h" - +#include "../Minecraft.Client/Windows64/Windows64_App.h" PreLoginPacket::PreLoginPacket() diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp index 4e26134a1..09a54e220 100644 --- a/Minecraft.World/RandomLevelSource.cpp +++ b/Minecraft.World/RandomLevelSource.cpp @@ -10,7 +10,7 @@ #include "RandomLevelSource.h" #ifdef __PS3__ -#include "..\Minecraft.Client\PS3\SPU_Tasks\PerlinNoise\PerlinNoiseJob.h" +#include "../Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h" #include "C4JSpursJob.h" static PerlinNoise_DataIn g_lperlinNoise1_SPU __attribute__((__aligned__(16))); static PerlinNoise_DataIn g_lperlinNoise2_SPU __attribute__((__aligned__(16))); diff --git a/Minecraft.World/RedStoneDustTile.cpp b/Minecraft.World/RedStoneDustTile.cpp index 699cad955..0e458e8c6 100644 --- a/Minecraft.World/RedStoneDustTile.cpp +++ b/Minecraft.World/RedStoneDustTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "RedStoneDustTile.h" #include "net.minecraft.world.item.h" #include "net.minecraft.world.level.h" @@ -9,7 +9,7 @@ // AP - added for Vita to set Alpha Cut out #include "IntBuffer.h" -#include "..\Minecraft.Client\Tesselator.h" +#include "../Minecraft.Client/Tesselator.h" const wstring RedStoneDustTile::TEXTURE_CROSS = L"redstoneDust_cross"; const wstring RedStoneDustTile::TEXTURE_LINE = L"redstoneDust_line"; diff --git a/Minecraft.World/RedStoneItem.cpp b/Minecraft.World/RedStoneItem.cpp index 64201caa4..5c7c8a4ab 100644 --- a/Minecraft.World/RedStoneItem.cpp +++ b/Minecraft.World/RedStoneItem.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.level.tile.h" #include "ItemInstance.h" #include "GenericStats.h" -#include "RedstoneItem.h" +#include "RedStoneItem.h" RedStoneItem::RedStoneItem(int id) : Item(id) { diff --git a/Minecraft.World/RepairMenu.cpp b/Minecraft.World/RepairMenu.cpp index d246b73fb..be2280cc6 100644 --- a/Minecraft.World/RepairMenu.cpp +++ b/Minecraft.World/RepairMenu.cpp @@ -400,4 +400,4 @@ void RepairMenu::setItemName(const wstring &name) getSlot(RESULT_SLOT)->getItem()->setHoverName(itemName); } createResult(); -} \ No newline at end of file +} diff --git a/Minecraft.World/RespawnPacket.cpp b/Minecraft.World/RespawnPacket.cpp index 5c04bbebb..5211e3792 100644 --- a/Minecraft.World/RespawnPacket.cpp +++ b/Minecraft.World/RespawnPacket.cpp @@ -4,6 +4,7 @@ #include "PacketListener.h" #include "RespawnPacket.h" #include "LevelType.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" RespawnPacket::RespawnPacket() { diff --git a/Minecraft.World/SetHealthPacket.cpp b/Minecraft.World/SetHealthPacket.cpp index 55d7ccc30..fef814807 100644 --- a/Minecraft.World/SetHealthPacket.cpp +++ b/Minecraft.World/SetHealthPacket.cpp @@ -3,7 +3,7 @@ #include "InputOutputStream.h" #include "PacketListener.h" #include "SetHealthPacket.h" - +#include "../Minecraft.Client/Common/Telemetry/TelemetryManager.h" SetHealthPacket::SetHealthPacket() @@ -63,4 +63,4 @@ bool SetHealthPacket::canBeInvalidated() bool SetHealthPacket::isInvalidatedBy(shared_ptr packet) { return true; -} \ No newline at end of file +} diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp index 30eeefcdb..2f97a4bac 100644 --- a/Minecraft.World/Sheep.cpp +++ b/Minecraft.World/Sheep.cpp @@ -16,7 +16,7 @@ using namespace std; #include "net.minecraft.world.entity.global.h" #include "net.minecraft.world.entity.player.h" #include "Sheep.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "MobCategory.h" #include "GenericStats.h" diff --git a/Minecraft.World/SignTileEntity.cpp b/Minecraft.World/SignTileEntity.cpp index 09b8e0222..dc70b699b 100644 --- a/Minecraft.World/SignTileEntity.cpp +++ b/Minecraft.World/SignTileEntity.cpp @@ -9,10 +9,10 @@ #include "net.minecraft.network.packet.h" #include "SignTileEntity.h" #include -#include "..\Minecraft.Client\ClientConnection.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.Client/ClientConnection.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/ServerLevel.h" +#include "../Minecraft.World/Level.h" diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index 117dc41b3..a235492e7 100644 --- a/Minecraft.World/Silverfish.cpp +++ b/Minecraft.World/Silverfish.cpp @@ -4,9 +4,10 @@ #include "net.minecraft.world.phys.h" #include "net.minecraft.world.damagesource.h" #include "net.minecraft.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "Silverfish.h" #include "SoundTypes.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" @@ -208,4 +209,4 @@ bool Silverfish::canSpawn() MobType Silverfish::getMobType() { return ARTHROPOD; -} \ No newline at end of file +} diff --git a/Minecraft.World/Skeleton.cpp b/Minecraft.World/Skeleton.cpp index b6dbab1f1..0eef16bf6 100644 --- a/Minecraft.World/Skeleton.cpp +++ b/Minecraft.World/Skeleton.cpp @@ -13,7 +13,7 @@ #include "net.minecraft.world.damagesource.h" #include "SharedConstants.h" #include "Skeleton.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp index 7941fbe0b..f28e5ead3 100644 --- a/Minecraft.World/Slime.cpp +++ b/Minecraft.World/Slime.cpp @@ -11,7 +11,7 @@ #include "net.minecraft.world.damagesource.h" #include "com.mojang.nbt.h" #include "Slime.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/SnowMan.cpp b/Minecraft.World/SnowMan.cpp index 958b8126a..9ad728eec 100644 --- a/Minecraft.World/SnowMan.cpp +++ b/Minecraft.World/SnowMan.cpp @@ -11,7 +11,7 @@ #include "net.minecraft.world.level.biome.h" #include "net.minecraft.world.item.h" #include "SharedConstants.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SnowMan.h" #include "SoundTypes.h" diff --git a/Minecraft.World/SparseDataStorage.cpp b/Minecraft.World/SparseDataStorage.cpp index 6db131e78..4b761d787 100644 --- a/Minecraft.World/SparseDataStorage.cpp +++ b/Minecraft.World/SparseDataStorage.cpp @@ -407,7 +407,7 @@ void SparseDataStorage::addNewPlane(int y) // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 == lastDataAndCount ) { @@ -485,7 +485,7 @@ void SparseDataStorage::updateDataAndCount(__int64 newDataAndCount) // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 == lastDataAndCount ) { @@ -564,7 +564,7 @@ int SparseDataStorage::compress() // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 != lastDataAndCount ) { diff --git a/Minecraft.World/SparseDataStorage.h b/Minecraft.World/SparseDataStorage.h index 93d5c4244..192316447 100644 --- a/Minecraft.World/SparseDataStorage.h +++ b/Minecraft.World/SparseDataStorage.h @@ -1,5 +1,7 @@ #pragma once +#ifndef __linux__ #include "xmcore.h" +#endif // __linux__ // 4J added - Storage for data (ie the extra per tile storage). Data is normally stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x 16 x 0.5 ) // This class provides more economical storage for such data by taking into consideration that it is quite common for large parts of the data to be very compressible (ie zero). diff --git a/Minecraft.World/SparseLightStorage.cpp b/Minecraft.World/SparseLightStorage.cpp index f9a2f0cbd..8cc1dfeea 100644 --- a/Minecraft.World/SparseLightStorage.cpp +++ b/Minecraft.World/SparseLightStorage.cpp @@ -413,7 +413,7 @@ void SparseLightStorage::addNewPlane(int y) // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 == lastDataAndCount ) { @@ -491,7 +491,7 @@ void SparseLightStorage::updateDataAndCount(__int64 newDataAndCount) // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 == lastDataAndCount ) { @@ -581,7 +581,7 @@ int SparseLightStorage::compress() // Attempt to update the data & count atomically. This command will Only succeed if the data stored at // dataAndCount is equal to lastDataAndCount, and will return the value present just before the write took place - __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( &dataAndCount, newDataAndCount, lastDataAndCount ); + __int64 lastDataAndCount2 = InterlockedCompareExchangeRelease64( (LONG64 *)&dataAndCount, newDataAndCount, lastDataAndCount ); if( lastDataAndCount2 != lastDataAndCount ) { diff --git a/Minecraft.World/Spider.cpp b/Minecraft.World/Spider.cpp index ba58ce54b..eacc6cc29 100644 --- a/Minecraft.World/Spider.cpp +++ b/Minecraft.World/Spider.cpp @@ -8,7 +8,7 @@ #include "net.minecraft.world.entity.h" #include "com.mojang.nbt.h" #include "Spider.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/Squid.cpp b/Minecraft.World/Squid.cpp index 3e36777c2..583583d89 100644 --- a/Minecraft.World/Squid.cpp +++ b/Minecraft.World/Squid.cpp @@ -8,7 +8,7 @@ using namespace std; #include "net.minecraft.world.item.h" #include "SharedConstants.h" #include "Squid.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" diff --git a/Minecraft.World/Stats.cpp b/Minecraft.World/Stats.cpp index ce9ed8a71..917ee1931 100644 --- a/Minecraft.World/Stats.cpp +++ b/Minecraft.World/Stats.cpp @@ -8,7 +8,7 @@ #include "ItemStat.h" #include "GeneralStat.h" #include "Stats.h" -#include "..\Minecraft.Client\StatsCounter.h" +#include "../Minecraft.Client/StatsCounter.h" const int Stats::BLOCKS_MINED_OFFSET = 0x1000000; const int Stats::ITEMS_COLLECTED_OFFSET = 0x1010000; diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp index 15c412eb0..90f98daa6 100644 --- a/Minecraft.World/StemTile.cpp +++ b/Minecraft.World/StemTile.cpp @@ -3,8 +3,8 @@ #include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Common/Colours/ColourTable.h" #include "StemTile.h" const wstring StemTile::TEXTURE_ANGLED = L"stem_bent"; diff --git a/Minecraft.World/SynchedEntityData.cpp b/Minecraft.World/SynchedEntityData.cpp index 9f1aa1f7a..bff268436 100644 --- a/Minecraft.World/SynchedEntityData.cpp +++ b/Minecraft.World/SynchedEntityData.cpp @@ -7,6 +7,7 @@ #include "net.minecraft.world.item.h" #include "SynchedEntityData.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" SynchedEntityData::SynchedEntityData() { @@ -555,4 +556,4 @@ bool SynchedEntityData::DataItem::isDirty() void SynchedEntityData::DataItem::setDirty(bool dirty) { this->dirty = dirty; -} \ No newline at end of file +} diff --git a/Minecraft.World/Tag.h b/Minecraft.World/Tag.h index 4c96b9812..7b4ec38e8 100644 --- a/Minecraft.World/Tag.h +++ b/Minecraft.World/Tag.h @@ -7,18 +7,18 @@ using namespace std; class Tag { public: - static const byte TAG_End = static_cast(0); - static const byte TAG_Byte = static_cast(1); - static const byte TAG_Short = static_cast(2); - static const byte TAG_Int = static_cast(3); - static const byte TAG_Long = static_cast(4); - static const byte TAG_Float = static_cast(5); - static const byte TAG_Double = static_cast(6); - static const byte TAG_Byte_Array = static_cast(7); - static const byte TAG_String = static_cast(8); - static const byte TAG_List = static_cast(9); - static const byte TAG_Compound = static_cast(10); - static const byte TAG_Int_Array = static_cast(11); + static const byte TAG_End = static_cast(0); + static const byte TAG_Byte = static_cast(1); + static const byte TAG_Short = static_cast(2); + static const byte TAG_Int = static_cast(3); + static const byte TAG_Long = static_cast(4); + static const byte TAG_Float = static_cast(5); + static const byte TAG_Double = static_cast(6); + static const byte TAG_Byte_Array = static_cast(7); + static const byte TAG_String = static_cast(8); + static const byte TAG_List = static_cast(9); + static const byte TAG_Compound = static_cast(10); + static const byte TAG_Int_Array = static_cast(11); private: wstring name; diff --git a/Minecraft.World/TallGrass.cpp b/Minecraft.World/TallGrass.cpp index e2e7cb19d..a3bdf4e83 100644 --- a/Minecraft.World/TallGrass.cpp +++ b/Minecraft.World/TallGrass.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.world.item.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp index ccc8641b4..16c65b0ac 100644 --- a/Minecraft.World/TheEndDimension.cpp +++ b/Minecraft.World/TheEndDimension.cpp @@ -4,8 +4,8 @@ #include "net.minecraft.world.level.levelgen.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/Common/Colours/ColourTable.h" void TheEndDimension::init() { diff --git a/Minecraft.World/ThrownEnderpearl.cpp b/Minecraft.World/ThrownEnderpearl.cpp index 1cddfb1fe..fda4a7ad9 100644 --- a/Minecraft.World/ThrownEnderpearl.cpp +++ b/Minecraft.World/ThrownEnderpearl.cpp @@ -3,8 +3,8 @@ #include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.entity.h" #include "net.minecraft.world.level.h" -#include "..\Minecraft.Client\ServerPlayer.h" -#include "..\Minecraft.Client\PlayerConnection.h" +#include "../Minecraft.Client/ServerPlayer.h" +#include "../Minecraft.Client/PlayerConnection.h" #include "ThrownEnderpearl.h" diff --git a/Minecraft.World/TileItem.cpp b/Minecraft.World/TileItem.cpp index 8f624bff6..a0a7fb93e 100644 --- a/Minecraft.World/TileItem.cpp +++ b/Minecraft.World/TileItem.cpp @@ -10,7 +10,7 @@ using namespace std; #include "net.minecraft.world.h" #include "net.minecraft.stats.h" #include "TileItem.h" -#include "facing.h" +#include "Facing.h" // 4J-PB - for the debug option of not removing items #include diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp index 328c0c708..99d38a6c2 100644 --- a/Minecraft.World/Villager.cpp +++ b/Minecraft.World/Villager.cpp @@ -13,7 +13,7 @@ #include "net.minecraft.world.item.trading.h" #include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "Villager.h" unordered_map > Villager::MIN_MAX_VALUES; diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp index a0f054721..1947bf377 100644 --- a/Minecraft.World/VillagerGolem.cpp +++ b/Minecraft.World/VillagerGolem.cpp @@ -13,7 +13,7 @@ #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.phys.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SynchedEntityData.h" #include "VillagerGolem.h" #include "ParticleTypes.h" diff --git a/Minecraft.World/WaterLilyTile.cpp b/Minecraft.World/WaterLilyTile.cpp index 912039224..e35f84d46 100644 --- a/Minecraft.World/WaterLilyTile.cpp +++ b/Minecraft.World/WaterLilyTile.cpp @@ -2,7 +2,7 @@ #include "WaterLilyTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.entity.item.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "AABB.h" WaterlilyTile::WaterlilyTile(int id) : Bush(id) diff --git a/Minecraft.World/Wolf.cpp b/Minecraft.World/Wolf.cpp index 8ffc45c69..5b62d7411 100644 --- a/Minecraft.World/Wolf.cpp +++ b/Minecraft.World/Wolf.cpp @@ -15,7 +15,7 @@ #include "net.minecraft.stats.h" #include "Sheep.h" #include "Wolf.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "SoundTypes.h" diff --git a/Minecraft.World/WoodSlabTile.cpp b/Minecraft.World/WoodSlabTile.cpp index ba3a98e50..d7a0e9e10 100644 --- a/Minecraft.World/WoodSlabTile.cpp +++ b/Minecraft.World/WoodSlabTile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WoodSlabTile.h" -#include "woodtile.h" -#include "treetile.h" +#include "WoodTile.h" +#include "TreeTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" #include "net.minecraft.world.item.h" diff --git a/Minecraft.World/Zombie.cpp b/Minecraft.World/Zombie.cpp index b167635fe..d58c998a1 100644 --- a/Minecraft.World/Zombie.cpp +++ b/Minecraft.World/Zombie.cpp @@ -11,7 +11,7 @@ #include "net.minecraft.world.entity.player.h" #include "Zombie.h" #include "GenericStats.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "net.minecraft.world.entity.h" #include "SoundTypes.h" diff --git a/Minecraft.World/compression.cpp b/Minecraft.World/compression.cpp index f7315f0bd..eb581bd04 100644 --- a/Minecraft.World/compression.cpp +++ b/Minecraft.World/compression.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "compression.h" #if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64 -#include "..\Minecraft.Client\Common\zlib\zlib.h" +#include "../Minecraft.Client/Common/zlib/zlib.h" #endif #if defined(__linux__) @@ -10,9 +10,9 @@ #endif // __linux__ #if defined __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVitaExtras\zlib.h" +#include "../Minecraft.Client/PSVita/PSVitaExtras/zlib.h" #elif defined __PS3__ -#include "..\Minecraft.Client\PS3\PS3Extras\EdgeZLib.h" +#include "../Minecraft.Client/PS3/PS3Extras/EdgeZLib.h" #endif //__PS3__ #if defined(__linux__) diff --git a/Minecraft.World/compression.h b/Minecraft.World/compression.h index bceac78c6..0cf2d7c05 100644 --- a/Minecraft.World/compression.h +++ b/Minecraft.World/compression.h @@ -2,7 +2,7 @@ #include "FileHeader.h" #ifdef _XBOX_ONE -#include "..\Minecraft.Client\Durango\DurangoExtras\xcompress.h" +#include "../Minecraft.Client/Durango/DurangoExtras/xcompress.h" #endif class Compression diff --git a/Minecraft.World/linux/wlinux.h b/Minecraft.World/linux/wlinux.h deleted file mode 100644 index 569b33a4d..000000000 --- a/Minecraft.World/linux/wlinux.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef WLINUX_H -#define WLINUX_H - -#pragma once - -#include -#include -#include - -#define TRUE true -#define FALSE false -#define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) -#define ZeroMemory RtlZeroMemory -#define WINAPI - -typedef unsigned int DWORD; -typedef const char *LPCSTR; -typedef bool BOOL; -typedef void* LPVOID; -typedef char WCHAR; -typedef unsigned char BYTE; -typedef BYTE* PBYTE; -typedef const wchar_t* LPCWSTR; -typedef unsigned long long ULONGLONG; -typedef int HRESULT; -typedef unsigned int UINT; -typedef void* HANDLE; -typedef int INT; -typedef long* PLONG; -typedef unsigned int* LPDWORD; -typedef const void* LPCVOID; -typedef char CHAR; -typedef void* PVOID; -typedef unsigned long* ULONG_PTR; -typedef long LONG; -typedef void VOID; -typedef ULONGLONG PlayerUID; -typedef DWORD WORD; -typedef struct { - DWORD LowPart; - long long QuadPart; - LONG HighPart; -} LARGE_INTEGER; -typedef long long LONGLONG; -typedef size_t SIZE_T; -typedef std::wstring LPWSTR; - -// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime -typedef struct _FILETIME { - DWORD dwLowDateTime; - DWORD dwHighDateTime; -} FILETIME, *PFILETIME, *LPFILETIME; - -#define FILE_BEGIN SEEK_SET - -typedef short SHORT; - -typedef VOID* XMEMCOMPRESSION_CONTEXT; -typedef VOID* XMEMDECOMPRESSION_CONTEXT; - -typedef float FLOAT; - -#include "../x64headers/extraX64.h" - -#endif // WLINUX_H diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index d53a12849..87ad6832f 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -9,12 +9,8 @@ #define AUTO_VAR(_var, _val) auto _var = _val #endif -typedef unsigned __int64; -typedef unsigned __uint64; - -#if defined( __linux__ ) -#include "linux/wlinux.h" -#include "linux/xbox_valve.h" +#if ( defined _XBOX || defined _WINDOWS64 || defined _DURANGO ) +typedef unsigned __int64 __uint64; #endif #ifdef _WINDOWS64 @@ -34,7 +30,7 @@ typedef unsigned __uint64; #include using namespace DirectX; #include -#include "..\Minecraft.Client\Durango\DurangoExtras\DurangoStubs.h" +#include "../Minecraft.Client/Durango/DurangoExtras/DurangoStubs.h" #endif #if (defined __PS3__ || defined _XBOX ) @@ -98,6 +94,9 @@ typedef XUID GameSessionUID; #include #include #include + +#include "../Minecraft.Client/Linux/LinuxStubs.h" +#include "../Minecraft.Client/Linux/xbox_valve.h" #else #include #include @@ -107,6 +106,8 @@ typedef XUID GameSessionUID; #include +#include "x64headers/extraX64.h" + #include #include #include @@ -124,11 +125,6 @@ typedef XUID GameSessionUID; #include #endif -#if defined(__linux__) -#else -#include "../Minecraft.Client/Xbox/Network/extra.h" -#endif - #include "Definitions.h" #include "Class.h" #include "Exceptions.h" @@ -155,41 +151,42 @@ typedef XUID GameSessionUID; void MemSect(int sect); #ifdef _XBOX -#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_XTMS.h" -#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/xbox/4JLibs/inc/4J_XTMS.h" +#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Input.h" #elif defined (__PS3__) -#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Input.h" #elif defined _DURANGO -#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Input.h" #elif defined _WINDOWS64 -#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h" #elif defined __PSVITA__ -#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Input.h" #elif defined __linux__ +// FIXME: Port 4JLibs to POSIX #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h" #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h" #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h" #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h" #else -#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Profile.h" -#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Render.h" -#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Storage.h" -#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Input.h" +#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Input.h" #endif #include "../Minecraft.Client/Common/Network/GameNetworkManager.h" @@ -203,8 +200,8 @@ void MemSect(int sect); //#endif #ifdef _XBOX -#include "..\Minecraft.Client\Common\XUI\XUI_Helper.h" -#include "..\Minecraft.Client\Common\XUI\XUI_Scene_Base.h" +#include "../Minecraft.Client/Common/XUI/XUI_Helper.h" +#include "../Minecraft.Client/Common/XUI/XUI_Scene_Base.h" #endif #include "../Minecraft.Client/Common/Consoles_App.h" #include "../Minecraft.Client/Common/Minecraft_Macros.h" @@ -213,43 +210,47 @@ void MemSect(int sect); #include "../Minecraft.Client/Common/BuildVer.h" #ifdef _XBOX -#include "..\Minecraft.Client\Xbox\Xbox_App.h" -#include "..\Minecraft.Client\XboxMedia\strings.h" -#include "..\Minecraft.Client\Xbox\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Xbox\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/Xbox/Xbox_App.h" +#include "../Minecraft.Client/XboxMedia/strings.h" +#include "../Minecraft.Client/Xbox/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Xbox/Sentient/MinecraftTelemetry.h" #elif defined (__PS3__) -#include "..\Minecraft.Client\PS3\PS3_App.h" -#include "..\Minecraft.Client\PS3Media\strings.h" -#include "..\Minecraft.Client\PS3\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\PS3\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/PS3/PS3_App.h" +#include "../Minecraft.Client/PS3Media/strings.h" +#include "../Minecraft.Client/PS3/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/PS3/Sentient/MinecraftTelemetry.h" #elif defined _DURANGO -#include "..\Minecraft.Client\Durango\Durango_App.h" -#include "..\Minecraft.Client\DurangoMedia\strings.h" -//#include "..\Minecraft.Client\Durango\Sentient\SentientManager.h" -#include "..\Minecraft.Client\Durango\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Durango\Sentient\MinecraftTelemetry.h" -#include "..\Minecraft.Client\Durango\Sentient\TelemetryEnum.h" +#include "../Minecraft.Client/Durango/Durango_App.h" +#include "../Minecraft.Client/DurangoMedia/strings.h" +//#include "../Minecraft.Client/Durango/Sentient/SentientManager.h" +#include "../Minecraft.Client/Durango/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Durango/Sentient/MinecraftTelemetry.h" +#include "../Minecraft.Client/Durango/Sentient/TelemetryEnum.h" #elif defined _WINDOWS64 -#include "..\Minecraft.Client\Windows64\Windows64_App.h" -#include "..\Minecraft.Client\Windows64Media\strings.h" -#include "..\Minecraft.Client\Windows64\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Windows64\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" +#include "../Minecraft.Client/Windows64Media/strings.h" +#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" #elif defined __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVita_App.h" -#include "..\Minecraft.Client\PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this -#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h" -#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/PSVita/PSVita_App.h" +#include "../Minecraft.Client/PSVitaMedia/strings.h" // TODO - create PSVita-specific version of this +#include "../Minecraft.Client/PSVita/Sentient/SentientManager.h" +#include "../Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h" #elif defined(__linux__) -// DecalOverdose: TODO???? +// FIXME: Move and port to ../Minecraft.Client/Linux +#include "../Minecraft.Client/Windows64/Windows64_App.h" +#include "../Minecraft.Client/Windows64Media/strings.h" +#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h" +// #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" #else -#include "..\Minecraft.Client\Orbis\Orbis_App.h" -#include "..\Minecraft.Client\OrbisMedia\strings.h" -#include "..\Minecraft.Client\Orbis\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Orbis\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/Orbis/Orbis_App.h" +#include "../Minecraft.Client/OrbisMedia/strings.h" +#include "../Minecraft.Client/Orbis/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Orbis/Sentient/MinecraftTelemetry.h" #endif #include "../Minecraft.Client/Common/DLC/DLCSkinFile.h" diff --git a/Minecraft.World/x64headers/extraX64.h b/Minecraft.World/x64headers/extraX64.h index a210fc892..c4051728c 100644 --- a/Minecraft.World/x64headers/extraX64.h +++ b/Minecraft.World/x64headers/extraX64.h @@ -11,9 +11,7 @@ #define MULTITHREAD_ENABLE -#ifndef __linux__ typedef unsigned char byte; -#endif // __linux__ const int XUSER_INDEX_ANY = 255; const int XUSER_INDEX_FOCUS = 254; @@ -25,50 +23,12 @@ const int XUSER_MAX_COUNT = 4; const int MINECRAFT_NET_MAX_PLAYERS = 8; #endif -#if defined(__linux__) - -typedef struct _RTL_CRITICAL_SECTION { - // // - // // The following field is used for blocking when there is contention for - // // the resource - // // - // - union { - ULONG_PTR RawEvent[4]; - } Synchronization; - // - // // - // // The following three fields control entering and exiting the critical - // // section for the resource - // // - // - LONG LockCount; - LONG RecursionCount; - HANDLE OwningThread; -} RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; - -typedef RTL_CRITICAL_SECTION CRITICAL_SECTION; - - -inline void DeleteCriticalSection(CRITICAL_SECTION* stubEnterCS) -{ -} - -inline void EnterCriticalSection(CRITICAL_SECTION* stubEnterCS) -{ -} - -inline void LeaveCriticalSection( CRITICAL_SECTION* stubEnterCS) -{ -} -#endif // __linux__ - #ifdef __ORBIS__ #include #include #include -#include "..\..\Minecraft.Client\Orbis\Orbis_PlayerUID.h" -#include "..\..\Minecraft.Client\Orbis\Network\SQRNetworkManager_Orbis.h" +#include "../../Minecraft.Client/Orbis/Orbis_PlayerUID.h" +#include "../../Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h" typedef SQRNetworkManager_Orbis::SessionID SessionID; typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO; @@ -78,8 +38,8 @@ typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO; #include #include #include -#include "..\..\Minecraft.Client\PS3\PS3_PlayerUID.h" -#include "..\..\Minecraft.Client\PS3\Network\SQRNetworkManager_PS3.h" +#include "../../Minecraft.Client/PS3/PS3_PlayerUID.h" +#include "../../Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h" typedef SQRNetworkManager::SessionID SessionID; typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO; @@ -87,15 +47,15 @@ typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO; #include #include #include -#include "..\..\Minecraft.Client\PSVita\PSVita_PlayerUID.h" -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h" -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" +#include "../../Minecraft.Client/PSVita/PSVita_PlayerUID.h" +#include "../../Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h" +#include "../../Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h" typedef SQRNetworkManager_Vita::SessionID SessionID; typedef SQRNetworkManager_Vita::PresenceSyncInfo INVITE_INFO; #elif defined _DURANGO -#include "..\..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h" -#include "..\..\Minecraft.Client\Durango\Network\DQRNetworkManager.h" +#include "../../Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h" +#include "../../Minecraft.Client/Durango/Network/DQRNetworkManager.h" typedef ULONGLONG SessionID; typedef ULONGLONG GameSessionUID; typedef DQRNetworkManager::SessionInfo INVITE_INFO; @@ -443,7 +403,7 @@ const int QNET_SENDDATA_SEQUENTIAL = 0; struct XRNM_SEND_BUFFER { DWORD dwDataSize; - std::byte *pbyData; + byte *pbyData; }; const int D3DBLEND_CONSTANTALPHA = 0; diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..5261a7a19 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..c143911aa --- /dev/null +++ b/flake.nix @@ -0,0 +1,44 @@ +{ + description = "4jcraft-nix dev shell"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = { nixpkgs, ... }: + let + allSystems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + + forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { + pkgs = import nixpkgs { inherit system; }; + }); + in + { + devShells = forAllSystems ({ pkgs }: + let + libs = with pkgs; [ + openssl.dev + libGL + glfw + ]; + packages = with pkgs; [ + gcc + cmake + gnumake + ]; + in + { + default = pkgs.mkShell { + LD_LIBRARY_PATH = "/run/opengl-driver/lib"; + buildInputs = libs; + nativeBuildInputs = packages; + }; + } + ); + }; +}