diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp index 048c76ae7..de662277f 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/AbstractProjectileDispenseBehavior.cpp b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp index 5e4b888b1..6e9270fa1 100644 --- a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp +++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.core.h" -#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "Minecraft.World/net.minecraft.core.h" +#include "Minecraft.World/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net.minecraft.world.level.h" #include "AbstractProjectileDispenseBehavior.h" shared_ptr AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr dispensed) diff --git a/Minecraft.Client/AbstractProjectileDispenseBehavior.h b/Minecraft.Client/AbstractProjectileDispenseBehavior.h index 30705a8a0..d620379c9 100644 --- a/Minecraft.Client/AbstractProjectileDispenseBehavior.h +++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\DefaultDispenseItemBehavior.h" +#include "Minecraft.World/DefaultDispenseItemBehavior.h" class Projectile; diff --git a/Minecraft.Client/AbstractTexturePack.cpp b/Minecraft.Client/AbstractTexturePack.cpp index 80799a4c5..917f3f767 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..53b6c0832 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..182bece7b 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..41a91e07b 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..539564e31 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/ArchiveFile.h b/Minecraft.Client/ArchiveFile.h index 722d570d8..c8caaef74 100644 --- a/Minecraft.Client/ArchiveFile.h +++ b/Minecraft.Client/ArchiveFile.h @@ -3,8 +3,8 @@ #include #include -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\ArrayWithLength.h" +#include "Minecraft.World/File.h" +#include "Minecraft.World/ArrayWithLength.h" using namespace std; diff --git a/Minecraft.Client/ArrowRenderer.cpp b/Minecraft.Client/ArrowRenderer.cpp index 4698cd6e3..683b158f2 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" ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/Minecraft.Client/BatModel.cpp b/Minecraft.Client/BatModel.cpp index ec582fef3..3ece2a5d8 100644 --- a/Minecraft.Client/BatModel.cpp +++ b/Minecraft.Client/BatModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" +#include "Minecraft.World/net.minecraft.world.entity.ambient.h" #include "BatModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BatRenderer.cpp b/Minecraft.Client/BatRenderer.cpp index 629fe014a..bde55b36c 100644 --- a/Minecraft.Client/BatRenderer.cpp +++ b/Minecraft.Client/BatRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" +#include "Minecraft.World/net.minecraft.world.entity.ambient.h" #include "BatRenderer.h" #include "BatModel.h" diff --git a/Minecraft.Client/BeaconRenderer.cpp b/Minecraft.Client/BeaconRenderer.cpp index 959df6a89..de87562aa 100644 --- a/Minecraft.Client/BeaconRenderer.cpp +++ b/Minecraft.Client/BeaconRenderer.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.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.level.h" #include "BeaconRenderer.h" #include "Tesselator.h" diff --git a/Minecraft.Client/BlazeModel.cpp b/Minecraft.Client/BlazeModel.cpp index 68d9ef467..7aca94761 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 8e0da036b..7ab5c410c 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" ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); diff --git a/Minecraft.Client/BoatRenderer.cpp b/Minecraft.Client/BoatRenderer.cpp index 4c2e9baf9..acdde0aa7 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" ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); diff --git a/Minecraft.Client/BookModel.cpp b/Minecraft.Client/BookModel.cpp index d032a7f5f..322f26e30 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/BossMobGuiInfo.cpp b/Minecraft.Client/BossMobGuiInfo.cpp index 1cc3cae86..fc73eeaee 100644 --- a/Minecraft.Client/BossMobGuiInfo.cpp +++ b/Minecraft.Client/BossMobGuiInfo.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "BossMobGuiInfo.h" -#include "../Minecraft.World/BossMob.h" +#include "Minecraft.World/BossMob.h" float BossMobGuiInfo::healthProgress = 0.0f; int BossMobGuiInfo::displayTicks = 0; diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp index 51b721f51..ab541e672 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..be4e5e47f 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 37662d8a1..c900ba2b6 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 4de963491..bc1e1d728 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 456c8858d..65022a094 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..101d621cf 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 97954b55a..e375fb9cc 100644 --- a/Minecraft.Client/ChestRenderer.cpp +++ b/Minecraft.Client/ChestRenderer.cpp @@ -3,9 +3,9 @@ #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\Calendar.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.level.tile.h" +#include "Minecraft.World/Calendar.h" ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST); diff --git a/Minecraft.Client/ChickenModel.cpp b/Minecraft.Client/ChickenModel.cpp index 98ef93587..3e8e0102a 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 4f369df35..cd8ab44cf 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" ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN); diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index d039227bf..98793210a 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..af442b9bd 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 f3510d336..981913085 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -9,46 +9,46 @@ #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.ai.attributes.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.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.ai.attributes.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.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\BasicTypeContainers.h" +#include "Minecraft.World/SoundTypes.h" +#include "Minecraft.World/BasicTypeContainers.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" @@ -56,8 +56,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 a80c10f78..16edc2164 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 837532fb7..02eb2a0ba 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/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h index 43d700d6d..21e227154 100644 --- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h +++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h @@ -1,19 +1,19 @@ #pragma once -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "Minecraft.World/SoundTypes.h" #ifdef _XBOX #elif defined (__PS3__) #undef __in #undef __out -#include "..\..\PS3\Miles\include\mss.h" +#include "Minecraft.Client/PS3/Miles/include/mss.h" #elif defined (__PSVITA__) -#include "..\..\PSVITA\Miles\include\mss.h" +#include "Minecraft.Client/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 "Minecraft.Client/Durango/Miles/include/mss.h" #elif defined _WINDOWS64 #include #elif defined _CROSS64 @@ -21,7 +21,7 @@ #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 "Minecraft.Client/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 486b102ae..de4fc1874 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -11,13 +11,13 @@ #include #include ======= -#include "..\Consoles_App.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/DLCTexturePack.h" #include "Common\DLC\DLCAudioFile.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp index 5c74d5ece..e7fd79f28 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 703d3f552..d2fb9d4b2 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.cpp +++ b/Minecraft.Client/Common/ConsoleGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ConsoleGameMode.h" -#include ".\Tutorial\Tutorial.h" +#include "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 983381b59..b340c72cb 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.h +++ b/Minecraft.Client/Common/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include ".\Tutorial\TutorialMode.h" +#include "Tutorial/TutorialMode.h" class ConsoleGameMode : public TutorialMode { diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index b476ca909..ee7071a13 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\net.minecraft.world.entity.item.h" -#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\Options.h" -#include "..\MinecraftServer.h" -#include "..\MultiPlayerLevel.h" -#include "..\GameRenderer.h" -#include "..\ProgressRenderer.h" -#include "..\LevelRenderer.h" -#include "..\MobSkinMemTextureProcessor.h" -#include "..\Minecraft.h" -#include "..\ClientConnection.h" -#include "..\MultiPlayerLocalPlayer.h" -#include "..\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 "..\StatsCounter.h" -#include "..\GameMode.h" -#include "..\Xbox\Social\SocialManager.h" -#include "Tutorial\TutorialMode.h" +#include "Minecraft.World/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.phys.h" +#include "Minecraft.World/InputOutputStream.h" +#include "Minecraft.World/compression.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/GameRenderer.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.Client/LevelRenderer.h" +#include "Minecraft.Client/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/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 "Minecraft.Client/GameMode.h" +#include "Minecraft.Client/Xbox/Social/SocialManager.h" +#include "Tutorial/TutorialMode.h" #if defined _XBOX || defined _WINDOWS64 -#include "..\Xbox\XML\ATGXmlParser.h" -#include "..\Xbox\XML\xmlFilesCallback.h" +#include "Minecraft.Client/Xbox/XML/ATGXmlParser.h" +#include "Minecraft.Client/Xbox/XML/xmlFilesCallback.h" #endif #include "Minecraft_Macros.h" -#include "..\PlayerList.h" -#include "..\ServerPlayer.h" -#include "GameRules\ConsoleGameRules.h" -#include "GameRules\ConsoleSchematicFile.h" -#include "..\User.h" -#include "..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\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.Client/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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/DLCTexturePack.h" +#include "DLC/DLCPack.h" +#include "Minecraft.Client/StringTable.h" #ifndef _XBOX -#include "..\ArchiveFile.h" +#include "Minecraft.Client/ArchiveFile.h" #endif -#include "..\Minecraft.h" +#include "Minecraft.Client/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 "Minecraft.Client/Xbox/GameConfig/Minecraft.spa.h" +#include "Minecraft.Client/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 "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 ec36b7652..b9c16a28d 100644 --- a/Minecraft.Client/Common/Consoles_App.h +++ b/Minecraft.Client/Common/Consoles_App.h @@ -5,23 +5,23 @@ using namespace std; #include "Audio/Consoles_SoundEngine.h" #include -#include ".\Tutorial\TutorialEnum.h" +#include "Tutorial/TutorialEnum.h" #ifdef _XBOX -#include ".\XUI\XUI_Helper.h" -#include ".\XUI\XUI_HelpCredits.h" +#include "XUI/XUI_Helper.h" +#include "XUI/XUI_HelpCredits.h" #endif -#include "UI\UIStructs.h" +#include "UI/UIStructs.h" -#include "..\..\Minecraft.World\DisconnectPacket.h" +#include "Minecraft.World/DisconnectPacket.h" #include -#include "..\StringTable.h" -#include ".\DLC\DLCManager.h" -#include ".\GameRules\ConsoleGameRulesConstants.h" -#include ".\GameRules\GameRuleManager.h" -#include "..\SkinBox.h" -#include "..\ArchiveFile.h" +#include "Minecraft.Client/StringTable.h" +#include "DLC/DLCManager.h" +#include "GameRules/ConsoleGameRulesConstants.h" +#include "GameRules/GameRuleManager.h" +#include "Minecraft.Client/SkinBox.h" +#include "Minecraft.Client/ArchiveFile.h" typedef struct _JoinFromInviteData { diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp index 49ba52cda..f9da25f77 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 "Minecraft.Client/Xbox/XML/ATGXmlParser.h" +#include "Minecraft.Client/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..f93f2a86e 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.Client/Minecraft.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/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..08a15d327 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 "Minecraft.Client/Common/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..84a1660db 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..8cb32c236 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 "Minecraft.Client/Common/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..27a1578cf 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 "Minecraft.Client/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 17c9fc6d1..cdb3c80b1 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.Client/Minecraft.h" +#include "Minecraft.Client/TexturePackRepository.h" WCHAR *DLCManager::wchTypeNamesA[]= { diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp index 4a003d05d..f52be05c6 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 c845acd9b..8e5b0435b 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 "Minecraft.Client/ModelPart.h" +#include "Minecraft.Client/EntityRenderer.h" +#include "Minecraft.Client/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/DLC/DLCSkinFile.h b/Minecraft.Client/Common/DLC/DLCSkinFile.h index c8dcf0e9c..136c004d4 100644 --- a/Minecraft.Client/Common/DLC/DLCSkinFile.h +++ b/Minecraft.Client/Common/DLC/DLCSkinFile.h @@ -1,6 +1,6 @@ #pragma once #include "DLCFile.h" -#include "..\..\..\Minecraft.Client\HumanoidModel.h" +#include "Minecraft.Client/HumanoidModel.h" class DLCSkinFile : public DLCFile { diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp index eabc14011..9a6e13248 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..b41c0abc3 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..c99bed171 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..f72314daf 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..d99a918c6 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 "Minecraft.Client/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..87a0a7c7e 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..d43c13f6a 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..349063697 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/ConsoleGenerateStructure.h b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h index 91c4ef357..ab9aa9d2d 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h +++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h @@ -1,6 +1,6 @@ #pragma once #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructurePiece.h" +#include "Minecraft.World/StructurePiece.h" class Level; class Random; diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp index 3b995000f..d9babda42 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/ConsoleSchematicFile.h b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h index f37a60585..a2e1ca218 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h +++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h @@ -4,7 +4,7 @@ using namespace std; #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #define XBOX_SCHEMATIC_CURRENT_VERSION 2 -#include "..\..\..\Minecraft.World\ArrayWithLength.h" +#include "Minecraft.World/ArrayWithLength.h" class Level; class DataOutputStream; diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp index b63687c22..c685a16c1 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 "Minecraft.Client/WstringLookup.h" +#include "Minecraft.World/StringHelpers.h" #include "ConsoleGameRules.h" GameRuleDefinition::GameRuleDefinition() diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h index afec8fbcc..2cb0fa939 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h +++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h @@ -3,7 +3,7 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "Minecraft.World/ItemInstance.h" #include "ConsoleGameRulesConstants.h" #include "GameRulesInstance.h" diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp index 6e5688cc7..59869ac4e 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 "Minecraft.Client/Common/DLC/DLCPack.h" +#include "Minecraft.Client/Common/DLC/DLCLocalisationFile.h" +#include "Minecraft.Client/Common/DLC/DLCGameRulesFile.h" +#include "Minecraft.Client/Common/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/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 9ebd34289..e685b6b49 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp @@ -2,13 +2,13 @@ #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 "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 "Common\DLC\DLCGameRulesHeader.h" -#include "..\..\StringTable.h" +#include "Minecraft.Client/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 aa128ff84..411fead55 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h @@ -4,7 +4,7 @@ using namespace std; #pragma message("LevelGenerationOptions.h ") #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructureFeature.h" +#include "Minecraft.World/StructureFeature.h" class ApplySchematicRuleDefinition; class LevelChunk; diff --git a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp index 1c7ecd475..ab0f58f5b 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 "Minecraft.Client/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..7b9951abf 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 7f0c8b5c9..1c5e892f6 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/StartFeature.h b/Minecraft.Client/Common/GameRules/StartFeature.h index b198a2fa2..78f40a098 100644 --- a/Minecraft.Client/Common/GameRules/StartFeature.h +++ b/Minecraft.Client/Common/GameRules/StartFeature.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructureFeature.h" +#include "Minecraft.World/StructureFeature.h" class StartFeature : public GameRuleDefinition { diff --git a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp index 6e55cd459..c8ed9c16a 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..0c8cb201a 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/UseTileRuleDefinition.h b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h index ad64bfe47..157691cf2 100644 --- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h +++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\Pos.h" +#include "Minecraft.World/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp index 6d687b360..2cf841965 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..d8eea7ead 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 d81a2b033..fb61775ac 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 3f6204af7..17c438b64 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..8b403a4e8 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/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp index 78d62568c..3321d3007 100644 --- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -11,7 +11,7 @@ #include "Common\Consoles_App.h" #include "Common\Network\Sony\SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" #ifdef __ORBIS__ @@ -154,7 +154,7 @@ void SonyLeaderboardManager::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 PlayStationPlus subscription and they are able to access the Leaderboards. // NotifyAsyncPlusFeature(); diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp index b3fb5cd70..41a0bbb97 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -1,32 +1,32 @@ #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 "..\..\..\Minecraft.World\FireworksRecipe.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 "Minecraft.World/FireworksRecipe.h" +#include "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/PlayerList.h" +#include "Minecraft.Client/ServerPlayer.h" +#include "Minecraft.Client/PlayerConnection.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/DisconnectPacket.h" +#include "Minecraft.World/compression.h" +#include "Minecraft.World/OldChunkStorage.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" -#include "..\..\Gui.h" -#include "..\..\LevelRenderer.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\GameRules\ConsoleGameRules.h" +#include "Minecraft.Client/Gui.h" +#include "Minecraft.Client/LevelRenderer.h" +#include "Minecraft.World/IntCache.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" #ifdef _XBOX @@ -34,7 +34,7 @@ #else #include "Common\UI\UI.h" #include "Common\UI\UIScene_PauseMenu.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h" #endif #ifdef _DURANGO diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h index 01db27240..5127e028d 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.h +++ b/Minecraft.Client/Common/Network/GameNetworkManager.h @@ -2,21 +2,21 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #ifdef _XBOX -#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h" +#include "Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h" #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ -#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h" +#include "Sony/PlatformNetworkManagerSony.h" #elif defined _DURANGO -#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h" +#include "Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h" #else #include "PlatformNetworkManagerStub.h" #endif #include "SessionInfo.h" #ifdef __ORBIS__ -#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h" +#include "Minecraft.Client/Orbis/Network/PsPlusUpsellWrapper_Orbis.h" #endif class ClientConnection; diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h index 31c415a75..4c16bde44 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h @@ -2,7 +2,7 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp index 10d1a6a53..637e93a43 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp @@ -1,12 +1,12 @@ #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" +#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\Network\WinsockNetLayer.h" -#include "..\..\Minecraft.h" -#include "..\..\User.h" +#include "Minecraft.Client/Windows64/Network/WinsockNetLayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/User.h" #endif CPlatformNetworkManagerStub *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h index 28953cecb..a5b3c0d3f 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerInterface.h" #include "SessionInfo.h" diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h index ce6365bc4..0a94bba1b 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 "Sony/SQRNetworkManager.h" #endif diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h index 40b6c04c6..bda8e3bcf 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\UI\UIEnums.h" +#include "Minecraft.Client/Common/UI/UIEnums.h" class CTelemetryManager { diff --git a/Minecraft.Client/Common/Trial/TrialMode.cpp b/Minecraft.Client/Common/Trial/TrialMode.cpp index e81491389..4fa81b486 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 "Minecraft.Client/Common/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..c4ad7b0a1 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 "Minecraft.Client/Common/Tutorial/FullTutorialMode.h" class TrialMode : public FullTutorialMode { diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp index 406ea7d91..61a5d0583 100644 --- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp @@ -4,11 +4,11 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 0a369b0da..0ffb4ecac 100644 --- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp @@ -4,11 +4,11 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 d411ae067..3f3585013 100644 --- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp @@ -6,14 +6,14 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.level.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 "Minecraft.Client/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 b359bb808..1dcb95f56 100644 --- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp @@ -5,14 +5,14 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "Tutorial.h" #include "TutorialConstraints.h" #include "ChoiceTask.h" -#include "..\..\..\Minecraft.World\Material.h" -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "Minecraft.World/Material.h" +#include "Minecraft.Client/Windows64/KeyboardMouseInput.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..1bf3d33ef 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 d1bfa9812..3dd5d727f 100644 --- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp @@ -5,8 +5,8 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "Tutorial.h" #include "TutorialConstraints.h" diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp index 6749d0302..cd41820f1 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 86dbe5005..eca57022a 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..4d265291a 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 d0fda62e1..1a1a18fb3 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 "Minecraft.Client/Common/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..b44daf0c1 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.Client/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 a51269064..b78bfa08f 100644 --- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp +++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp @@ -5,13 +5,13 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "Tutorial.h" #include "TutorialConstraints.h" #include "InfoTask.h" -#include "..\..\..\Minecraft.World\Material.h" +#include "Minecraft.World/Material.h" #include "..\..\KeyboardMouseInput.h" InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, diff --git a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h index 991366919..c4d2716ce 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 c8723a84b..ca64822dd 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..9bbc009fe 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.Client/Minecraft.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/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..24e42130c 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 057e21713..83978d972 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 "Minecraft.Client/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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/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 7c77e1bee..0c79de1c0 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp @@ -1,15 +1,15 @@ #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" <<<<<<< HEAD #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp index 031831743..c106bafa0 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp @@ -9,13 +9,13 @@ #include #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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "TutorialMode.h" diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h index 75e24edf0..5e35aca11 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 "Minecraft.Client/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..2546d01d4 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..4130e740c 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..60c33108e 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 "Minecraft.Client/Common/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..17be49df8 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 348eaffba..4eb84da69 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -10,12 +10,12 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp index 10d1bcc41..8957e3901 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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 4e9e3aa79..72f4937f7 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..454bfe729 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_CommandBlockMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp index 4371b4e58..dc3e1d09a 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../../../Minecraft.World/CustomPayloadPacket.h" +#include "Minecraft.World/CustomPayloadPacket.h" #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" #include "IUIScene_CommandBlockMenu.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp index c6a4df002..9c61e97e3 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 05a44202d..97df56ac4 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 "Minecraft.Client/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 03a58378c..c0be9e3c3 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 a9416667c..453d43f2a 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -13,16 +13,16 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.World/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.item.enchantment.h" +#include "Minecraft.World/net.minecraft.world.entity.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/JavaMath.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) // 4J JEV - Images for each tab. diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h index 64b78029b..51394a33a 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..66eef8f23 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 346bf53f9..70dca7d4a 100644 --- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp @@ -4,9 +4,9 @@ #include #include ======= -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "IUIScene_EnchantingMenu.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp index 7f90fe8f4..07d4e3250 100644 --- a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_FireworksMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp index 4a6c6762a..fb576d062 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_HUD.cpp b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp index 03adbd2c2..e76036cd7 100644 --- a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.effect.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net.minecraft.world.entity.monster.h" #include "IUIScene_HUD.h" IUIScene_HUD::IUIScene_HUD() diff --git a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h index ef6d8d25d..84c38dafe 100644 --- a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h @@ -1,8 +1,8 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "../../../Minecraft.World/Container.h" -#include "../../../Minecraft.World/Inventory.h" +#include "Minecraft.World/Container.h" +#include "Minecraft.World/Inventory.h" class IUIScene_HopperMenu : public virtual IUIScene_AbstractContainerMenu { diff --git a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp index 8f1caab8c..b4e2ffc30 100644 --- a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "IUIScene_HorseInventoryMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h index 6df2001e7..f3da1cbce 100644 --- a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h @@ -1,9 +1,9 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -#include "../../../Minecraft.World/Container.h" -#include "../../../Minecraft.World/Inventory.h" -#include "../../../Minecraft.World/EntityHorse.h" +#include "Minecraft.World/Container.h" +#include "Minecraft.World/Inventory.h" +#include "Minecraft.World/EntityHorse.h" class IUIScene_HorseInventoryMenu : public virtual IUIScene_AbstractContainerMenu { diff --git a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp index 7bed406ac..745c62a9b 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 ab1767d4f..5e6ea26e4 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.Client/Minecraft.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.World/net.minecraft.world.level.h" +#include "Minecraft.World/net.minecraft.world.phys.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/DLCTexturePack.h" +#include "Minecraft.World/StringHelpers.h" #ifndef _XBOX #include "UI.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp index 8cc04940b..4c27b898c 100644 --- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "Minecraft.World/net.minecraft.world.item.trading.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/ClientConnection.h" #include "IUIScene_TradingMenu.h" IUIScene_TradingMenu::IUIScene_TradingMenu() @@ -78,7 +78,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) int buyBMatches = player->inventory->countMatches(buyBItem); if( (buyAItem != NULL && buyAMatches >= buyAItem->count) && (buyBItem == NULL || buyBMatches >= buyBItem->count) ) { - // 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple ‘Enchanted Books’ will cause the title to crash. + // 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple Enchanted Books will cause the title to crash. int actualShopItem = m_activeOffers.at(selectedShopItem).second; m_merchant->notifyTrade(activeRecipe); diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp index 98b4f1654..b595026f4 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.Client/Minecraft.h" +#include "Minecraft.Client/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 cb6443a17..2663275d3 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 9af43df49..c936e0e97 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 3036d8baf..670fb05d5 100644 --- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp @@ -8,11 +8,11 @@ #include #include ======= -#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 "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.World/net.minecraft.world.level.tile.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) 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..d2ccb5cec 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 7a4a24e5e..00c2ac0c2 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 9664dbf4f..c51e43e14 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.Client/Minecraft.h" +#include "Minecraft.Client/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/EnchantTableRenderer.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/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 b2d997fac..333ab2644 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp @@ -7,10 +7,10 @@ #include #include ======= -#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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/StringHelpers.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) UIControl_EnchantmentButton::UIControl_EnchantmentButton() diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp index 47374d214..7bb847ace 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_MinecraftHorse.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp index c7dbf1113..eda1e4116 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp @@ -1,25 +1,25 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HorseRenderer.h" +#include "Minecraft.Client/PlayerRenderer.h" +#include "Minecraft.Client/HorseRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\ModelHorse.h" +#include "Minecraft.Client/HumanoidModel.h" +#include "Minecraft.Client/ModelHorse.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/ModelPart.h" +#include "Minecraft.Client/Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" //#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.EntityHorse.h" <<<<<<< HEAD #include ======= -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "UI.h" #include "UIControl_MinecraftHorse.h" diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp index 6234d68e6..50d01418d 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp @@ -11,16 +11,16 @@ #include #include ======= -#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.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" +#include "Minecraft.Client/PlayerRenderer.h" +#include "Minecraft.Client/HumanoidModel.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/ModelPart.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 2d7c0224e..dff12bc5d 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.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" +#include "Minecraft.Client/PlayerRenderer.h" +#include "Minecraft.Client/HumanoidModel.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/ModelPart.h" +#include "Minecraft.Client/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..11e9405fb 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 "Minecraft.Client/Textures.h" class ModelPart; class EntityRenderer; diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index 8b38bbb3b..e0d74620d 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 "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/DLCTexturePack.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.Client/EnderDragonRenderer.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" #include "UIFontData.h" #ifdef __PSVITA__ #include diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index ba2536434..de797539e 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 "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/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 9a1803209..365aca250 100644 --- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -7,12 +7,12 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #ifdef _WINDOWS64 -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "Minecraft.Client/Windows64/KeyboardMouseInput.h" #endif UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp index c810ad455..dc90d1a09 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.Client/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_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp index e70397d68..fe9713a1b 100644 --- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Minecraft.h" #include "UIScene_BeaconMenu.h" UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp index 8563054c6..f0bce4fd7 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.Client/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 968072a8e..37b7f1ed9 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.Client/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 9e48a57b2..089dd231c 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 "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/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 923822bf6..9cfbf1a62 100644 --- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp @@ -5,8 +5,8 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) 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 5c8f2ed94..2836b208e 100644 --- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp @@ -5,9 +5,9 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "UIScene_CraftingMenu.h" diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index f7cca84bf..dfb25b7ff 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -1,17 +1,17 @@ #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/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 "Minecraft.Client/DLCTexturePack.h" #ifdef __PSVITA__ #include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp index 0895cdffe..1b6f82dbf 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp @@ -3,11 +3,11 @@ #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.Client/LocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/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_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp index 65c1b6fc0..eb3d26b0d 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp @@ -1,7 +1,7 @@ #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" #endif @@ -191,13 +191,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 ftes de fin d'anne.

