backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: reformat includes, with correct slashes and capitalization

Browse source
This commit is contained in:
izzy 2026-03-04 12:41:52 -05:00
parent 9236e57af4
commit 822d2af4fa
824 changed files with 3206 additions and 3206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/AbstractContainerScreen.cpp
View file

@ -6,9 +6,9 @@
#include "GameMode.h" #include "GameMode.h"
#include "KeyMapping.h" #include "KeyMapping.h"
#include "Options.h" #include "Options.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.h" #include "Minecraft.World/net.minecraft.world.inventory.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer(); ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer();

8
Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.core.h" #include "Minecraft.World/net.minecraft.core.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.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.tile.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "Minecraft.World/net.minecraft.world.level.h"
#include "AbstractProjectileDispenseBehavior.h" #include "AbstractProjectileDispenseBehavior.h"
shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed) shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed)

2
Minecraft.Client/AbstractProjectileDispenseBehavior.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\Minecraft.World\DefaultDispenseItemBehavior.h" #include "Minecraft.World/DefaultDispenseItemBehavior.h"
class Projectile; class Projectile;

4
Minecraft.Client/AbstractTexturePack.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "Textures.h" #include "Textures.h"
#include "AbstractTexturePack.h" #include "AbstractTexturePack.h"
#include "..\Minecraft.World\InputOutputStream.h" #include "Minecraft.World/InputOutputStream.h"
#include "..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name) AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
{ {

8
Minecraft.Client/AchievementPopup.cpp
View file

@ -4,10 +4,10 @@
#include "Font.h" #include "Font.h"
#include "Textures.h" #include "Textures.h"
#include "Lighting.h" #include "Lighting.h"
#include "..\Minecraft.World\System.h" #include "Minecraft.World/System.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "Minecraft.World/net.minecraft.stats.h"
#include "..\Minecraft.World\SharedConstants.h" #include "Minecraft.World/SharedConstants.h"
AchievementPopup::AchievementPopup(Minecraft *mc) AchievementPopup::AchievementPopup(Minecraft *mc)
{ {

8
Minecraft.Client/AchievementScreen.cpp
View file

@ -8,10 +8,10 @@
#include "Textures.h" #include "Textures.h"
#include "StatsCounter.h" #include "StatsCounter.h"
#include "ItemRenderer.h" #include "ItemRenderer.h"
#include "..\Minecraft.World\System.h" #include "Minecraft.World/System.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\JavaMath.h" #include "Minecraft.World/JavaMath.h"

2
Minecraft.Client/AchievementScreen.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "Screen.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "Minecraft.World/net.minecraft.stats.h"
class StatsCounter; class StatsCounter;
class AchievementScreen : public Screen class AchievementScreen : public Screen

4
Minecraft.Client/ArchiveFile.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "ArchiveFile.h" #include "ArchiveFile.h"

4
Minecraft.Client/ArchiveFile.h
View file

@ -3,8 +3,8 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "..\Minecraft.World\File.h" #include "Minecraft.World/File.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "Minecraft.World/ArrayWithLength.h"
using namespace std; using namespace std;

4
Minecraft.Client/ArrowRenderer.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "ArrowRenderer.h" #include "ArrowRenderer.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" #include "Minecraft.World/net.minecraft.world.entity.projectile.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS);

2
Minecraft.Client/BatModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #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 "BatModel.h"
#include "ModelPart.h" #include "ModelPart.h"

2
Minecraft.Client/BatRenderer.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #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 "BatRenderer.h"
#include "BatModel.h" #include "BatModel.h"

4
Minecraft.Client/BeaconRenderer.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.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.h"
#include "BeaconRenderer.h" #include "BeaconRenderer.h"
#include "Tesselator.h" #include "Tesselator.h"

2
Minecraft.Client/BlazeModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
#include "BlazeModel.h" #include "BlazeModel.h"
#include "ModelPart.h" #include "ModelPart.h"

2
Minecraft.Client/BlazeRenderer.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "BlazeModel.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" #include "BlazeRenderer.h"
ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);

4
Minecraft.Client/BoatRenderer.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "BoatRenderer.h" #include "BoatRenderer.h"
#include "BoatModel.h" #include "BoatModel.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.h" #include "Minecraft.World/net.minecraft.world.entity.item.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);

2
Minecraft.Client/BookModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
#include "BookModel.h" #include "BookModel.h"
#include "ModelPart.h" #include "ModelPart.h"

2
Minecraft.Client/BossMobGuiInfo.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "BossMobGuiInfo.h" #include "BossMobGuiInfo.h"
#include "../Minecraft.World/BossMob.h" #include "Minecraft.World/BossMob.h"
float BossMobGuiInfo::healthProgress = 0.0f; float BossMobGuiInfo::healthProgress = 0.0f;
int BossMobGuiInfo::displayTicks = 0; int BossMobGuiInfo::displayTicks = 0;

6
Minecraft.Client/BreakingItemParticle.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "BreakingItemParticle.h" #include "BreakingItemParticle.h"
#include "Tesselator.h" #include "Tesselator.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.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.h"
#include "..\Minecraft.World\net.minecraft.world.h" #include "Minecraft.World/net.minecraft.world.h"
void BreakingItemParticle::_init(Item *item, Textures *textures, int data) void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
{ {

10
Minecraft.Client/BubbleParticle.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "BubbleParticle.h" #include "BubbleParticle.h"
#include "..\Minecraft.World\Random.h" #include "Minecraft.World/Random.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
#include "..\Minecraft.World\JavaMath.h" #include "Minecraft.World/JavaMath.h"
#include "..\Minecraft.World\net.minecraft.world.level.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.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) BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
{ {

4
Minecraft.Client/BufferedImage.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "Textures.h" #include "Textures.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "Minecraft.World/ArrayWithLength.h"
#include "BufferedImage.h" #include "BufferedImage.h"
#ifdef _XBOX #ifdef _XBOX

8
Minecraft.Client/Camera.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "Camera.h" #include "Camera.h"
#include "MemoryTracker.h" #include "MemoryTracker.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.level.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.tile.h"
#include "..\Minecraft.World\TilePos.h" #include "Minecraft.World/TilePos.h"
float Camera::xPlayerOffs = 0.0f; float Camera::xPlayerOffs = 0.0f;
float Camera::yPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f;

4
Minecraft.Client/Camera.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\Minecraft.World\FloatBuffer.h" #include "Minecraft.World/FloatBuffer.h"
#include "..\Minecraft.World\IntBuffer.h" #include "Minecraft.World/IntBuffer.h"
class TilePos; class TilePos;

4
Minecraft.Client/ChatScreen.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "ChatScreen.h" #include "ChatScreen.h"
#include "MultiplayerLocalPlayer.h" #include "MultiplayerLocalPlayer.h"
#include "..\Minecraft.World\SharedConstants.h" #include "Minecraft.World/SharedConstants.h"
#include "..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;

6
Minecraft.Client/ChestRenderer.cpp
View file

@ -3,9 +3,9 @@
#include "ChestModel.h" #include "ChestModel.h"
#include "LargeChestModel.h" #include "LargeChestModel.h"
#include "ModelPart.h" #include "ModelPart.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.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.h"
#include "..\Minecraft.World\Calendar.h" #include "Minecraft.World/Calendar.h"
ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
//ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST); //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST);

2
Minecraft.Client/ChickenModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
#include "ChickenModel.h" #include "ChickenModel.h"
#include "ModelPart.h" #include "ModelPart.h"

4
Minecraft.Client/ChickenRenderer.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "Minecraft.World/Mth.h"
#include "ChickenRenderer.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); ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN);

14
Minecraft.Client/Chunk.cpp
View file

@ -2,16 +2,16 @@
#include "Chunk.h" #include "Chunk.h"
#include "TileRenderer.h" #include "TileRenderer.h"
#include "TileEntityRenderDispatcher.h" #include "TileEntityRenderDispatcher.h"
#include "..\Minecraft.World\net.minecraft.world.level.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.chunk.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.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.entity.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
#ifdef __PS3__ #ifdef __PS3__
#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" #include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h"
#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h" #include "PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h"
#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" #include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h"
#include "C4JThread_SPU.h" #include "C4JThread_SPU.h"
#include "C4JSpursJob.h" #include "C4JSpursJob.h"

2
Minecraft.Client/Chunk.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "AllowAllCuller.h" #include "AllowAllCuller.h"
#include "Tesselator.h" #include "Tesselator.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "Minecraft.World/ArrayWithLength.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
class Level; class Level;

66
Minecraft.Client/ClientConnection.cpp
View file

@ -9,46 +9,46 @@
#include "TakeAnimationParticle.h" #include "TakeAnimationParticle.h"
#include "CritParticle.h" #include "CritParticle.h"
#include "User.h" #include "User.h"
#include "..\Minecraft.World\net.minecraft.world.level.storage.h" #include "Minecraft.World/net.minecraft.world.level.storage.h"
#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" #include "Minecraft.World/net.minecraft.world.level.chunk.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "Minecraft.World/net.minecraft.stats.h"
#include "..\Minecraft.World\net.minecraft.world.entity.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.ai.attributes.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.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.npc.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.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.projectile.h"
#include "..\Minecraft.World\net.minecraft.world.entity.global.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.boss.enderdragon.h"
#include "..\Minecraft.World\net.minecraft.world.entity.monster.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.level.tile.entity.h"
#include "..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\Minecraft.World\net.minecraft.world.item.trading.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.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.h" #include "Minecraft.World/net.minecraft.world.inventory.h"
#include "..\Minecraft.World\net.minecraft.world.h" #include "Minecraft.World/net.minecraft.world.h"
#include "..\Minecraft.World\net.minecraft.world.level.saveddata.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.level.dimension.h"
#include "..\Minecraft.World\net.minecraft.world.effect.h" #include "Minecraft.World/net.minecraft.world.effect.h"
#include "..\Minecraft.World\net.minecraft.world.food.h" #include "Minecraft.World/net.minecraft.world.food.h"
#include "..\Minecraft.World\SharedConstants.h" #include "Minecraft.World/SharedConstants.h"
#include "..\Minecraft.World\AABB.h" #include "Minecraft.World/AABB.h"
#include "..\Minecraft.World\Pos.h" #include "Minecraft.World/Pos.h"
#include "..\Minecraft.World\Socket.h" #include "Minecraft.World/Socket.h"
#include "Minecraft.h" #include "Minecraft.h"
#include "ProgressRenderer.h" #include "ProgressRenderer.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
#include "Options.h" #include "Options.h"
#include "MinecraftServer.h" #include "MinecraftServer.h"
#include "ClientConstants.h" #include "ClientConstants.h"
#include "..\Minecraft.World\SoundTypes.h" #include "Minecraft.World/SoundTypes.h"
#include "..\Minecraft.World\BasicTypeContainers.h" #include "Minecraft.World/BasicTypeContainers.h"
#include "TexturePackRepository.h" #include "TexturePackRepository.h"
#ifdef _XBOX #ifdef _XBOX
#include "Common\XUI\XUI_Scene_Trading.h" #include "Common/XUI/XUI_Scene_Trading.h"
#else #else
#include "Common\UI\UI.h" #include "Common/UI/UI.h"
#endif #endif
#ifdef __PS3__ #ifdef __PS3__
#include "PS3/Network/SonyVoiceChat.h" #include "PS3/Network/SonyVoiceChat.h"
@ -56,8 +56,8 @@
#include "DLCTexturePack.h" #include "DLCTexturePack.h"
#ifdef _DURANGO #ifdef _DURANGO
#include "..\Minecraft.World\DurangoStats.h" #include "Minecraft.World/DurangoStats.h"
#include "..\Minecraft.World\GenericStats.h" #include "Minecraft.World/GenericStats.h"
#endif #endif
ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port) ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)

2
Minecraft.Client/ClientConnection.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Minecraft.World\net.minecraft.network.h" #include "Minecraft.World/net.minecraft.network.h"
class Minecraft; class Minecraft;
class MultiPlayerLevel; class MultiPlayerLevel;
class SavedDataStorage; class SavedDataStorage;

6
Minecraft.Client/ClockTexture.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "Minecraft.h" #include "Minecraft.h"
#include "..\Minecraft.World\net.minecraft.world.level.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.dimension.h"
#include "MultiplayerLocalPlayer.h" #include "MultiplayerLocalPlayer.h"
#include "..\Minecraft.World\JavaMath.h" #include "Minecraft.World/JavaMath.h"
#include "Texture.h" #include "Texture.h"
#include "ClockTexture.h" #include "ClockTexture.h"

10
Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
View file

@ -1,19 +1,19 @@
#pragma once #pragma once
#include "..\..\..\Minecraft.World\SoundTypes.h" #include "Minecraft.World/SoundTypes.h"
#ifdef _XBOX #ifdef _XBOX
#elif defined (__PS3__) #elif defined (__PS3__)
#undef __in #undef __in
#undef __out #undef __out
#include "..\..\PS3\Miles\include\mss.h" #include "Minecraft.Client/PS3/Miles/include/mss.h"
#elif defined (__PSVITA__) #elif defined (__PSVITA__)
#include "..\..\PSVITA\Miles\include\mss.h" #include "Minecraft.Client/PSVita/Miles/include/mss.h"
#elif defined _DURANGO #elif defined _DURANGO
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT #define _SEKRIT
#include "..\..\Durango\Miles\include\mss.h" #include "Minecraft.Client/Durango/Miles/include/mss.h"
#elif defined _WINDOWS64 #elif defined _WINDOWS64
#include <windows64/Miles/include/mss.h> #include <windows64/Miles/include/mss.h>
#elif defined _CROSS64 #elif defined _CROSS64
@ -21,7 +21,7 @@
#else // PS4 #else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT2 #define _SEKRIT2
#include "..\..\Orbis\Miles\include\mss.h" #include "Minecraft.Client/Orbis/Miles/include/mss.h"
#endif #endif
typedef struct typedef struct

10
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -11,13 +11,13 @@
#include <DLCTexturePack.h> #include <DLCTexturePack.h>
#include <Common/DLC/DLCAudioFile.h> #include <Common/DLC/DLCAudioFile.h>
======= =======
#include "..\Consoles_App.h" #include "Minecraft.Client/Common/Consoles_App.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "Minecraft.World/net.minecraft.world.level.h"
#include "..\..\Minecraft.World\leveldata.h" #include "..\..\Minecraft.World\leveldata.h"
#include "..\..\Minecraft.World\mth.h" #include "..\..\Minecraft.World\mth.h"
#include "..\..\TexturePackRepository.h" #include "Minecraft.Client/TexturePackRepository.h"
#include "..\..\DLCTexturePack.h" #include "Minecraft.Client/DLCTexturePack.h"
#include "Common\DLC\DLCAudioFile.h" #include "Common\DLC\DLCAudioFile.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)

2
Minecraft.Client/Common/Colours/ColourTable.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "ColourTable.h" #include "ColourTable.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap; unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;

2
Minecraft.Client/Common/ConsoleGameMode.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "ConsoleGameMode.h" #include "ConsoleGameMode.h"
#include ".\Tutorial\Tutorial.h" #include "Tutorial/Tutorial.h"
ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
: TutorialMode(iPad, minecraft, connection) : TutorialMode(iPad, minecraft, connection)

2
Minecraft.Client/Common/ConsoleGameMode.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include ".\Tutorial\TutorialMode.h" #include "Tutorial/TutorialMode.h"
class ConsoleGameMode : public TutorialMode class ConsoleGameMode : public TutorialMode
{ {

106
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -1,64 +1,64 @@
 
#include "stdafx.h" #include "stdafx.h"
#include "..\..\Minecraft.World\net.minecraft.world.entity.item.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.entity.player.h"
#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\Minecraft.World\InputOutputStream.h" #include "Minecraft.World/InputOutputStream.h"
#include "..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "..\Options.h" #include "Minecraft.Client/Options.h"
#include "..\MinecraftServer.h" #include "Minecraft.Client/MinecraftServer.h"
#include "..\MultiPlayerLevel.h" #include "Minecraft.Client/MultiPlayerLevel.h"
#include "..\GameRenderer.h" #include "Minecraft.Client/GameRenderer.h"
#include "..\ProgressRenderer.h" #include "Minecraft.Client/ProgressRenderer.h"
#include "..\LevelRenderer.h" #include "Minecraft.Client/LevelRenderer.h"
#include "..\MobSkinMemTextureProcessor.h" #include "Minecraft.Client/MobSkinMemTextureProcessor.h"
#include "..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\ClientConnection.h" #include "Minecraft.Client/ClientConnection.h"
#include "..\MultiPlayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "..\LocalPlayer.h" #include "Minecraft.Client/LocalPlayer.h"
#include "..\..\Minecraft.World\Player.h" #include "Minecraft.World/Player.h"
#include "..\..\Minecraft.World\Inventory.h" #include "Minecraft.World/Inventory.h"
#include "..\..\Minecraft.World\Level.h" #include "Minecraft.World/Level.h"
#include "..\..\Minecraft.World\FurnaceTileEntity.h" #include "Minecraft.World/FurnaceTileEntity.h"
#include "..\..\Minecraft.World\Container.h" #include "Minecraft.World/Container.h"
#include "..\..\Minecraft.World\DispenserTileEntity.h" #include "Minecraft.World/DispenserTileEntity.h"
#include "..\..\Minecraft.World\SignTileEntity.h" #include "Minecraft.World/SignTileEntity.h"
#include "..\StatsCounter.h" #include "Minecraft.Client/StatsCounter.h"
#include "..\GameMode.h" #include "Minecraft.Client/GameMode.h"
#include "..\Xbox\Social\SocialManager.h" #include "Minecraft.Client/Xbox/Social/SocialManager.h"
#include "Tutorial\TutorialMode.h" #include "Tutorial/TutorialMode.h"
#if defined _XBOX || defined _WINDOWS64 #if defined _XBOX || defined _WINDOWS64
#include "..\Xbox\XML\ATGXmlParser.h" #include "Minecraft.Client/Xbox/XML/ATGXmlParser.h"
#include "..\Xbox\XML\xmlFilesCallback.h" #include "Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
#endif #endif
#include "Minecraft_Macros.h" #include "Minecraft_Macros.h"
#include "..\PlayerList.h" #include "Minecraft.Client/PlayerList.h"
#include "..\ServerPlayer.h" #include "Minecraft.Client/ServerPlayer.h"
#include "GameRules\ConsoleGameRules.h" #include "GameRules/ConsoleGameRules.h"
#include "GameRules\ConsoleSchematicFile.h" #include "GameRules/ConsoleSchematicFile.h"
#include "..\User.h" #include "Minecraft.Client/User.h"
#include "..\..\Minecraft.World\LevelData.h" #include "Minecraft.World/LevelData.h"
#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" #include "Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\EntityRenderDispatcher.h" #include "Minecraft.Client/EntityRenderDispatcher.h"
#include "..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "..\TexturePackRepository.h" #include "Minecraft.Client/TexturePackRepository.h"
#include "..\DLCTexturePack.h" #include "Minecraft.Client/DLCTexturePack.h"
#include "DLC\DLCPack.h" #include "DLC/DLCPack.h"
#include "..\StringTable.h" #include "Minecraft.Client/StringTable.h"
#ifndef _XBOX #ifndef _XBOX
#include "..\ArchiveFile.h" #include "Minecraft.Client/ArchiveFile.h"
#endif #endif
#include "..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#ifdef _XBOX #ifdef _XBOX
#include "..\Xbox\GameConfig\Minecraft.spa.h" #include "Minecraft.Client/Xbox/GameConfig/Minecraft.spa.h"
#include "..\Xbox\Network\NetworkPlayerXbox.h" #include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
#include "XUI\XUI_TextEntry.h" #include "XUI/XUI_TextEntry.h"
#include "XUI\XUI_XZP_Icons.h" #include "XUI/XUI_XZP_Icons.h"
#include "XUI\XUI_PauseMenu.h" #include "XUI/XUI_PauseMenu.h"
#else #else
#include "UI\UI.h" #include "UI/UI.h"
#include "UI\UIScene_PauseMenu.h" #include "UI/UIScene_PauseMenu.h"
#endif #endif
#ifdef __PS3__ #ifdef __PS3__
#include <sys/tty.h> #include <sys/tty.h>
@ -67,7 +67,7 @@
#include <save_data_dialog.h> #include <save_data_dialog.h>
#endif #endif
#include "..\Common\Leaderboards\LeaderboardManager.h" #include "Leaderboards/LeaderboardManager.h"
//CMinecraftApp app; //CMinecraftApp app;
unsigned int CMinecraftApp::m_uiLastSignInData = 0; unsigned int CMinecraftApp::m_uiLastSignInData = 0;

22
Minecraft.Client/Common/Consoles_App.h
View file

@ -5,23 +5,23 @@ using namespace std;
#include "Audio/Consoles_SoundEngine.h" #include "Audio/Consoles_SoundEngine.h"
#include <xuiapp.h> #include <xuiapp.h>
#include ".\Tutorial\TutorialEnum.h" #include "Tutorial/TutorialEnum.h"
#ifdef _XBOX #ifdef _XBOX
#include ".\XUI\XUI_Helper.h" #include "XUI/XUI_Helper.h"
#include ".\XUI\XUI_HelpCredits.h" #include "XUI/XUI_HelpCredits.h"
#endif #endif
#include "UI\UIStructs.h" #include "UI/UIStructs.h"
#include "..\..\Minecraft.World\DisconnectPacket.h" #include "Minecraft.World/DisconnectPacket.h"
#include <xsocialpost.h> #include <xsocialpost.h>
#include "..\StringTable.h" #include "Minecraft.Client/StringTable.h"
#include ".\DLC\DLCManager.h" #include "DLC/DLCManager.h"
#include ".\GameRules\ConsoleGameRulesConstants.h" #include "GameRules/ConsoleGameRulesConstants.h"
#include ".\GameRules\GameRuleManager.h" #include "GameRules/GameRuleManager.h"
#include "..\SkinBox.h" #include "Minecraft.Client/SkinBox.h"
#include "..\ArchiveFile.h" #include "Minecraft.Client/ArchiveFile.h"
typedef struct _JoinFromInviteData typedef struct _JoinFromInviteData
{ {

4
Minecraft.Client/Common/DLC/DLCAudioFile.cpp
View file

@ -2,8 +2,8 @@
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCAudioFile.h" #include "DLCAudioFile.h"
#if defined _XBOX || defined _WINDOWS64 #if defined _XBOX || defined _WINDOWS64
#include "..\..\Xbox\XML\ATGXmlParser.h" #include "Minecraft.Client/Xbox/XML/ATGXmlParser.h"
#include "..\..\Xbox\XML\xmlFilesCallback.h" #include "Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
#endif #endif
DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)

6
Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCColourTableFile.h" #include "DLCColourTableFile.h"
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\TexturePackRepository.h" #include "Minecraft.Client/TexturePackRepository.h"
#include "..\..\TexturePack.h" #include "Minecraft.Client/TexturePack.h"
DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path) DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
{ {

2
Minecraft.Client/Common/DLC/DLCGameRules.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "DLCFile.h" #include "DLCFile.h"
#include "..\GameRules\LevelGenerationOptions.h" #include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"
class DLCGameRules : public DLCFile class DLCGameRules : public DLCFile
{ {

6
Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
View file

@ -2,9 +2,9 @@
#include <string> #include <string>
#include "..\..\..\Minecraft.World\File.h" #include "Minecraft.World/File.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h" #include "Minecraft.World/InputOutputStream.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCGameRulesHeader.h" #include "DLCGameRulesHeader.h"

2
Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "DLCGameRules.h" #include "DLCGameRules.h"
#include "..\GameRules\LevelGenerationOptions.h" #include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"
class DLCGameRulesHeader : public DLCGameRules, public JustGrSource class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
{ {

2
Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCLocalisationFile.h" #include "DLCLocalisationFile.h"
#include "..\..\StringTable.h" #include "Minecraft.Client/StringTable.h"
DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path) DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
{ {

6
Minecraft.Client/Common/DLC/DLCManager.cpp
View file

@ -3,9 +3,9 @@
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCPack.h" #include "DLCPack.h"
#include "DLCFile.h" #include "DLCFile.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\TexturePackRepository.h" #include "Minecraft.Client/TexturePackRepository.h"
WCHAR *DLCManager::wchTypeNamesA[]= WCHAR *DLCManager::wchTypeNamesA[]=
{ {

2
Minecraft.Client/Common/DLC/DLCPack.cpp
View file

@ -9,7 +9,7 @@
#include "DLCGameRulesHeader.h" #include "DLCGameRulesHeader.h"
#include "DLCAudioFile.h" #include "DLCAudioFile.h"
#include "DLCColourTableFile.h" #include "DLCColourTableFile.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask) DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
{ {

10
Minecraft.Client/Common/DLC/DLCSkinFile.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCSkinFile.h" #include "DLCSkinFile.h"
#include "..\..\ModelPart.h" #include "Minecraft.Client/ModelPart.h"
#include "..\..\EntityRenderer.h" #include "Minecraft.Client/EntityRenderer.h"
#include "..\..\EntityRenderDispatcher.h" #include "Minecraft.Client/EntityRenderDispatcher.h"
#include "..\..\..\Minecraft.World\Player.h" #include "Minecraft.World/Player.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path) DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
{ {

2
Minecraft.Client/Common/DLC/DLCSkinFile.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "DLCFile.h" #include "DLCFile.h"
#include "..\..\..\Minecraft.Client\HumanoidModel.h" #include "Minecraft.Client/HumanoidModel.h"
class DLCSkinFile : public DLCFile class DLCSkinFile : public DLCFile
{ {

6
Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" #include "Minecraft.World/net.minecraft.world.item.enchantment.h"
#include "AddEnchantmentRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h"
AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()

8
Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" #include "Minecraft.World/net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" #include "Minecraft.World/net.minecraft.world.entity.player.h"
#include "AddItemRuleDefinition.h" #include "AddItemRuleDefinition.h"
#include "AddEnchantmentRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h"

12
Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.dimension.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" #include "Minecraft.World/net.minecraft.world.level.chunk.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "ApplySchematicRuleDefinition.h" #include "ApplySchematicRuleDefinition.h"
#include "LevelGenerationOptions.h" #include "LevelGenerationOptions.h"
#include "ConsoleSchematicFile.h" #include "ConsoleSchematicFile.h"

2
Minecraft.Client/Common/GameRules/BiomeOverride.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "BiomeOverride.h" #include "BiomeOverride.h"
BiomeOverride::BiomeOverride() BiomeOverride::BiomeOverride()

10
Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\WstringLookup.h" #include "Minecraft.Client/WstringLookup.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "CollectItemRuleDefinition.h" #include "CollectItemRuleDefinition.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\Connection.h" #include "Minecraft.World/Connection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" #include "Minecraft.World/net.minecraft.network.packet.h"
CollectItemRuleDefinition::CollectItemRuleDefinition() CollectItemRuleDefinition::CollectItemRuleDefinition()
{ {

6
Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "CompleteAllRuleDefinition.h" #include "CompleteAllRuleDefinition.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\Connection.h" #include "Minecraft.World/Connection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" #include "Minecraft.World/net.minecraft.network.packet.h"
void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
{ {

4
Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "CompoundGameRuleDefinition.h" #include "CompoundGameRuleDefinition.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"

10
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "ConsoleGenerateStructure.h" #include "ConsoleGenerateStructure.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.dimension.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" #include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.h" #include "Minecraft.World/net.minecraft.h"
ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
{ {

2
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "GameRuleDefinition.h" #include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructurePiece.h" #include "Minecraft.World/StructurePiece.h"
class Level; class Level;
class Random; class Random;

20
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
View file

@ -1,16 +1,16 @@
#include "stdafx.h" #include "stdafx.h"
#include <vector> #include <vector>
#include "..\..\..\Minecraft.World\com.mojang.nbt.h" #include "Minecraft.World/com.mojang.nbt.h"
#include "..\..\..\Minecraft.World\System.h" #include "Minecraft.World/System.h"
#include "ConsoleSchematicFile.h" #include "ConsoleSchematicFile.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h" #include "Minecraft.World/InputOutputStream.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.chunk.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.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.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.item.h" #include "Minecraft.World/net.minecraft.world.entity.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
ConsoleSchematicFile::ConsoleSchematicFile() ConsoleSchematicFile::ConsoleSchematicFile()
{ {

2
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
View file

@ -4,7 +4,7 @@ using namespace std;
#define XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
#define XBOX_SCHEMATIC_CURRENT_VERSION 2 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
#include "..\..\..\Minecraft.World\ArrayWithLength.h" #include "Minecraft.World/ArrayWithLength.h"
class Level; class Level;
class DataOutputStream; class DataOutputStream;

4
Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\WstringLookup.h" #include "Minecraft.Client/WstringLookup.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
GameRuleDefinition::GameRuleDefinition() GameRuleDefinition::GameRuleDefinition()

2
Minecraft.Client/Common/GameRules/GameRuleDefinition.h
View file

@ -3,7 +3,7 @@ using namespace std;
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include "..\..\..\Minecraft.World\ItemInstance.h" #include "Minecraft.World/ItemInstance.h"
#include "ConsoleGameRulesConstants.h" #include "ConsoleGameRulesConstants.h"
#include "GameRulesInstance.h" #include "GameRulesInstance.h"

20
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\File.h" #include "Minecraft.World/File.h"
#include "..\..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "..\DLC\DLCPack.h" #include "Minecraft.Client/Common/DLC/DLCPack.h"
#include "..\DLC\DLCLocalisationFile.h" #include "Minecraft.Client/Common/DLC/DLCLocalisationFile.h"
#include "..\DLC\DLCGameRulesFile.h" #include "Minecraft.Client/Common/DLC/DLCGameRulesFile.h"
#include "..\DLC\DLCGameRules.h" #include "Minecraft.Client/Common/DLC/DLCGameRules.h"
#include "..\DLC\DLCGameRulesHeader.h" #include "Minecraft.Client/Common/DLC/DLCGameRulesHeader.h"
#include "..\..\StringTable.h" #include "Minecraft.Client/StringTable.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "GameRuleManager.h" #include "GameRuleManager.h"

12
Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -2,13 +2,13 @@
#include <unordered_set> #include <unordered_set>
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\Pos.h" #include "Minecraft.World/Pos.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.chunk.h"
#include "Common\DLC\DLCGameRulesHeader.h" #include "Common\DLC\DLCGameRulesHeader.h"
#include "..\..\StringTable.h" #include "Minecraft.Client/StringTable.h"
#include "LevelGenerationOptions.h" #include "LevelGenerationOptions.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"

2
Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
View file

@ -4,7 +4,7 @@ using namespace std;
#pragma message("LevelGenerationOptions.h ") #pragma message("LevelGenerationOptions.h ")
#include "GameRuleDefinition.h" #include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructureFeature.h" #include "Minecraft.World/StructureFeature.h"
class ApplySchematicRuleDefinition; class ApplySchematicRuleDefinition;
class LevelChunk; class LevelChunk;

4
Minecraft.Client/Common/GameRules/LevelRuleset.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\StringTable.h" #include "Minecraft.Client/StringTable.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "LevelRuleset.h" #include "LevelRuleset.h"

4
Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "NamedAreaRuleDefinition.h" #include "NamedAreaRuleDefinition.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
NamedAreaRuleDefinition::NamedAreaRuleDefinition() NamedAreaRuleDefinition::NamedAreaRuleDefinition()
{ {

2
Minecraft.Client/Common/GameRules/StartFeature.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "StartFeature.h" #include "StartFeature.h"
StartFeature::StartFeature() StartFeature::StartFeature()

2
Minecraft.Client/Common/GameRules/StartFeature.h
View file

@ -2,7 +2,7 @@
using namespace std; using namespace std;
#include "GameRuleDefinition.h" #include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructureFeature.h" #include "Minecraft.World/StructureFeature.h"
class StartFeature : public GameRuleDefinition class StartFeature : public GameRuleDefinition
{ {

10
Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "UpdatePlayerRuleDefinition.h" #include "UpdatePlayerRuleDefinition.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\Pos.h" #include "Minecraft.World/Pos.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.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.food.h" #include "Minecraft.World/net.minecraft.world.food.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
{ {

2
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "UseTileRuleDefinition.h" #include "UseTileRuleDefinition.h"
UseTileRuleDefinition::UseTileRuleDefinition() UseTileRuleDefinition::UseTileRuleDefinition()

2
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
View file

@ -2,7 +2,7 @@
using namespace std; using namespace std;
#include "GameRuleDefinition.h" #include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\Pos.h" #include "Minecraft.World/Pos.h"
class UseTileRuleDefinition : public GameRuleDefinition class UseTileRuleDefinition : public GameRuleDefinition
{ {

4
Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "XboxStructureActionGenerateBox.h" #include "XboxStructureActionGenerateBox.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" #include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
{ {

4
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "XboxStructureActionPlaceBlock.h" #include "XboxStructureActionPlaceBlock.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h" #include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
{ {

10
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "XboxStructureActionPlaceContainer.h" #include "XboxStructureActionPlaceContainer.h"
#include "AddItemRuleDefinition.h" #include "AddItemRuleDefinition.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.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.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" #include "Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" #include "Minecraft.World/net.minecraft.world.inventory.h"
XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
{ {

8
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "XboxStructureActionPlaceSpawner.h" #include "XboxStructureActionPlaceSpawner.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.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.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner()
{ {

2
Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "LeaderboardManager.h" #include "LeaderboardManager.h"

4
Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
View file

@ -11,7 +11,7 @@
#include "Common\Consoles_App.h" #include "Common\Consoles_App.h"
#include "Common\Network\Sony\SQRNetworkManager.h" #include "Common\Network\Sony\SQRNetworkManager.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#ifdef __ORBIS__ #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. // The following NP call should be reserved for asynchronous multiplayer modes that require PS Plus to be accessed.
// //
// Note 2: // 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(); // NotifyAsyncPlusFeature();

56
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View file

@ -1,32 +1,32 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "Minecraft.World/AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h" #include "Minecraft.World/Vec3.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "Minecraft.World/Socket.h"
#include "..\..\..\Minecraft.World\ThreadName.h" #include "Minecraft.World/ThreadName.h"
#include "..\..\..\Minecraft.World\Entity.h" #include "Minecraft.World/Entity.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" #include "Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\..\..\Minecraft.World\FireworksRecipe.h" #include "Minecraft.World/FireworksRecipe.h"
#include "..\..\ClientConnection.h" #include "Minecraft.Client/ClientConnection.h"
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\User.h" #include "Minecraft.Client/User.h"
#include "..\..\MinecraftServer.h" #include "Minecraft.Client/MinecraftServer.h"
#include "..\..\PlayerList.h" #include "Minecraft.Client/PlayerList.h"
#include "..\..\ServerPlayer.h" #include "Minecraft.Client/ServerPlayer.h"
#include "..\..\PlayerConnection.h" #include "Minecraft.Client/PlayerConnection.h"
#include "..\..\MultiPlayerLevel.h" #include "Minecraft.Client/MultiPlayerLevel.h"
#include "..\..\ProgressRenderer.h" #include "Minecraft.Client/ProgressRenderer.h"
#include "..\..\MultiPlayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\DisconnectPacket.h" #include "Minecraft.World/DisconnectPacket.h"
#include "..\..\..\Minecraft.World\compression.h" #include "Minecraft.World/compression.h"
#include "..\..\..\Minecraft.World\OldChunkStorage.h" #include "Minecraft.World/OldChunkStorage.h"
#include "..\..\TexturePackRepository.h" #include "Minecraft.Client/TexturePackRepository.h"
#include "..\..\TexturePack.h" #include "Minecraft.Client/TexturePack.h"
#include "..\..\Gui.h" #include "Minecraft.Client/Gui.h"
#include "..\..\LevelRenderer.h" #include "Minecraft.Client/LevelRenderer.h"
#include "..\..\..\Minecraft.World\IntCache.h" #include "Minecraft.World/IntCache.h"
#include "..\GameRules\ConsoleGameRules.h" #include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h"
#include "GameNetworkManager.h" #include "GameNetworkManager.h"
#ifdef _XBOX #ifdef _XBOX
@ -34,7 +34,7 @@
#else #else
#include "Common\UI\UI.h" #include "Common\UI\UI.h"
#include "Common\UI\UIScene_PauseMenu.h" #include "Common\UI\UIScene_PauseMenu.h"
#include "..\..\Xbox\Network\NetworkPlayerXbox.h" #include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
#endif #endif
#ifdef _DURANGO #ifdef _DURANGO

10
Minecraft.Client/Common/Network/GameNetworkManager.h
View file

@ -2,21 +2,21 @@
using namespace std; using namespace std;
#include <vector> #include <vector>
#include <qnet.h> #include <qnet.h>
#include "..\..\..\Minecraft.World\C4JThread.h" #include "Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h" #include "NetworkPlayerInterface.h"
#ifdef _XBOX #ifdef _XBOX
#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h" #include "Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h"
#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h" #include "Sony/PlatformNetworkManagerSony.h"
#elif defined _DURANGO #elif defined _DURANGO
#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h" #include "Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h"
#else #else
#include "PlatformNetworkManagerStub.h" #include "PlatformNetworkManagerStub.h"
#endif #endif
#include "SessionInfo.h" #include "SessionInfo.h"
#ifdef __ORBIS__ #ifdef __ORBIS__
#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h" #include "Minecraft.Client/Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
#endif #endif
class ClientConnection; class ClientConnection;

2
Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
View file

@ -2,7 +2,7 @@
using namespace std; using namespace std;
#include <vector> #include <vector>
#include <qnet.h> #include <qnet.h>
#include "..\..\..\Minecraft.World\C4JThread.h" #include "Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h" #include "NetworkPlayerInterface.h"
#include "SessionInfo.h" #include "SessionInfo.h"

12
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
View file

@ -1,12 +1,12 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "Minecraft.World/Socket.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "Minecraft.World/StringHelpers.h"
#include "PlatformNetworkManagerStub.h" #include "PlatformNetworkManagerStub.h"
#include "..\..\Xbox\Network\NetworkPlayerXbox.h" #include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\Windows64\Network\WinsockNetLayer.h" #include "Minecraft.Client/Windows64/Network/WinsockNetLayer.h"
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\User.h" #include "Minecraft.Client/User.h"
#endif #endif
CPlatformNetworkManagerStub *g_pPlatformNetworkManager; CPlatformNetworkManagerStub *g_pPlatformNetworkManager;

2
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
using namespace std; using namespace std;
#include <vector> #include <vector>
#include "..\..\..\Minecraft.World\C4JThread.h" #include "Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h" #include "NetworkPlayerInterface.h"
#include "PlatformNetworkManagerInterface.h" #include "PlatformNetworkManagerInterface.h"
#include "SessionInfo.h" #include "SessionInfo.h"

2
Minecraft.Client/Common/Network/SessionInfo.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#if defined(__PS3__) || defined(__ORBIS__) #if defined(__PS3__) || defined(__ORBIS__)
#include "..\..\Common\Network\Sony\SQRNetworkManager.h" #include "Sony/SQRNetworkManager.h"
#endif #endif

2
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\..\Common\UI\UIEnums.h" #include "Minecraft.Client/Common/UI/UIEnums.h"
class CTelemetryManager class CTelemetryManager
{ {

2
Minecraft.Client/Common/Trial/TrialMode.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "TrialMode.h" #include "TrialMode.h"
#include "..\Tutorial\FullTutorial.h" #include "Minecraft.Client/Common/Tutorial/FullTutorial.h"
TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
: FullTutorialMode(iPad, minecraft, connection) : FullTutorialMode(iPad, minecraft, connection)

2
Minecraft.Client/Common/Trial/TrialMode.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Tutorial\FullTutorialMode.h" #include "Minecraft.Client/Common/Tutorial/FullTutorialMode.h"
class TrialMode : public FullTutorialMode class TrialMode : public FullTutorialMode
{ {

6
Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
View file

@ -4,11 +4,11 @@
#include <Minecraft.h> #include <Minecraft.h>
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "AreaConstraint.h" #include "AreaConstraint.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "Minecraft.World/AABB.h"
AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ ) AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
: TutorialConstraint( descriptionId ) : TutorialConstraint( descriptionId )

6
Minecraft.Client/Common/Tutorial/AreaHint.cpp
View file

@ -4,11 +4,11 @@
#include <Minecraft.h> #include <Minecraft.h>
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "AreaHint.h" #include "AreaHint.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "Minecraft.World/AABB.h"
#include "Tutorial.h" #include "Tutorial.h"
AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState, AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,

12
Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
View file

@ -6,14 +6,14 @@
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
#include <Minecraft.World/net.minecraft.world.level.h> #include <Minecraft.World/net.minecraft.world.level.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "Minecraft.World/net.minecraft.world.level.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "ChangeStateConstraint.h" #include "ChangeStateConstraint.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "Minecraft.World/AABB.h"
#include "..\..\ClientConnection.h" #include "Minecraft.Client/ClientConnection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" #include "Minecraft.World/net.minecraft.network.packet.h"
ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, 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*/ ) double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )

8
Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
View file

@ -5,14 +5,14 @@
#include <Minecraft.h> #include <Minecraft.h>
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "ChoiceTask.h" #include "ChoiceTask.h"
#include "..\..\..\Minecraft.World\Material.h" #include "Minecraft.World/Material.h"
#include "..\..\Windows64\KeyboardMouseInput.h" #include "Minecraft.Client/Windows64/KeyboardMouseInput.h"
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/, int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,

2
Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\ItemInstance.h" #include "Minecraft.World/ItemInstance.h"
#include "CompleteUsingItemTask.h" #include "CompleteUsingItemTask.h"
CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion) CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)

4
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View file

@ -5,8 +5,8 @@
#include <Minecraft.h> #include <Minecraft.h>
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"

2
Minecraft.Client/Common/Tutorial/CraftTask.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "CraftTask.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, CraftTask::CraftTask( int itemId, int auxValue, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/, Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,

8
Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" #include "Minecraft.World/net.minecraft.world.entity.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "DiggerItemHint.h" #include "DiggerItemHint.h"

2
Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" #include "Minecraft.World/net.minecraft.world.effect.h"
#include "EffectChangedTask.h" #include "EffectChangedTask.h"
EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply, EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,

12
Minecraft.Client/Common/Tutorial/FullTutorial.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "Minecraft.World/net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.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.tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" #include "Minecraft.World/net.minecraft.world.effect.h"
#include "..\GameRules\ConsoleGameRules.h" #include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h"
#include "DiggerItemHint.h" #include "DiggerItemHint.h"
#include "TutorialTasks.h" #include "TutorialTasks.h"
#include "AreaHint.h" #include "AreaHint.h"

2
Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "FullTutorial.h" #include "FullTutorial.h"
#include "FullTutorialMode.h" #include "FullTutorialMode.h"

6
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View file

@ -5,13 +5,13 @@
#include <Minecraft.h> #include <Minecraft.h>
#include <MultiPlayerLocalPlayer.h> #include <MultiPlayerLocalPlayer.h>
======= =======
#include "..\..\Minecraft.h" #include "Minecraft.Client/Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "Minecraft.Client/MultiPlayerLocalPlayer.h"
>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "InfoTask.h" #include "InfoTask.h"
#include "..\..\..\Minecraft.World\Material.h" #include "Minecraft.World/Material.h"
#include "..\..\KeyboardMouseInput.h" #include "..\..\KeyboardMouseInput.h"
InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,

2
Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
using namespace std; using namespace std;
#include "..\..\..\Minecraft.World\Class.h" #include "Minecraft.World/Class.h"
#include "TutorialHint.h" #include "TutorialHint.h"
class ItemInstance; class ItemInstance;

Some files were not shown because too many files have changed in this diff Show more