1-4 joueurs
2-8 joueurs en rseau

Cet article fait lobjet dune licence ou dune sous-licence de Sony Computer Entertainment America, et est soumis aux conditions gnrales du service du rseau, au contrat dutilisateur, aux restrictions dutilisation 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 tlchargez pas ce produit. Cet article peut tre utilis avec un maximum de deux systmes PlayStation3 activs associs 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 artculo, que est sujeto a los trminos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artculo, as como otros trminos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos trminos, no descargue este artculo. Este artculo puede usarse en hasta dos sistemas PlayStation3 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 incrvel 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 Servio da Rede e Acordo do Usurio, as restries de uso deste item e outros termos aplicveis esto localizados em www.us.playstation.com/support/useragreements. Caso no queira aceitar todos esses termos, no baixe este item. Este item pode ser usado com at 2 sistemas PlayStation3 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 61e76babf..49695627c 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -6,8 +6,8 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) 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..03ade1f1f 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..156215a4a 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 "Minecraft.Client/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 8e45c3246..105c90b43 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.Client/Minecraft.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/GameRenderer.h" +#include "Minecraft.Client/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..b9f8382d7 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 97cf842a9..2947e4b04 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.Client/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..95692516b 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 27459ccc1..a4efae0be 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.Client/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 8d5a5602a..dd88ae0ba 100644 --- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp @@ -7,9 +7,9 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/StringHelpers.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp index 1d24f989b..f0c25d158 100644 --- a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\LocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/LocalPlayer.h" #include "UIScene_FireworksMenu.h" UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp index fb17bda44..a6be103da 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.Client/Minecraft.h" +#include "Minecraft.Client/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 392221a6f..d9ce2c2bf 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.Client/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 f2147cb21..2bd041dc4 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -10,12 +10,12 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.Client/EnderDragonRenderer.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.World/StringHelpers.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) 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 a0d631723..65a832db9 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.Client/Minecraft.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp index f0f6db18a..37e6cb057 100644 --- a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Minecraft.h" #include "UIScene_HopperMenu.h" UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp index ab98e30f9..4c19f7786 100644 --- a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "Minecraft.Client/Minecraft.h" #include "UIScene_HorseInventoryMenu.h" UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp index e33e24fe7..9f12ce1b3 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 68ac537ee..ae5a37be3 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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 57acf3458..84dce008c 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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 d7196849f..2601db409 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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 47b091052..523e29d61 100644 --- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp @@ -16,18 +16,18 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h index fb8d57a24..947617037 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 c036f7bf9..26d3d6ce3 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.Client/Minecraft.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/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 12b219053..f0168406c 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 "Minecraft.Client/Common/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 bcd4fe873..583bf3bd8 100644 --- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h @@ -1,8 +1,8 @@ #pragma once #include "UIScene.h" -// #include "..\Leaderboards\LeaderboardManager.h" -#include "..\Leaderboards\LeaderboardInterface.h" +#include "Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/Leaderboards/LeaderboardInterface.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 d4d832284..fc212fa48 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.Client/Minecraft.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/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" #endif -#include "..\..\DLCTexturePack.h" +#include "Minecraft.Client/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 2059c76fa..24a080931 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -2,17 +2,17 @@ #include "UI.h" #include "UIScene_LoadOrJoinMenu.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFile.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\Network\SessionInfo.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.level.h" +#include "Minecraft.World/net.minecraft.world.level.chunk.storage.h" +#include "Minecraft.World/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleSaveFileOriginal.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/Common/Network/SessionInfo.h" #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) #include "Common\Network\Sony\SonyHttp.h" #include "Common\Network\Sony\SonyRemoteStorage.h" diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index fe743adc2..dcd758094 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 "Minecraft.Client/User.h" +#include "Minecraft.Client/MinecraftServer.h" #include "UI.h" #include "UIScene_MainMenu.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp index 998679cab..ca6a578a6 100644 --- a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp +++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_NewUpdateMessage.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp index 164eb6c52..207bbbcba 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -9,19 +9,19 @@ #include #include ======= -#include "..\..\MinecraftServer.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/DLCTexturePack.h" +#include "Minecraft.World/StringHelpers.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #ifdef __ORBIS__ #include #endif #ifdef _DURANGO -#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h" +#include "Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.h" #endif #ifdef __PSVITA__ diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp index 0cb6cf2bd..0014b526f 100644 --- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_QuadrantSignin.h" -#include "..\..\Minecraft.h" +#include "Minecraft.Client/Minecraft.h" #if defined(__ORBIS__) #include "Common\Network\Sony\SonyHttp.h" #endif diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp index 39a0b7c66..409eeb013 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.Client/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..06e3c3005 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/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 d4f26ae71..07e4b3de5 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 e8d760967..bef9523c5 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..41f166ba3 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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 0a35c8e5b..2768d867c 100644 --- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.inventory.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.item.trading.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "Minecraft.Client/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/UIString.cpp b/Minecraft.Client/Common/UI/UIString.cpp index 288fa87a9..ffd7be9a4 100644 --- a/Minecraft.Client/Common/UI/UIString.cpp +++ b/Minecraft.Client/Common/UI/UIString.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" #include "UIString.h" diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp index 5d72ed97c..cbd9f9d3b 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 &name, const string &path, S32 fallbackCharacter) diff --git a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp index 91f362a3e..701700c67 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..7a3005583 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.Client/Minecraft.h" +#include "Minecraft.Client/Gui.h" HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.h b/Minecraft.Client/Common/XUI/XUI_Chat.h index d685e587f..cc5700733 100644 --- a/Minecraft.Client/Common/XUI/XUI_Chat.h +++ b/Minecraft.Client/Common/XUI/XUI_Chat.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_chat.h" +#include "Minecraft.Client/Common/Media/xuiscene_chat.h" #include "XUI_CustomMessages.h" #define CHAT_LINES_COUNT 10 diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp index 9a82a7b3b..10419b176 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.Client/Minecraft.h" +#include "Minecraft.World/DisconnectPacket.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h index 360ca0b0a..de0947a00 100644 --- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h +++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_connectingprogress.h" +#include "Minecraft.Client/Common/Media/xuiscene_connectingprogress.h" class CScene_ConnectingProgress : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp index 074b7300b..d460cbbe5 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..cf828e284 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..679593fc5 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..5067b33ef 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..7d8177797 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 "Minecraft.Client/Font.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/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..604217a50 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.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/EnchantTableRenderer.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/LocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantmentBook.h" -#include "..\..\BookModel.h" -#include "..\..\Options.h" +#include "Minecraft.Client/BookModel.h" +#include "Minecraft.Client/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..0fe84f31f 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..f157d8889 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 "Minecraft.Client/Font.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/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.Client/Minecraft.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/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..6448e77b3 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..39ff8e82d 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.Client/Minecraft.h" +#include "Minecraft.Client/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 d17eeb089..badfd0028 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp @@ -6,16 +6,16 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\Lighting.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_MinecraftPlayer.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "..\..\Options.h" +#include "Minecraft.Client/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..64bc72a0a 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.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/EntityRenderDispatcher.h" +#include "Minecraft.Client/PlayerRenderer.h" +#include "Minecraft.Client/HumanoidModel.h" +#include "Minecraft.Client/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 "Minecraft.Client/Options.h" +#include "Minecraft.Client/stubs.h" +#include "Minecraft.Client/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 92cc68578..e7e56c76e 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h @@ -8,9 +8,9 @@ #include ======= #include -#include "..\..\Textures.h" +#include "Minecraft.Client/Textures.h" //#include "..\..\Xbox\DLC\DLCSkinFile.h" -#include "..\..\Model.h" +#include "Minecraft.Client/Model.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) 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..3ff844348 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 "Minecraft.Client/ItemRenderer.h" +#include "Minecraft.Client/GameRenderer.h" +#include "Minecraft.Client/TileRenderer.h" +#include "Minecraft.Client/Lighting.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/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..451198427 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..105fa3205 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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..b76dcfbe5 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..9f7a33a35 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.Client/Minecraft.h" +#include "Minecraft.Client/ScreenSizeCalculator.h" +#include "Minecraft.Client/Lighting.h" #include "XUI_Ctrl_SplashPulser.h" -#include "..\..\Font.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\System.h" +#include "Minecraft.Client/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..6f63c775e 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..606d21e3c 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 "Minecraft.Client/Common/Media/xuiscene_DLCOffers.h" +#include "Minecraft.Client/Common/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 434c72fc1..f109b7e24 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_Death.h" +#include "XUI_Death.h" #include <<<<<<< HEAD #include @@ -23,23 +23,23 @@ #include #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.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.World/compression.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_Death.h b/Minecraft.Client/Common/XUI/XUI_Death.h index 3164f59d0..0136862ff 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.h +++ b/Minecraft.Client/Common/XUI/XUI_Death.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_Death.h" +#include "Minecraft.Client/Common/Media/xuiscene_death.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Debug.h b/Minecraft.Client/Common/XUI/XUI_Debug.h index 1fa6d3c86..b683d7e98 100644 --- a/Minecraft.Client/Common/XUI/XUI_Debug.h +++ b/Minecraft.Client/Common/XUI/XUI_Debug.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_debug.h" +#include "Minecraft.Client/Common/Media/xuiscene_debug.h" class CScene_Debug : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp index 56b41267e..87040c5fa 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/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..53dbc18c0 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h @@ -1,10 +1,10 @@ #pragma once using namespace std; -#include "../media/xuiscene_debug_item_editor.h" +#include "Minecraft.Client/Common/Media/xuiscene_debug_item_editor.h" #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 4dd805033..101a5c5d6 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp @@ -7,35 +7,35 @@ #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\MultiplayerLevel.h" -#include "..\..\GameMode.h" -#include "..\..\SurvivalMode.h" -#include "..\..\CreativeMode.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/GameMode.h" +#include "Minecraft.Client/SurvivalMode.h" +#include "Minecraft.Client/CreativeMode.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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..90cbfdbdd 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h @@ -1,14 +1,14 @@ #pragma once using namespace std; -#include "../media/xuiscene_debugoverlay.h" +#include "Minecraft.Client/Common/Media/xuiscene_debugoverlay.h" #define DEBUG_OVERLAY_UPDATE_TIME_PERIOD 10000 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..5be60f578 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..91473f015 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 "Minecraft.Client/Common/Media/xuiscene_debug_schematic_create.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "Minecraft.Client/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 8044f227a..d9c58980a 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp @@ -1,16 +1,16 @@ #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 "Minecraft.Client/Xbox/4JLibs/inc/4J_Input.h" <<<<<<< HEAD #include #include ======= -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #ifndef _CONTENT_PACKAGE diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h index 1bc662e96..8ad72806e 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 "Minecraft.Client/Common/Media/xuiscene_debug_set_camera.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "Minecraft.Client/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..f90407cbc 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_DebugTips.h b/Minecraft.Client/Common/XUI/XUI_DebugTips.h index 5a0ac47f8..f06647b6b 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugTips.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_DebugTips.h" +#include "Minecraft.Client/Common/Media/xuiscene_debugtips.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp index f66c0d70c..629ebe73f 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.Client/Minecraft.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.Client/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..acc7a685f 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.Client/Common/Media/xuiscene_fullscreenprogress.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 4329ea641..73077bb3f 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp @@ -9,13 +9,13 @@ #include #include ======= -#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.Client/Minecraft.h" +#include "Minecraft.Client/Gui.h" +#include "Minecraft.Client/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" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.h b/Minecraft.Client/Common/XUI/XUI_HUD.h index 1bf6bcbf7..c0f516238 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.h +++ b/Minecraft.Client/Common/XUI/XUI_HUD.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_hud.h" +#include "Minecraft.Client/Common/Media/xuiscene_hud.h" #include "XUI_CustomMessages.h" #define CHAT_LINES_COUNT 10 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp index 9ba49e9d4..1fc31408f 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_HelpAndOptions.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h index 9ece2cd95..e8c5e848c 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_helpandoptions.h" +#include "Minecraft.Client/Common/Media/xuiscene_helpandoptions.h" #include "XUI_CustomMessages.h" #define BUTTON_HAO_CHANGESKIN 0 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp index e3124ae41..d5c6a73b5 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpControls.h" +#include "XUI_HelpControls.h" #include "XUI_Ctrl_4JList.h" <<<<<<< HEAD @@ -9,9 +9,9 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #define ALIGN_START 0 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.h b/Minecraft.Client/Common/XUI/XUI_HelpControls.h index 4d14953b5..2e2190f3c 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_controls.h" +#include "Minecraft.Client/Common/Media/xuiscene_controls.h" #include "XUI_CustomMessages.h" class CXuiCtrl4JList; diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h index e973286eb..2912ba7cb 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 "Minecraft.Client/Common/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..a8beb435f 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_HelpHowToPlay.h" +#include "Minecraft.World/StringHelpers.h" static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] = { diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h index 8a37e9255..9b38d4869 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_howtoplay.h" +#include "Minecraft.Client/Common/Media/xuiscene_howtoplay.h" #include "XUI_CustomMessages.h" enum EHowToPlayTextControls diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp index 14046f203..32c1bcc9f 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_HowToPlayMenu.h" +#include "XUI_HelpHowToPlay.h" // strings for buttons in the list unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]= diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h index ba334c80c..c84b26dac 100644 --- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_howtoplay_menu.h" +#include "Minecraft.Client/Common/Media/xuiscene_howtoplay_menu.h" #include "XUI_CustomMessages.h" class CScene_HowToPlayMenu : public CXuiSceneImpl diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp index f05617451..bd81cfb6a 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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..64eeaf0c2 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 "Minecraft.Client/Common/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..ae8c1151f 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 "Minecraft.Client/ServerPlayer.h" +#include "Minecraft.Client/PlayerConnection.h" +#include "Minecraft.Client/PlayerList.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.Client/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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/ClientConnection.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h" #define IGNORE_KEYPRESS_TIMERID 0 #define TOOLTIP_TIMERID 1 diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h index 8b685aaf7..c6845e12f 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "../media/xuiscene_ingameinfo.h" +#include "Minecraft.Client/Common/Media/xuiscene_ingameinfo.h" #include "XUI_CustomMessages.h" class INetworkPlayer; diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp index 156cd0925..cba5666cf 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/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..ec8d70be7 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 "Minecraft.Client/Common/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..1f09dcd68 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_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 dont 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_Intro.h b/Minecraft.Client/Common/XUI/XUI_Intro.h index f896faed0..55f57598a 100644 --- a/Minecraft.Client/Common/XUI/XUI_Intro.h +++ b/Minecraft.Client/Common/XUI/XUI_Intro.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_intro.h" +#include "Minecraft.Client/Common/Media/xuiscene_intro.h" class CScene_Intro : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp index 428b3e88a..5518604ec 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..6c6f571ef 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h @@ -1,8 +1,8 @@ #pragma once #include "XUI_Helper.h" -#include "../media/xuiscene_leaderboards.h" +#include "Minecraft.Client/Common/Media/xuiscene_leaderboards.h" -#include "..\Leaderboards\LeaderboardManager.h" +#include "Minecraft.Client/Common/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..4db4b6cd6 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 "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.World/ConsoleSaveFileIO.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/StringTable.h" +#include "Minecraft.Client/DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h index 61e934b7e..c650e3442 100644 --- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h +++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_load_settings.h" +#include "Minecraft.Client/Common/Media/xuiscene_load_settings.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp index 7b9c1a56e..c71d4a210 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_MainMenu.h" +#include "Minecraft.Client/SurvivalMode.h" +#include "Minecraft.World/ConsoleSaveFileIO.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.World/AABB.h" +#include "Minecraft.World/Vec3.h" +#include "Minecraft.Client/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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.Client/Font.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h" #define DLC_INSTALLED_TIMER_ID 1 #define DLC_INSTALLED_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.h b/Minecraft.Client/Common/XUI/XUI_MainMenu.h index 2e4279e42..2eafc90b2 100644 --- a/Minecraft.Client/Common/XUI/XUI_MainMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_main.h" +#include "Minecraft.Client/Common/Media/xuiscene_main.h" #include "XUI_CustomMessages.h" #define BUTTON_PLAYGAME 0 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp index b3608b068..5951e297a 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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/Common/DLC/DLCLocalisationFile.h" +#include "Minecraft.Client/StringTable.h" +#include "Minecraft.Client/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..1d1f99d5f 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 "Minecraft.Client/Common/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..b416383f5 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..689a7135a 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 "Minecraft.Client/Common/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..709b833ad 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 "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.World/ConsoleSaveFileIO.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/Options.h" -#include "..\GameRules\LevelGenerationOptions.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/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..dba248315 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 "Minecraft.Client/Common/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..0faa4bb68 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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/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..3b0bafe31 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 "Minecraft.Client/Common/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..16efd14d0 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..244dded82 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 "Minecraft.Client/Common/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..53092b7a0 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_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..7e0c208da 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 "Minecraft.Client/Common/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 3ca972331..ff8afaf28 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp @@ -23,23 +23,23 @@ #include #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.World/DisconnectPacket.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" +#include "Minecraft.World/compression.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/DLCTexturePack.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #define IGNORE_KEYPRESS_TIMERID 0 diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h index df779b9ed..477ad3dfa 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h @@ -3,8 +3,8 @@ #include #include ======= -#include "../media/xuiscene_Pause.h" -#include "..\UI\IUIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Media/xuiscene_pause.h" +#include "Minecraft.Client/Common/UI/IUIScene_PauseMenu.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp index c1e06c0d1..e794d25e7 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_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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/ProgressRenderer.h" +#include "Minecraft.World/DisconnectPacket.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/Options.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Common/XUI/XUI_Reinstall.h index 7855a3410..f649d6868 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.h +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_Reinstall.h" +#include "Minecraft.Client/Common/Media/xuiscene_reinstall.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #define BUTTON_REINSTALL_THEME 0 diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp index 7c8160337..61af4c49e 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_SaveMessage.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h index 3e84541c8..7d20c8829 100644 --- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h +++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_savemessage.h" +#include "Minecraft.Client/Common/Media/xuiscene_savemessage.h" class CScene_SaveMessage : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp index 10369d5ea..c770e0fdb 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 "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/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..feb51e7df 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 "Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h" #include "XUI_CustomMessages.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "Minecraft.Client/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..b7df0b914 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/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..e07fd1d58 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_anvil.h" +#include "Minecraft.Client/Common/Media/xuiscene_anvil.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_AnvilMenu.h" +#include "Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h" #include "Common\XUI\XUI_Ctrl_4JEdit.h" #define ANVIL_UPDATE_TIMER_ID (10) diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp index 5321df349..f452300b0 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp @@ -9,25 +9,25 @@ #include #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 "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.World/net.minecraft.stats.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) -#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 "Minecraft.Client/GameMode.h" +#include "Minecraft.Client/EnderDragonRenderer.h" +#include "Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/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..505eafb7c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h @@ -1,10 +1,10 @@ #pragma once -#include "../media/xuiscene_base.h" +#include "Minecraft.Client/Common/Media/xuiscene_base.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_CustomMessages.h" -#include "..\UI\UIEnums.h" -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "Minecraft.Client/Common/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..a1e8c2d87 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/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..80e704351 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 "Minecraft.Client/Common/Media/xuiscene_brewingstand.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_BrewingMenu.h" +#include "Minecraft.Client/Common/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 ecc5c9f3a..9a648b817 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp @@ -5,17 +5,17 @@ #include #include ======= -#include "..\..\..\Minecraft.World\Container.h" -#include "..\..\..\Minecraft.World\ContainerMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.World/Container.h" +#include "Minecraft.World/ContainerMenu.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/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..dfaa9d087 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 "Minecraft.Client/Common/Media/xuiscene_container.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/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 e9ffdb316..362103281 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -16,16 +16,16 @@ #include #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 "Minecraft.Client/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 "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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..4b7f9e73a 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h @@ -1,14 +1,14 @@ #pragma once using namespace std; -#include "../media/xuiscene_craftingpanel_2x2.h" +#include "Minecraft.Client/Common/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 "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/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 7d8f36ea1..b7f3d0abb 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp @@ -1,9 +1,9 @@ #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" <<<<<<< HEAD //#include @@ -13,12 +13,12 @@ #include #include ======= -//#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SlotList.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h index 5cab04a40..2b11b2ec6 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 "Minecraft.Client/Common/Media/xuiscene_enchant.h" -#include "..\..\BookModel.h" +#include "Minecraft.Client/BookModel.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_EnchantmentBook.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/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 d6ff25946..c98142524 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp @@ -8,12 +8,12 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Furnace.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h index 22cbf262e..ec72d5f57 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 "Minecraft.Client/Common/Media/xuiscene_furnace.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_FurnaceMenu.h" +#include "Minecraft.Client/Common/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 9f176d678..1a62cc808 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp @@ -10,14 +10,14 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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..c1523c9b9 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 "Minecraft.Client/Common/Media/xuiscene_inventory.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/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 245da2e42..3c051d42f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -1,13 +1,13 @@ #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" <<<<<<< HEAD #include @@ -16,11 +16,11 @@ #include #include ======= -#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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Minecraft.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Scene_AbstractContainer.h" @@ -31,7 +31,7 @@ <<<<<<< HEAD #include ======= -#include "..\..\Common\Potion_macros.h" +#include "Minecraft.Client/Common/Potion_Macros.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) //-------------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h index bb3ff9767..b1632dfc7 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 "Minecraft.Client/Common/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 "Minecraft.Client/Common/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..626f893aa 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 "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/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..6697d0f5a 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 "Minecraft.Client/Common/Media/xuiscene_trading.h" +#include "Minecraft.Client/Common/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 0ece3afc4..475bbac3e 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp @@ -5,15 +5,15 @@ #include #include ======= -#include "..\..\..\Minecraft.World\DispenserTileEntity.h" -#include "..\..\..\Minecraft.World\TrapMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.World/DispenserTileEntity.h" +#include "Minecraft.World/TrapMenu.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #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 "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/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..f0b69c24f 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 "Minecraft.Client/Common/Media/xuiscene_trap.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/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 c0b0f1071..157d96e83 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp @@ -11,13 +11,13 @@ #include #include ======= -#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.Client/Minecraft.h" +#include "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Font.h" +#include "Minecraft.World/Random.h" +#include "Minecraft.World/SharedConstants.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Scene_Win.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h index ef9d8c623..95aa24cbc 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_Win.h" +#include "Minecraft.Client/Common/Media/xuiscene_win.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp index c6dc7118f..d4f684af4 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_SettingsAll.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h index b76727117..37f47204a 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_settings_all.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_All.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp index 0f0fe2e30..883ac4dd7 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_SettingsAudio.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h index 27aaebfc9..8bca8e497 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_settings_audio.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_Audio.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp index 7e2835a27..465d66851 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_SettingsControl.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h index bb92c7431..9f0d0f2c8 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_settings_control.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_Control.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp index 48a933e27..ab078a16b 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_SettingsGraphics.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h index b79172325..2ab96c789 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "../media/xuiscene_settings_graphics.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_Graphics.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp index 526847c7c..cb87167c9 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_SettingsOptions.h" int CScene_SettingsOptions::m_iDifficultySettingA[4]= { diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h index 020e76536..b09f4a18b 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_options.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_options.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp index da95d084d..33d6781f9 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_SettingsUI.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.h b/Minecraft.Client/Common/XUI/XUI_SettingsUI.h index 12bffead5..861ceeba9 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_UI.h" +#include "Minecraft.Client/Common/Media/xuiscene_settings_UI.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp index f13944e16..f09b9ef7d 100644 --- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp @@ -9,12 +9,12 @@ #include ======= #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 "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" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_SignEntry.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.h b/Minecraft.Client/Common/XUI/XUI_SignEntry.h index 4f8c44d26..f84989643 100644 --- a/Minecraft.Client/Common/XUI/XUI_SignEntry.h +++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_signentry.h" +#include "Minecraft.Client/Common/Media/xuiscene_signentry.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h index dbbb388ce..e7fad9647 100644 --- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h +++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h @@ -1,9 +1,9 @@ #pragma once -#include "../media/xuiscene_skinselect.h" +#include "Minecraft.Client/Common/Media/xuiscene_skinselect.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\Definitions.h" -#include "..\..\Textures.h" +#include "Minecraft.World/Definitions.h" +#include "Minecraft.Client/Textures.h" class DLCPack; diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp index f237e7d87..1f890d985 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_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 "Minecraft.Client/LocalPlayer.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Common/XUI/XUI_SocialPost.h index 0dd37fa68..78cb56ee3 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 "Minecraft.Client/Common/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..e3edc1311 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 "Minecraft.Client/ServerPlayer.h" +#include "Minecraft.Client/PlayerConnection.h" +#include "Minecraft.Client/PlayerList.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.Client/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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/ClientConnection.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h" #include "TeleportCommand.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.h b/Minecraft.Client/Common/XUI/XUI_Teleport.h index cf60eab0d..89e7b3363 100644 --- a/Minecraft.Client/Common/XUI/XUI_Teleport.h +++ b/Minecraft.Client/Common/XUI/XUI_Teleport.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "../media/xuiscene_teleportmenu.h" +#include "Minecraft.Client/Common/Media/xuiscene_teleportmenu.h" #include "XUI_CustomMessages.h" class INetworkPlayer; diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp index 1352ee10d..dbcd9244c 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp @@ -3,7 +3,7 @@ <<<<<<< HEAD #include ======= -#include "..\..\MultiplayerLocalPlayer.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Common/XUI/XUI_TextEntry.h index 70dcf30b2..e64f82e46 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 "Minecraft.Client/Common/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..20b9f4340 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 "Minecraft.Client/ProgressRenderer.h" #include "XUI_TransferToXboxOne.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h index 748b36a2b..0adcee8ad 100644 --- a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h +++ b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_trialexitupsell.h" +#include "Minecraft.Client/Common/Media/xuiscene_trialexitupsell.h" #define TRIAL_EXIT_UPSELL_IMAGE_DISPLAY_TIME 3000 diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp index f7725779e..5edf3cca9 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp @@ -6,11 +6,11 @@ #include #include ======= -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "Minecraft.Client/Common/Tutorial/Tutorial.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/StringHelpers.h" +#include "Minecraft.World/Tile.h" +#include "Minecraft.World/Item.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h index 657167594..b2434d60d 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h @@ -1,5 +1,5 @@ #pragma once -#include "../media/xuiscene_tutorialpopup.h" +#include "Minecraft.Client/Common/Media/xuiscene_tutorialpopup.h" #include "XUI_CustomMessages.h" class Tutorial; diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp index 61b818a07..c5728f309 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 bba43b783..b505ae03c 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..f3590b5dc 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..817a0765a 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..4b937ae85 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..32a9cb4ad 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..928979f6c 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..c7d1e09d8 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..08a1408f8 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 dd9ef193f..e098e6860 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 a9d16314f..5a5c98c7d 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" ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER); ResourceLocation CreeperRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_CREEPER); diff --git a/Minecraft.Client/CritParticle.cpp b/Minecraft.Client/CritParticle.cpp index 6c71b027f..37d16308a 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..67263e0c2 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..c852f9706 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..3314d2dd3 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 553128d96..344468848 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 f63a053fe..360006d45 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..d1c85188b 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..8dd24cd10 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 91d233971..06943d257 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..5cbdaac0c 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..2c4c91da7 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..fb92b9244 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/DirtyChunkSorter.cpp b/Minecraft.Client/DirtyChunkSorter.cpp index ebeed96d0..b7f9be135 100644 --- a/Minecraft.Client/DirtyChunkSorter.cpp +++ b/Minecraft.Client/DirtyChunkSorter.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DirtyChunkSorter.h" -#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" #include "Chunk.h" DirtyChunkSorter::DirtyChunkSorter(shared_ptr cameraEntity, int playerIndex) // 4J - added player index diff --git a/Minecraft.Client/DisconnectedScreen.cpp b/Minecraft.Client/DisconnectedScreen.cpp index b445e4d07..05bb71499 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/DispenserBootstrap.h b/Minecraft.Client/DispenserBootstrap.h index 84dde91ad..6e001a93a 100644 --- a/Minecraft.Client/DispenserBootstrap.h +++ b/Minecraft.Client/DispenserBootstrap.h @@ -1,8 +1,8 @@ #pragma once -#include "../Minecraft.World/net.minecraft.world.item.h" -#include "../Minecraft.World/DispenserTile.h" -#include "../Minecraft.World/net.minecraft.core.h" -#include "../Minecraft.World/LevelEvent.h" +#include "Minecraft.World/net.minecraft.world.item.h" +#include "Minecraft.World/DispenserTile.h" +#include "Minecraft.World/net.minecraft.core.h" +#include "Minecraft.World/LevelEvent.h" class DispenserBootstrap { diff --git a/Minecraft.Client/DistanceChunkSorter.cpp b/Minecraft.Client/DistanceChunkSorter.cpp index 80ac0cdf5..0e0ae551e 100644 --- a/Minecraft.Client/DistanceChunkSorter.cpp +++ b/Minecraft.Client/DistanceChunkSorter.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DistanceChunkSorter.h" -#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" #include "Chunk.h" DistanceChunkSorter::DistanceChunkSorter(shared_ptr player) diff --git a/Minecraft.Client/DragonBreathParticle.cpp b/Minecraft.Client/DragonBreathParticle.cpp index 0d0f75f33..5ae64cde0 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 9e0499a9f..48b8d5c0f 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..c81f0746d 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..a4be55bf2 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 "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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 "XML/xmlFilesCallback.h" CConsoleMinecraftApp app; diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp index 48d5c3198..2caeb3896 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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/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..95535b62a 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 "Minecraft.Client/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..4b41a63da 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/Network/NetworkPlayerDurango.h b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h index c95e8aefc..a6310bd0b 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 "Minecraft.Client/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..f56d89e85 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..ff34eb357 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 "Minecraft.Client/Common/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/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..5e5b2be21 100644 --- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp +++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp @@ -10,7 +10,7 @@ #include "Common\Network\GameNetworkManager.h" #include "MultiPlayerLocalPlayer.h" -#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "Minecraft.Client/Durango/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..218a21200 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 "Minecraft.Client/Common/Telemetry/TelemetryManager.h" class CDurangoTelemetryManager : public CTelemetryManager { diff --git a/Minecraft.Client/Durango/XboxGameMode.cpp b/Minecraft.Client/Durango/XboxGameMode.cpp index 1b55fdd9f..fc8d0b8df 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 "Minecraft.Client/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..99e68023d 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 "Minecraft.Client/Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EchantmentTableParticle.cpp index 5af7ef365..3311c93d2 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..aaac0dcc6 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 ff539fcd5..7a8242b4a 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" ResourceLocation EnchantTableRenderer::BOOK_LOCATION = ResourceLocation(TN_ITEM_BOOK); diff --git a/Minecraft.Client/EnderChestRenderer.cpp b/Minecraft.Client/EnderChestRenderer.cpp index 52fdede94..32927f2e5 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 d2eba5e83..0ba18c9ee 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" ResourceLocation EnderCrystalRenderer::ENDER_CRYSTAL_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_ENDERCRYSTAL); diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp index 037552ed3..05c70de34 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..00424a457 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 f6e5220a4..f7ed21738 100644 --- a/Minecraft.Client/EndermanRenderer.cpp +++ b/Minecraft.Client/EndermanRenderer.cpp @@ -2,8 +2,8 @@ #include "EndermanRenderer.h" #include "EndermanModel.h" #include "TextureAtlas.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" ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION = ResourceLocation(TN_MOB_ENDERMAN_EYES); ResourceLocation EndermanRenderer::ENDERMAN_LOCATION = ResourceLocation(TN_MOB_ENDERMAN); diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp index 07b1e90bb..440393fe5 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 07ab7c4d0..67f55848f 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 9aa4ad7d9..e8f0a2102 100644 --- a/Minecraft.Client/EntityRenderer.cpp +++ b/Minecraft.Client/EntityRenderer.cpp @@ -5,13 +5,13 @@ #include "LocalPlayer.h" #include "Options.h" #include "TextureAtlas.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.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/net.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" ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__MISC_SHADOW); diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp index deed369e8..e6886cf7f 100644 --- a/Minecraft.Client/EntityTileRenderer.cpp +++ b/Minecraft.Client/EntityTileRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "EntityTileRenderer.h" #include "TileEntityRenderDispatcher.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" +#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 adc230eea..eecf26950 100644 --- a/Minecraft.Client/EntityTracker.cpp +++ b/Minecraft.Client/EntityTracker.cpp @@ -5,20 +5,20 @@ #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\net.minecraft.world.level.chunk.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/net.minecraft.world.level.chunk.h" #include "PlayerConnection.h" EntityTracker::EntityTracker(ServerLevel *level) diff --git a/Minecraft.Client/EntityTracker.h b/Minecraft.Client/EntityTracker.h index 6ff9fe0f7..dd0754927 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 c0eae7560..f7baa38d0 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" ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB); diff --git a/Minecraft.Client/ExplodeParticle.cpp b/Minecraft.Client/ExplodeParticle.cpp index fa950a03a..3e1bac2bf 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 23b2c7f0e..2f7eae6f1 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -4,34 +4,34 @@ #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\Network\WinsockNetLayer.h" +#include "Windows64/Social/SocialManager.h" +#include "Windows64/Sentient/DynamicConfigurations.h" +#include "Windows64/Network/WinsockNetLayer.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 2d9f5daea..9079699c6 100644 --- a/Minecraft.Client/FallingTileRenderer.cpp +++ b/Minecraft.Client/FallingTileRenderer.cpp @@ -2,9 +2,9 @@ #include "FallingTileRenderer.h" #include "TextureAtlas.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 3b1ab924f..220d1cf47 100644 --- a/Minecraft.Client/FireballRenderer.cpp +++ b/Minecraft.Client/FireballRenderer.cpp @@ -2,11 +2,11 @@ #include "FireballRenderer.h" #include "EntityRenderDispatcher.h" #include "TextureAtlas.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/FireworksParticles.cpp b/Minecraft.Client/FireworksParticles.cpp index fd19b0114..55387158a 100644 --- a/Minecraft.Client/FireworksParticles.cpp +++ b/Minecraft.Client/FireworksParticles.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.item.h" #include "FireworksParticles.h" #include "Tesselator.h" -#include "../Minecraft.World/Level.h" +#include "Minecraft.World/Level.h" FireworksParticles::FireworksStarter::FireworksStarter(Level *level, double x, double y, double z, double xd, double yd, double zd, ParticleEngine *engine, CompoundTag *infoTag) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/Minecraft.Client/FireworksParticles.h b/Minecraft.Client/FireworksParticles.h index ac06be073..63ac42f9b 100644 --- a/Minecraft.Client/FireworksParticles.h +++ b/Minecraft.Client/FireworksParticles.h @@ -1,6 +1,6 @@ #pragma once #include "Particle.h" -#include "..\Minecraft.World\CompoundTag.h" +#include "Minecraft.World/CompoundTag.h" class ParticleEngine; diff --git a/Minecraft.Client/FishingHookRenderer.cpp b/Minecraft.Client/FishingHookRenderer.cpp index 9d60a9ace..de58abd53 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" ResourceLocation FishingHookRenderer::PARTICLE_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/Minecraft.Client/FlameParticle.cpp b/Minecraft.Client/FlameParticle.cpp index eb12dbfda..4164a2382 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 7a37dd7b8..f3e2816fc 100644 --- a/Minecraft.Client/Font.cpp +++ b/Minecraft.Client/Font.cpp @@ -4,10 +4,10 @@ #include "Options.h" #include "Tesselator.h" #include "ResourceLocation.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, ResourceLocation *textureLocation, 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 300575eb1..1cd766a56 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" #include "ResourceLocation.h" ResourceLocation FootstepParticle::FOOTPRINT_LOCATION = ResourceLocation(TN_MISC_FOOTSTEP); diff --git a/Minecraft.Client/Frustum.cpp b/Minecraft.Client/Frustum.cpp index c40f7c6fa..ed2a4ae1b 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..c49110be9 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..ec173b74f 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..727a9e610 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 68754f65d..c951d92f0 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -17,35 +17,35 @@ #include "GuiParticles.h" #include "MultiPlayerLevel.h" #include "Chunk.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.enchantment.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\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\net.minecraft.world.phys.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.entity.player.h" +#include "Minecraft.World/net.minecraft.world.item.enchantment.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/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/net.minecraft.world.phys.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 "BossMobGuiInfo.h" #include "TexturePackRepository.h" diff --git a/Minecraft.Client/GameRenderer.h b/Minecraft.Client/GameRenderer.h index 1db7713a4..f558fda77 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" #include "ResourceLocation.h" class GameRenderer diff --git a/Minecraft.Client/GhastModel.cpp b/Minecraft.Client/GhastModel.cpp index 14277c438..6f5d764e5 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 cecb4eaf5..0422620af 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" ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST); ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION = ResourceLocation(TN_MOB_GHAST_FIRE); diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 54d57cf24..90702e214 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -10,24 +10,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" ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR); diff --git a/Minecraft.Client/GuiParticle.cpp b/Minecraft.Client/GuiParticle.cpp index 25859c707..b4ee2d122 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/HorseRenderer.cpp b/Minecraft.Client/HorseRenderer.cpp index 006f9e200..22d663c5a 100644 --- a/Minecraft.Client/HorseRenderer.cpp +++ b/Minecraft.Client/HorseRenderer.cpp @@ -2,7 +2,7 @@ #include "HorseRenderer.h" #include "MobRenderer.h" #include "EntityRenderDispatcher.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.h" ResourceLocation HorseRenderer::HORSE_LOCATION = ResourceLocation(TN_MOB_HORSE_WHITE); ResourceLocation HorseRenderer::HORSE_MULE_LOCATION = ResourceLocation(TN_MOB_MULE); diff --git a/Minecraft.Client/HugeExplosionParticle.cpp b/Minecraft.Client/HugeExplosionParticle.cpp index 2a104c19e..e4b486b43 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..35e9361f4 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 a9ff25c45..b09046315 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" const wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { L"cloth", L"chain", L"iron", L"diamond", L"gold" }; std::map HumanoidMobRenderer::ARMOR_LOCATION_CACHE; diff --git a/Minecraft.Client/HumanoidModel.cpp b/Minecraft.Client/HumanoidModel.cpp index 05d132fae..7e7c52e36 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..ecd3ad640 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 6933a2d70..b7a37d287 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 "LocalPlayer.h" #include "Options.h" Input::Input() diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp index 0c8701af4..ceaa99cc6 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 2d7493ecb..77cf6c435 100644 --- a/Minecraft.Client/ItemFrameRenderer.cpp +++ b/Minecraft.Client/ItemFrameRenderer.cpp @@ -6,16 +6,16 @@ #include "ItemFrameRenderer.h" #include "TextureAtlas.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 74f3e26ca..3434b3447 100644 --- a/Minecraft.Client/ItemInHandRenderer.cpp +++ b/Minecraft.Client/ItemInHandRenderer.cpp @@ -11,12 +11,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" ResourceLocation ItemInHandRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); ResourceLocation ItemInHandRenderer::MAP_BACKGROUND_LOCATION = ResourceLocation(TN_MISC_MAPBG); diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp index 49e25060c..efeb7c30b 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" #include "TextureAtlas.h" diff --git a/Minecraft.Client/ItemSpriteRenderer.cpp b/Minecraft.Client/ItemSpriteRenderer.cpp index 5f1c7089b..7a9c1c45e 100644 --- a/Minecraft.Client/ItemSpriteRenderer.cpp +++ b/Minecraft.Client/ItemSpriteRenderer.cpp @@ -2,10 +2,10 @@ #include "ItemSpriteRenderer.h" #include "EntityRenderDispatcher.h" #include "TextureAtlas.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..c40893ede 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..d818099b8 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 052850f81..c44862119 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 e828a353b..fa33ba033 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 8216f1fe9..147f00194 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -41,32 +41,32 @@ #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" //#define DISABLE_SPU_CODE #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))); diff --git a/Minecraft.Client/LevelRenderer.h b/Minecraft.Client/LevelRenderer.h index 46a4c31fe..bb7d78c8a 100644 --- a/Minecraft.Client/LevelRenderer.h +++ b/Minecraft.Client/LevelRenderer.h @@ -1,9 +1,9 @@ #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" #include "ResourceLocation.h" #include #ifdef __PS3__ diff --git a/Minecraft.Client/Lighting.cpp b/Minecraft.Client/Lighting.cpp index 50529d516..55ecf95d9 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..d0c006eaa 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/LivingEntityRenderer.cpp b/Minecraft.Client/LivingEntityRenderer.cpp index 89d656142..9963ca302 100644 --- a/Minecraft.Client/LivingEntityRenderer.cpp +++ b/Minecraft.Client/LivingEntityRenderer.cpp @@ -5,9 +5,9 @@ #include "ModelPart.h" #include "EntityRenderDispatcher.h" #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\Arrow.h" -#include "..\Minecraft.World\Mth.h" -#include "..\Minecraft.World\Player.h" +#include "Minecraft.World/Arrow.h" +#include "Minecraft.World/Mth.h" +#include "Minecraft.World/Player.h" ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); diff --git a/Minecraft.Client/LivingEntityRenderer.h b/Minecraft.Client/LivingEntityRenderer.h index 2f77e1b54..0df37c165 100644 --- a/Minecraft.Client/LivingEntityRenderer.h +++ b/Minecraft.Client/LivingEntityRenderer.h @@ -1,7 +1,7 @@ #pragma once #include "ResourceLocation.h" #include "EntityRenderer.h" -#include "..\Minecraft.World\LivingEntity.h" +#include "Minecraft.World/LivingEntity.h" class LivingEntity; diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index bb25105f7..83e979ccd 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -16,45 +16,45 @@ #include "CreativeMode.h" #include "GameRenderer.h" #include "ItemInHandRenderer.h" -#include "..\Minecraft.World\AttributeInstance.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\net.minecraft.world.entity.monster.h" -#include "..\Minecraft.World\ItemEntity.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.phys.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\com.mojang.nbt.h" -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.World\TileEntity.h" -#include "..\Minecraft.World\Mth.h" +#include "Minecraft.World/AttributeInstance.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/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/ItemEntity.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.phys.h" +#include "Minecraft.World/net.minecraft.stats.h" +#include "Minecraft.World/com.mojang.nbt.h" +#include "Minecraft.World/Random.h" +#include "Minecraft.World/TileEntity.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 @@ -1277,7 +1277,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 0a5b14b2e..ee9a6cfc5 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..0694dbfe1 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 fd907019e..4be7c9c15 100644 --- a/Minecraft.Client/MinecartRenderer.cpp +++ b/Minecraft.Client/MinecartRenderer.cpp @@ -2,8 +2,8 @@ #include "MinecartRenderer.h" #include "MinecartModel.h" #include "TextureAtlas.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" ResourceLocation MinecartRenderer::MINECART_LOCATION(TN_ITEM_CART); diff --git a/Minecraft.Client/MinecartSpawnerRenderer.cpp b/Minecraft.Client/MinecartSpawnerRenderer.cpp index 270db5871..b260a9f0c 100644 --- a/Minecraft.Client/MinecartSpawnerRenderer.cpp +++ b/Minecraft.Client/MinecartSpawnerRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "MinecartSpawnerRenderer.h" -#include "../Minecraft.World/Tile.h" -#include "../Minecraft.World/net.minecraft.world.entity.item.h" +#include "Minecraft.World/Tile.h" +#include "Minecraft.World/net.minecraft.world.entity.item.h" #include "MobSpawnerRenderer.h" void MinecartSpawnerRenderer::renderMinecartContents(shared_ptr cart, float a, Tile *tile, int tileData) diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 87f1b8bee..53860f131 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -34,44 +34,44 @@ #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\ChestTileEntity.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/ChestTileEntity.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 // #define DISABLE_SPU_CODE diff --git a/Minecraft.Client/Minecraft.h b/Minecraft.Client/Minecraft.h index cc1e5d18a..a196f61c9 100644 --- a/Minecraft.Client/Minecraft.h +++ b/Minecraft.Client/Minecraft.h @@ -38,9 +38,9 @@ class ColourTable; class MultiPlayerGameMode; class PsPlusUpsellWrapper; -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\DisconnectPacket.h" -#include "..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/File.h" +#include "Minecraft.World/DisconnectPacket.h" +#include "Minecraft.World/C4JThread.h" #include "ResourceLocation.h" using namespace std; diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index 4206a3995..4412a9014 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -15,44 +15,44 @@ #include "ServerLevel.h" #include "ServerLevelListener.h" #include "Settings.h" -#include "..\Minecraft.World\Command.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/Command.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" #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" #include "PlayerConnection.h" #ifdef _XBOX_ONE -#include "Durango\Network\NetworkPlayerDurango.h" +#include "Durango/Network/NetworkPlayerDurango.h" #endif #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 @@ -165,7 +165,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/MinecraftServer.h b/Minecraft.Client/MinecraftServer.h index 5f33fa853..2e3cc5788 100644 --- a/Minecraft.Client/MinecraftServer.h +++ b/Minecraft.Client/MinecraftServer.h @@ -1,8 +1,8 @@ #pragma once #include "ConsoleInputSource.h" -#include "..\Minecraft.World\ArrayWithLength.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/ArrayWithLength.h" +#include "Minecraft.World/SharedConstants.h" +#include "Minecraft.World/C4JThread.h" class ServerConnection; class Settings; diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp index c18cd267a..e459af019 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..0f733d61d 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 ee5125302..14babb2cb 100644 --- a/Minecraft.Client/MobRenderer.cpp +++ b/Minecraft.Client/MobRenderer.cpp @@ -2,11 +2,11 @@ #include "MobRenderer.h" #include "LivingEntityRenderer.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) : LivingEntityRenderer(model, shadow) diff --git a/Minecraft.Client/MobSpawnerRenderer.cpp b/Minecraft.Client/MobSpawnerRenderer.cpp index 02aac27fd..ad1851824 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/Model.h b/Minecraft.Client/Model.h index 5a4b6f2e8..14f047490 100644 --- a/Minecraft.Client/Model.h +++ b/Minecraft.Client/Model.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.Client\SkinBox.h" +#include "Minecraft.World/Random.h" +#include "SkinBox.h" class Mob; class ModelPart; class TexOffs; diff --git a/Minecraft.Client/ModelHorse.cpp b/Minecraft.Client/ModelHorse.cpp index 7a13d0adc..f9e3006f9 100644 --- a/Minecraft.Client/ModelHorse.cpp +++ b/Minecraft.Client/ModelHorse.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.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 "ModelHorse.h" #include "ModelPart.h" diff --git a/Minecraft.Client/ModelPart.h b/Minecraft.Client/ModelPart.h index c6458e71d..ee5742534 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 "SkinBox.h" class Cube; diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp index b5e1dd255..ee05e654d 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 c180f8584..251e1b1ac 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 e7611b37c..8467e450e 100644 --- a/Minecraft.Client/MultiPlayerGameMode.cpp +++ b/Minecraft.Client/MultiPlayerGameMode.cpp @@ -6,13 +6,13 @@ #include "Minecraft.h" #include "ClientConnection.h" #include "LevelRenderer.h" -#include "Common\Network\GameNetworkManager.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 "Common/Network/GameNetworkManager.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 5c27e4502..eccc52241 100644 --- a/Minecraft.Client/MultiPlayerLevel.cpp +++ b/Minecraft.Client/MultiPlayerLevel.cpp @@ -3,17 +3,17 @@ #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 "FireworksParticles.h" -#include "..\Minecraft.World\PrimedTnt.h" -#include "..\Minecraft.World\Tile.h" -#include "..\Minecraft.World\TileEntity.h" -#include "..\Minecraft.World\JavaMath.h" +#include "Minecraft.World/PrimedTnt.h" +#include "Minecraft.World/Tile.h" +#include "Minecraft.World/TileEntity.h" +#include "Minecraft.World/JavaMath.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 6e5b00865..e93a98e6d 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 25bf06bf1..2864ac6c9 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" #include "Input.h" #include "LevelRenderer.h" diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.h b/Minecraft.Client/MultiPlayerLocalPlayer.h index e660a96a2..140231c5a 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 b5f9ba9f8..77d8dc930 100644 --- a/Minecraft.Client/MushroomCowRenderer.cpp +++ b/Minecraft.Client/MushroomCowRenderer.cpp @@ -3,8 +3,8 @@ #include "MushroomCowRenderer.h" #include "TextureAtlas.h" #include "QuadrupedModel.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" ResourceLocation MushroomCowRenderer::MOOSHROOM_LOCATION = ResourceLocation(TN_MOB_RED_COW); diff --git a/Minecraft.Client/NameEntryScreen.cpp b/Minecraft.Client/NameEntryScreen.cpp index c9df70245..5d1ae37af 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..2cda2fca6 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..eda47d509 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/OcelotModel.cpp b/Minecraft.Client/OcelotModel.cpp index 8e8455979..04ef7c3e5 100644 --- a/Minecraft.Client/OcelotModel.cpp +++ b/Minecraft.Client/OcelotModel.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 "OcelotModel.h" const float OcelotModel::xo = 0; diff --git a/Minecraft.Client/OcelotRenderer.cpp b/Minecraft.Client/OcelotRenderer.cpp index 3672714b3..1949ebc1a 100644 --- a/Minecraft.Client/OcelotRenderer.cpp +++ b/Minecraft.Client/OcelotRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "OcelotRenderer.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.h" ResourceLocation OcelotRenderer::CAT_BLACK_LOCATION = ResourceLocation(TN_MOB_CAT_BLACK); ResourceLocation OcelotRenderer::CAT_OCELOT_LOCATION = ResourceLocation(TN_MOB_OCELOT); diff --git a/Minecraft.Client/OffsettedRenderList.cpp b/Minecraft.Client/OffsettedRenderList.cpp index 729d26f92..1be764fa6 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 c18c136bc..ce80e4e70 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..67eac2346 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..76a753d98 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..af82fd33a 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -4,12 +4,12 @@ #include "base64.h" -#include "..\Orbis_App.h" -#include "..\..\Common\Consoles_App.h" +#include "Minecraft.Client/Orbis/Orbis_App.h" +#include "Minecraft.Client/Common/Consoles_App.h" #include "Common\Network\Sony\SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" #include @@ -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 PlayStationPlus subscription and they are able to access the Leaderboards. // NotifyAsyncPlusFeature(); diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp index 5c02cb08e..40885723c 100644 --- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -9,11 +9,11 @@ #include #include -#include "../ps4__np_conf.h" +#include "Minecraft.Client/Orbis/ps4__np_conf.h" #include "Orbis_NPToolkit.h" #include "SonyVoiceChat_Orbis.h" #include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "Minecraft.World/C4JThread.h" // #include "..\PS3Extras\PS3Strings.h" diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h index 5b19f63ec..73aaed221 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 "Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Orbis/Orbis_App.cpp b/Minecraft.Client/Orbis/Orbis_App.cpp index 9af5ee120..13584a906 100644 --- a/Minecraft.Client/Orbis/Orbis_App.cpp +++ b/Minecraft.Client/Orbis/Orbis_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 "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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 "Minecraft.World/StringHelpers.h" #include "Network/Orbis_NPToolkit.h" #include "Orbis\Network\SonyRemoteStorage_Orbis.h" diff --git a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp index 947b9df8b..0019b1c5e 100644 --- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp @@ -6,38 +6,38 @@ #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/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" diff --git a/Minecraft.Client/Orbis/Orbis_UIController.cpp b/Minecraft.Client/Orbis/Orbis_UIController.cpp index 38cc79e94..dc21e8952 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.Client/Minecraft.h" +#include "Minecraft.Client/Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Orbis/Orbis_UIController.h b/Minecraft.Client/Orbis/Orbis_UIController.h index fcd901e22..6453dd65f 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 "Minecraft.Client/Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/OzelotModel.cpp b/Minecraft.Client/OzelotModel.cpp index 9c22cc4b7..f6e07fb3c 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..9af0d0dbf 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/4JLibs/STO_TitleSmallStorage.cpp b/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp index f3d2729f0..48147890f 100644 --- a/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp +++ b/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp @@ -18,7 +18,7 @@ #include #include "STO_TitleSmallStorage.h" -#include "../Passphrase/ps3__np_conf.h" +#include "Minecraft.Client/PS3/Passphrase/ps3__np_conf.h" diff --git a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp index fcce5f05a..b548dbfea 100644 --- a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp +++ b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp @@ -5,9 +5,9 @@ #include #include #include -#include "..\..\Common\Audio\SoundEngine.h" -#include "..\..\Common\Consoles_App.h" -#include "..\..\PS3\Miles\include\mss.h" +#include "Minecraft.Client/Common/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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..201e63590 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp @@ -4,12 +4,12 @@ #include "base64.h" -#include "..\PS3_App.h" -#include "..\..\Common\Consoles_App.h" +#include "Minecraft.Client/PS3/PS3_App.h" +#include "Minecraft.Client/Common/Consoles_App.h" #include "Common\Network\Sony\SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" #include diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h index 7a85896da..1182f3097 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h @@ -1,7 +1,7 @@ #pragma once -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\..\Minecraft.World\x64headers\extraX64.h" +#include "Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" +#include "Minecraft.World/x64headers/extraX64.h" #include "PS3\Passphrase\ps3__np_conf.h" diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp index 46b1916d0..784c68068 100644 --- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp @@ -10,13 +10,13 @@ #include #include #endif -#include "../Passphrase/ps3__np_conf.h" +#include "Minecraft.Client/PS3/Passphrase/ps3__np_conf.h" #ifdef __PS3__ #include "SonyVoiceChat.h" #include "Common/Network/Sony/SonyHttp.h" #endif -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\PS3Extras\PS3Strings.h" +#include "Minecraft.World/C4JThread.h" +#include "Minecraft.Client/PS3/PS3Extras/PS3Strings.h" #include "PS3\Network\SonyRemoteStorage_PS3.h" int (* SQRNetworkManager_PS3::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL; diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h index 6143bbb58..63bee590a 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 "Minecraft.Client/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..b2b8fdb0b 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 "Minecraft.Client/PS3/PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp index e3417e425..0df654707 100644 --- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp +++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp @@ -1,5 +1,5 @@ -#include "../../../Server/HeapInspectorServer.h" -#include "../../../Server/PS3/HeapHooks.hpp" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/HeapInspectorServer.h" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/PS3/HeapHooks.hpp" void RunHeapInspectorServer(); diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp index 34914717e..3859e175d 100644 --- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp +++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp @@ -3,7 +3,7 @@ // how to configure multiple heaps. // ================================================================================================================================= -#include "../../Server/HeapInspectorServer.h" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/HeapInspectorServer.h" #include using namespace HeapInspectorServer; diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp index e3417e425..0df654707 100644 --- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp +++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp @@ -1,5 +1,5 @@ -#include "../../../Server/HeapInspectorServer.h" -#include "../../../Server/PS3/HeapHooks.hpp" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/HeapInspectorServer.h" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/PS3/HeapHooks.hpp" void RunHeapInspectorServer(); diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp index ed27945ac..9e11db7fe 100644 --- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp +++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp @@ -1,5 +1,5 @@ #include -#include "../IThread.h" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/IThread.h" void* InternalThread(void* a_UserData) { diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp index 305d589b5..8ca5769d6 100644 --- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp +++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp @@ -8,7 +8,7 @@ // sign that the operators aren't properly matched. // ================================================================================================================================= -#include "../../Server/HeapInspectorServer.h" +#include "Minecraft.Client/PS3/PS3Extras/HeapInspector/Server/HeapInspectorServer.h" #include #include diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h index b6cf351de..65750e3a6 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..4a312cf55 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 "Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/algorithm.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/algorithm.hpp index dffd39991..d17c0ade1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/algorithm.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/algorithm.hpp @@ -12,7 +12,7 @@ #ifndef GIL_DYNAMICIMAGE_ALGORITHM_HPP #define GIL_DYNAMICIMAGE_ALGORITHM_HPP -#include "../../algorithm.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/algorithm.hpp" #include "any_image.hpp" #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image.hpp index dde831994..dd1ad2ab4 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image.hpp @@ -22,7 +22,7 @@ //////////////////////////////////////////////////////////////////////////////////////// #include "any_image_view.hpp" -#include "../../image.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/image.hpp" //#ifdef _MSC_VER //#pragma warning(push) diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image_view.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image_view.hpp index 1b1d5503f..43da07ae4 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image_view.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image_view.hpp @@ -23,8 +23,8 @@ //////////////////////////////////////////////////////////////////////////////////////// #include "variant.hpp" -#include "../../image_view.hpp" -#include "../../image.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/image_view.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/image.hpp" namespace boost { namespace gil { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/apply_operation_base.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/apply_operation_base.hpp index 3b55de6e0..b7562a0d0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/apply_operation_base.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/apply_operation_base.hpp @@ -13,8 +13,8 @@ #ifndef GIL_APPLY_OPERATION_BASE_HPP #define GIL_APPLY_OPERATION_BASE_HPP -#include "../../gil_config.hpp" -#include "../../utilities.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/utilities.hpp" #include #include #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_at_c.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_at_c.hpp index 93ab5cdeb..25b39a953 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_at_c.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_at_c.hpp @@ -13,7 +13,7 @@ #ifndef GIL_DYNAMIC_AT_C_HPP #define GIL_DYNAMIC_AT_C_HPP -#include "../../gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" #include #include #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp index 99cab1fe7..fe018f92f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp @@ -22,7 +22,7 @@ /// //////////////////////////////////////////////////////////////////////////////////////// -#include "../../gil_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_all.hpp" #include "algorithm.hpp" #include "any_image.hpp" #include "apply_operation.hpp" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/image_view_factory.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/image_view_factory.hpp index fe82ef1c6..d449d1034 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/image_view_factory.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/image_view_factory.hpp @@ -23,7 +23,7 @@ */ #include "any_image_view.hpp" -#include "../../image_view_factory.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/image_view_factory.hpp" namespace boost { namespace gil { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/reduce.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/reduce.hpp index ea8623dee..ea8cd34de 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/reduce.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/reduce.hpp @@ -23,8 +23,8 @@ #include #include -#include "../../metafunctions.hpp" -#include "../../typedefs.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/metafunctions.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/typedefs.hpp" #include "dynamic_at_c.hpp" //////////////////////////////////////////////////////////////////////////////////////// diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/variant.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/variant.hpp index 24460ca6b..dee8260b6 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/variant.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/variant.hpp @@ -22,8 +22,8 @@ /// //////////////////////////////////////////////////////////////////////////////////////// -#include "../../gil_config.hpp" -#include "../../utilities.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/utilities.hpp" #include #include #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/dynamic_io.hpp index 9f88e50d4..11a9a59f1 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/dynamic_io.hpp @@ -21,9 +21,9 @@ #include #include -#include "../../gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" #include "io_error.hpp" -#include "../dynamic_image/any_image.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/any_image.hpp" namespace boost { namespace gil { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp index 5ea79c58f..f05d2aade 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/io_error.hpp @@ -19,7 +19,7 @@ /// \date 2005-2007 \n Last updated on May 30, 2006 #include -#include "../../gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" #include namespace boost { namespace gil { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp index b1108fe8f..5cb3f2cdc 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_dynamic_io.hpp @@ -25,7 +25,7 @@ #include #include #include -#include "../dynamic_image/dynamic_image_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp" #include "io_error.hpp" #include "jpeg_io.hpp" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io_private.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io_private.hpp index 4b3e7bdd5..5fe7d0212 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io_private.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/jpeg_io_private.hpp @@ -22,7 +22,7 @@ #include #include #include -#include "../../gil_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_all.hpp" #include "io_error.hpp" #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp index a3a25a97f..b0460a95b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_dynamic_io.hpp @@ -32,7 +32,7 @@ #include #include #include -#include "../dynamic_image/dynamic_image_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp" #include "io_error.hpp" #include "png_io.hpp" #include "png_io_private.hpp" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io.hpp index 9b57cebb8..3dddb09e8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io.hpp @@ -35,8 +35,8 @@ extern "C" { #include "png.h" } #include -#include "../../gil_config.hpp" -#include "../../utilities.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_config.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/utilities.hpp" #include "io_error.hpp" #include "png_io_private.hpp" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io_private.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io_private.hpp index a0ee57be5..209b49e9d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io_private.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/png_io_private.hpp @@ -21,7 +21,7 @@ #include #include #include -#include "../../gil_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_all.hpp" #include "io_error.hpp" #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_dynamic_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_dynamic_io.hpp index bb3c8c3ca..f2e62cac2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_dynamic_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_dynamic_io.hpp @@ -27,7 +27,7 @@ #include #include -#include "../dynamic_image/dynamic_image_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/dynamic_image/dynamic_image_all.hpp" #include "io_error.hpp" #include "tiff_io.hpp" #include "dynamic_io.hpp" diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_io.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_io.hpp index 4198a3f98..9403f4a4e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_io.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/extension/io/tiff_io.hpp @@ -25,7 +25,7 @@ #include #include #include -#include "../../gil_all.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/gil/gil_all.hpp" #include "io_error.hpp" namespace boost { namespace gil { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp index b18067a46..0e0b1bbc2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp @@ -20,10 +20,10 @@ #define BOOST_PHOENIX_HAS_EQUAL_RANGE_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_find.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_find.hpp index cc6cf9096..5027b238f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_find.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_find.hpp @@ -16,10 +16,10 @@ #define BOOST_PHOENIX_HAS_FIND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp index eca0eb10f..1261f4c3f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp @@ -20,10 +20,10 @@ #define BOOST_PHOENIX_HAS_LOWER_BOUND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove.hpp index e18aa4214..04c777254 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove.hpp @@ -15,7 +15,7 @@ #ifndef BOOST_PHOENIX_HAS_REMOVE_EN_14_12_2004 #define BOOST_PHOENIX_HAS_REMOVE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp index e8f311f2d..ce4460821 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp @@ -19,7 +19,7 @@ #ifndef BOOST_PHOENIX_HAS_REMOVE_IF_EN_14_12_2004 #define BOOST_PHOENIX_HAS_REMOVE_IF_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_reverse.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_reverse.hpp index 2cb425ec3..b4242793c 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_reverse.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_reverse.hpp @@ -19,7 +19,7 @@ #ifndef BOOST_PHOENIX_HAS_REVERSE_EN_14_12_2004 #define BOOST_PHOENIX_HAS_REVERSE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_sort.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_sort.hpp index b93ff6cd9..136e1e5f2 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_sort.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_sort.hpp @@ -15,7 +15,7 @@ #ifndef BOOST_PHOENIX_HAS_SORT_EN_14_12_2004 #define BOOST_PHOENIX_HAS_SORT_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_unique.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_unique.hpp index 5f1b547f7..d16614024 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_unique.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_unique.hpp @@ -19,7 +19,7 @@ #ifndef BOOST_PHOENIX_HAS_UNIQUE_EN_14_12_2004 #define BOOST_PHOENIX_HAS_UNIQUE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp index abedbaee5..26d8a39c5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/has_upper_bound.hpp @@ -16,10 +16,10 @@ #define BOOST_PHOENIX_HAS_UPPER_BOUND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp index 7a02b4fd6..62e364e10 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_map.hpp @@ -16,7 +16,7 @@ #define BOOST_PHOENIX_IS_STD_HASH_MAP_EN_16_12_2004 #include -#include "./std_hash_map_fwd.hpp" +#include "std_hash_map_fwd.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp index c6631ad70..c6ff18e03 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/phoenix/stl/algorithm/detail/is_std_hash_set.hpp @@ -16,7 +16,7 @@ #define BOOST_PHOENIX_IS_STD_HASH_SET_EN_16_12_2004 #include -#include "./std_hash_set_fwd.hpp" +#include "std_hash_set_fwd.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_equal_range.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_equal_range.hpp index 1f7dcce25..b9d5371e9 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_equal_range.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_equal_range.hpp @@ -20,10 +20,10 @@ #define HAS_EQUAL_RANGE_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_find.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_find.hpp index 3768dd5c4..c61d53113 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_find.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_find.hpp @@ -20,10 +20,10 @@ #define HAS_FIND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_lower_bound.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_lower_bound.hpp index c1d47e292..d8330151e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_lower_bound.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_lower_bound.hpp @@ -20,10 +20,10 @@ #define HAS_LOWER_BOUND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove.hpp index e86c87c75..6f9929d3f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove.hpp @@ -19,7 +19,7 @@ #ifndef HAS_REMOVE_EN_14_12_2004 #define HAS_REMOVE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove_if.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove_if.hpp index 99ce7cd8a..354cd5007 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove_if.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_remove_if.hpp @@ -19,7 +19,7 @@ #ifndef HAS_REMOVE_IF_EN_14_12_2004 #define HAS_REMOVE_IF_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_reverse.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_reverse.hpp index e74bcabf5..b4da9ec95 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_reverse.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_reverse.hpp @@ -19,7 +19,7 @@ #ifndef HAS_REVERSE_EN_14_12_2004 #define HAS_REVERSE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_sort.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_sort.hpp index fa9edc923..8f505a62f 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_sort.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_sort.hpp @@ -19,7 +19,7 @@ #ifndef HAS_SORT_EN_14_12_2004 #define HAS_SORT_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_unique.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_unique.hpp index 35dcd3c96..05db8a0ad 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_unique.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_unique.hpp @@ -19,7 +19,7 @@ #ifndef HAS_UNIQUE_EN_14_12_2004 #define HAS_UNIQUE_EN_14_12_2004 -#include "./is_std_list.hpp" +#include "is_std_list.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_upper_bound.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_upper_bound.hpp index 995c28c01..4d558c7c5 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_upper_bound.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/has_upper_bound.hpp @@ -20,10 +20,10 @@ #define HAS_UPPER_BOUND_EN_14_12_2004 #include -#include "./is_std_map.hpp" -#include "./is_std_set.hpp" -#include "./is_std_hash_map.hpp" -#include "./is_std_hash_set.hpp" +#include "is_std_map.hpp" +#include "is_std_set.hpp" +#include "is_std_hash_map.hpp" +#include "is_std_hash_set.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_map.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_map.hpp index 9d4895c35..03886db41 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_map.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_map.hpp @@ -20,7 +20,7 @@ #define IS_STD_HASH_MAP_EN_16_12_2004 #include -#include "./std_hash_map_fwd.hpp" +#include "std_hash_map_fwd.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_set.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_set.hpp index ece317315..31cfb508c 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_set.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_hash_set.hpp @@ -20,7 +20,7 @@ #define IS_STD_HASH_SET_EN_16_12_2004 #include -#include "./std_hash_set_fwd.hpp" +#include "std_hash_set_fwd.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp index 98411e676..81ac4edb8 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp @@ -6,7 +6,7 @@ #ifndef BOOST_LEXER_PTR_VECTOR_HPP #define BOOST_LEXER_PTR_VECTOR_HPP -#include "../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp index 38c70b547..25c0fed96 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp @@ -6,10 +6,10 @@ #ifndef BOOST_LEXER_CHAR_STATE_MACHINE_HPP #define BOOST_LEXER_CHAR_STATE_MACHINE_HPP -#include "../consts.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/consts.hpp" #include -#include "../size_t.hpp" -#include "../string_token.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/string_token.hpp" #include namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/parser.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/parser.hpp index 9000e5e36..a4fc5820d 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/parser.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/parser.hpp @@ -10,10 +10,10 @@ #include "tree/end_node.hpp" #include "tree/iteration_node.hpp" #include "tree/leaf_node.hpp" -#include "../runtime_error.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/runtime_error.hpp" #include "tree/selection_node.hpp" #include "tree/sequence_node.hpp" -#include "../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include "tokeniser/re_tokeniser.hpp" namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp index dc1c6bd86..ed7db658e 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp @@ -7,8 +7,8 @@ #define BOOST_LEXER_NUM_TOKEN_HPP #include -#include "../../consts.hpp" // null_token -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/consts.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp index 7bdeb8040..891768715 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp @@ -10,10 +10,10 @@ #include #include #include "num_token.hpp" -#include "../../runtime_error.hpp" -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/runtime_error.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include -#include "../../string_token.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/string_token.hpp" #include "re_tokeniser_helper.hpp" namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp index 6e0791e7f..a98964528 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp @@ -6,10 +6,10 @@ #ifndef BOOST_LEXER_RE_TOKENISER_HELPER_H #define BOOST_LEXER_RE_TOKENISER_HELPER_H -#include "../../char_traits.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/char_traits.hpp" // strlen() #include -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include "re_tokeniser_state.hpp" namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp index 35995adbb..2f9ceeda0 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp @@ -6,9 +6,9 @@ #ifndef BOOST_LEXER_RE_TOKENISER_STATE_HPP #define BOOST_LEXER_RE_TOKENISER_STATE_HPP -#include "../../consts.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/consts.hpp" #include -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include namespace boost diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp index c613e6a4e..ea5f68cfb 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp @@ -7,7 +7,7 @@ #define BOOST_LEXER_END_NODE_HPP #include "node.hpp" -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp index 39ed98d27..afde5e188 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp @@ -6,9 +6,9 @@ #ifndef BOOST_LEXER_LEAF_NODE_HPP #define BOOST_LEXER_LEAF_NODE_HPP -#include "../../consts.hpp" // null_token +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/consts.hpp" #include "node.hpp" -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp index 1e36ccb6e..cdf20ae9b 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp @@ -7,9 +7,9 @@ #define BOOST_LEXER_NODE_HPP #include -#include "../../containers/ptr_vector.hpp" -#include "../../runtime_error.hpp" -#include "../../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/runtime_error.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" #include #include diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/charset.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/charset.hpp index c74dd365c..c8775fb95 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/charset.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/charset.hpp @@ -7,8 +7,8 @@ #define BOOST_LEXER_CHARSET_HPP #include -#include "../size_t.hpp" -#include "../string_token.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/string_token.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/equivset.hpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/equivset.hpp index b39fb1505..7ab874e35 100644 --- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/equivset.hpp +++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/partition/equivset.hpp @@ -7,9 +7,9 @@ #define BOOST_LEXER_EQUIVSET_HPP #include -#include "../parser/tree/node.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp" #include -#include "../size_t.hpp" +#include "Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/detail/lexer/size_t.hpp" namespace boost { diff --git a/Minecraft.Client/PS3/PS3_App.cpp b/Minecraft.Client/PS3/PS3_App.cpp index d2ab71501..805b8c018 100644 --- a/Minecraft.Client/PS3/PS3_App.cpp +++ b/Minecraft.Client/PS3/PS3_App.cpp @@ -1,18 +1,18 @@  #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.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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 "Minecraft.World/StringHelpers.h" +#include "PS3Extras/ShutdownManager.h" #include "PS3\Network\SonyRemoteStorage_PS3.h" diff --git a/Minecraft.Client/PS3/PS3_Minecraft.cpp b/Minecraft.Client/PS3/PS3_Minecraft.cpp index 821a47d95..9c129e43e 100644 --- a/Minecraft.Client/PS3/PS3_Minecraft.cpp +++ b/Minecraft.Client/PS3/PS3_Minecraft.cpp @@ -17,7 +17,7 @@ SYS_PROCESS_PARAM(1001, 0x10000); // thread priority, and stack size #include //#include -#include "Leaderboards\PS3LeaderboardManager.h" +#include "Leaderboards/PS3LeaderboardManager.h" #include "PS3\PS3Extras\PS3Strings.h" #include "PS3\PS3Extras\ShutdownManager.h" #include @@ -59,39 +59,39 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/Common/Console_Awards_enum.h" +#include "Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "Minecraft.World/IntCache.h" +#include "Minecraft.Client/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 "PS3\PS3Extras\EdgeZLib.h" #include "C4JThread_SPU.h" #include "Common\Network\Sony\SQRNetworkManager.h" @@ -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: PlayStation3 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: PlayStation3 Edition");//GAMENAME); + StorageManager.SetOptionsFolderTitle((WCHAR *)app.GetString(IDS_OPTIONSFILE));//"Minecraft: PlayStation3 Edition");//GAMENAME); StorageManager.SetGameSaveFolderPrefix(app.GetSaveFolderPrefix()); StorageManager.SetMaxSaves(99); byteArray baOptionsIcon = app.getArchiveFile(L"DefaultOptionsImage320x176.png"); diff --git a/Minecraft.Client/PS3/PS3_UIController.cpp b/Minecraft.Client/PS3/PS3_UIController.cpp index 7b634e3b0..6d7872aeb 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.Client/Minecraft.h" +#include "Minecraft.Client/Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PS3/PS3_UIController.h b/Minecraft.Client/PS3/PS3_UIController.h index 0077b8cf4..040dd95b8 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 "Minecraft.Client/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..f1074e903 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 "Minecraft.Client/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 "Minecraft.Client/Chunk.h" +#include "Minecraft.Client/TileRenderer.h" +#include "Minecraft.Client/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/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 "Minecraft.Client/PS3/SPU_Tasks/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..7bc70a95b 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 "Minecraft.Client/stdafx.h" +#include "Minecraft.World/Region.h" +#include "Minecraft.Client/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..c4e1cee36 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 "Minecraft.Client/PS3/SPU_Tasks/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..47f22ab74 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "..\Common\spu_assert.h" +#include "Minecraft.Client/PS3/SPU_Tasks/Common/spu_assert.h" #endif // SN_TARGET_PS3_SPU #include "Tesselator_SPU.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h index 66e8424ea..a68639a5f 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 "Minecraft.Client/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..c1b5a2f03 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 "Minecraft.Client/PS3/SPU_Tasks/Common/spu_assert.h" #endif static const float MATH_PI = 3.141592654f; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp index f2dfeaac7..de1a0c379 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 "Minecraft.Client/PS3/SPU_Tasks/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..093494ff2 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 "Minecraft.Client/PS3/SPU_Tasks/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..9e1a122af 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 "Minecraft.Client/PS3/SPU_Tasks/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..4c924bc21 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 "Minecraft.Client/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..87b1218ad 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 "Minecraft.Client/PS3/SPU_Tasks/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..ff53a62d9 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 "Minecraft.Client/PS3/SPU_Tasks/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..bf3162215 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 "Minecraft.Client/PS3/SPU_Tasks/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..5664bbf51 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 "Minecraft.Client/PS3/SPU_Tasks/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..ee2b6b09a 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 "Minecraft.Client/PS3/SPU_Tasks/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..279640858 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 "Minecraft.Client/PS3/SPU_Tasks/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..95c2d1cee 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 "Minecraft.Client/PS3/SPU_Tasks/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..820035417 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 "Minecraft.Client/PS3/SPU_Tasks/Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h index fd79a145e..aa11718ef 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h @@ -1,4 +1,4 @@ #pragma once #include -#include "../LevelRenderer_cull/LevelRenderer_cull.h" +#include "Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp index 755c30d09..0b5c994c5 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 "Minecraft.Client/PS3/SPU_Tasks/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..b44c535e9 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 "Minecraft.Client/PS3/SPU_Tasks/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..2c44b491d 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 "Minecraft.Client/PS3/SPU_Tasks/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..52a52f8fd 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 "Minecraft.Client/PS3/SPU_Tasks/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..5fdc2226d 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 "Minecraft.Client/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..c3be4feb8 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 "Minecraft.Client/PS3/SPU_Tasks/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..ec5196225 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 "Minecraft.Client/PS3/SPU_Tasks/Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/XboxGameMode.cpp b/Minecraft.Client/PS3/XboxGameMode.cpp index 1b55fdd9f..fc8d0b8df 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 "Minecraft.Client/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..99e68023d 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 "Minecraft.Client/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..9a1179d85 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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/Textures.h" #include "Resource.h" diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index 958999e4b..0b3a433bd 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -8,7 +8,7 @@ #include "Common\Consoles_App.h" #include "Common\Network\Sony\SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "Minecraft.World/StringHelpers.h" #include diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 9a95ee082..c1ba707a7 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -13,7 +13,7 @@ #include "PSVita\PSVitaExtras\Conf.h" #include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.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 c1b2d2668..9788fac9e 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 "Minecraft.Client/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 8182674a4..4f862b9f1 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -11,7 +11,7 @@ #include "PSVita\PSVitaExtras\Conf.h" #include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.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 0fd0b4149..6cc822e37 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 "Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h index 005d7b6ee..25ce2dd9f 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h +++ b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h @@ -6,7 +6,7 @@ // causing huge stalls. // This isn't really a univeral replacement for std::unordered_map and is quite specific to MobSpawner.h -#include "../../../Minecraft.World/ChunkPos.h" +#include "Minecraft.World/ChunkPos.h" typedef struct SCustomMapNode { diff --git a/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h b/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h index 46f962761..c466a111f 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h +++ b/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h @@ -6,7 +6,7 @@ // causing huge stalls. // This isn't really a univeral replacement for std::unordered_set and is quite specific to Level.h -#include "../../../Minecraft.World/ChunkPos.h" +#include "Minecraft.World/ChunkPos.h" typedef struct SCustomSetNode { diff --git a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp index e7eca53f4..4a312cf55 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 "Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp index 48aa25c47..9653d748f 100644 --- a/Minecraft.Client/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/PSVita/PSVita_App.cpp @@ -1,16 +1,16 @@  #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 "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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" diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp index a82adf00f..85fd869c2 100644 --- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" -#include "Leaderboards\PSVitaLeaderboardManager.h" +#include "Leaderboards/PSVitaLeaderboardManager.h" #include "PSVita\PSVitaExtras\ShutdownManager.h" //#define HEAPINSPECTOR_PS3 1 @@ -18,48 +18,48 @@ //#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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/Common/Console_Awards_enum.h" +#include "Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "Minecraft.World/IntCache.h" +#include "Minecraft.Client/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 "PS3\PS3Extras\EdgeZLib.h" -#include "..\..\Minecraft.World\C4JThread.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 "..\..\Minecraft.World\FireworksRecipe.h" +#include "Minecraft.World/FireworksRecipe.h" #include #include diff --git a/Minecraft.Client/PSVita/PSVita_UIController.cpp b/Minecraft.Client/PSVita/PSVita_UIController.cpp index c3a03acea..c433a3c20 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.Client/Minecraft.h" +#include "Minecraft.Client/Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PSVita/PSVita_UIController.h b/Minecraft.Client/PSVita/PSVita_UIController.h index 0d1e934f6..4cc5a6914 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 "Minecraft.Client/Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp index f5e09dbd2..e42767475 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" ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ); diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp index 1091a26aa..bcdb49958 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..a1e908def 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 a6f65fa6e..9794e7356 100644 --- a/Minecraft.Client/ParticleEngine.cpp +++ b/Minecraft.Client/ParticleEngine.cpp @@ -7,11 +7,11 @@ #include "TerrainParticle.h" #include "ResourceLocation.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" ResourceLocation ParticleEngine::PARTICLES_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp index 18d066b5a..9e3255904 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 "LocalPlayer.h" PauseScreen::PauseScreen() { diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index 1c37d41f7..ddc003583 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -7,12 +7,12 @@ #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" diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h index e8a493b09..75c3e88c1 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 7425889dd..5259efba9 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" ResourceLocation PigRenderer::PIG_LOCATION = ResourceLocation(TN_MOB_PIG); ResourceLocation PigRenderer::SADDLE_LOCATION = ResourceLocation(TN_MOB_SADDLE); diff --git a/Minecraft.Client/PistonPieceRenderer.cpp b/Minecraft.Client/PistonPieceRenderer.cpp index c51d2e0f8..7a57b289c 100644 --- a/Minecraft.Client/PistonPieceRenderer.cpp +++ b/Minecraft.Client/PistonPieceRenderer.cpp @@ -4,9 +4,9 @@ #include "Tesselator.h" #include "TextureAtlas.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" ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/Minecraft.Client/PlayerChunkMap.cpp b/Minecraft.Client/PlayerChunkMap.cpp index acf6edc3f..f0716a002 100644 --- a/Minecraft.Client/PlayerChunkMap.cpp +++ b/Minecraft.Client/PlayerChunkMap.cpp @@ -5,12 +5,12 @@ #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.chunk.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.chunk.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 9d1ab1b55..b41b8343e 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..3ba13dab3 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 4928f65bb..8740ab7a3 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -5,32 +5,32 @@ #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.world.entity.animal.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.world.entity.animal.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" +#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; @@ -124,7 +124,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) ) ); @@ -539,7 +539,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) ) ); @@ -728,13 +728,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() diff --git a/Minecraft.Client/PlayerConnection.h b/Minecraft.Client/PlayerConnection.h index c691e6f5b..d70cea51b 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; diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp index 3cf47a1cf..71e6df142 100644 --- a/Minecraft.Client/PlayerList.cpp +++ b/Minecraft.Client/PlayerList.cpp @@ -11,24 +11,24 @@ #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\EntityIO.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/EntityIO.h" #if defined(_XBOX) || defined(_WINDOWS64) -#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. diff --git a/Minecraft.Client/PlayerList.h b/Minecraft.Client/PlayerList.h index 6a6ee94c9..73e6b60b3 100644 --- a/Minecraft.Client/PlayerList.h +++ b/Minecraft.Client/PlayerList.h @@ -1,6 +1,6 @@ #pragma once #include -#include "..\Minecraft.World\ArrayWithLength.h" +#include "Minecraft.World/ArrayWithLength.h" class ServerPlayer; class PlayerChunkMap; diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index 7d135c2bc..19cb75a16 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -7,12 +7,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 25c32a308..240a32164 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; diff --git a/Minecraft.Client/Polygon.h b/Minecraft.Client/Polygon.h index 24cb2218e..46fe24822 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 5ea7bc59e..3268952c4 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 882a7eae3..da23ff73d 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..150b8d78b 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..0f1f407a7 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 ea0419104..31d331099 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..61977258f 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..d19a834a1 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 bea128428..9735119c4 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, name) { diff --git a/Minecraft.Client/RemotePlayer.h b/Minecraft.Client/RemotePlayer.h index 3fab1dded..13578f7a7 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..28e811f8c 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 6a402b04c..f8b78c1aa 100644 --- a/Minecraft.Client/Screen.cpp +++ b/Minecraft.Client/Screen.cpp @@ -4,9 +4,9 @@ #include "GuiParticles.h" #include "Tesselator.h" #include "Textures.h" -#include "..\Minecraft.World\SoundTypes.h" +#include "Minecraft.World/SoundTypes.h" #ifdef _WINDOWS64 -#include "Windows64\KeyboardMouseInput.h" +#include "Windows64/KeyboardMouseInput.h" #endif diff --git a/Minecraft.Client/ScrolledSelectionList.cpp b/Minecraft.Client/ScrolledSelectionList.cpp index 9b7367ce0..abfe45505 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..5e2c3699c 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 619efa98e..2b42e5ee7 100644 --- a/Minecraft.Client/ServerChunkCache.cpp +++ b/Minecraft.Client/ServerChunkCache.cpp @@ -2,16 +2,16 @@ #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\Tile.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/Tile.h" ServerChunkCache::ServerChunkCache(ServerLevel *level, ChunkStorage *storage, ChunkSource *source) { diff --git a/Minecraft.Client/ServerChunkCache.h b/Minecraft.Client/ServerChunkCache.h index cf93fdc55..51e26cd23 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..722d9771b 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..3841183d6 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 21d77f228..ade36f82d 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 8501cbf98..251d9d44c 100644 --- a/Minecraft.Client/ServerLevel.cpp +++ b/Minecraft.Client/ServerLevel.cpp @@ -7,35 +7,35 @@ #include "PlayerConnection.h" #include "EntityTracker.h" #include "ServerScoreboard.h" -#include "..\Minecraft.World\ScoreboardSaveData.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.item.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.global.h" -#include "..\Minecraft.World\net.minecraft.world.entity.npc.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.biome.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.levelgen.feature.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\Minecraft.World\net.minecraft.world.scores.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\StructurePiece.h" -#include "..\Minecraft.Client\ServerLevelListener.h" -#include "..\Minecraft.World\WeighedTreasure.h" +#include "Minecraft.World/ScoreboardSaveData.h" +#include "Minecraft.World/net.minecraft.world.h" +#include "Minecraft.World/net.minecraft.world.item.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.global.h" +#include "Minecraft.World/net.minecraft.world.entity.npc.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.biome.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.levelgen.feature.h" +#include "Minecraft.World/net.minecraft.world.level.storage.h" +#include "Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net.minecraft.world.scores.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/StructurePiece.h" +#include "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/ServerLevel.h b/Minecraft.Client/ServerLevel.h index 45f3114d5..bd223d6d6 100644 --- a/Minecraft.Client/ServerLevel.h +++ b/Minecraft.Client/ServerLevel.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "Minecraft.World/net.minecraft.world.level.h" +#include "Minecraft.World/JavaIntHash.h" class ServerChunkCache; class MinecraftServer; class Node; diff --git a/Minecraft.Client/ServerLevelListener.cpp b/Minecraft.Client/ServerLevelListener.cpp index b95f6fa78..6560f9da4 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 5265efb59..a7e09ccb6 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 10fde77b2..87a89c670 100644 --- a/Minecraft.Client/ServerPlayer.cpp +++ b/Minecraft.Client/ServerPlayer.cpp @@ -9,28 +9,28 @@ #include "PlayerList.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\Minecraft.World\net.minecraft.world.damagesource.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.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\net.minecraft.world.entity.projectile.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.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.world.scores.h" -#include "..\Minecraft.World\net.minecraft.world.scores.criteria.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "Minecraft.World/net.minecraft.network.packet.h" +#include "Minecraft.World/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net.minecraft.world.inventory.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/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net.minecraft.world.entity.h" +#include "Minecraft.World/net.minecraft.world.entity.animal.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.world.scores.h" +#include "Minecraft.World/net.minecraft.world.scores.criteria.h" +#include "Minecraft.World/net.minecraft.stats.h" +#include "Minecraft.World/net.minecraft.locale.h" -#include "..\Minecraft.World\Pos.h" -#include "..\Minecraft.World\Random.h" +#include "Minecraft.World/Pos.h" +#include "Minecraft.World/Random.h" -#include "..\Minecraft.World\LevelChunk.h" +#include "Minecraft.World/LevelChunk.h" #include "LevelRenderer.h" @@ -477,7 +477,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/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h index 57ea89479..803834e3b 100644 --- a/Minecraft.Client/ServerPlayer.h +++ b/Minecraft.Client/ServerPlayer.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h" -#include "..\Minecraft.World\ChunkPos.h" +#include "Minecraft.World/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/ChunkPos.h" class PlayerConnection; class MinecraftServer; class ServerPlayerGameMode; diff --git a/Minecraft.Client/ServerPlayerGameMode.cpp b/Minecraft.Client/ServerPlayerGameMode.cpp index 2e6bca35e..5cd48c882 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/ServerScoreboard.h b/Minecraft.Client/ServerScoreboard.h index 6de7f88d6..8af99d981 100644 --- a/Minecraft.Client/ServerScoreboard.h +++ b/Minecraft.Client/ServerScoreboard.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Minecraft.World\Scoreboard.h" +#include "Minecraft.World/Scoreboard.h" class MinecraftServer; class ScoreboardSaveData; diff --git a/Minecraft.Client/Settings.cpp b/Minecraft.Client/Settings.cpp index 89946773b..a457cc910 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 648c56031..a30cfac3c 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 669446043..b982965eb 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 5a3580bce..7346b89a8 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" ResourceLocation SheepRenderer::SHEEP_LOCATION = ResourceLocation(TN_MOB_SHEEP); ResourceLocation SheepRenderer::SHEEP_FUR_LOCATION = ResourceLocation(TN_MOB_SHEEP_FUR); diff --git a/Minecraft.Client/SignRenderer.cpp b/Minecraft.Client/SignRenderer.cpp index 5f764a92a..ccf737bae 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" ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/Minecraft.Client/SilverfishModel.cpp b/Minecraft.Client/SilverfishModel.cpp index ce8b8254a..b6479e420 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 a03aaef18..5374c1539 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" ResourceLocation SilverfishRenderer::SILVERFISH_LOCATION(TN_MOB_SILVERFISH); diff --git a/Minecraft.Client/SkeletonModel.cpp b/Minecraft.Client/SkeletonModel.cpp index 7cdba9e25..40444bd4e 100644 --- a/Minecraft.Client/SkeletonModel.cpp +++ b/Minecraft.Client/SkeletonModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SkeletonModel.h" -#include "..\Minecraft.World\Mth.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 "ModelPart.h" void SkeletonModel::_init(float g) diff --git a/Minecraft.Client/SkeletonRenderer.cpp b/Minecraft.Client/SkeletonRenderer.cpp index 56682ddf1..9f707f341 100644 --- a/Minecraft.Client/SkeletonRenderer.cpp +++ b/Minecraft.Client/SkeletonRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SkeletonRenderer.h" #include "SkeletonModel.h" -#include "../Minecraft.World/Skeleton.h" +#include "Minecraft.World/Skeleton.h" ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON); ResourceLocation SkeletonRenderer::WITHER_SKELETON_LOCATION = ResourceLocation(TN_MOB_WITHER_SKELETON); diff --git a/Minecraft.Client/SkullTileRenderer.cpp b/Minecraft.Client/SkullTileRenderer.cpp index 32d216cd6..dfd4bcf95 100644 --- a/Minecraft.Client/SkullTileRenderer.cpp +++ b/Minecraft.Client/SkullTileRenderer.cpp @@ -2,9 +2,9 @@ #include "SkullTileRenderer.h" #include "SkeletonHeadModel.h" #include "PlayerRenderer.h" -#include "..\Minecraft.World\SkullTileEntity.h" -#include "..\Minecraft.World\net.minecraft.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "Minecraft.World/SkullTileEntity.h" +#include "Minecraft.World/net.minecraft.h" +#include "Minecraft.World/net.minecraft.world.level.tile.h" SkullTileRenderer *SkullTileRenderer::instance = NULL; diff --git a/Minecraft.Client/SlimeRenderer.cpp b/Minecraft.Client/SlimeRenderer.cpp index f3f64aed4..a867c71af 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" ResourceLocation SlimeRenderer::SLIME_LOCATION = ResourceLocation(TN_MOB_SLIME); diff --git a/Minecraft.Client/SmokeParticle.cpp b/Minecraft.Client/SmokeParticle.cpp index a88558851..5888e6c87 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 eadbf367d..bf1ebdb44 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 1e258f3c6..75cb8fdf4 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..c48c78c8e 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..b369c1ffb 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 739677e43..88ec63f1c 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 617cce900..1693405a2 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" ResourceLocation SpiderRenderer::SPIDER_LOCATION = ResourceLocation(TN_MOB_SPIDER); ResourceLocation SpiderRenderer::SPIDER_EYES_LOCATION = ResourceLocation(TN_MOB_SPIDER_EYES); diff --git a/Minecraft.Client/SquidModel.cpp b/Minecraft.Client/SquidModel.cpp index 0152418f2..e7ec0dd47 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 75d14f4e5..71723b491 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" ResourceLocation SquidRenderer::SQUID_LOCATION = ResourceLocation(TN_MOB_SQUID); diff --git a/Minecraft.Client/StatsCounter.cpp b/Minecraft.Client/StatsCounter.cpp index b75625e9d..da35c555b 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 "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 "Common/Leaderboards/LeaderboardManager.h" Stat** StatsCounter::LARGE_STATS[] = { &Stats::walkOneM, diff --git a/Minecraft.Client/StatsScreen.cpp b/Minecraft.Client/StatsScreen.cpp index 01d041f0e..fb7bcd133 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..03dcbe7e7 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 c17f3db5e..f9edf9638 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 0ac37b2da..0743939ef 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..21712b081 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..707fa0ba6 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..424d8a303 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..989904aa0 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..fe5c60eff 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..e7ef8debe 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..3b993e8cd 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 7bae7aca9..5bb6ec907 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..5067b934a 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 809f606aa..32ea71dee 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..14ec6339c 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..c0307c3a1 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..a360c41b8 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..0c1041eb3 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 23cb4f62e..90fce599c 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..9018a8d08 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 ab9db75d9..aed861c26 100644 --- a/Minecraft.Client/Textures.cpp +++ b/Minecraft.Client/Textures.cpp @@ -3,21 +3,21 @@ #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 "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" #include "ResourceLocation.h" -#include "..\Minecraft.World\ItemEntity.h" +#include "Minecraft.World/ItemEntity.h" #include "TextureAtlas.h" bool Textures::MIPMAP = true; diff --git a/Minecraft.Client/Textures.h b/Minecraft.Client/Textures.h index eb3d2f6d2..1ad20d614 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 98c7e7cc5..fe6103f6a 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" ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION = ResourceLocation(TN_MISC_TUNNEL); diff --git a/Minecraft.Client/TileEntityRenderDispatcher.cpp b/Minecraft.Client/TileEntityRenderDispatcher.cpp index f9ecfea44..b561e020e 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 a9d5fea77..5566b2ce6 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 2acc6170a..e7c90237e 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 15a2c2f13..7543125b4 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 1c7d5125b..93a702f38 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/TntMinecartRenderer.cpp b/Minecraft.Client/TntMinecartRenderer.cpp index b168e174b..87c1778e0 100644 --- a/Minecraft.Client/TntMinecartRenderer.cpp +++ b/Minecraft.Client/TntMinecartRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "TntMinecartRenderer.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" void TntMinecartRenderer::renderMinecartContents(shared_ptr _cart, float a, Tile *tile, int tileData) { diff --git a/Minecraft.Client/TntRenderer.cpp b/Minecraft.Client/TntRenderer.cpp index 52e2877dc..29e051e4c 100644 --- a/Minecraft.Client/TntRenderer.cpp +++ b/Minecraft.Client/TntRenderer.cpp @@ -2,8 +2,8 @@ #include "TntRenderer.h" #include "TextureAtlas.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 6e956b15a..3560b8273 100644 --- a/Minecraft.Client/TrackedEntity.cpp +++ b/Minecraft.Client/TrackedEntity.cpp @@ -2,18 +2,18 @@ #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\net.minecraft.world.entity.ai.attributes.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/net.minecraft.world.entity.ai.attributes.h" #include "MinecraftServer.h" #include "ServerLevel.h" #include "PlayerList.h" diff --git a/Minecraft.Client/TrapScreen.cpp b/Minecraft.Client/TrapScreen.cpp index c7eb1472c..f45f08933 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 b8e2f2c05..4d911592f 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..152321e59 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..d21d58861 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 41a8eb368..3f6f781dd 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 4e9121a63..c4d23e97e 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 e8b1bf278..ed6b9d043 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 5d6809784..897b79784 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 "TextureAtlas.h" diff --git a/Minecraft.Client/VillagerModel.cpp b/Minecraft.Client/VillagerModel.cpp index 669637af9..2035b0c6f 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 ac885747c..1d562b686 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 25b8f66ea..e822ba5c2 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..9f6cc8dee 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/Network/WinsockNetLayer.cpp b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp index 19fc25987..9a24ca003 100644 --- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp +++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp @@ -3,8 +3,8 @@ #ifdef _WINDOWS64 #include "WinsockNetLayer.h" -#include "..\..\Common\Network\PlatformNetworkManagerStub.h" -#include "..\..\..\Minecraft.World\Socket.h" +#include "Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h" +#include "Minecraft.World/Socket.h" SOCKET WinsockNetLayer::s_listenSocket = INVALID_SOCKET; SOCKET WinsockNetLayer::s_hostConnectionSocket = INVALID_SOCKET; diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h index 96b03c9ba..e6b0ff025 100644 --- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h +++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h @@ -5,7 +5,7 @@ #include #include #include -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/Network/NetworkPlayerInterface.h" #pragma comment(lib, "Ws2_32.lib") diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp index 461e8c348..d09a1b37d 100644 --- a/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/Minecraft.Client/Windows64/Windows64_App.cpp @@ -1,14 +1,14 @@ #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.Client/Common/Consoles_App.h" +#include "Minecraft.Client/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" wstring g_playerName; diff --git a/Minecraft.Client/Windows64/Windows64_App.h b/Minecraft.Client/Windows64/Windows64_App.h index bff916ec7..1f21aad05 100644 --- a/Minecraft.Client/Windows64/Windows64_App.h +++ b/Minecraft.Client/Windows64/Windows64_App.h @@ -1,5 +1,5 @@ #pragma once -#include "4JLibs\inc\4J_Render.h" +#include "4JLibs/inc/4J_Render.h" class CConsoleMinecraftApp : public CMinecraftApp { diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 529399308..c6c9d317d 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -5,39 +5,39 @@ #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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/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 "Minecraft.Client/Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -#include "Network\WinsockNetLayer.h" +#include "Minecraft.World/compression.h" +#include "Minecraft.World/OldChunkStorage.h" +#include "Network/WinsockNetLayer.h" #include "Xbox/resource.h" diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp index 10ae20aff..cb80b3498 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.Client/Minecraft.h" +#include "Minecraft.Client/Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Windows64/Windows64_UIController.h b/Minecraft.Client/Windows64/Windows64_UIController.h index 2b2ccdbac..c32991010 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 "Minecraft.Client/Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/WitchModel.cpp b/Minecraft.Client/WitchModel.cpp index 2ac56697b..ad914350c 100644 --- a/Minecraft.Client/WitchModel.cpp +++ b/Minecraft.Client/WitchModel.cpp @@ -2,7 +2,7 @@ #include "ModelPart.h" #include "WitchModel.h" #include "VillagerModel.h" -#include "../Minecraft.World/Mth.h" +#include "Minecraft.World/Mth.h" WitchModel::WitchModel(float g) : VillagerModel(g, 0, 64, 128) { diff --git a/Minecraft.Client/WitchRenderer.cpp b/Minecraft.Client/WitchRenderer.cpp index 5e0f2b103..74e45b2da 100644 --- a/Minecraft.Client/WitchRenderer.cpp +++ b/Minecraft.Client/WitchRenderer.cpp @@ -3,7 +3,7 @@ #include "WitchRenderer.h" #include "WitchModel.h" #include "ModelPart.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "Minecraft.World/net.minecraft.world.item.h" ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH); diff --git a/Minecraft.Client/WitherBossModel.cpp b/Minecraft.Client/WitherBossModel.cpp index 626a89505..1a9ebda87 100644 --- a/Minecraft.Client/WitherBossModel.cpp +++ b/Minecraft.Client/WitherBossModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "WitherBossModel.h" -#include "..\Minecraft.World\WitherBoss.h" +#include "Minecraft.World/WitherBoss.h" #include "ModelPart.h" WitherBossModel::WitherBossModel() diff --git a/Minecraft.Client/WitherBossRenderer.cpp b/Minecraft.Client/WitherBossRenderer.cpp index 254a00bc7..5c5868ff0 100644 --- a/Minecraft.Client/WitherBossRenderer.cpp +++ b/Minecraft.Client/WitherBossRenderer.cpp @@ -2,8 +2,8 @@ #include "WitherBossRenderer.h" #include "WitherBossModel.h" #include "MobRenderer.h" -#include "../Minecraft.World/WitherBoss.h" -#include "../Minecraft.Client/BossMobGuiInfo.h" +#include "Minecraft.World/WitherBoss.h" +#include "BossMobGuiInfo.h" ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = ResourceLocation(TN_MOB_WITHER_ARMOR); ResourceLocation WitherBossRenderer::WITHER_INVULERABLE_LOCATION = ResourceLocation(TN_MOB_WITHER_INVULNERABLE); diff --git a/Minecraft.Client/WitherSkullRenderer.cpp b/Minecraft.Client/WitherSkullRenderer.cpp index 878735740..eab8e0ba0 100644 --- a/Minecraft.Client/WitherSkullRenderer.cpp +++ b/Minecraft.Client/WitherSkullRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WitherSkullRenderer.h" #include "SkeletonHeadModel.h" -#include "../Minecraft.World/WitherSkull.h" +#include "Minecraft.World/WitherSkull.h" ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION(TN_MOB_WITHER_INVULNERABLE); ResourceLocation WitherSkullRenderer::WITHER_LOCATION(TN_MOB_WITHER); diff --git a/Minecraft.Client/WolfModel.cpp b/Minecraft.Client/WolfModel.cpp index d459240d0..96e87a820 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 4b7bda6c3..dc15367ed 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 c4577db88..ba89c7c44 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" ResourceLocation *WolfRenderer::WOLF_LOCATION = new ResourceLocation(TN_MOB_WOLF); ResourceLocation *WolfRenderer::WOLF_TAME_LOCATION = new ResourceLocation(TN_MOB_WOLF_TAME); diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp index b088150c9..dd4cc19b3 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.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" #include "SoundEngine.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\Common\DLC\DLCAudioFile.h" -#include "..\..\DLCTexturePack.h" +#include "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/Common/DLC/DLCAudioFile.h" +#include "Minecraft.Client/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..46d2c5fec 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..ef365f659 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 "Minecraft.Client/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..07e32a0f2 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 "Minecraft.Client/stubs.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/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..844572a3e 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 "Minecraft.Client/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..a1b2c1581 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..c017eaa0d 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 "Minecraft.Client/Xbox/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..fb17ad47c 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 "Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" class XboxLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h index bec7a1255..f17b4c948 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 "Minecraft.Client/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..7cdc7d786 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 "Minecraft.Client/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..5b50b9ce9 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 "Minecraft.Client/Common/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/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..668e0aca0 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 "Minecraft.Client/Xbox/GameConfig/Minecraft.spa.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/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..7f86ab474 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 "Minecraft.Client/Xbox/Sentient/SentientManager.h" /////////////////////////////////////////////////////////////////////////// // Constants. diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp index b252035e6..f604d7b06 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 "Minecraft.Client/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 "Minecraft.Client/Common/XUI/XUI_Intro.h" +#include "Minecraft.Client/Common/XUI/XUI_MainMenu.h" +#include "Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_TextEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h" +#include "Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpControls.h" +#include "Minecraft.Client/Common/XUI/XUI_TextEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_LoadSettings.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsAll.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsAudio.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsControl.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsUI.h" +#include "Minecraft.Client/Common/XUI/XUI_Leaderboards.h" +#include "Minecraft.Client/Common/XUI/XUI_Debug.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugTips.h" +#include "Minecraft.Client/Common/XUI/XUI_Reinstall.h" +#include "Minecraft.Client/Common/XUI/XUI_Death.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugOverlay.h" +#include "Minecraft.Client/Common/XUI/XUI_DLCOffers.h" +#include "Minecraft.Client/Common/XUI/XUI_SocialPost.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Container.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Trap.h" +#include "Minecraft.Client/Common/XUI/XUI_Control_ComboBox.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_SignEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_InGameInfo.h" +#include "Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h" +#include "Minecraft.Client/Common/XUI/XUI_BasePlayer.h" +#include "Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h" +#include "Minecraft.Client/Common/XUI/XUI_SaveMessage.h" +#include "Minecraft.Client/Common/XUI/XUI_Chat.h" +#include "Minecraft.Client/Common/XUI/XUI_SkinSelect.h" +#include "Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h" +#include "Minecraft.Client/Common/XUI/XUI_XZP_Icons.h" +#include "Minecraft.Client/Common/XUI/XUI_Controls.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Win.h" +#include "Minecraft.Client/Common/XUI/XUI_HUD.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h" +#include "Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h" #ifdef _DEBUG_MENUS_ENABLED -#include "..\Common\XUI\XUI_DebugItemEditor.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "Minecraft.Client/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 "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/GameRenderer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/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 "Minecraft.Client/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 "Minecraft.Client/Common/Tutorial/TutorialMode.h" +#include "XML/ATGXmlParser.h" +#include "XML/xmlFilesCallback.h" +#include "4JLibs/inc/4J_Input.h" +#include "Font/XUI_FontRenderer.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/PlayerList.h" +#include "Minecraft.Client/ServerPlayer.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h" +#include "Minecraft.World/InputOutputStream.h" +#include "Minecraft.World/LevelSettings.h" +#include "Minecraft.Client/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 "Minecraft.Client/TexturePackRepository.h" +#include "Minecraft.Client/TexturePack.h" +#include "Minecraft.Client/Common/DLC/DLCAudioFile.h" +#include "Minecraft.Client/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 "Minecraft.Client/Common/XUI/XUI_Intro.h" +#include "Minecraft.Client/Common/XUI/XUI_MainMenu.h" +#include "Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_TextEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h" +#include "Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h" +#include "Minecraft.Client/Common/XUI/XUI_HelpControls.h" +#include "Minecraft.Client/Common/XUI/XUI_TextEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_LoadSettings.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsAll.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsAudio.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsControl.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h" +#include "Minecraft.Client/Common/XUI/XUI_SettingsUI.h" +#include "Minecraft.Client/Common/XUI/XUI_Leaderboards.h" +#include "Minecraft.Client/Common/XUI/XUI_Debug.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugTips.h" +#include "Minecraft.Client/Common/XUI/XUI_Reinstall.h" +#include "Minecraft.Client/Common/XUI/XUI_Death.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugOverlay.h" +#include "Minecraft.Client/Common/XUI/XUI_DLCOffers.h" +#include "Minecraft.Client/Common/XUI/XUI_SocialPost.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Container.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Trap.h" +#include "Minecraft.Client/Common/XUI/XUI_Control_ComboBox.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h" +#include "Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_SignEntry.h" +#include "Minecraft.Client/Common/XUI/XUI_InGameInfo.h" +#include "Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h" +#include "Minecraft.Client/Common/XUI/XUI_BasePlayer.h" +#include "Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h" +#include "Minecraft.Client/Common/XUI/XUI_SaveMessage.h" +#include "Minecraft.Client/Common/XUI/XUI_Chat.h" +#include "Minecraft.Client/Common/XUI/XUI_SkinSelect.h" +#include "Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h" +#include "Minecraft.Client/Common/XUI/XUI_XZP_Icons.h" +#include "Minecraft.Client/Common/XUI/XUI_Controls.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Win.h" +#include "Minecraft.Client/Common/XUI/XUI_HUD.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h" +#include "Minecraft.Client/Common/XUI/XUI_Scene_Trading.h" +#include "Minecraft.Client/Common/XUI/XUI_Teleport.h" #ifdef _DEBUG_MENUS_ENABLED -#include "..\Common\XUI\XUI_DebugItemEditor.h" +#include "Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "Minecraft.Client/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..b813d51e4 100644 --- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp @@ -4,35 +4,35 @@ #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 "GameConfig/Minecraft.spa.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/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 "Minecraft.Client/ClientConnection.h" +#include "Minecraft.Client/User.h" +#include "Minecraft.World/Socket.h" +#include "Minecraft.World/ThreadName.h" +#include "Minecraft.Client/StatsCounter.h" +#include "Minecraft.Client/ConnectScreen.h" +#include "Social/SocialManager.h" +#include "Leaderboards/XboxLeaderboardManager.h" +#include "Minecraft.Client/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 "Minecraft.Client/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..5748841a5 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 "Minecraft.Client/Common/XUI/XUI_Scene_Base.h" +#include "Minecraft.Client/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..ce5e14c56 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 "Minecraft.Client/Common/UI/IUIController.h" class ConsoleUIController : public IUIController { diff --git a/Minecraft.Client/ZombieModel.cpp b/Minecraft.Client/ZombieModel.cpp index 648dd09f8..6a1cc630e 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 7fd2d2015..25daad0b8 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" ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE); diff --git a/Minecraft.Client/glWrapper.cpp b/Minecraft.Client/glWrapper.cpp index 5e0fab2c6..c76c0014b 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 4c8bf5d69..54524c109 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -118,7 +118,7 @@ typedef XNKID SessionID; typedef XUID GameSessionUID; #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) -#include "..\Minecraft.Client\xbox\network\extra.h" +#include "xbox/network/extra.h" #else #include "extraX64.h" #endif @@ -159,48 +159,48 @@ 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 - #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\KeyboardMouseInput.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" +#include "Windows64/KeyboardMouseInput.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" @@ -214,139 +214,139 @@ 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\App_defines.h" -#include "Common\UI\UIEnums.h" -#include "Common\UI\UIStructs.h" +#include "Common/App_defines.h" +#include "Common/UI/UIEnums.h" +#include "Common/UI/UIStructs.h" // #ifdef _XBOX -#include "Common\App_enums.h" -#include "Common\Tutorial\TutorialEnum.h" -#include "Common\App_structs.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 "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 "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/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 __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" +#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.Client/stubs.cpp b/Minecraft.Client/stubs.cpp index 16215ba2f..05f6a81e0 100644 --- a/Minecraft.Client/stubs.cpp +++ b/Minecraft.Client/stubs.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #ifdef _WINDOWS64 -#include "Windows64\KeyboardMouseInput.h" +#include "Windows64/KeyboardMouseInput.h" int Mouse::getX() { diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp index 114b200b9..a34667035 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.level.tile.h" #include "net.minecraft.world.entity.player.h" diff --git a/Minecraft.World/Arrow.cpp b/Minecraft.World/Arrow.cpp index 743f966be..acb916176 100644 --- a/Minecraft.World/Arrow.cpp +++ b/Minecraft.World/Arrow.cpp @@ -8,8 +8,8 @@ #include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.item.enchantment.h" #include "net.minecraft.network.packet.h" -#include "..\Minecraft.Client\ServerPlayer.h" -#include "..\Minecraft.Client\PlayerConnection.h" +#include "Minecraft.Client/ServerPlayer.h" +#include "Minecraft.Client/PlayerConnection.h" #include "com.mojang.nbt.h" #include "Arrow.h" diff --git a/Minecraft.World/Biome.cpp b/Minecraft.World/Biome.cpp index 169db77e6..ed72dd390 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/BiomeCache.h b/Minecraft.World/BiomeCache.h index bf509f544..d52a1e4c3 100644 --- a/Minecraft.World/BiomeCache.h +++ b/Minecraft.World/BiomeCache.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\JavaIntHash.h" +#include "JavaIntHash.h" class BiomeCache { diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp index 8e2a56809..c19f7d49e 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 d87a83b2d..ce44ae12a 100644 --- a/Minecraft.World/Blaze.cpp +++ b/Minecraft.World/Blaze.cpp @@ -9,7 +9,7 @@ #include "net.minecraft.world.entity.monster.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 a3bd7bee1..90d0e960b 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 "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..1869289ac 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/CauldronTile.cpp b/Minecraft.World/CauldronTile.cpp index f7a8d0445..fa1b000f5 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 d9396c43c..28d0f45c3 100644 --- a/Minecraft.World/CaveSpider.cpp +++ b/Minecraft.World/CaveSpider.cpp @@ -5,7 +5,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 5f4cf2a73..7366c91f8 100644 --- a/Minecraft.World/Chicken.cpp +++ b/Minecraft.World/Chicken.cpp @@ -8,7 +8,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/ClockItem.cpp b/Minecraft.World/ClockItem.cpp index afe0544d2..5f7a29a28 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/Command.cpp b/Minecraft.World/Command.cpp index bf546f6ea..956715840 100644 --- a/Minecraft.World/Command.cpp +++ b/Minecraft.World/Command.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "net.minecraft.commands.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\PlayerList.h" -#include "..\Minecraft.Client\ServerPlayer.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/PlayerList.h" +#include "Minecraft.Client/ServerPlayer.h" #include "Command.h" AdminLogCommand *Command::logger; diff --git a/Minecraft.World/CommandBlockEntity.cpp b/Minecraft.World/CommandBlockEntity.cpp index 1c518f4fd..7d5ffb497 100644 --- a/Minecraft.World/CommandBlockEntity.cpp +++ b/Minecraft.World/CommandBlockEntity.cpp @@ -2,7 +2,7 @@ #include "net.minecraft.network.packet.h" #include "net.minecraft.world.level.h" #include "net.minecraft.commands.h" -#include "..\Minecraft.Client\MinecraftServer.h" +#include "Minecraft.Client/MinecraftServer.h" #include "CommandBlockEntity.h" CommandBlockEntity::CommandBlockEntity() diff --git a/Minecraft.World/CompassItem.cpp b/Minecraft.World/CompassItem.cpp index 57ad65d04..af173ad98 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/Connection.cpp b/Minecraft.World/Connection.cpp index 09f72be09..8eea9de42 100644 --- a/Minecraft.World/Connection.cpp +++ b/Minecraft.World/Connection.cpp @@ -4,7 +4,7 @@ #include "Connection.h" #include "ThreadName.h" #include "compression.h" -#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h" +#include "Minecraft.Client/PS3/PS3Extras/ShutdownManager.h" // This should always be enabled, except for debugging use #ifndef _DEBUG @@ -341,7 +341,7 @@ bool Connection::readTick() // printf("Con:0x%x readTick close EOS\n",this); // 4J Stu - Remove this line - // Fix for #10410 - UI: If the player is removed from a splitscreened host’s game, the next game that player joins will produce a message stating that the host has left. + // Fix for #10410 - UI: If the player is removed from a splitscreened hosts game, the next game that player joins will produce a message stating that the host has left. //close(DisconnectPacket::eDisconnect_EndOfStream); } diff --git a/Minecraft.World/ConsoleSaveFileOriginal.cpp b/Minecraft.World/ConsoleSaveFileOriginal.cpp index c07808d42..40a053edf 100644 --- a/Minecraft.World/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/ConsoleSaveFileOriginal.cpp @@ -4,13 +4,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 "net.minecraft.world.level.h" +#include "LevelData.h" +#include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h" +#include "net.minecraft.world.level.chunk.storage.h" #ifdef _XBOX diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp index b1fd4d6bd..cf7dcfa6e 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/ControlledByPlayerGoal.h b/Minecraft.World/ControlledByPlayerGoal.h index 25bd579c5..536a8bd2d 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; diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp index 05e701027..22e212e21 100644 --- a/Minecraft.World/Cow.cpp +++ b/Minecraft.World/Cow.cpp @@ -11,7 +11,7 @@ #include "net.minecraft.world.entity.monster.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 29be2c0ca..1c57eb118 100644 --- a/Minecraft.World/Creeper.cpp +++ b/Minecraft.World/Creeper.cpp @@ -15,7 +15,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/Dimension.cpp b/Minecraft.World/Dimension.cpp index 443bd1bc7..91c741380 100644 --- a/Minecraft.World/Dimension.cpp +++ b/Minecraft.World/Dimension.cpp @@ -11,8 +11,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" const float Dimension::MOON_BRIGHTNESS_PER_PHASE[8] = {1.0f, 0.75f, 0.5f, 0.25f, 0, 0.25f, 0.5f, 0.75f}; diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp index 6e50fd20d..495f03d46 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/EffectCommand.cpp b/Minecraft.World/EffectCommand.cpp index 5d708db8a..a64709e41 100644 --- a/Minecraft.World/EffectCommand.cpp +++ b/Minecraft.World/EffectCommand.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "net.minecraft.commands.common.h" -#include "..\Minecraft.Client\MinecraftServer.h" +#include "Minecraft.Client/MinecraftServer.h" EGameCommand EffectCommand::getId() { diff --git a/Minecraft.World/EnchantItemCommand.cpp b/Minecraft.World/EnchantItemCommand.cpp index 7ec57563c..1cdd28367 100644 --- a/Minecraft.World/EnchantItemCommand.cpp +++ b/Minecraft.World/EnchantItemCommand.cpp @@ -2,7 +2,7 @@ #include "net.minecraft.network.packet.h" #include "net.minecraft.world.item.h" #include "net.minecraft.world.item.enchantment.h" -#include "..\Minecraft.Client\ServerPlayer.h" +#include "Minecraft.Client/ServerPlayer.h" #include "EnchantItemCommand.h" EGameCommand EnchantItemCommand::getId() diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp index 2dc0c434a..8ff6915ae 100644 --- a/Minecraft.World/EnderDragon.cpp +++ b/Minecraft.World/EnderDragon.cpp @@ -9,7 +9,7 @@ #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" diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index d099911c0..e21b87b81 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -9,7 +9,7 @@ #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" AttributeModifier *EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, AttributeModifier::OPERATION_ADDITION))->setSerialize(false); diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index e45160578..7b320230b 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -26,12 +26,12 @@ #include #include ======= -#include "..\minecraft.Client\HumanoidModel.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\MultiPlayerLevel.h" -#include "..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.Client\PlayerList.h" +#include "Minecraft.Client/HumanoidModel.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/MultiPlayerLevel.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/ServerLevel.h" +#include "Minecraft.Client/PlayerList.h" >>>>>>> parent of fef5c7b0 (the reformatting, pt 1) const wstring Entity::RIDING_TAG = L"Riding"; diff --git a/Minecraft.World/EntityHorse.cpp b/Minecraft.World/EntityHorse.cpp index 2d67d21bd..1239d1a5c 100644 --- a/Minecraft.World/EntityHorse.cpp +++ b/Minecraft.World/EntityHorse.cpp @@ -13,8 +13,8 @@ #include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.inventory.h" #include "net.minecraft.world.phys.h" -#include "..\Minecraft.Client\Textures.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "Minecraft.Client/Textures.h" +#include "Minecraft.Client/Minecraft.h" #include "BasicTypeContainers.h" #include "EntityHorse.h" diff --git a/Minecraft.World/ExperienceCommand.cpp b/Minecraft.World/ExperienceCommand.cpp index 9a59d71a0..dca00b68e 100644 --- a/Minecraft.World/ExperienceCommand.cpp +++ b/Minecraft.World/ExperienceCommand.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.commands.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.h" #include "ExperienceCommand.h" diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp index dfb4b961c..99a52881d 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/FoliageColor.cpp b/Minecraft.World/FoliageColor.cpp index 276bf9298..ea05ef9ab 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/GenericStats.h b/Minecraft.World/GenericStats.h index 541424db0..7515c5122 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 f0817791c..347a645da 100644 --- a/Minecraft.World/Ghast.cpp +++ b/Minecraft.World/Ghast.cpp @@ -11,7 +11,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 dbb790bf0..9b5302e61 100644 --- a/Minecraft.World/Giant.cpp +++ b/Minecraft.World/Giant.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.entity.ai.attributes.h" #include "net.minecraft.world.entity.monster.h" #include "Giant.h" -#include "..\Minecraft.Client\Textures.h" +#include "Minecraft.Client/Textures.h" diff --git a/Minecraft.World/GiveItemCommand.cpp b/Minecraft.World/GiveItemCommand.cpp index b3cbff4f1..584945a70 100644 --- a/Minecraft.World/GiveItemCommand.cpp +++ b/Minecraft.World/GiveItemCommand.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.item.h" #include "net.minecraft.network.packet.h" -#include "..\Minecraft.Client\ServerPlayer.h" +#include "Minecraft.Client/ServerPlayer.h" #include "GiveItemCommand.h" EGameCommand GiveItemCommand::getId() diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp index 68e7c2332..177407188 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/HellDimension.cpp b/Minecraft.World/HellDimension.cpp index 85e2a25ae..9cba83309 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/LavaSlime.cpp b/Minecraft.World/LavaSlime.cpp index 21982995d..b5017ecdf 100644 --- a/Minecraft.World/LavaSlime.cpp +++ b/Minecraft.World/LavaSlime.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.entity.ai.attributes.h" #include "net.minecraft.world.entity.monster.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 956a8917b..654fa85d1 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 684618a78..2ca18f4c4 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 f9c383ed6..1ba442945 100644 --- a/Minecraft.World/Level.cpp +++ b/Minecraft.World/Level.cpp @@ -29,16 +29,16 @@ #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\MinecraftServer.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/MinecraftServer.h" DWORD Level::tlsIdx = TlsAlloc(); diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h index 045cfdb87..ac0991124 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 920fdfc12..38f3317eb 100644 --- a/Minecraft.World/LevelChunk.cpp +++ b/Minecraft.World/LevelChunk.cpp @@ -12,10 +12,10 @@ #include "BlockReplacements.h" #include "LevelChunk.h" #include "BasicTypeContainers.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" #include "ItemEntity.h" #include "Minecart.h" diff --git a/Minecraft.World/LightningBolt.cpp b/Minecraft.World/LightningBolt.cpp index 7f32c8ec8..6c41b448a 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/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp index 5f8a3dd1c..0a9ff064c 100644 --- a/Minecraft.World/LivingEntity.cpp +++ b/Minecraft.World/LivingEntity.cpp @@ -24,9 +24,9 @@ #include "net.minecraft.world.scores.h" #include "com.mojang.nbt.h" #include "LivingEntity.h" -#include "..\Minecraft.Client\Textures.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.Client\EntityTracker.h" +#include "Minecraft.Client/Textures.h" +#include "Minecraft.Client/ServerLevel.h" +#include "Minecraft.Client/EntityTracker.h" #include "SoundTypes.h" #include "BasicTypeContainers.h" #include "ParticleTypes.h" diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp index 6304aa624..279619d28 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 48787f55c..11e46c767 100644 --- a/Minecraft.World/Minecart.cpp +++ b/Minecraft.World/Minecart.cpp @@ -9,8 +9,8 @@ #include "net.minecraft.world.entity.animal.h" #include "net.minecraft.world.item.h" #include "net.minecraft.world.damagesource.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/ServerLevel.h" #include "com.mojang.nbt.h" #include "Minecart.h" #include "SharedConstants.h" diff --git a/Minecraft.World/Minecraft.World.cpp b/Minecraft.World/Minecraft.World.cpp index 1ee6eb47c..cb51f2f41 100644 --- a/Minecraft.World/Minecraft.World.cpp +++ b/Minecraft.World/Minecraft.World.cpp @@ -15,7 +15,7 @@ #include "net.minecraft.world.effect.h" #include "Minecraft.World.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "Minecraft.Client/ServerLevel.h" #ifdef _DURANGO #include "DurangoStats.h" diff --git a/Minecraft.World/Mob.cpp b/Minecraft.World/Mob.cpp index cac25ddbe..92253d32b 100644 --- a/Minecraft.World/Mob.cpp +++ b/Minecraft.World/Mob.cpp @@ -19,11 +19,11 @@ #include "net.minecraft.world.item.alchemy.h" #include "net.minecraft.world.item.enchantment.h" #include "net.minecraft.world.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.Client\EntityTracker.h" +#include "Minecraft.Client/ServerLevel.h" +#include "Minecraft.Client/EntityTracker.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/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp index 8cd60e922..c4facae63 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 452ddcc43..41bdc36a5 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 174a706cb..2b258be28 100644 --- a/Minecraft.World/Monster.cpp +++ b/Minecraft.World/Monster.cpp @@ -10,7 +10,7 @@ #include "net.minecraft.world.item.enchantment.h" #include "Monster.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "Minecraft.Client/Minecraft.h" Monster::Monster(Level *level) : PathfinderMob( level ) diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp index a29700338..9bf78960c 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/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp index 0f88c8435..6217dc089 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/Ocelot.cpp b/Minecraft.World/Ocelot.cpp index 50285682a..9918381be 100644 --- a/Minecraft.World/Ocelot.cpp +++ b/Minecraft.World/Ocelot.cpp @@ -14,9 +14,9 @@ #include "net.minecraft.world.phys.h" #include "SynchedEntityData.h" #include "StringHelpers.h" -#include "..\Minecraft.Client\Textures.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Textures.h" +#include "Minecraft.Client/Minecraft.h" +#include "Minecraft.Client/MultiPlayerLocalPlayer.h" #include "GenericStats.h" #include "Ocelot.h" diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp index 3c05f3578..87c9b25d5 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 f1630db5f..0c3f980a0 100644 --- a/Minecraft.World/Packet.cpp +++ b/Minecraft.World/Packet.cpp @@ -8,8 +8,8 @@ #include "com.mojang.nbt.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/Pig.cpp b/Minecraft.World/Pig.cpp index cc042f586..68c69339d 100644 --- a/Minecraft.World/Pig.cpp +++ b/Minecraft.World/Pig.cpp @@ -14,7 +14,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 7a736c9ad..fbf31d66c 100644 --- a/Minecraft.World/PigZombie.cpp +++ b/Minecraft.World/PigZombie.cpp @@ -11,7 +11,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" AttributeModifier *PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, AttributeModifier::OPERATION_ADDITION))->setSerialize(false); diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp index c71bbf95d..58dc7ebf4 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 700935f6e..9c2e5a1f4 100644 --- a/Minecraft.World/Player.cpp +++ b/Minecraft.World/Player.cpp @@ -37,10 +37,10 @@ #include "Player.h" #include "ParticleTypes.h" -#include "..\Minecraft.Client\Textures.h" +#include "Minecraft.Client/Textures.h" -#include "..\Minecraft.Client\LocalPlayer.h" -#include "..\Minecraft.Client\HumanoidModel.h" +#include "Minecraft.Client/LocalPlayer.h" +#include "Minecraft.Client/HumanoidModel.h" #include "SoundTypes.h" diff --git a/Minecraft.World/PlayerInfoPacket.cpp b/Minecraft.World/PlayerInfoPacket.cpp index 9cbe5f7cc..b7503c8d7 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" diff --git a/Minecraft.World/PortalForcer.cpp b/Minecraft.World/PortalForcer.cpp index 8880399ef..d5dbea658 100644 --- a/Minecraft.World/PortalForcer.cpp +++ b/Minecraft.World/PortalForcer.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.dimension.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "Minecraft.Client/ServerLevel.h" #include "PortalForcer.h" PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, __int64 time) : Pos(x, y, z) diff --git a/Minecraft.World/PotionBrewing.cpp b/Minecraft.World/PotionBrewing.cpp index 5c454fd42..7cf44706a 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/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp index 2b93578a6..7ada78db5 100644 --- a/Minecraft.World/RandomLevelSource.cpp +++ b/Minecraft.World/RandomLevelSource.cpp @@ -11,7 +11,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 0107b6679..3f114bd26 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" @@ -12,7 +12,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"_cross"; const wstring RedStoneDustTile::TEXTURE_LINE = L"_line"; diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp index 32379c2a1..f3f6d26c7 100644 --- a/Minecraft.World/Sheep.cpp +++ b/Minecraft.World/Sheep.cpp @@ -16,7 +16,7 @@ #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.monster.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 74adc8ccc..7741193f9 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 "Level.h" diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index 5cd4c77ee..22f21423f 100644 --- a/Minecraft.World/Silverfish.cpp +++ b/Minecraft.World/Silverfish.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.entity.ai.attributes.h" #include "net.minecraft.world.entity.monster.h" #include "net.minecraft.h" -#include "..\Minecraft.Client\Textures.h" +#include "Minecraft.Client/Textures.h" #include "Silverfish.h" #include "SoundTypes.h" diff --git a/Minecraft.World/Skeleton.cpp b/Minecraft.World/Skeleton.cpp index 9afb95c6b..7015f8e42 100644 --- a/Minecraft.World/Skeleton.cpp +++ b/Minecraft.World/Skeleton.cpp @@ -19,7 +19,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" Skeleton::Skeleton(Level *level) : Monster( level ) diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp index eb80d09c8..5858a6fe1 100644 --- a/Minecraft.World/Slime.cpp +++ b/Minecraft.World/Slime.cpp @@ -13,7 +13,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 6c78b56f8..c228c6ec6 100644 --- a/Minecraft.World/SnowMan.cpp +++ b/Minecraft.World/SnowMan.cpp @@ -12,7 +12,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/Socket.cpp b/Minecraft.World/Socket.cpp index bd0c2032f..19815305f 100644 --- a/Minecraft.World/Socket.cpp +++ b/Minecraft.World/Socket.cpp @@ -3,9 +3,9 @@ #include "SocketAddress.h" #include "Socket.h" #include "ThreadName.h" -#include "..\Minecraft.Client\ServerConnection.h" +#include "Minecraft.Client/ServerConnection.h" #include -#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h" +#include "Minecraft.Client/PS3/PS3Extras/ShutdownManager.h" // This current socket implementation is for the creation of a single local link. 2 sockets can be created, one for either end of this local // link, the end (0 or 1) is passed as a parameter to the ctor. diff --git a/Minecraft.World/SpawnEggItem.cpp b/Minecraft.World/SpawnEggItem.cpp index ab082bfb9..e415f8681 100644 --- a/Minecraft.World/SpawnEggItem.cpp +++ b/Minecraft.World/SpawnEggItem.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/Spider.cpp b/Minecraft.World/Spider.cpp index 49997db39..92342a78f 100644 --- a/Minecraft.World/Spider.cpp +++ b/Minecraft.World/Spider.cpp @@ -11,7 +11,7 @@ #include "com.mojang.nbt.h" #include "BasicTypeContainers.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 7aae36154..8b3de7458 100644 --- a/Minecraft.World/Squid.cpp +++ b/Minecraft.World/Squid.cpp @@ -9,7 +9,7 @@ #include "net.minecraft.world.entity.monster.h" #include "SharedConstants.h" #include "Squid.h" -#include "..\Minecraft.Client\Textures.h" +#include "Minecraft.Client/Textures.h" void Squid::_init() { diff --git a/Minecraft.World/Stats.cpp b/Minecraft.World/Stats.cpp index 89da587b7..1b6d55bac 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 bf9b058d1..195b44f51 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/TallGrass.cpp b/Minecraft.World/TallGrass.cpp index 1a89d3edf..fa3efe231 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/TextureAndGeometryPacket.h b/Minecraft.World/TextureAndGeometryPacket.h index 8577f03df..235436f3e 100644 --- a/Minecraft.World/TextureAndGeometryPacket.h +++ b/Minecraft.World/TextureAndGeometryPacket.h @@ -2,8 +2,8 @@ using namespace std; #include "Packet.h" -#include "..\Minecraft.Client\Model.h" -#include "..\Minecraft.Client\SkinBox.h" +#include "Minecraft.Client/Model.h" +#include "Minecraft.Client/SkinBox.h" class DLCSkinFile; diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp index ccc8641b4..e96b599e2 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 1035bffdc..37d95487c 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/TileEntity.h b/Minecraft.World/TileEntity.h index 8addb3ed0..30d9c183d 100644 --- a/Minecraft.World/TileEntity.h +++ b/Minecraft.World/TileEntity.h @@ -2,7 +2,7 @@ using namespace std; #include "HashExtension.h" -#include "..\Minecraft.World\JavaIntHash.h" +#include "JavaIntHash.h" class Level; class Packet; diff --git a/Minecraft.World/TimeCommand.cpp b/Minecraft.World/TimeCommand.cpp index 4ac23c947..3d3c4a08e 100644 --- a/Minecraft.World/TimeCommand.cpp +++ b/Minecraft.World/TimeCommand.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.commands.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/ServerLevel.h" #include "net.minecraft.network.packet.h" #include "TimeCommand.h" diff --git a/Minecraft.World/ToggleDownfallCommand.cpp b/Minecraft.World/ToggleDownfallCommand.cpp index 1d0a4d9eb..c5a176e92 100644 --- a/Minecraft.World/ToggleDownfallCommand.cpp +++ b/Minecraft.World/ToggleDownfallCommand.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\ServerLevel.h" +#include "Minecraft.Client/MinecraftServer.h" +#include "Minecraft.Client/ServerLevel.h" #include "net.minecraft.commands.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.storage.h" diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp index 1fe32a12c..e76fc9f35 100644 --- a/Minecraft.World/Villager.cpp +++ b/Minecraft.World/Villager.cpp @@ -14,7 +14,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 dba80ffa7..b319326e6 100644 --- a/Minecraft.World/VillagerGolem.cpp +++ b/Minecraft.World/VillagerGolem.cpp @@ -14,7 +14,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 15e43b9db..da69662f7 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 1988382e1..4cab2db6e 100644 --- a/Minecraft.World/Wolf.cpp +++ b/Minecraft.World/Wolf.cpp @@ -18,7 +18,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/Zombie.cpp b/Minecraft.World/Zombie.cpp index df9d5c6b7..d1127347d 100644 --- a/Minecraft.World/Zombie.cpp +++ b/Minecraft.World/Zombie.cpp @@ -14,7 +14,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 "JavaMath.h" #include "SoundTypes.h" diff --git a/Minecraft.World/compression.cpp b/Minecraft.World/compression.cpp index 99c5228ab..3107cbbe9 100644 --- a/Minecraft.World/compression.cpp +++ b/Minecraft.World/compression.cpp @@ -1,13 +1,13 @@ #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 __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__ diff --git a/Minecraft.World/compression.h b/Minecraft.World/compression.h index bceac78c6..48b8a2291 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/stdafx.h b/Minecraft.World/stdafx.h index 352930322..78495579c 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -30,7 +30,7 @@ typedef unsigned __int64 __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 ) @@ -125,7 +125,7 @@ typedef XUID GameSessionUID; #ifndef _XBOX #include "extraX64.h" #else -#include "..\Minecraft.Client\xbox\network\extra.h" +#include "Minecraft.Client/Xbox/Network/extra.h" #endif #include "Definitions.h" @@ -154,102 +154,102 @@ 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 _CROSS64 // TODO: implement 4jlibs #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" +#include "Minecraft.Client/Common/Network/GameNetworkManager.h" // #ifdef _XBOX -#include "..\Minecraft.Client\Common\App_defines.h" -#include "..\Minecraft.Client\Common\UI\UIEnums.h" -#include "..\Minecraft.Client\Common\App_enums.h" -#include "..\Minecraft.Client\Common\Tutorial\TutorialEnum.h" -#include "..\Minecraft.Client\Common\App_structs.h" +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.Client/Common/UI/UIEnums.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/App_structs.h" //#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" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/Common/Colours/ColourTable.h" -#include "..\Minecraft.Client\Common\BuildVer.h" +#include "Minecraft.Client/Common/BuildVer.h" #ifdef _XBOX -#include "..\Minecraft.Client\Xbox\Xbox_App.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" +#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" +#include "Minecraft.Client/PSVita/Sentient/SentientManager.h" +#include "Minecraft.Client/PSVita/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" -#include "..\Minecraft.Client\Common\Console_Awards_enum.h" -#include "..\Minecraft.Client\Common\Potion_Macros.h" -#include "..\Minecraft.Client\Common\Console_Debug_enum.h" -#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRulesConstants.h" -#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRules.h" -#include "..\Minecraft.Client\Common\Telemetry\TelemetryManager.h" +#include "Minecraft.Client/Common/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/Console_Awards_enum.h" +#include "Minecraft.Client/Common/Potion_Macros.h" +#include "Minecraft.Client/Common/Console_Debug_enum.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/Telemetry/TelemetryManager.h" diff --git a/Minecraft.World/x64headers/extraX64.h b/Minecraft.World/x64headers/extraX64.h index 0ea70a01b..9be0d78b8 100644 --- a/Minecraft.World/x64headers/extraX64.h +++ b/Minecraft.World/x64headers/extraX64.h @@ -4,7 +4,7 @@ #include #include -#include "../../Minecraft.Client/SkinBox.h" +#include "Minecraft.Client/SkinBox.h" #include @@ -27,8 +27,8 @@ const int MINECRAFT_NET_MAX_PLAYERS = 8; #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; @@ -38,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; @@ -47,15 +47,15 @@ typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO; #include #include #include -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h" -#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" -#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h" +#include "Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h" +#include "Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h" +#include "Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.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;