diff --git a/.gitignore b/.gitignore index 10e49ddb55..0df5e38994 100644 --- a/.gitignore +++ b/.gitignore @@ -414,3 +414,9 @@ build/ tmp*/ _server_asset_probe/ server-data/ + +# Nix +result +result-* +.direnv/ +.xwin-cache/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 63071a0ed7..4eb2b823b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -if(NOT WIN32) - message(FATAL_ERROR "This CMake build currently supports Windows only.") +if(NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) + message(FATAL_ERROR "This CMake build currently supports Windows only. For cross-compilation from Linux, use the clang-cl toolchain.") endif() if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/COMPILE.md b/COMPILE.md index 4a9d56b97b..7d46f340e9 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -72,7 +72,119 @@ cd .\build\windows64\Minecraft.Server\Debug ``` Notes: -- The CMake build is Windows-only and x64-only. -- Contributors on macOS or Linux need a Windows machine or VM to build the project. Running the game via Wine is separate from having a supported build environment. - Post-build asset copy is automatic for `Minecraft.Client` in CMake (Debug and Release variants). - The game relies on relative paths (for example `Common\Media\...`), so launching from the output directory is required. + +## CMake (Linux x64 Cross-Compile with Clang) + +Cross-compile Windows x64 binaries on Linux using LLVM/Clang and the Windows SDK obtained via xwin. + +### Prerequisites + +Install the following packages (example for Ubuntu): + +```bash +sudo apt install clang lld llvm cmake ninja-build rsync cargo +``` + +Install xwin for downloading the Windows SDK: + +```bash +cargo install xwin +``` + +### Download Windows SDK + +Download and extract the Windows SDK and CRT: + +```bash +xwin --accept-license splat --output ~/.cache/xwin/splat +``` + +Create symlinks to account for Linux filesystems being case sensitive: + +```bash +WINSDK=~/.cache/xwin/splat +ln -sf $WINSDK/sdk/include/shared/sdkddkver.h $WINSDK/sdk/include/shared/SDKDDKVer.h +ln -sf $WINSDK/sdk/lib/um/x86_64/xinput9_1_0.lib $WINSDK/sdk/lib/um/x86_64/XInput9_1_0.lib +ln -sf $WINSDK/sdk/lib/um/x86_64/ws2_32.lib $WINSDK/sdk/lib/um/x86_64/Ws2_32.lib +``` + +### Configure + +Set environment variables and configure CMake: + +```bash +export WINSDK=~/.cache/xwin/splat +export INCLUDE="$WINSDK/crt/include;$WINSDK/sdk/include/um;$WINSDK/sdk/include/ucrt;$WINSDK/sdk/include/shared" +export LIB="$WINSDK/crt/lib/x86_64;$WINSDK/sdk/lib/um/x86_64;$WINSDK/sdk/lib/ucrt/x86_64" + +cmake -S . -B build/windows64-clang \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=clang-cl \ + -DCMAKE_CXX_COMPILER=clang-cl \ + -DCMAKE_LINKER=lld-link \ + -DCMAKE_RC_COMPILER=llvm-rc \ + -DCMAKE_MT=llvm-mt \ + -DPLATFORM_DEFINES="_WINDOWS64" \ + -DPLATFORM_NAME="Windows64" \ + -DIGGY_LIBS="iggy_w64.lib;iggyperfmon_w64.lib;iggyexpruntime_w64.lib" \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \ + -DCMAKE_C_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_CXX_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_ASM_MASM_FLAGS="-m64" \ + -DCMAKE_EXE_LINKER_FLAGS="-libpath:$WINSDK/crt/lib/x86_64 -libpath:$WINSDK/sdk/lib/um/x86_64 -libpath:$WINSDK/sdk/lib/ucrt/x86_64" +``` + +### Build + +Build Release: + +```bash +cmake --build build/windows64-clang --config Release +``` + +Build specific target: + +```bash +cmake --build build/windows64-clang --config Release --target Minecraft.Client +cmake --build build/windows64-clang --config Release --target Minecraft.Server +``` + +### Run with Wine + +Run executable: + +```bash +cd build/windows64-clang/Minecraft.Client +wine ./Minecraft.Client.exe +``` + +Run dedicated server: + +```bash +cd build/windows64-clang/Minecraft.Server +wine ./Minecraft.Server.exe -port 25565 -bind 0.0.0.0 -name DedicatedServer +``` + +### NixOS / Nix + +For NixOS or systems with Nix installed, use the provided flake: + +```bash +nix build .#client +nix build .#server +``` + +Or enter the development shell with all dependencies: + +```bash +nix develop +``` + +Notes: +- Requires LLVM 15+ with clang-cl, lld-link, llvm-rc, and llvm-mt. +- The xwin tool downloads ~1GB of SDK files on first run. +- Wine is required to run the compiled Windows executables on Linux. diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp index c2de6dc9ac..5c80aec6b1 100644 --- a/Minecraft.Client/AbstractContainerScreen.cpp +++ b/Minecraft.Client/AbstractContainerScreen.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" #include "AbstractContainerScreen.h" #include "ItemRenderer.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Lighting.h" #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 5e4b888b15..8af0b20c99 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 30705a8a0e..fa2c631d24 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 a3c677272e..3adb09b03d 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" #include "Common/UI/UI.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 4e08f3b81e..34ca5bfed5 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 baafce30a5..db13c13669 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 3c4412e35e..254b2de03d 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 608428b6eb..bf41ec9707 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 722d570d83..f529e806c0 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 a7dd6efdd7..ac59f062c3 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 ec582fef3b..13c613562e 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 97c6412d7a..b82f70538b 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 959df6a890..9f6e9a26d3 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 68d9ef4674..c1efb36ff7 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 f8426a2f37..7293906774 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 c012168a4e..a3eec3c08f 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 d032a7f5fd..06ff1f530a 100644 --- a/Minecraft.Client/BookModel.cpp +++ b/Minecraft.Client/BookModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\Mth.h" +#include "../Minecraft.World/Mth.h" #include "BookModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp index 8842209b89..4b2e55b635 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 29dd120296..3ceb17eeb2 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 8777d307bd..2dcf2b5e8e 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 4de9634919..0216149fa0 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 456c8858d0..638c4c0b0b 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 53c9072242..e2933a0cf3 100644 --- a/Minecraft.Client/ChatScreen.cpp +++ b/Minecraft.Client/ChatScreen.cpp @@ -2,10 +2,10 @@ #include "ChatScreen.h" #include "ClientConnection.h" #include "Font.h" -#include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\SharedConstants.h" -#include "..\Minecraft.World\StringHelpers.h" -#include "..\Minecraft.World\ChatPacket.h" +#include "MultiPlayerLocalPlayer.h" +#include "../Minecraft.World/SharedConstants.h" +#include "../Minecraft.World/StringHelpers.h" +#include "../Minecraft.World/ChatPacket.h" const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; vector ChatScreen::s_chatHistory; diff --git a/Minecraft.Client/ChestRenderer.cpp b/Minecraft.Client/ChestRenderer.cpp index 7d306f45d2..06a51a30f3 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 14eb612706..e8fd2c603b 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 4f369df35e..c50ac01b02 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 0a63b87474..bf2922450f 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 e0ae016ef1..d40e0ce3f1 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 a80af5d2c9..3dcb934789 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,14 +56,14 @@ #include "DLCTexturePack.h" #ifdef _WINDOWS64 -#include "Xbox\Network\NetworkPlayerXbox.h" -#include "Common\Network\PlatformNetworkManagerStub.h" +#include "Xbox/Network/NetworkPlayerXbox.h" +#include "Common/Network/PlatformNetworkManagerStub.h" #endif #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) @@ -4036,7 +4036,8 @@ void ClientConnection::handleSetPlayerTeamPacket(shared_ptr void ClientConnection::handleParticleEvent(shared_ptr packet) { - ePARTICLE_TYPE particleId = (ePARTICLE_TYPE)Integer::parseInt(packet->getName()); + wstring particleName = packet->getName(); + ePARTICLE_TYPE particleId = (ePARTICLE_TYPE)Integer::parseInt(particleName); for (int i = 0; i < packet->getCount(); i++) { diff --git a/Minecraft.Client/ClientConnection.h b/Minecraft.Client/ClientConnection.h index 3448496d07..a27e739c76 100644 --- a/Minecraft.Client/ClientConnection.h +++ b/Minecraft.Client/ClientConnection.h @@ -1,6 +1,6 @@ #pragma once #include -#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 5febeff34b..340cc0d30d 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 "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\JavaMath.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 "Texture.h" #include "ClockTexture.h" diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h index 9a1ae37239..3c30a2db07 100644 --- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h +++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h @@ -1,24 +1,24 @@ #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 "../../PS3/Miles/include/mss.h" #elif defined (__PSVITA__) -#include "..\..\PSVITA\Miles\include\mss.h" +#include "../../PSVITA/Miles/include/mss.h" #elif defined _DURANGO // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT -#include "..\..\Durango\Miles\include\mss.h" +#include "../../Durango/Miles/include/mss.h" #elif defined _WINDOWS64 #else // PS4 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT2 -#include "..\..\Orbis\Miles\include\mss.h" +#include "../../Orbis/Miles/include/mss.h" #endif typedef struct diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index cf140c7806..fc3ae86ab6 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include "SoundEngine.h" -#include "..\Consoles_App.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\Minecraft.World\leveldata.h" -#include "..\..\Minecraft.World\mth.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\DLCTexturePack.h" -#include "Common\DLC\DLCAudioFile.h" +#include "../Consoles_App.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../Minecraft.World/LevelData.h" +#include "../../Minecraft.World/Mth.h" +#include "../../TexturePackRepository.h" +#include "../../DLCTexturePack.h" +#include "Common/DLC/DLCAudioFile.h" #ifdef __PSVITA__ #include #endif -#include "..\..\Minecraft.Client\Windows64\Windows64_App.h" +#include "../../Minecraft.Client/Windows64/Windows64_App.h" #include "stb_vorbis.h" diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h index 38d70d414d..77d7b1dc99 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Common/Audio/SoundEngine.h @@ -2,7 +2,7 @@ class Mob; class Options; using namespace std; -#include "..\..\Minecraft.World\SoundTypes.h" +#include "../../Minecraft.World/SoundTypes.h" #include "miniaudio.h" diff --git a/Minecraft.Client/Common/Audio/SoundNames.cpp b/Minecraft.Client/Common/Audio/SoundNames.cpp index ebb7e9ee12..6df8b89c95 100644 --- a/Minecraft.Client/Common/Audio/SoundNames.cpp +++ b/Minecraft.Client/Common/Audio/SoundNames.cpp @@ -187,28 +187,28 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]= L"liquid.swim", //eSoundType_LIQUID_SWIM, - L"mob.horse.land", //eSoundType_MOB_HORSE_LAND, - L"mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR, - L"mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER, - L"mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH, - L"mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH, - L"mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH, - L"mob.horse.death", //eSoundType_MOB_HORSE_DEATH, - L"mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT, - L"mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT, - L"mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT, - L"mob.horse.hit", //eSoundType_MOB_HORSE_HIT, - L"mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE, - L"mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE, - L"mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE, - L"mob.horse.idle", //eSoundType_MOB_HORSE_IDLE, - L"mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY, - L"mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY, - L"mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP, - L"mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE, - L"mob.horse.wood", //eSoundType_MOB_HORSE_WOOD, - L"mob.horse.soft", //eSoundType_MOB_HORSE_SOFT, - L"mob.horse.jump", //eSoundType_MOB_HORSE_JUMP, + L"Mob.horse.land", //eSoundType_MOB_HORSE_LAND, + L"Mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR, + L"Mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER, + L"Mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH, + L"Mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH, + L"Mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH, + L"Mob.horse.death", //eSoundType_MOB_HORSE_DEATH, + L"Mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT, + L"Mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT, + L"Mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT, + L"Mob.horse.hit", //eSoundType_MOB_HORSE_HIT, + L"Mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE, + L"Mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE, + L"Mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE, + L"Mob.horse.idle", //eSoundType_MOB_HORSE_IDLE, + L"Mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY, + L"Mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY, + L"Mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP, + L"Mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE, + L"Mob.horse.wood", //eSoundType_MOB_HORSE_WOOD, + L"Mob.horse.soft", //eSoundType_MOB_HORSE_SOFT, + L"Mob.horse.jump", //eSoundType_MOB_HORSE_JUMP, L"mob.witch.ambient", //eSoundType_MOB_WITCH_IDLE, L"mob.witch.hurt", //eSoundType_MOB_WITCH_HURT, diff --git a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h index a46cc76dbc..3fb158fb0f 100644 --- a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h +++ b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Minecraft.Client\Common\C4JMemoryPool.h" +#include "../Minecraft.Client/Common/C4JMemoryPool.h" // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations. diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp index 07326b8c11..5509e8c637 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 703d3f5523..35b17a6c84 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 983381b59a..7c3ea38b0d 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/Console_Utils.cpp b/Minecraft.Client/Common/Console_Utils.cpp index 9a64dbea32..3b7e5741fb 100644 --- a/Minecraft.Client/Common/Console_Utils.cpp +++ b/Minecraft.Client/Common/Console_Utils.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) -#include "..\..\Minecraft.Server\ServerLogManager.h" +#include "../../Minecraft.Server/ServerLogManager.h" #endif //-------------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 0a2fd159a4..0e8a016391 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -1,66 +1,66 @@ #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 "../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" #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 #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 "../PlayerList.h" +#include "../ServerPlayer.h" +#include "GameRules/ConsoleGameRules.h" +#include "GameRules/ConsoleSchematicFile.h" +#include "../User.h" +#include "../../Minecraft.World/LevelData.h" #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) -#include "..\..\Minecraft.Server\ServerLogManager.h" -#endif -#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.Server/ServerLogManager.h" +#endif +#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" #ifndef _XBOX -#include "..\ArchiveFile.h" +#include "../ArchiveFile.h" #endif -#include "..\Minecraft.h" +#include "../Minecraft.h" #ifdef _XBOX -#include "..\Xbox\GameConfig\Minecraft.spa.h" -#include "..\Xbox\Network\NetworkPlayerXbox.h" -#include "XUI\XUI_TextEntry.h" -#include "XUI\XUI_XZP_Icons.h" -#include "XUI\XUI_PauseMenu.h" +#include "../Xbox/GameConfig/Minecraft.spa.h" +#include "../Xbox/Network/NetworkPlayerXbox.h" +#include "XUI/XUI_TextEntry.h" +#include "XUI/XUI_XZP_Icons.h" +#include "XUI/XUI_PauseMenu.h" #else -#include "UI\UI.h" -#include "UI\UIScene_PauseMenu.h" +#include "UI/UI.h" +#include "UI/UIScene_PauseMenu.h" #endif #ifdef __PS3__ #include @@ -69,7 +69,7 @@ #include #endif -#include "..\Common\Leaderboards\LeaderboardManager.h" +#include "../Common/Leaderboards/LeaderboardManager.h" //CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h index 0c1c261efd..b43b4f6395 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 "../StringTable.h" +#include "./DLC/DLCManager.h" +#include "./GameRules/ConsoleGameRulesConstants.h" +#include "./GameRules/GameRuleManager.h" +#include "../SkinBox.h" +#include "../ArchiveFile.h" typedef struct _JoinFromInviteData { diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp index ee0cb7a728..85ea3095f0 100644 --- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp @@ -2,8 +2,8 @@ #include "DLCManager.h" #include "DLCAudioFile.h" #if defined _XBOX || defined _WINDOWS64 -#include "..\..\Xbox\XML\ATGXmlParser.h" -#include "..\..\Xbox\XML\xmlFilesCallback.h" +#include "../../Xbox/XML/ATGXmlParser.h" +#include "../../Xbox/XML/xmlFilesCallback.h" #endif DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp index a0c818a7c1..567d9e9b70 100644 --- a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCColourTableFile.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path) { diff --git a/Minecraft.Client/Common/DLC/DLCGameRules.h b/Minecraft.Client/Common/DLC/DLCGameRules.h index 9d3bbaad4b..a1998b1dd6 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRules.h +++ b/Minecraft.Client/Common/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "..\GameRules\LevelGenerationOptions.h" +#include "../GameRules/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp index 2b78599879..df3aeaa93e 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 7409540d12..225801b8be 100644 --- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h +++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h @@ -1,7 +1,7 @@ #pragma once #include "DLCGameRules.h" -#include "..\GameRules\LevelGenerationOptions.h" +#include "../GameRules/LevelGenerationOptions.h" class DLCGameRulesHeader : public DLCGameRules, public JustGrSource { diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp index 9092143459..076b04158a 100644 --- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCLocalisationFile.h" -#include "..\..\StringTable.h" +#include "../../StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path) { diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp index c363becf43..90614a97c1 100644 --- a/Minecraft.Client/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Common/DLC/DLCManager.cpp @@ -3,9 +3,9 @@ #include "DLCManager.h" #include "DLCPack.h" #include "DLCFile.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" #include "Common/UI/UI.h" const WCHAR *DLCManager::wchTypeNamesA[]= diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp index 110008c615..9247c6b8c1 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 f7ef2ad005..d6ba11d581 100644 --- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp +++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "DLCManager.h" #include "DLCSkinFile.h" -#include "..\..\ModelPart.h" -#include "..\..\EntityRenderer.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\..\Minecraft.World\Player.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../ModelPart.h" +#include "../../EntityRenderer.h" +#include "../../EntityRenderDispatcher.h" +#include "../../../Minecraft.World/Player.h" +#include "../../../Minecraft.World/StringHelpers.h" DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path) { diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Common/DLC/DLCSkinFile.h index 15a50e7178..1645fb2a56 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 f97bfdd1f3..0157be0b75 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 49809d0c56..7ab8a073dd 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 3c7e02a390..e3c34f73f6 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 155a6e2d30..2f487d88d6 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 7f03a0fefc..d188dfbab1 100644 --- a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\WstringLookup.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../WstringLookup.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "CollectItemRuleDefinition.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\Connection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/Connection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp index cd23cd504d..fb814567a0 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 f75eddd402..a05962178f 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 dd7776824b..bbe37f8c08 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 712a29ab1f..cb62cd4db9 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 c261e0cd68..4990dd4a1e 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 b0eebf9e87..4a3bb49fa3 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 770b56d56a..a0d3f1e84c 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\WstringLookup.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../WstringLookup.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "ConsoleGameRules.h" GameRuleDefinition::GameRuleDefinition() diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h index 4a2c43a1c8..c3a43f07be 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 95434c08cc..e1e09ad504 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\DLC\DLCPack.h" -#include "..\DLC\DLCLocalisationFile.h" -#include "..\DLC\DLCGameRulesFile.h" -#include "..\DLC\DLCGameRules.h" -#include "..\DLC\DLCGameRulesHeader.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/compression.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/compression.h" +#include "../DLC/DLCPack.h" +#include "../DLC/DLCLocalisationFile.h" +#include "../DLC/DLCGameRulesFile.h" +#include "../DLC/DLCGameRules.h" +#include "../DLC/DLCGameRulesHeader.h" +#include "../../StringTable.h" #include "ConsoleGameRules.h" #include "GameRuleManager.h" diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp index 2af1826cf1..e6d21735ae 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 "Common\DLC\DLCGameRulesHeader.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Pos.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "Common/DLC/DLCGameRulesHeader.h" +#include "../../StringTable.h" #include "LevelGenerationOptions.h" #include "ConsoleGameRules.h" diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h index 378ac6c5dd..dee60c8207 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 de17bacca5..c7cfdc81a0 100644 --- a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp +++ b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\StringTable.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../StringTable.h" #include "ConsoleGameRules.h" #include "LevelRuleset.h" diff --git a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp index 2294c579c8..f64269d5ff 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 14b6d9c931..dd03d48448 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 b198a2fa2e..4ea975e7b5 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 99aee99b05..06dec9a3d2 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 49cc0e9c17..756f402fc6 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 ad64bfe475..ddcd313b55 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 6d949fc0cd..e926a4f7dd 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 f8ac1d4483..a1aa7df4e1 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 1f49469126..a7a111425d 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 3e61154fc3..83e3d294b9 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 2ba1efd60e..350b954825 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 f2d48947d3..f4e00ab349 100644 --- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -8,21 +8,21 @@ #include "base64.h" -#include "Common\Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Consoles_App.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifdef __ORBIS__ -#include "Orbis\OrbisExtras\ShutdownManager.h" -#include "Orbis\Orbis_App.h" +#include "Orbis/OrbisExtras/ShutdownManager.h" +#include "Orbis/Orbis_App.h" #elif defined __PSVITA__ -#include "PSVita\PSVitaExtras\ShutdownManager.h" -#include "PSVita\PSVita_App.h" +#include "PSVita/PSVitaExtras/ShutdownManager.h" +#include "PSVita/PSVita_App.h" #elif defined __PS3__ -#include "PS3\PS3Extras\ShutdownManager.h" -#include "PS3\PS3_App.h" +#include "PS3/PS3Extras/ShutdownManager.h" +#include "PS3/PS3_App.h" #else #error "SonyLeaderboardManager is included for a non-sony platform." #endif diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h index 3b2c26c5f4..fc9300e6b5 100644 --- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h +++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" #ifdef __PS3__ typedef CellRtcTick SonyRtcTick; diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp index 50aeae689e..e5280fe4ee 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -1,49 +1,49 @@ #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 "..\..\Gui.h" -#include "..\..\LevelRenderer.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\GameRules\ConsoleGameRules.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 "../../Gui.h" +#include "../../LevelRenderer.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" #ifdef _XBOX -#include "Common\XUI\XUI_PauseMenu.h" +#include "Common/XUI/XUI_PauseMenu.h" #else -#include "Common\UI\UI.h" -#include "Common\UI\UIScene_PauseMenu.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "Common/UI/UI.h" +#include "Common/UI/UIScene_PauseMenu.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #endif #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #ifdef _WINDOWS64 -#include "..\..\Windows64\Network\WinsockNetLayer.h" -#include "..\..\Windows64\Windows64_Xuid.h" +#include "../../Windows64/Network/WinsockNetLayer.h" +#include "../../Windows64/Windows64_Xuid.h" #endif // Global instance diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h index 22d5880773..b246348ae9 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 "../../Xbox/Network/PlatformNetworkManagerXbox.h" #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ -#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h" +#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h" #elif defined _DURANGO -#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h" +#include "../../Durango/Network/PlatformNetworkManagerDurango.h" #else #include "PlatformNetworkManagerStub.h" #endif #include "SessionInfo.h" #ifdef __ORBIS__ -#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h" +#include "../../Orbis/Network/PsPlusUpsellWrapper_Orbis.h" #endif class ClientConnection; diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h index 3ed0f888fc..d24fb22966 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 430f2c111a..e1cf66616a 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp @@ -1,15 +1,15 @@ #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 "../../Xbox/Network/NetworkPlayerXbox.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\Network\WinsockNetLayer.h" -#include "..\..\Windows64\Windows64_Xuid.h" -#include "..\..\Minecraft.h" -#include "..\..\User.h" -#include "..\..\MinecraftServer.h" -#include "..\..\PlayerList.h" +#include "../../Windows64/Network/WinsockNetLayer.h" +#include "../../Windows64/Windows64_Xuid.h" +#include "../../Minecraft.h" +#include "../../User.h" +#include "../../MinecraftServer.h" +#include "../../PlayerList.h" #include #endif diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h index dffa39531b..200f28ab7f 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 4e091c8715..c32ab8e1da 100644 --- a/Minecraft.Client/Common/Network/SessionInfo.h +++ b/Minecraft.Client/Common/Network/SessionInfo.h @@ -1,7 +1,7 @@ #pragma once #if defined(__PS3__) || defined(__ORBIS__) -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" #endif diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h index 2c61f78dfb..8c3c8a594a 100644 --- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h +++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" #include "SQRNetworkPlayer.h" // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way. diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp index 107101f4ae..cf009aa0c1 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerSony.h" #include "NetworkPlayerSony.h" -#include "..\..\Common\Network\GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerSony *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h index 9131e89795..4361950575 100644 --- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h +++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h @@ -1,10 +1,10 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" #include "SQRNetworkPlayer.h" // This is how often we allow a search for new games diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h index e3f15aca1b..1bec6e3713 100644 --- a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h +++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h @@ -12,7 +12,7 @@ #include #if defined __PSVITA__ -#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h" +#include "../../Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h" #endif class SQRNetworkPlayer; diff --git a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp index 8435cd5629..0611358993 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp +++ b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce.h" -#include "..\PS3Extras\ShutdownManager.h" +#include "../PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp index f0095885ce..4e90e10b0a 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp +++ b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp @@ -3,15 +3,15 @@ #ifdef __PS3__ -#include "PS3\Network\SonyHttp_PS3.h" +#include "PS3/Network/SonyHttp_PS3.h" SonyHttp_PS3 g_SonyHttp; #elif defined __ORBIS__ -#include "Orbis\Network\SonyHttp_Orbis.h" +#include "Orbis/Network/SonyHttp_Orbis.h" SonyHttp_Orbis g_SonyHttp; #elif defined __PSVITA__ -#include "PSVita\Network\SonyHttp_Vita.h" +#include "PSVita/Network/SonyHttp_Vita.h" SonyHttp_Vita g_SonyHttp; #endif diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h index 5740f78d80..02b82c66e1 100644 --- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h +++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h @@ -1,7 +1,7 @@ #pragma once -#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h" +#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage { diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp index 5561e2a176..b4f20592df 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp @@ -2,9 +2,9 @@ #include "MultiPlayerLocalPlayer.h" -#include "..\Minecraft.World\LevelSettings.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.World/LevelSettings.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/Level.h" #include "TelemetryManager.h" diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h index 40b6c04c64..17c345e0c8 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 "../../Common/UI/UIEnums.h" class CTelemetryManager { diff --git a/Minecraft.Client/Common/Trial/TrialMode.cpp b/Minecraft.Client/Common/Trial/TrialMode.cpp index e814913898..5d3092c943 100644 --- a/Minecraft.Client/Common/Trial/TrialMode.cpp +++ b/Minecraft.Client/Common/Trial/TrialMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "TrialMode.h" -#include "..\Tutorial\FullTutorial.h" +#include "../Tutorial/FullTutorial.h" TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : FullTutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Common/Trial/TrialMode.h b/Minecraft.Client/Common/Trial/TrialMode.h index a1034acf54..2feed67b4e 100644 --- a/Minecraft.Client/Common/Trial/TrialMode.h +++ b/Minecraft.Client/Common/Trial/TrialMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Tutorial\FullTutorialMode.h" +#include "../Tutorial/FullTutorialMode.h" class TrialMode : public FullTutorialMode { diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp index f133d604b3..12ccbbdb59 100644 --- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" -#include "..\..\..\Minecraft.World\AABB.h" +#include "../../../Minecraft.World/AABB.h" AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ ) : TutorialConstraint( descriptionId ) diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp index 8b711c8807..ff4e02b6b2 100644 --- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "AreaHint.h" -#include "..\..\..\Minecraft.World\AABB.h" +#include "../../../Minecraft.World/AABB.h" #include "Tutorial.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp index 06e73d6f72..3c930fd8ee 100644 --- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "Tutorial.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" #include "ChangeStateConstraint.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ ) diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp index 023e4b22ce..8a45ee022e 100644 --- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ChoiceTask.h" -#include "..\..\..\Minecraft.World\Material.h" -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "../../../Minecraft.World/Material.h" +#include "../../Windows64/KeyboardMouseInput.h" #include "Common/UI/UI.h" ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, diff --git a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp index f2fb8c127d..7a9a6cff71 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 ddb07050fa..733fea01b9 100644 --- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "ControllerTask.h" diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp index c96e68724a..a255dead15 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 /*= nullptr*/, diff --git a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp index 428bbe3c01..5692044d7c 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 4a027b6cc8..19c7c2b51c 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 a6e1ebb73e..e3faa4d4df 100644 --- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../GameRules/ConsoleGameRules.h" #include "DiggerItemHint.h" #include "TutorialTasks.h" #include "AreaHint.h" diff --git a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp index a5ee85b860..ce3f151edc 100644 --- a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" diff --git a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp index e1d50fbfbf..ab42d89566 100644 --- a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp @@ -5,7 +5,7 @@ #include "Minecraft.h" #include "Tutorial.h" -#include "..\Minecraft.World\EntityHorse.h" +#include "../Minecraft.World/EntityHorse.h" #include "HorseChoiceTask.h" diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp index 2e48180478..1d148d605d 100644 --- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp +++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "Tutorial.h" #include "TutorialConstraints.h" #include "InfoTask.h" -#include "..\..\..\Minecraft.World\Material.h" -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "../../../Minecraft.World/Material.h" +#include "../../Windows64/KeyboardMouseInput.h" #include "Common/UI/UI.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 991366919c..cced69fa0c 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 c8723a84ba..83fdf55398 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/RideEntityTask.cpp b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp index 29b776453b..4c1bbcb7e9 100644 --- a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp +++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp @@ -5,7 +5,7 @@ #include "Minecraft.h" #include "Tutorial.h" -#include "..\Minecraft.World\EntityHorse.h" +#include "../Minecraft.World/EntityHorse.h" #include "RideEntityTask.h" diff --git a/Minecraft.Client/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Common/Tutorial/StatTask.cpp index c2dc82aa42..ba975044f5 100644 --- a/Minecraft.Client/Common/Tutorial/StatTask.cpp +++ b/Minecraft.Client/Common/Tutorial/StatTask.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\LocalPlayer.h" -#include "..\..\StatsCounter.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" +#include "../../Minecraft.h" +#include "../../LocalPlayer.h" +#include "../../StatsCounter.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" #include "StatTask.h" StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/) diff --git a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp index 3a31848899..6b4a93d83f 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 c985ef4914..ee6b777101 100644 --- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\SurvivalMode.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" #include "TutorialTasks.h" diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp index d80d7d16ea..9f207a3ed1 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #include "Tutorial.h" #include "TutorialHint.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) : m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ), diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp index 50a45a42dd..8a387fc4b5 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\..\Minecraft.World\Inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../../Minecraft.World/Inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "TutorialMode.h" TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad ) diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h index 2263a91c68..2058e8dd67 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.h +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\..\MultiPlayerGameMode.h" +#include "../../MultiPlayerGameMode.h" #include "Tutorial.h" class TutorialMode : public MultiPlayerGameMode diff --git a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp index 09bac4d172..65359af07b 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 1f4ed4cb3f..574f3537b2 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 d0217d1959..132ce261a6 100644 --- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp +++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" #if !(defined _XBOX) && !(defined __PSVITA__) -#include "..\UI\UI.h" +#include "../UI/UI.h" #endif #include "Tutorial.h" #include "XuiCraftingTask.h" diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h index 146b1554a5..0580977472 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 7db52b3f9b..918bd8e670 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -3,20 +3,20 @@ #include "IUIScene_AbstractContainerMenu.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.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../Options.h" #ifdef __ORBIS__ #include #endif #ifdef _WINDOWS64 -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "../../Windows64/KeyboardMouseInput.h" #endif IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp index 1e6fa6fa06..09e211d86a 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "IUIScene_AnvilMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" IUIScene_AnvilMenu::IUIScene_AnvilMenu() { diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h index 4e9e3aa79b..4111a03787 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_BeaconMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp index 3dede3d94d..fccffe3642 100644 --- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\Minecraft.World\CustomPayloadPacket.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.effect.h" -#include "..\Minecraft.World\HtmlString.h" +#include "../Minecraft.World/CustomPayloadPacket.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.effect.h" +#include "../Minecraft.World/HtmlString.h" #include "IUIScene_BeaconMenu.h" #include "Minecraft.h" #include "MultiPlayerLocalPlayer.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h index 1f5f734014..74bd3f3f3d 100644 --- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "Common\UI\IUIScene_AbstractContainerMenu.h" +#include "Common/UI/IUIScene_AbstractContainerMenu.h" class BeaconTileEntity; diff --git a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp index 44bbdc44b8..a1ffaedd7c 100644 --- a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IUIScene_BrewingMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) { diff --git a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp index c6a4df0020..f1b7ba6ef0 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 6fddece9cc..735ed2dcf5 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" #include "IUIScene_CraftingMenu.h" #include "UI.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h index fa8d9bd163..a8761eaba7 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 a0c0ebddfb..8818b54136 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -2,16 +2,16 @@ #include "IUIScene_CreativeMenu.h" #include "UI.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../../../Minecraft.World/JavaMath.h" // 4J JEV - Images for each tab. IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = nullptr; diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h index 864fb5606f..02625233bd 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 ec8a73c354..be7fdac521 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 fbbf7c24ff..5f1e8ced7a 100644 --- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) diff --git a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp index 7f90fe8f4a..184240c0e8 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 4a6c6762a2..927281b8b4 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 d2754789c7..643cf9d0d8 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.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 "IUIScene_HUD.h" #include "UI.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp index 8f1caab8c7..d25b136776 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_InventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp index 7bed406ac6..a4886003c3 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 e88ed08cdb..41934c25ce 100644 --- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "IUIScene_PauseMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MinecraftServer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.phys.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifndef _XBOX #include "UI.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp index d7939d8c5d..7eda58032f 100644 --- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp @@ -1,12 +1,12 @@ #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 "..\..\Options.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.h" +#include "../../Options.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" #include "IUIScene_TradingMenu.h" #include "UI.h" diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h index 726f13c7ac..08e08e34e8 100644 --- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h +++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\MerchantMenu.h" +#include "../Minecraft.World/MerchantMenu.h" class MerchantRecipe; diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp index 49c5d5d219..552767cbc8 100644 --- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp @@ -2,8 +2,8 @@ #include "UI.h" #include "UIComponent_Chat.h" #include "UISplitScreenHelpers.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" +#include "../../Minecraft.h" +#include "../../Gui.h" UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp index 3da8174c7d..6700887ab4 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 9af43df49c..f15a4ab289 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 76d3babfbc..40fcad554b 100644 --- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp @@ -2,11 +2,11 @@ #include "UI.h" #include "UIComponent_TutorialPopup.h" #include "UISplitScreenHelpers.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp index 7582e82ffe..f17612e449 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 87c2862f46..2c76b46342 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 f091b0fcc1..2e96f15a68 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_EnchantmentBook.h" -#include "..\..\Minecraft.h" -#include "..\..\TileEntityRenderDispatcher.h" -#include "..\..\EnchantTableRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\BookModel.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../TileEntityRenderDispatcher.h" +#include "../../EnchantTableRenderer.h" +#include "../../Lighting.h" +#include "../../BookModel.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" UIControl_EnchantmentBook::UIControl_EnchantmentBook() { diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp index 156f981568..46dc428990 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_EnchantmentButton.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp index 47374d2145..2f400db5e4 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 25fc0316da..3e56eb856c 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp @@ -1,22 +1,22 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HorseRenderer.h" +#include "../../PlayerRenderer.h" +#include "../../HorseRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\ModelHorse.h" +#include "../../HumanoidModel.h" +#include "../../ModelHorse.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" +#include "../../Lighting.h" +#include "../../ModelPart.h" +#include "../../Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -//#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.EntityHorse.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +//#include "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLocalPlayer.h" #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 ae65ac2b50..3fecbde7e5 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../ModelPart.h" +#include "../../Options.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../MultiPlayerLocalPlayer.h" #include "UI.h" #include "UIControl_MinecraftPlayer.h" diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp index b8c439b1a5..cbffa662fa 100644 --- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp +++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\ModelPart.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../ModelPart.h" +#include "../../Options.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "UIControl_PlayerSkinPreview.h" //#define SKIN_PREVIEW_BOB_ANIM diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h index a7c3126e1e..974e5924b2 100644 --- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h +++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h @@ -1,7 +1,7 @@ #pragma once #include "UIControl.h" -#include "..\..\Textures.h" +#include "../../Textures.h" class ModelPart; class EntityRenderer; diff --git a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp index 76f25afb37..a6470ecaa6 100644 --- a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp +++ b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIControl_TextInput.h" -#include "..\..\Screen.h" +#include "../../Screen.h" UIControl_TextInput::UIControl_TextInput() { diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index b12ea5e739..5f86b2df58 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -4,18 +4,18 @@ #include "UIScene.h" #include "UIControl_Slider.h" #include "UIControl_TexturePackList.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\LocalPlayer.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../LocalPlayer.h" +#include "../../DLCTexturePack.h" +#include "../../TexturePackRepository.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../EnderDragonRenderer.h" +#include "../../MultiPlayerLocalPlayer.h" #include "UIFontData.h" #include "UISplitScreenHelpers.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "../../Windows64/KeyboardMouseInput.h" #endif #ifdef __PSVITA__ #include @@ -27,7 +27,7 @@ //#define ENABLE_IGGY_EXPLORER #ifdef ENABLE_IGGY_EXPLORER -#include "Windows64\Iggy\include\iggyexpruntime.h" +#include "Windows64/Iggy/include/iggyexpruntime.h" #endif //#define ENABLE_IGGY_PERFMON @@ -37,18 +37,18 @@ #define PM_ORIGIN_Y 34 #ifdef __ORBIS__ -#include "Orbis\Iggy\include\iggyperfmon.h" -#include "Orbis\Iggy\include\iggyperfmon_orbis.h" +#include "Orbis/Iggy/include/iggyperfmon.h" +#include "Orbis/Iggy/include/iggyperfmon_orbis.h" #elif defined _DURANGO -#include "Durango\Iggy\include\iggyperfmon.h" +#include "Durango/Iggy/include/iggyperfmon.h" #elif defined __PS3__ -#include "PS3\Iggy\include\iggyperfmon.h" -#include "PS3\Iggy\include\iggyperfmon_ps3.h" +#include "PS3/Iggy/include/iggyperfmon.h" +#include "PS3/Iggy/include/iggyperfmon_ps3.h" #elif defined __PSVITA__ -#include "PSVita\Iggy\include\iggyperfmon.h" -#include "PSVita\Iggy\include\iggyperfmon_psp2.h" +#include "PSVita/Iggy/include/iggyperfmon.h" +#include "PSVita/Iggy/include/iggyperfmon_psp2.h" #elif defined __WINDOWS64 -#include "Windows64\Iggy\include\iggyperfmon.h" +#include "Windows64/Iggy/include/iggyperfmon.h" #endif #endif diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index 303897a7f1..b29a7e5632 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Common/UI/UIScene.cpp @@ -3,10 +3,10 @@ #include "UIScene.h" #include "UISplitScreenHelpers.h" -#include "..\..\Lighting.h" -#include "..\..\LocalPlayer.h" -#include "..\..\ItemRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../../Lighting.h" +#include "../../LocalPlayer.h" +#include "../../ItemRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" UIScene::UIScene(int iPad, UILayer *parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp index c5dc0554b8..3539ce3349 100644 --- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -3,11 +3,11 @@ #include "UIScene_AbstractContainerMenu.h" #include "UISplitScreenHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../MultiPlayerLocalPlayer.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\KeyboardMouseInput.h" +#include "../../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 a3fb0d2d7b..8145ab6844 100644 --- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #include "UIScene_AnvilMenu.h" UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h index 44f759929a..fe5201f60b 100644 --- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h @@ -2,7 +2,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "IUIScene_AnvilMenu.h" -#include "..\Minecraft.World\MerchantMenu.h" +#include "../Minecraft.World/MerchantMenu.h" class InventoryMenu; diff --git a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp index 64e1237361..ee8f6adefb 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.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 129868fd0c..a82620ad96 100644 --- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.h" #include "UIScene_BrewingStandMenu.h" UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp index 40557cd5c2..e48ceaee93 100644 --- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_ConnectingProgress.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\Network\WinsockNetLayer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" +#include "../../Windows64/Network/WinsockNetLayer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" static int ConnectingProgress_OnRejectedDialogOK(LPVOID, int iPad, const C4JStorage::EMessageResult) { diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp index b26ae48e96..a74690e3f9 100644 --- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp @@ -2,14 +2,14 @@ #include "UI.h" #include "UIScene_ContainerMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\Tutorial\TutorialEnum.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../Tutorial/TutorialEnum.h" UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp index 939efde11a..dc747a63bb 100644 --- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_ControlsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp index 16b63c4c56..a7b38ff791 100644 --- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" #ifdef _WINDOWS64 -#include "..\..\Windows64\Iggy\gdraw\gdraw_d3d11.h" +#include "../../Windows64/Iggy/gdraw/gdraw_d3d11.h" #endif #ifdef __PSVITA__ diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index ef72ec163f..bc56134b5f 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -1,26 +1,26 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_CreateWorldMenu.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\BiomeSource.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\..\..\Minecraft.World\LevelType.h" -#include "..\..\DLCTexturePack.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/BiomeSource.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../../../Minecraft.World/LevelType.h" +#include "../../DLCTexturePack.h" #ifdef __PSVITA__ -#include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h" +#include "PSVita/Network/SQRNetworkManager_AdHoc_Vita.h" #endif #ifdef _WINDOWS64 #include -#include "Xbox\Resource.h" +#include "Xbox/Resource.h" #endif #define GAME_CREATE_ONLINE_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp index ba2cd84525..19bc06f7d5 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp @@ -2,12 +2,12 @@ #include "UI.h" #include "UIScene_CreativeMenu.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\..\LocalPlayer.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/JavaMath.h" +#include "../../LocalPlayer.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #ifdef __PSVITA__ #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Common/UI/UIScene_Credits.cpp index 02dc662010..a475acc35d 100644 --- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp +++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "UI.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "UIScene_Credits.h" #define CREDIT_ICON -2 diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp index 6d705765ee..fcc6e4623e 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #if defined(__PS3__) || defined(__ORBIS__) -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" #endif #include "UIScene_DLCMainMenu.h" diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp index 5e644803b1..4935819007 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_DLCOffersMenu.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif #ifdef __PSVITA__ -#include "PSVita\Network\SonyCommerce_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" #endif #define PLAYER_ONLINE_TIMER_ID 0 diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp index a4dbe8a82b..84b1f18704 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -2,8 +2,8 @@ #include "UI.h" #include "UIScene_DeathMenu.h" #include "IUIScene_PauseMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp index d698b51f50..913c7d2042 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 e18d9f5d08..690082b5fb 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h +++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h @@ -1,7 +1,7 @@ #pragma once #ifdef _DEBUG_MENUS_ENABLED #include "UIScene.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class UIScene_DebugCreateSchematic : public UIScene { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp index c997fb3117..eb0871af4b 100644 --- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp @@ -3,18 +3,18 @@ #ifdef _DEBUG_MENUS_ENABLED #include "UI.h" #include "UIScene_DebugOverlay.h" -#include "..\..\Minecraft.h" -#include "..\..\MinecraftServer.h" -#include "..\..\GameRenderer.h" -#include "..\..\MultiPlayerLevel.h" +#include "../../Minecraft.h" +#include "../../MinecraftServer.h" +#include "../../GameRenderer.h" +#include "../../MultiPlayerLevel.h" #include "ClientConnection.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../../../Minecraft.World/net.minecraft.commands.common.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp index 51eab5aa03..d0761ab786 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 2e47dda438..a4ec4fe9d5 100644 --- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_DispenserMenu.h" UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp index 4119562124..c1c76efdc3 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 f90c4b12b2..91d0d38ff3 100644 --- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_EnchantingMenu.h" UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp index 5b10e8cfeb..297898155a 100644 --- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp @@ -2,9 +2,9 @@ #include "UI.h" #include "UIScene_EndPoem.h" #include "UIBitmapFont.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp index b33e086a7d..22d6a2374a 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.h" +#include "../../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 6a4ea09668..8330ae8e26 100644 --- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_FullscreenProgress.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp index 9dcbe45b4d..7575f13278 100644 --- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "UI.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../Minecraft.h" #include "UIScene_FurnaceMenu.h" UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp index 213caa8dc6..1559a6ec37 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -3,12 +3,12 @@ #include "UIScene_HUD.h" #include "UISplitScreenHelpers.h" #include "BossMobGuiInfo.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../EnderDragonRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp index ab79b94001..d876de5373 100644 --- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_HelpAndOptionsMenu.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp index 8c657c9730..e60dd66b81 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.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 c062df4edd..5f0da601cf 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.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 bc72180270..90f9439756 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 51992e3229..91c066fa47 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGameHostOptionsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp index 338d1905cd..025c5e2d96 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGameInfoMenu.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp index 57937543fc..f7ed869706 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_InGamePlayerOptionsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" #define CHECKBOXES_TIMER_ID 0 #define CHECKBOXES_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp index 4e217c7720..e98d07089a 100644 --- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp @@ -2,18 +2,18 @@ #include "UI.h" #include "UIScene_InventoryMenu.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\Lighting.h" -#include "..\Tutorial\Tutorial.h" -#include "..\Tutorial\TutorialMode.h" -#include "..\Tutorial\TutorialEnum.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../EntityRenderDispatcher.h" +#include "../../Lighting.h" +#include "../Tutorial/Tutorial.h" +#include "../Tutorial/TutorialMode.h" +#include "../Tutorial/TutorialEnum.h" #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h index fb8d57a243..1b425a3a98 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 5b83ea7c57..7aa3214734 100644 --- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_JoinMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Options.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../Options.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp index 35edf17fda..12189af2c6 100644 --- a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp +++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_Keyboard.h" -#include "..\..\Screen.h" +#include "../../Screen.h" #ifdef _WINDOWS64 // Global buffer that stores the text entered in the native keyboard scene. diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp index ed0b3151fe..ad27fa9a4b 100644 --- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_LeaderboardsMenu.h" -#include "..\Leaderboards\LeaderboardManager.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" +#include "../Leaderboards/LeaderboardManager.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h index bcd4fe8732..d41e0e905d 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 "../Leaderboards/LeaderboardManager.h" +#include "../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 d61a790227..5945e10e5d 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_LoadMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\User.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Options.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../Minecraft.h" +#include "../../User.h" +#include "../../TexturePackRepository.h" +#include "../../Options.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../../Minecraft.World/StringHelpers.h" #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif -#include "..\..\DLCTexturePack.h" +#include "../../DLCTexturePack.h" #if defined(__ORBIS__) || defined(__PSVITA__) #include #endif diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp index d7ad789a13..3810b3aa43 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -2,20 +2,20 @@ #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 "../../ProgressRenderer.h" +#include "../../MinecraftServer.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../Network/SessionInfo.h" #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) -#include "Common\Network\Sony\SonyHttp.h" -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" #include "DLCTexturePack.h" #endif #if defined(__ORBIS__) || defined(__PSVITA__) @@ -26,8 +26,8 @@ #endif #ifdef _WINDOWS64 -#include "..\..\..\Minecraft.World\NbtIo.h" -#include "..\..\..\Minecraft.World\compression.h" +#include "../../../Minecraft.World/NbtIo.h" +#include "../../../Minecraft.World/compression.h" static wstring ReadLevelNameFromSaveFile(const wstring& filePath) { diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index 93f1edf119..1eef994f49 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\User.h" -#include "..\..\MinecraftServer.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../User.h" +#include "../../MinecraftServer.h" #include "UI.h" #include "UIScene_MainMenu.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp index 118712a463..ab9718eae2 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 7cec38b3c8..7d75aa2f4b 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -1,22 +1,22 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_PauseMenu.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../MinecraftServer.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" +#include "../../../Minecraft.World/StringHelpers.h" #ifdef __ORBIS__ #include #endif #ifdef _DURANGO -#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h" +#include "../../Durango/Leaderboards/DurangoStatsDebugger.h" #endif #ifdef __PSVITA__ -#include "PSVita\Network\SonyCommerce_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" #endif #if defined __PS3__ || defined __ORBIS__ diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp index 7667656148..c90ecaf672 100644 --- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_QuadrantSignin.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" #if defined(__ORBIS__) -#include "Common\Network\Sony\SonyHttp.h" +#include "Common/Network/Sony/SonyHttp.h" #endif UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp index e9a85fa54c..e4836bc551 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SettingsGraphicsMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\GameRenderer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../GameRenderer.h" namespace { diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp index 2ae9c897db..8b77787500 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SettingsMenu.h" -#include "..\..\Minecraft.h" +#include "../../Minecraft.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp index 5ef783d39a..41bb3cfd53 100644 --- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_SignEntryMenu.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp index a3482a24d1..dd6318e6b3 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 60579ac60c..f6922230ae 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 017af93ef6..1a02187139 100644 --- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "UI.h" #include "UIScene_TeleportMenu.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" #include "TeleportCommand.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp index bb9e30af4c..092e8408d9 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.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 04d8b8e37b..b9bf2111a2 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 359ac76b82..49f415e9c7 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 91f362a3ed..21866898f5 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 640056217d..e2d33bc939 100644 --- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "XUI_Chat.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" +#include "../../Minecraft.h" +#include "../../Gui.h" HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp index 5ae736a3d1..64ade5c314 100644 --- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp @@ -4,8 +4,8 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/DisconnectPacket.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp index 0096da4459..229b9f8ea1 100644 --- a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_Control_ComboBox.h" -#include "..\Xbox_App.h" +#include "../Xbox_App.h" HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp index e74b92b4b5..927f87e946 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 48a130c420..027e8a98ed 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 5a1a367431..eb1af72fb7 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 46bcc9831c..a84bb7bb1d 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 9a312287ec..7efc1ff7b4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Font.h" -#include "..\..\Lighting.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Font.h" +#include "../../Lighting.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp index a83b7811ec..5b90257a5f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp @@ -1,21 +1,21 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\TileEntityRenderDispatcher.h" -#include "..\..\EnchantTableRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../TileEntityRenderDispatcher.h" +#include "../../EnchantTableRenderer.h" +#include "../../Lighting.h" +#include "../../LocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantmentBook.h" -#include "..\..\BookModel.h" -#include "..\..\Options.h" +#include "../../BookModel.h" +#include "../../Options.h" //----------------------------------------------------------------------------- // CXuiCtrlEnchantmentBook class diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h index 93da07684b..3ec502b09d 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 ecb6132d7a..1740795085 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Font.h" -#include "..\..\Lighting.h" -#include "..\..\MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Font.h" +#include "../../Lighting.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Scene_Enchant.h" #include "XUI_Ctrl_EnchantButton.h" #include "XUI_Ctrl_EnchantmentButtonText.h" -#include "..\..\Minecraft.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" +#include "../../Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp index 3d55db1973..9b33cfe726 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 3bb3344007..0808e5c945 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "XUI_Ctrl_LoadingProgress.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" int CXuiCtrlLoadingProgress::GetValue() { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp index 98ff1c267d..b46b3cdee1 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\Lighting.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../Lighting.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_MinecraftPlayer.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "..\..\Options.h" +#include "../../Options.h" //----------------------------------------------------------------------------- // CXuiCtrlMinecraftPlayer class diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp index 1fa44d3f7d..3206185f63 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp @@ -1,18 +1,18 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\EntityRenderDispatcher.h" -#include "..\..\PlayerRenderer.h" -#include "..\..\HumanoidModel.h" -#include "..\..\Lighting.h" -#include "..\..\..\Minecraft.World\Class.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../EntityRenderDispatcher.h" +#include "../../PlayerRenderer.h" +#include "../../HumanoidModel.h" +#include "../../Lighting.h" +#include "../../../Minecraft.World/Class.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "XUI_Ctrl_MinecraftSkinPreview.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" -#include "..\..\Options.h" -#include "..\..\stubs.h" -#include "..\..\ModelPart.h" +#include "../../Options.h" +#include "../../stubs.h" +#include "../../ModelPart.h" //#define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h index 22f4991b23..254bc04324 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h @@ -2,9 +2,9 @@ #include #include -#include "..\..\Textures.h" -//#include "..\..\Xbox\DLC\DLCSkinFile.h" -#include "..\..\Model.h" +#include "../../Textures.h" +//#include "../../Xbox/DLC/DLCSkinFile.h" +#include "../../Model.h" using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp index 9b64dbcb57..1f9e280186 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" -#include "..\..\ItemRenderer.h" -#include "..\..\GameRenderer.h" -#include "..\..\TileRenderer.h" -#include "..\..\Lighting.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" -#include "..\..\..\Minecraft.World\Item.h" -#include "..\..\..\Minecraft.World\Tile.h" +#include "../../ItemRenderer.h" +#include "../../GameRenderer.h" +#include "../../TileRenderer.h" +#include "../../Lighting.h" +#include "../../ScreenSizeCalculator.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/ItemInstance.h" +#include "../../../Minecraft.World/Item.h" +#include "../../../Minecraft.World/Tile.h" #include "XUI_Ctrl_MinecraftSlot.h" //----------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h index c43e7fe9ee..4e223e3f43 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_PassThroughList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp index d00762b835..cc34326ccd 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "XUI_Ctrl_PassThroughList.h" +#include "XUI_Ctrl_PassthroughList.h" HRESULT CXuiCtrlPassThroughList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp index 8a45d6fcb2..b3674a30ed 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotItemCtrlBase.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp index a34f2a7e43..468028e38a 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 874edc6f0b..78462d5618 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\ScreenSizeCalculator.h" -#include "..\..\Lighting.h" +#include "../../Minecraft.h" +#include "../../ScreenSizeCalculator.h" +#include "../../Lighting.h" #include "XUI_Ctrl_SplashPulser.h" -#include "..\..\Font.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\System.h" +#include "../../Font.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/System.h" //----------------------------------------------------------------------------- // CXuiCtrlSplashPulser class diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp index c5150249a1..4d82457059 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 412446d00e..0717846eef 100644 --- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h +++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h @@ -1,7 +1,7 @@ #pragma once -#include "../media\xuiscene_DLCOffers.h" -#include "../media\xuiscene_DLCMain.h" +#include "../media/xuiscene_DLCOffers.h" +#include "../media/xuiscene_DLCMain.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp index 1788ceffdc..0f0bc25d30 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp @@ -2,25 +2,25 @@ // #include "stdafx.h" -#include "..\XUI\XUI_Death.h" +#include "../XUI/XUI_Death.h" #include -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.World\ChunkSource.h" -#include "..\..\..\Minecraft.Client\ProgressRenderer.h" -#include "..\..\..\Minecraft.Client\GameRenderer.h" -#include "..\..\..\Minecraft.Client\LevelRenderer.h" -#include "..\..\..\Minecraft.World\Pos.h" -#include "..\..\..\Minecraft.World\Dimension.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\compression.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.World/ChunkSource.h" +#include "../../../Minecraft.Client/ProgressRenderer.h" +#include "../../../Minecraft.Client/GameRenderer.h" +#include "../../../Minecraft.Client/LevelRenderer.h" +#include "../../../Minecraft.World/Pos.h" +#include "../../../Minecraft.World/Dimension.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/compression.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Death.h b/Minecraft.Client/Common/XUI/XUI_Death.h index 62d37d0d26..52f24c5f57 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.h +++ b/Minecraft.Client/Common/XUI/XUI_Death.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Death.h" +#include "../media/xuiscene_death.h" #include "XUI_CustomMessages.h" #define BUTTON_DEATH_RESPAWN 0 diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp index d8c06ae14d..99c5a936a2 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\Common\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../Common/GameRules/ConsoleGameRules.h" #include "XUI_DebugItemEditor.h" #ifdef _DEBUG_MENUS_ENABLED diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h index 2e2f5b5aed..c559b7ec4d 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h @@ -4,7 +4,7 @@ using namespace std; #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" class CScene_DebugItemEditor : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp index 338eb853c2..4b940f2307 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp @@ -1,32 +1,32 @@ #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\MultiplayerLevel.h" -#include "..\..\GameMode.h" -#include "..\..\SurvivalMode.h" -#include "..\..\CreativeMode.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../MultiPlayerLevel.h" +#include "../../GameMode.h" +#include "../../SurvivalMode.h" +#include "../../CreativeMode.h" #include "ClientConnection.h" #include "MultiPlayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\com.mojang.nbt.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.saveddata.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/com.mojang.nbt.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.monster.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/net.minecraft.world.level.saveddata.h" +#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h" +#include "../../../Minecraft.World/net.minecraft.world.level.storage.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h" #include "XUI_DebugOverlay.h" -#include "..\..\..\Minecraft.Client\GameRenderer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h" +#include "../../../Minecraft.Client/GameRenderer.h" +#include "../../MinecraftServer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../../Minecraft.World/net.minecraft.commands.common.h" +#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h" #ifdef _DEBUG_MENUS_ENABLED HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h index ed5f85c2a6..a790e0fe64 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h @@ -7,8 +7,8 @@ using namespace std; class RegionFile; class DataOutputStream; class ConsoleSaveFile; -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\Entity.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/Entity.h" class CScene_DebugOverlay : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp index 66279d1f58..27fd43ac0a 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 b502d1105c..a3ee8b8872 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Media\xuiscene_debug_schematic_create.h" +#include "../Media/xuiscene_debug_schematic_create.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class CScene_DebugSchematicCreator : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp index fb6339ce20..7c8a7a1531 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_DebugSetCamera.h" -#include "..\..\..\Minecraft.World\ChunkSource.h" +#include "../../../Minecraft.World/ChunkSource.h" -// #include "..\..\Xbox\4JLibs\inc\4J_Input.h" +// #include "../../Xbox/4JLibs/inc/4J_Input.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h index 1bc662e963..e8efbfb3e9 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h @@ -1,7 +1,7 @@ #pragma once -#include "..\Media\xuiscene_debug_set_camera.h" +#include "../Media/xuiscene_debug_set_camera.h" #include "XUI_Ctrl_4JEdit.h" -#include "..\..\Common\GameRules\ConsoleSchematicFile.h" +#include "../../Common/GameRules/ConsoleSchematicFile.h" class CScene_DebugSetCamera : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp index e8091bcb32..a3b8505e8c 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 10627d3cb8..e4f5a32597 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugTips.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_DebugTips.h" +#include "../media/xuiscene_debugtips.h" diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp index cc23591563..0c36c2d1ec 100644 --- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp @@ -4,10 +4,10 @@ #include "stdafx.h" #include -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h index 271a578130..70fbe054f5 100644 --- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h +++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h @@ -1,6 +1,6 @@ #pragma once #include "../media/xuiscene_fullscreenprogress.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "../../../Minecraft.World/C4JThread.h" #define ERROR_FULLSCREENPROGRESS_ diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp index e188cbf682..7937bb48b8 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "XUI_HUD.h" -#include "..\..\Minecraft.h" -#include "..\..\Gui.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h" +#include "../../Minecraft.h" +#include "../../Gui.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../../Minecraft.World/net.minecraft.world.level.material.h" HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) { diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp index f33d1d91fb..5d0828898b 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpAndOptions.h" +#include "../XUI/XUI_HelpAndOptions.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp index 3c4e80a228..8397d77e76 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpControls.h" +#include "../XUI/XUI_HelpControls.h" #include "XUI_Ctrl_4JList.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\LevelData.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/LevelData.h" +#include "../../MultiPlayerLocalPlayer.h" #define ALIGN_START 0 #define ALIGN_END 1 diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h index e973286eb7..3ac7315737 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h +++ b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h @@ -5,7 +5,7 @@ #define MAX_CREDIT_STRINGS 360 // 213 -#include "..\UI\UIStructs.h" +#include "../UI/UIStructs.h" class CScene_Credits : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp index cd9e962d00..4aa8105285 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HelpHowToPlay.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../XUI/XUI_HelpHowToPlay.h" +#include "../../../Minecraft.World/StringHelpers.h" static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] = { diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp index a99921e069..ed14f57f2a 100644 --- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_HowToPlayMenu.h" -#include "..\XUI\XUI_HelpHowToPlay.h" +#include "../XUI/XUI_HowToPlayMenu.h" +#include "../XUI/XUI_HelpHowToPlay.h" // strings for buttons in the list unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]= diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp index 5030a79233..8c30562eb3 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGameHostOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h index cdc99f7c1f..c3a617c5d0 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_host_options.h" +#include "../Media/xuiscene_ingame_host_options.h" class CScene_InGameHostOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp index 35e0833969..5bb3f7f210 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp @@ -2,18 +2,18 @@ #include #include "XUI_InGameInfo.h" -#include "..\..\ServerPlayer.h" -#include "..\..\PlayerConnection.h" -#include "..\..\PlayerList.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\PlayerRenderer.h" +#include "../../ServerPlayer.h" +#include "../../PlayerConnection.h" +#include "../../PlayerList.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #define IGNORE_KEYPRESS_TIMERID 0 #define TOOLTIP_TIMERID 1 diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp index 4ab2a54a25..925d5b8ab3 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" #include "XUI_InGameInfo.h" diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h index 87b9de1384..487be5afc8 100644 --- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_ingame_player_options.h" +#include "../Media/xuiscene_ingame_player_options.h" class CScene_InGamePlayerOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.cpp b/Minecraft.Client/Common/XUI/XUI_Intro.cpp index 997abe5d52..e6a0b1ecdf 100644 --- a/Minecraft.Client/Common/XUI/XUI_Intro.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Intro.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_Intro.h" +#include "../XUI/XUI_Intro.h" #define TIMELINE_NORMAL 0 #define TIMELINE_ESRBFADE 1 diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp index 7fde530bff..aea3c92fd2 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 e06f13e183..2823cbe09b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h @@ -2,7 +2,7 @@ #include "XUI_Helper.h" #include "../media/xuiscene_leaderboards.h" -#include "..\Leaderboards\LeaderboardManager.h" +#include "../Leaderboards/LeaderboardManager.h" class CXuiCtrlCraftIngredientSlot; diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp index e12957959d..e8c98eccce 100644 --- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp +++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp @@ -2,29 +2,29 @@ #include #include #include -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Options.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/InputOutputStream.h" +#include "../../MinecraftServer.h" +#include "../../Options.h" #include "XUI_Ctrl_4JList.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\GameRules\ConsoleGameRules.h" -#include "..\..\StringTable.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../GameRules/ConsoleGameRules.h" +#include "../../StringTable.h" +#include "../../DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp index 4126c55916..1381821443 100644 --- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp @@ -4,21 +4,21 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_MainMenu.h" -#include "..\..\..\Minecraft.Client\SurvivalMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\User.h" +#include "../XUI/XUI_MainMenu.h" +#include "../../../Minecraft.Client/SurvivalMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../User.h" //#include "XUI_CreateLoad.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\Font.h" -#include "..\..\Common\GameRules\ConsoleGameRules.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../Font.h" +#include "../../Common/GameRules/ConsoleGameRules.h" #define DLC_INSTALLED_TIMER_ID 1 #define DLC_INSTALLED_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp index b73f93051a..529a531831 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp @@ -1,21 +1,21 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "XUI_MultiGameCreate.h" #include "XUI_Controls.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "../../MinecraftServer.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../../Minecraft.World/LevelSettings.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "..\..\..\Minecraft.World\BiomeSource.h" -#include "..\..\..\Minecraft.World\IntCache.h" -#include "..\..\..\Minecraft.World\LevelType.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\DLC\DLCLocalisationFile.h" -#include "..\..\StringTable.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/BiomeSource.h" +#include "../../../Minecraft.World/IntCache.h" +#include "../../../Minecraft.World/LevelType.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../DLC/DLCLocalisationFile.h" +#include "../../StringTable.h" +#include "../../DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h index 5b4e6ef7f1..de99b02137 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_multi_create.h" +#include "../Media/xuiscene_multi_create.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_MultiGameLaunchMoreOptions.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp index c1dba28294..1ad036086b 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 9664640b36..e06434558d 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h @@ -2,7 +2,7 @@ using namespace std; #include #include -#include "..\Media\xuiscene_multi_gameinfo.h" +#include "../Media/xuiscene_multi_gameinfo.h" class FriendSessionInfo; diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp index fab4a4fd04..7b5c5e96da 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp @@ -2,30 +2,30 @@ #include #include #include -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\LocalPlayer.h" -#include "..\..\Minecraft.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\..\Minecraft.World\File.h" -#include "..\..\..\Minecraft.World\InputOutputStream.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../LocalPlayer.h" +#include "../../Minecraft.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/ArrayWithLength.h" +#include "../../../Minecraft.World/File.h" +#include "../../../Minecraft.World/InputOutputStream.h" #include "XUI_Ctrl_4JList.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" #include "XUI_MultiGameInfo.h" #include "XUI_MultiGameJoinLoad.h" #include "XUI_MultiGameCreate.h" -#include "..\..\MinecraftServer.h" -#include "..\..\Options.h" +#include "../../MinecraftServer.h" +#include "../../Options.h" -#include "..\GameRules\LevelGenerationOptions.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "../GameRules/LevelGenerationOptions.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../../Minecraft.World/LevelSettings.h" #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h index e91fbac237..b7d5ddc0fc 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "..\Media\xuiscene_multi_joinload.h" +#include "../Media/xuiscene_multi_joinload.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp index 63d28498f4..7103c88f0a 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "XUI_MultiGameCreate.h" #include "XUI_MultiGameLaunchMoreOptions.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\Minecraft.h" +#include "../../TexturePackRepository.h" +#include "../../Minecraft.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h index 9287624055..1e5ebd029e 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h @@ -1,6 +1,6 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_multi_launch_more_options.h" +#include "../Media/xuiscene_multi_launch_more_options.h" class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp index fa6da21e04..814e613560 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 8c4fbb36cf..b9685933c3 100644 --- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h +++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../media\xuiscene_NewUpdateMessage.h" +#include "../media/xuiscene_NewUpdateMessage.h" class CScene_NewUpdateMessage : public CXuiSceneImpl { diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp index 76b820d3ed..fc4ca4860b 100644 --- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_PartnernetPassword.h" -#include "..\XUI\XUI_Ctrl_4JList.h" +#include "../XUI/XUI_Ctrl_4JList.h" #ifdef _CONTENT_PACKAGE #ifndef _FINAL_BUILD diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h index b05206c0e4..ea5d305e78 100644 --- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h +++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_partnernetpassword.h" +#include "../Media/xuiscene_partnernetpassword.h" #include "XUI_Ctrl_4JEdit.h" #ifdef _CONTENT_PACKAGE diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp index 0879ba2788..494a7acdb7 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp @@ -4,23 +4,23 @@ #include "stdafx.h" #include -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\MultiPlayerLevel.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" -#include "..\..\..\Minecraft.World\compression.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h" +#include "../../MinecraftServer.h" +#include "../../MultiPlayerLevel.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../Options.h" +#include "../../../Minecraft.World/compression.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" #define IGNORE_KEYPRESS_TIMERID 0 #define IGNORE_KEYPRESS_TIME 100 diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h index 9c0e0015c1..e5dfe4d925 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Pause.h" -#include "..\UI\IUIScene_PauseMenu.h" +#include "../media/xuiscene_pause.h" +#include "../UI/IUIScene_PauseMenu.h" #include "XUI_CustomMessages.h" #define BUTTON_PAUSE_RESUMEGAME 0 diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp index c0650335c0..34276f045f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp @@ -4,19 +4,19 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_Reinstall.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.Client\StatsCounter.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\MinecraftServer.h" -#include "..\..\ProgressRenderer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\Minecraft.h" -#include "..\..\Options.h" +#include "../XUI/XUI_Reinstall.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.Client/StatsCounter.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/LocalPlayer.h" +#include "../../MinecraftServer.h" +#include "../../ProgressRenderer.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../../Options.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Common/XUI/XUI_Reinstall.h index 06b823cb98..6be2ae9eee 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.h +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Reinstall.h" +#include "../media/xuiscene_reinstall.h" #define BUTTON_REINSTALL_THEME 0 #define BUTTON_REINSTALL_GAMERPIC1 1 diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp index 7c81603374..5469cd0d65 100644 --- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_SaveMessage.h" +#include "../XUI/XUI_SaveMessage.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp index 2692c8f1c2..b2ecbca017 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 "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.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 "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 ca191db5b4..154b53680b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h @@ -1,7 +1,7 @@ #pragma once -#include "..\UI\IUIScene_AbstractContainerMenu.h" +#include "../UI/IUIScene_AbstractContainerMenu.h" #include "XUI_CustomMessages.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/TutorialEnum.h" class CXuiCtrlSlotList; class CXuiCtrlSlotItem; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp index 36a12757c2..695b7dbe61 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Anvil.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h index 2b16c8ab82..0259955070 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h @@ -1,9 +1,9 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_anvil.h" +#include "../Media/xuiscene_anvil.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_AnvilMenu.h" -#include "Common\XUI\XUI_Ctrl_4JEdit.h" +#include "../UI/IUIScene_AnvilMenu.h" +#include "Common/XUI/XUI_Ctrl_4JEdit.h" #define ANVIL_UPDATE_TIMER_ID (10) #define ANVIL_UPDATE_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp index c9a57f2145..9e3fbd1f7f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp @@ -1,24 +1,24 @@ #include "stdafx.h" #include -#include "..\..\MultiplayerLevel.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\StatsCounter.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\Minecraft.h" - -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\LevelData.h" +#include "../../MultiPlayerLevel.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../StatsCounter.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../Minecraft.h" + +#include "../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../Minecraft.World/LevelData.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\Dimension.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\GameMode.h" -#include "..\..\EnderDragonRenderer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\DLCTexturePack.h" +#include "../../../Minecraft.World/Dimension.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../GameMode.h" +#include "../../EnderDragonRenderer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../DLCTexturePack.h" #define PRESS_START_TIMER 0 diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h index 1a5b5d876c..7b89a6e163 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h @@ -3,8 +3,8 @@ #include "../media/xuiscene_base.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_CustomMessages.h" -#include "..\UI\UIEnums.h" -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "../UI/UIEnums.h" +#include "../../../Minecraft.World/SoundTypes.h" #define BUTTON_TOOLTIP_A 0 #define BUTTON_TOOLTIP_B 1 diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp index a55e8f777a..56ad4f2e43 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_BrewingStand.h" #include "XUI_Ctrl_BrewProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h index 370b6b1894..96b4146501 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_brewingstand.h" +#include "../Media/xuiscene_brewingstand.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_BrewingMenu.h" +#include "../UI/IUIScene_BrewingMenu.h" class CXuiCtrlSlotList; class CXuiCtrlBrewProgress; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp index 25f5cffcb9..cd0c0c850a 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Container.h" -#include "..\..\..\Minecraft.World\ContainerMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/Container.h" +#include "../../../Minecraft.World/ContainerMenu.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Container.h" #include "XUI_Ctrl_SlotItemListItem.h" #include "XUI_Ctrl_SlotItem.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" // The height of one row of slots //#define ROW_HEIGHT 42.0f - comes from the pointer height in the xui diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h index 475a6974df..a1bb4d19d6 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h @@ -1,8 +1,8 @@ #pragma once -#include "..\Media\xuiscene_container.h" +#include "../Media/xuiscene_container.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_ContainerMenu.h" +#include "../UI/IUIScene_ContainerMenu.h" //-------------------------------------------------------------------------------------- // Scene implementation class. diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp index f1c51ff0d3..5ef400edcd 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -4,16 +4,16 @@ #include "stdafx.h" #include -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_Ctrl_SlotList.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h index 0c6e22ff7d..77466402f4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h @@ -3,12 +3,12 @@ using namespace std; #include "../media/xuiscene_craftingpanel_2x2.h" #include "XUI_Ctrl_MinecraftSlot.h" -#include "..\..\..\Minecraft.World\Recipy.h" +#include "../../../Minecraft.World/Recipy.h" #include "XUI_Ctrl_CraftIngredientSlot.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../../Minecraft.World/Item.h" #include "XUI_CustomMessages.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\UI\IUIScene_CraftingMenu.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../UI/IUIScene_CraftingMenu.h" class CXuiCtrlSlotList; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp index dabe6d6d1b..4af26c61b9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" - -//#include "..\..\..\Minecraft.World\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/AbstractContainerMenu.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h" + +//#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Enchant.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h index 5cab04a40e..eb26041ddb 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h @@ -1,20 +1,20 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_enchant.h" +#include "../Media/xuiscene_enchant.h" -#include "..\..\BookModel.h" +#include "../../BookModel.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_EnchantmentBook.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_EnchantingMenu.h" +#include "../UI/IUIScene_EnchantingMenu.h" #include "XUI_CustomMessages.h" #include "XUI_Scene_Enchant.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\SimpleContainer.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/SimpleContainer.h" class Level; class CXuiCtrlEnchantmentButton; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp index c5e2d22c36..58e09dc0f4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\FurnaceMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/FurnaceMenu.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Furnace.h" #include "XUI_Ctrl_BurnProgress.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h index 22cbf262e4..8c965e8bff 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_furnace.h" +#include "../Media/xuiscene_furnace.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_FurnaceMenu.h" +#include "../UI/IUIScene_FurnaceMenu.h" class CXuiCtrlSlotList; class CXuiCtrlFireProgress; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp index e86ff67e00..5384edd283 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../../Minecraft.World/net.minecraft.world.effect.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Controls.h" #include "XUI_Scene_Inventory.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h index 2a7b305c14..6cccad7fa7 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h @@ -1,9 +1,9 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory.h" +#include "../Media/xuiscene_inventory.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\UI\IUIScene_InventoryMenu.h" +#include "../UI/IUIScene_InventoryMenu.h" #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp index 0fa3e78034..72a0a9bb48 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -1,26 +1,26 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\Container.h" -#include "..\..\..\Minecraft.World\Slot.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "../../../Minecraft.World/Container.h" +#include "../../../Minecraft.World/Slot.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../Minecraft.World/net.minecraft.world.item.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.player.h" -#include "..\..\..\Minecraft.World\net.minecraft.stats.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.stats.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Minecraft.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Ctrl_SlotItem.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_SlotItemListItem.h" -#include "..\..\Common\Potion_macros.h" +#include "../../Common/Potion_Macros.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneInventoryCreative::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h index bb3ff9767b..acccbe04d6 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h @@ -1,13 +1,13 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_inventory_creative.h" +#include "../Media/xuiscene_inventory_creative.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\AbstractContainerMenu.h" -#include "..\..\..\Minecraft.World\SimpleContainer.h" +#include "../../../Minecraft.World/AbstractContainerMenu.h" +#include "../../../Minecraft.World/SimpleContainer.h" -#include "..\UI\IUIScene_CreativeMenu.h" +#include "../UI/IUIScene_CreativeMenu.h" #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp index 3fbca979e7..2e8cc11218 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" -#include "..\..\Minecraft.h" +#include "../../../Minecraft.World/net.minecraft.world.inventory.h" +#include "../../../Minecraft.World/net.minecraft.world.item.trading.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trading.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\JavaMath.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/JavaMath.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneTrading::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h index 72194cbce4..5916f713c4 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trading.h" -#include "..\UI\IUIScene_TradingMenu.h" +#include "../Media/xuiscene_trading.h" +#include "../UI/IUIScene_TradingMenu.h" #define TRADING_UPDATE_TIMER_ID (10) #define TRADING_UPDATE_TIMER_TIME (50) diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp index 326e626392..15ac5276f2 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\DispenserTileEntity.h" -#include "..\..\..\Minecraft.World\TrapMenu.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/DispenserTileEntity.h" +#include "../../../Minecraft.World/TrapMenu.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trap.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Common\Tutorial\TutorialEnum.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Common/Tutorial/TutorialEnum.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneTrap::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h index 3008a7ca3c..233825afce 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h @@ -1,8 +1,8 @@ #pragma once using namespace std; -#include "..\Media\xuiscene_trap.h" +#include "../Media/xuiscene_trap.h" #include "XUI_Scene_AbstractContainer.h" -#include "..\UI\IUIScene_DispenserMenu.h" +#include "../UI/IUIScene_DispenserMenu.h" #include "XUI_CustomMessages.h" class Container; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp index c4c279a61c..c1bb393d17 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp @@ -2,13 +2,13 @@ // #include "stdafx.h" -#include "..\..\Minecraft.h" -#include "..\..\Common\Tutorial\TutorialMode.h" -#include "..\..\Font.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../Minecraft.h" +#include "../../Common/Tutorial/TutorialMode.h" +#include "../../Font.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../MultiPlayerLocalPlayer.h" #include "XUI_Scene_Win.h" BYTE CScene_Win::s_winUserIndex = 0; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h index 7a5e9da096..f04552cc56 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_Win.h" +#include "../media/xuiscene_win.h" #include "XUI_CustomMessages.h" class CScene_Win : public CXuiSceneImpl diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp index 3c37b8d85f..e2f0193594 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsAll.h" +#include "../XUI/XUI_SettingsAll.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h index 217f6c7365..dc90079cf3 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_all.h" +#include "../media/xuiscene_settings_All.h" #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 6f399d55e9..697e487a77 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\XUI\XUI_SettingsAudio.h" +#include "../XUI/XUI_SettingsAudio.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h index c77f579859..492829ba79 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_audio.h" +#include "../media/xuiscene_settings_Audio.h" #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 4fa335fb5b..8497708d38 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsControl.h" +#include "../XUI/XUI_SettingsControl.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h index 67e43699ce..69083573c5 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_control.h" +#include "../media/xuiscene_settings_Control.h" #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 d73baa0b3b..d58dafea46 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsGraphics.h" +#include "../XUI/XUI_SettingsGraphics.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h index 224dedd7c9..f34eb25b73 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h @@ -1,6 +1,6 @@ #pragma once -#include "../media/xuiscene_settings_graphics.h" +#include "../media/xuiscene_settings_Graphics.h" #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 683ee175ee..5e2ee4ea40 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsOptions.h" +#include "../XUI/XUI_SettingsOptions.h" int CScene_SettingsOptions::m_iDifficultySettingA[4]= { diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp index ab9cc53b47..52252fec2d 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" -#include "..\XUI\XUI_SettingsUI.h" +#include "../XUI/XUI_SettingsUI.h" //---------------------------------------------------------------------------------- // Performs initialization tasks - retrieves controls. diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp index 963d8f103b..2affab8d26 100644 --- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "..\..\..\MultiplayerLevel.h" -#include "..\..\..\Minecraft.World\SignTileEntity.h" -#include "..\..\..\Minecraft.World\Entity.h" -#include "..\..\..\Minecraft.World\Level.h" -#include "..\..\..\Minecraft.Client\LocalPlayer.h" -#include "..\..\..\Minecraft.Client\ClientConnection.h" -#include "..\..\..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../../../MultiPlayerLevel.h" +#include "../../../Minecraft.World/SignTileEntity.h" +#include "../../../Minecraft.World/Entity.h" +#include "../../../Minecraft.World/Level.h" +#include "../../../Minecraft.Client/LocalPlayer.h" +#include "../../../Minecraft.Client/ClientConnection.h" +#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "XUI_SignEntry.h" HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h index dbbb388ce0..e8e0f03d69 100644 --- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h +++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h @@ -2,8 +2,8 @@ #include "../media/xuiscene_skinselect.h" #include "XUI_CustomMessages.h" -#include "..\..\..\Minecraft.World\Definitions.h" -#include "..\..\Textures.h" +#include "../../../Minecraft.World/Definitions.h" +#include "../../Textures.h" class DLCPack; diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp index 2bd842638f..0615eeeadf 100644 --- a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp @@ -4,16 +4,16 @@ #include "stdafx.h" #include -#include "..\XUI\XUI_SocialPost.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\SharedConstants.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.Client\SurvivalMode.h" -#include "..\..\..\Minecraft.Client\CreateWorldScreen.h" -#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h" -#include "..\..\..\Minecraft.World\AABB.h" -#include "..\..\..\Minecraft.World\Vec3.h" -#include "..\..\LocalPlayer.h" +#include "../XUI/XUI_SocialPost.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/SharedConstants.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.Client/SurvivalMode.h" +#include "../../../Minecraft.Client/CreateWorldScreen.h" +#include "../../../Minecraft.World/ConsoleSaveFileIO.h" +#include "../../../Minecraft.World/AABB.h" +#include "../../../Minecraft.World/Vec3.h" +#include "../../LocalPlayer.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Common/XUI/XUI_SocialPost.h index 0dd37fa681..5d39e41ebb 100644 --- a/Minecraft.Client/Common/XUI/XUI_SocialPost.h +++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.h @@ -1,6 +1,6 @@ #pragma once -#include "../media\xuiscene_socialpost.h" +#include "../media/xuiscene_socialpost.h" #include "XUI_Ctrl_4JEdit.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp index bbf0005e92..8b91e3e376 100644 --- a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp @@ -2,18 +2,18 @@ #include #include "XUI_Teleport.h" -#include "..\..\ServerPlayer.h" -#include "..\..\PlayerConnection.h" -#include "..\..\PlayerList.h" -#include "..\..\MinecraftServer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\PlayerRenderer.h" +#include "../../ServerPlayer.h" +#include "../../PlayerConnection.h" +#include "../../PlayerList.h" +#include "../../MinecraftServer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../PlayerRenderer.h" #include "XUI_InGamePlayerOptions.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiPlayerLocalPlayer.h" -#include "..\..\ClientConnection.h" -#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" -#include "..\..\Xbox\Network\NetworkPlayerXbox.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../ClientConnection.h" +#include "../../../Minecraft.World/net.minecraft.network.packet.h" +#include "../../Xbox/Network/NetworkPlayerXbox.h" #include "TeleportCommand.h" //---------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp index 5eff65e8e0..72d2ad9c84 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_TextEntry.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLocalPlayer.h" CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]= diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Common/XUI/XUI_TextEntry.h index 70dcf30b25..884ec678ea 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.h +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Media\xuiscene_text_entry.h" +#include "../Media/xuiscene_text_entry.h" #include "XUI_Ctrl_4JEdit.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp index da224f7a35..80b9fba4c7 100644 --- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp @@ -6,7 +6,7 @@ #include "XUI_Ctrl_4JList.h" #include "XUI_Ctrl_4JIcon.h" #include "XUI_LoadSettings.h" -#include "..\..\ProgressRenderer.h" +#include "../../ProgressRenderer.h" #include "XUI_TransferToXboxOne.h" diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h index f08de59aea..dc80495cfc 100644 --- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h +++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h @@ -2,7 +2,7 @@ using namespace std; //#include -#include "..\Media\xuiscene_TransferToXboxOne.h" +#include "../Media/xuiscene_TransferToXboxOne.h" class CXuiCtrl4JList; diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp index 29893d0416..0be89d4cb9 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\Common\Tutorial\Tutorial.h" -#include "..\..\MultiplayerLocalPlayer.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" -#include "..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\Minecraft.World\Item.h" +#include "../../Common/Tutorial/Tutorial.h" +#include "../../MultiPlayerLocalPlayer.h" +#include "../../../Minecraft.World/StringHelpers.h" +#include "../../../Minecraft.World/Tile.h" +#include "../../../Minecraft.World/Item.h" #include "XUI_Ctrl_CraftIngredientSlot.h" #include "XUI_XZP_Icons.h" diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp index 9aee388820..a04ba7b81f 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 1480699163..dd5f52132a 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 "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\JavaMath.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 "Texture.h" #include "CompassTexture.h" diff --git a/Minecraft.Client/ConfirmScreen.cpp b/Minecraft.Client/ConfirmScreen.cpp index b67ea19d86..13a89a4e3d 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 18d50a5275..70494ed98b 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 17b454063f..4ec572aca6 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 487dbb1606..c047327d72 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 c28df18df2..76aa8db754 100644 --- a/Minecraft.Client/CraftingScreen.cpp +++ b/Minecraft.Client/CraftingScreen.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "CraftingScreen.h" #include "Textures.h" -#include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.inventory.h" +#include "MultiPlayerLocalPlayer.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 9c31747a87..5065428a60 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 48342ebc10..b78f534457 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 99d7d47352..3d1971aa33 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 bcec521509..047a5a14c4 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 6c71b027f8..b3ed2f05e6 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 fe64b91e44..ecac2fcbe8 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 3aee2b6508..2dd074e438 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 bd428ac0e4..cb1f8a02c3 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 f1304a9ef5..8fe1860bee 100644 --- a/Minecraft.Client/DLCTexturePack.cpp +++ b/Minecraft.Client/DLCTexturePack.cpp @@ -1,20 +1,20 @@ #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/UI/UI.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, nullptr, pack->getName(), fallback) diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp index 0e9cfb191d..574554f401 100644 --- a/Minecraft.Client/DeathScreen.cpp +++ b/Minecraft.Client/DeathScreen.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "DeathScreen.h" #include "Button.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "TitleScreen.h" void DeathScreen::init() diff --git a/Minecraft.Client/DefaultRenderer.cpp b/Minecraft.Client/DefaultRenderer.cpp index d4c1573772..cfe8891192 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 d2712404be..28c4303ce4 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, nullptr, L"Minecraft", nullptr) diff --git a/Minecraft.Client/DemoLevel.cpp b/Minecraft.Client/DemoLevel.cpp index 91d2339718..6d78556fdf 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 6464c32b73..4bb9c004b4 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 2a5664e470..93585a277a 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 78de818dea..d6114fd6f9 100644 --- a/Minecraft.Client/DerivedServerLevel.cpp +++ b/Minecraft.Client/DerivedServerLevel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DerivedServerLevel.h" -#include "..\Minecraft.World\SavedDataStorage.h" -#include "..\Minecraft.World\DerivedLevelData.h" +#include "../Minecraft.World/SavedDataStorage.h" +#include "../Minecraft.World/DerivedLevelData.h" DerivedServerLevel::DerivedServerLevel(MinecraftServer *server, shared_ptr levelStorage, const wstring& levelName, int dimension, LevelSettings *levelSettings, ServerLevel *wrapped) : ServerLevel(server, levelStorage, levelName, dimension, levelSettings) diff --git a/Minecraft.Client/DisconnectedScreen.cpp b/Minecraft.Client/DisconnectedScreen.cpp index 800df73f40..3413e7fed9 100644 --- a/Minecraft.Client/DisconnectedScreen.cpp +++ b/Minecraft.Client/DisconnectedScreen.cpp @@ -2,7 +2,7 @@ #include "DisconnectedScreen.h" #include "TitleScreen.h" #include "Button.h" -#include "..\Minecraft.World\net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.locale.h" DisconnectedScreen::DisconnectedScreen(const wstring& title, const wstring reason, void *reasonObjects, ...) { diff --git a/Minecraft.Client/DragonBreathParticle.cpp b/Minecraft.Client/DragonBreathParticle.cpp index 3fd90806b2..a372144506 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 f1f36743ad..c3a9de55d2 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 d7202b0781..0f73d1f5be 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 efef93b445..1c2ffbe290 100644 --- a/Minecraft.Client/Durango/Durango_App.cpp +++ b/Minecraft.Client/Durango/Durango_App.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "ServiceConfig\Events-XBLA.8-149E11AEEvents.h" -#include "..\..\Minecraft.World\DurangoStats.h" -#include "..\..\Minecraft.Client\Durango\XML\xmlFilesCallback.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "ServiceConfig/Events-XBLA.8-149E11AEEvents.h" +#include "../../Minecraft.World/DurangoStats.h" +#include "../../Minecraft.Client/Durango/XML/xmlFilesCallback.h" #include "Common/UI/UI.h" CConsoleMinecraftApp app; diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp index 350c4dbffe..a857112d86 100644 --- a/Minecraft.Client/Durango/Durango_Minecraft.cpp +++ b/Minecraft.Client/Durango/Durango_Minecraft.cpp @@ -4,36 +4,36 @@ #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 "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 "..\GameRenderer.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" + +#include "Leaderboards/GameProgress.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +#include "Leaderboards/DurangoLeaderboardManager.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "../GameRenderer.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" #include //using namespace Windows::Xbox::Input; diff --git a/Minecraft.Client/Durango/Durango_UIController.h b/Minecraft.Client/Durango/Durango_UIController.h index 28fe08adb2..4ad3410e10 100644 --- a/Minecraft.Client/Durango/Durango_UIController.h +++ b/Minecraft.Client/Durango/Durango_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Durango/Iggy/include/gdraw.h b/Minecraft.Client/Durango/Iggy/include/gdraw.h index 7cc4ddd0e1..f251273110 100644 --- a/Minecraft.Client/Durango/Iggy/include/gdraw.h +++ b/Minecraft.Client/Durango/Iggy/include/gdraw.h @@ -6,7 +6,7 @@ #ifndef __RAD_INCLUDE_GDRAW_H__ #define __RAD_INCLUDE_GDRAW_H__ -#include "rrcore.h" +#include "rrCore.h" #define IDOC diff --git a/Minecraft.Client/Durango/Iggy/include/iggy.h b/Minecraft.Client/Durango/Iggy/include/iggy.h index 56638a3211..d38ccae67a 100644 --- a/Minecraft.Client/Durango/Iggy/include/iggy.h +++ b/Minecraft.Client/Durango/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp index cc19b73820..9dca54f8c9 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp +++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "DurangoLeaderboardManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" namespace WFC = Windows::Foundation::Collections; namespace CC = concurrency; diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h index 233d8b7118..2425b949ec 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h +++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" namespace P = Platform; namespace PC = Platform::Collections; diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp index 5ac711417e..072591624f 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\Minecraft.World\Tile.h" -#include "..\Minecraft.World\Item.h" +#include "../Minecraft.World/Tile.h" +#include "../Minecraft.World/Item.h" -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" -#include "..\Minecraft.World\EntityIO.h" +#include "../Minecraft.World/EntityIO.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" -#include "Common\Console_Awards_enum.h" +#include "Common/Console_Awards_enum.h" #include "DurangoStatsDebugger.h" diff --git a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp index f97f9bb33f..72822830c8 100644 --- a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp +++ b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include "Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h" -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #include "GameProgress.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp index 9e9e78c0c3..30ab2785df 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Durango/Network/DQRNetworkManager.h index b74e079c14..0867f3af61 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager.h +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.h @@ -1,7 +1,7 @@ #pragma once #include "DQRNetworkPlayer.h" -#include "..\Minecraft.World\C4JThread.h" +#include "../Minecraft.World/C4JThread.h" #include class IDQRNetworkManagerListener; diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp index 0822a93c6c..f664c3d32b 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp index cf66ea6f60..ea353246a8 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp index eed3e8511f..c637be7c92 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp index ae7094fb37..c437397117 100644 --- a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp +++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp @@ -5,11 +5,11 @@ #include #include #include -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include "base64.h" #ifdef _DURANGO -#include "..\Minecraft.World\DurangoStats.h" +#include "../Minecraft.World/DurangoStats.h" #endif #include "ChatIntegrationLayer.h" diff --git a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h index c95e8aefcd..2fef6dfa6b 100644 --- a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h +++ b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" #include "DQRNetworkPlayer.h" // This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way. diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp index 5e3a08245d..9e8d1fc656 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 5626b01204..451c53b381 100644 --- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h +++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h @@ -1,10 +1,10 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" #include "DQRNetworkManager.h" #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp index 31ab9d64ba..c5b64bd4b6 100644 --- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp +++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" -#include "..\Minecraft.World\Player.h" -#include "..\Minecraft.World\Level.h" -#include "..\Minecraft.World\LevelData.h" -#include "..\Minecraft.World\LevelSettings.h" +#include "../Minecraft.World/Player.h" +#include "../Minecraft.World/Level.h" +#include "../Minecraft.World/LevelData.h" +#include "../Minecraft.World/LevelSettings.h" -#include "Common\Network\GameNetworkManager.h" +#include "Common/Network/GameNetworkManager.h" #include "MultiPlayerLocalPlayer.h" -#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h" +#include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h" #include "DurangoTelemetry.h" diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h index 4f0866963c..0bab9193a8 100644 --- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h +++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h @@ -1,8 +1,8 @@ #pragma once -#include "..\..\..\Minecraft.World\DurangoStats.h" +#include "../../../Minecraft.World/DurangoStats.h" -#include "..\..\Common\Telemetry\TelemetryManager.h" +#include "../../Common/Telemetry/TelemetryManager.h" class CDurangoTelemetryManager : public CTelemetryManager { diff --git a/Minecraft.Client/Durango/XML/ATGXmlParser.cpp b/Minecraft.Client/Durango/XML/ATGXmlParser.cpp index 89ca771418..ecacd62566 100644 --- a/Minecraft.Client/Durango/XML/ATGXmlParser.cpp +++ b/Minecraft.Client/Durango/XML/ATGXmlParser.cpp @@ -15,7 +15,7 @@ //------------------------------------------------------------------------------------- #include "stdafx.h" -#include "AtgXmlParser.h" +#include "ATGXmlParser.h" namespace ATG { diff --git a/Minecraft.Client/Durango/XboxGameMode.cpp b/Minecraft.Client/Durango/XboxGameMode.cpp index 1b55fdd9f3..709a6589d9 100644 --- a/Minecraft.Client/Durango/XboxGameMode.cpp +++ b/Minecraft.Client/Durango/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XboxGameMode.h" -#include "..\Common\Tutorial\Tutorial.h" +#include "../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Durango/XboxGameMode.h b/Minecraft.Client/Durango/XboxGameMode.h index 347cdf3082..a9f0d6cd60 100644 --- a/Minecraft.Client/Durango/XboxGameMode.h +++ b/Minecraft.Client/Durango/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Common\Tutorial\TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EchantmentTableParticle.cpp index 95bd3dbc7a..1261763c6e 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 54ee62ef31..e4d71cb965 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 e188529b92..c8eb4e09f7 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 71804a5a15..f9f4b773e8 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 2dde12467b..7ab014776f 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 8b5b248c29..ed50748e3d 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 ee1a9c3568..1a5a8904c3 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 fc2b8952d5..3665f1fafe 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 01972e5685..7a39f0e3ea 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" @@ -44,7 +44,7 @@ #include "ExperienceOrbRenderer.h" #include "SilverfishRenderer.h" #include "MushroomCowRenderer.h" -#include "SnowmanRenderer.h" +#include "SnowManRenderer.h" #include "LavaSlimeRenderer.h" #include "VillagerRenderer.h" #include "EnderDragonRenderer.h" diff --git a/Minecraft.Client/EntityRenderDispatcher.h b/Minecraft.Client/EntityRenderDispatcher.h index 07ab7c4d00..10740d1b1d 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 fa41dfa606..b7abf91f38 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 6a84e3a3ad..d54801d3e7 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 087227e775..24e4815ba4 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 6ff9fe0f76..21e742996f 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 691efadecb..202c5b1b2d 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 e9d4687bc7..2596908465 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 0147896ca9..a699e95326 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -4,35 +4,35 @@ #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\Windows64_Xuid.h" +#include "Windows64/Social/SocialManager.h" +#include "Windows64/Sentient/DynamicConfigurations.h" +#include "Windows64/Network/WinsockNetLayer.h" +#include "Windows64/Windows64_Xuid.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 132f033a53..9fd9572ea2 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 24e59ff481..fb997b8db7 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 c17283ac41..d43717ac9f 100644 --- a/Minecraft.Client/FireworksParticles.cpp +++ b/Minecraft.Client/FireworksParticles.cpp @@ -1,5 +1,5 @@ #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" diff --git a/Minecraft.Client/FireworksParticles.h b/Minecraft.Client/FireworksParticles.h index ac06be0735..1e5ee866cf 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 d587ddb87e..ca6733141b 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 a242f71477..6a7845e618 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 1040eaa082..f610c58558 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 b2bfc98932..30d71fb5ad 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 c40f7c6fa9..74faa376be 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 7285f145c5..1801d983d3 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 20ec710404..915a8dbc6f 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 a11d6c07b4..7d791d2846 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 0b99a23117..c65e4b1665 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -13,39 +13,39 @@ #include "CreativeMode.h" #include "Lighting.h" #include "Options.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #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 c379106e0d..ed032695c2 100644 --- a/Minecraft.Client/GameRenderer.h +++ b/Minecraft.Client/GameRenderer.h @@ -14,8 +14,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 0a482e6286..5c665b6cf2 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 cecb4eaf5a..6148995c7a 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 5e3a954fe3..474a281106 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -3,31 +3,31 @@ #include "ItemRenderer.h" #include "GameRenderer.h" #include "Options.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Textures.h" #include "TextureAtlas.h" #include "GameMode.h" #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" #include ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR); diff --git a/Minecraft.Client/GuiParticle.cpp b/Minecraft.Client/GuiParticle.cpp index 1e6bcc7080..da1e33a38a 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 5bbf766160..ab2d89204b 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 276b1d1603..20d8b8d1d7 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 bb8c8f223d..486e2b83fe 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 284b084d43..774c7ef9bc 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 c6c6b9f4f4..6cbb8d729d 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 fca3d02281..6194afc714 100644 --- a/Minecraft.Client/InBedChatScreen.cpp +++ b/Minecraft.Client/InBedChatScreen.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "InBedChatScreen.h" #include "Button.h" -#include "MultiplayerLocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "MultiPlayerLocalPlayer.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 c9b04e78f1..3b3b5eda8e 100644 --- a/Minecraft.Client/Input.cpp +++ b/Minecraft.Client/Input.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" #include "Minecraft.h" #include "GameMode.h" -#include "..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.storage.h" #include "Input.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.Client/LocalPlayer.h" #include "Options.h" #ifdef _WINDOWS64 -#include "Windows64\KeyboardMouseInput.h" +#include "Windows64/KeyboardMouseInput.h" #endif Input::Input() diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp index b6728533c9..17df86c146 100644 --- a/Minecraft.Client/InventoryScreen.cpp +++ b/Minecraft.Client/InventoryScreen.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "InventoryScreen.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Font.h" #include "EntityRenderDispatcher.h" #include "Lighting.h" @@ -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 55354aac8d..821ed5e8df 100644 --- a/Minecraft.Client/ItemFrameRenderer.cpp +++ b/Minecraft.Client/ItemFrameRenderer.cpp @@ -1,21 +1,21 @@ #include "stdafx.h" #include "ItemRenderer.h" -#include "tileRenderer.h" -#include "entityRenderDispatcher.h" +#include "TileRenderer.h" +#include "EntityRenderDispatcher.h" //#include "ItemFrame" #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 13d4fc20d7..9c999ed424 100644 --- a/Minecraft.Client/ItemInHandRenderer.cpp +++ b/Minecraft.Client/ItemInHandRenderer.cpp @@ -8,15 +8,15 @@ #include "PlayerRenderer.h" #include "EntityRenderDispatcher.h" #include "Lighting.h" -#include "MultiplayerLocalPlayer.h" +#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 a7a3a1bf6f..ead8016f5b 100644 --- a/Minecraft.Client/ItemRenderer.cpp +++ b/Minecraft.Client/ItemRenderer.cpp @@ -1,14 +1,14 @@ #include "stdafx.h" #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 "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 "Options.h" #include "TextureAtlas.h" diff --git a/Minecraft.Client/ItemSpriteRenderer.cpp b/Minecraft.Client/ItemSpriteRenderer.cpp index afe8023ee4..728b92357d 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 f8e13fbbfc..d5eec45f75 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 0ff9b1b064..c43fa4b4ea 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 0f9d6a4359..762f4cb0a2 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 3d5858eae1..161f752e3b 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 cf2937f4fb..0a18d936cd 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -41,33 +41,33 @@ #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 "MultiplayerLocalPlayer.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" #include "Common/UI/UIScene_SettingsGraphicsMenu.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 37e0b813d8..5c7b5e5004 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 ef9feaa144..24fecbb929 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 46b628dfb0..9d7d71e74e 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 b3478ba92c..034498cf58 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 2f77e1b54a..8a9cbcdd15 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 7988416ad9..852b830814 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 extern ConsoleUIController ui; @@ -1233,7 +1233,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 2198c489e5..de832c8530 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 9d0b29de93..c3a7b60a8c 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 0ecb7f583a..b8475ff2b9 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/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 1ba432fd04..6299e70ee3 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -36,45 +36,45 @@ #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 "Windows64\Windows64_Xuid.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 "Windows64/Windows64_Xuid.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 2c5203d827..9425cf9f83 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 27ee68b65f..620308a3b0 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -15,52 +15,52 @@ #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\net.minecraft.world.entity.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.damagesource.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/net.minecraft.world.entity.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.damagesource.h" #ifdef _WINDOWS64 -#include "Windows64\Network\WinsockNetLayer.h" +#include "Windows64/Network/WinsockNetLayer.h" #endif #include #ifdef SPLIT_SAVES -#include "..\Minecraft.World\ConsoleSaveFileSplit.h" +#include "../Minecraft.World/ConsoleSaveFileSplit.h" #endif -#include "..\Minecraft.World\ConsoleSaveFileOriginal.h" -#include "..\Minecraft.World\Socket.h" -#include "..\Minecraft.World\net.minecraft.world.entity.h" +#include "../Minecraft.World/ConsoleSaveFileOriginal.h" +#include "../Minecraft.World/Socket.h" +#include "../Minecraft.World/net.minecraft.world.entity.h" #include "ProgressRenderer.h" #include "ServerPlayer.h" #include "GameRenderer.h" -#include "..\Minecraft.World\ThreadName.h" -#include "..\Minecraft.World\IntCache.h" -#include "..\Minecraft.World\CompressedTileStorage.h" -#include "..\Minecraft.World\SparseLightStorage.h" -#include "..\Minecraft.World\SparseDataStorage.h" -#include "..\Minecraft.World\compression.h" +#include "../Minecraft.World/ThreadName.h" +#include "../Minecraft.World/IntCache.h" +#include "../Minecraft.World/CompressedTileStorage.h" +#include "../Minecraft.World/SparseLightStorage.h" +#include "../Minecraft.World/SparseDataStorage.h" +#include "../Minecraft.World/compression.h" #ifdef _XBOX -#include "Common\XUI\XUI_DebugSetCamera.h" +#include "Common/XUI/XUI_DebugSetCamera.h" #endif -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include "ServerCommandDispatcher.h" -#include "..\Minecraft.World\BiomeSource.h" +#include "../Minecraft.World/BiomeSource.h" #include "PlayerChunkMap.h" -#include "Common\Telemetry\TelemetryManager.h" +#include "Common/Telemetry/TelemetryManager.h" #include "PlayerConnection.h" #ifdef _XBOX_ONE -#include "Durango\Network\NetworkPlayerDurango.h" +#include "Durango/Network/NetworkPlayerDurango.h" #endif #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/Minecraft.Client/MinecraftServer.h b/Minecraft.Client/MinecraftServer.h index 1ed5db9d7c..259b3e3995 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 4f6ccd6b61..b62a8a673a 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 758d8a8adc..84e439e646 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 5399807025..2c411518ec 100644 --- a/Minecraft.Client/MobRenderer.cpp +++ b/Minecraft.Client/MobRenderer.cpp @@ -2,12 +2,12 @@ #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 "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.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 1a083fabd6..55246b145b 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 6a797a2581..c4b81da413 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 "../Minecraft.Client/SkinBox.h" class Mob; class ModelPart; class TexOffs; diff --git a/Minecraft.Client/ModelHorse.cpp b/Minecraft.Client/ModelHorse.cpp index 81ff7ea612..99b07e1e04 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 c6458e71d3..da78e54379 100644 --- a/Minecraft.Client/ModelPart.h +++ b/Minecraft.Client/ModelPart.h @@ -1,9 +1,9 @@ #pragma once -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/ArrayWithLength.h" #include "Vertex.h" #include "Polygon.h" #include "Model.h" -#include "..\Minecraft.Client\SkinBox.h" +#include "../Minecraft.Client/SkinBox.h" class Cube; diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp index 62361ce367..3b6d0155ee 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 c180f8584c..203f3124e0 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 66fc22a6ba..96071d283f 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 4aede44588..49fa51f7c4 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 b7f1640a3a..2f4ec0fc66 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 aef7898f25..bf1135d56b 100644 --- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp +++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp @@ -1,17 +1,17 @@ #include "stdafx.h" -//#include "..\Minecraft.World\JavaMath.h" -#include "MultiplayerLocalPlayer.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 e660a96a20..14b0bf4290 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 277e05d8a5..d5b518e56e 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 f498d4ea33..24cb359d1d 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 9dcdd4ce53..dd79733b9a 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 6d2a31cdb0..162104fc79 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 8e84559791..34cef83bbc 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 3672714b38..b155f5f0a9 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 0a93fa9219..2b209519ba 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 60886597ec..b22b92ad3c 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 29cd83ac91..3ef114b312 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 5076400666..3994719edd 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/Iggy/include/gdraw.h b/Minecraft.Client/Orbis/Iggy/include/gdraw.h index 7cc4ddd0e1..f251273110 100644 --- a/Minecraft.Client/Orbis/Iggy/include/gdraw.h +++ b/Minecraft.Client/Orbis/Iggy/include/gdraw.h @@ -6,7 +6,7 @@ #ifndef __RAD_INCLUDE_GDRAW_H__ #define __RAD_INCLUDE_GDRAW_H__ -#include "rrcore.h" +#include "rrCore.h" #define IDOC diff --git a/Minecraft.Client/Orbis/Iggy/include/iggy.h b/Minecraft.Client/Orbis/Iggy/include/iggy.h index 56638a3211..d38ccae67a 100644 --- a/Minecraft.Client/Orbis/Iggy/include/iggy.h +++ b/Minecraft.Client/Orbis/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp index b2492381b3..feede12a1f 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp @@ -4,19 +4,19 @@ #include "base64.h" -#include "..\Orbis_App.h" -#include "..\..\Common\Consoles_App.h" +#include "../Orbis_App.h" +#include "../../Common/Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include #include //#include -#include "Orbis\OrbisExtras\ShutdownManager.h" +#include "Orbis/OrbisExtras/ShutdownManager.h" LeaderboardManager *LeaderboardManager::m_instance = new OrbisLeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h index c2243a93e8..430d3c06a5 100644 --- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h +++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" class OrbisLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp index 5db367d4cd..4fd38ab7a6 100644 --- a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp +++ b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Orbis_NPToolkit.h" -#include "Orbis\ps4__np_conf.h" +#include "Orbis/ps4__np_conf.h" #include "Orbis/Network/SonyCommerce_Orbis.h" // #define NP_TITLE_ID "CUSA00265_00" diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp index 7c3e1a663e..1b62f1a9c3 100644 --- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -12,9 +12,9 @@ #include "../ps4__np_conf.h" #include "Orbis_NPToolkit.h" #include "SonyVoiceChat_Orbis.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" -// #include "..\PS3Extras\PS3Strings.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" +// #include "../PS3Extras/PS3Strings.h" int (* SQRNetworkManager_Orbis::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = nullptr; diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h index 0217e4c554..83be79e3a8 100644 --- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h @@ -8,7 +8,7 @@ #include // #include "SonyVoiceChat_Orbis.h" -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp index 67ae639bc0..bf99245be6 100644 --- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp +++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce_Orbis.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h index dc7671f469..6f01813d93 100644 --- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" class OrbisNPToolkit; class SonyCommerce_Orbis : public SonyCommerce diff --git a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h index 0b36c41d08..a04411b3b9 100644 --- a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h +++ b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Orbis : public SonyRemoteStorage { diff --git a/Minecraft.Client/Orbis/Orbis_App.cpp b/Minecraft.Client/Orbis/Orbis_App.cpp index 061f0904ee..fbe4b92958 100644 --- a/Minecraft.Client/Orbis/Orbis_App.cpp +++ b/Minecraft.Client/Orbis/Orbis_App.cpp @@ -1,22 +1,22 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\Orbis\Network\SonyCommerce_Orbis.h" -#include "..\..\Minecraft.World\StringHelpers.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../Orbis/Network/SonyCommerce_Orbis.h" +#include "../../Minecraft.World/StringHelpers.h" #include "Network/Orbis_NPToolkit.h" -#include "Orbis\Network\SonyRemoteStorage_Orbis.h" +#include "Orbis/Network/SonyRemoteStorage_Orbis.h" #include -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #include #include diff --git a/Minecraft.Client/Orbis/Orbis_App.h b/Minecraft.Client/Orbis/Orbis_App.h index 06b6e83a8a..0e5502de08 100644 --- a/Minecraft.Client/Orbis/Orbis_App.h +++ b/Minecraft.Client/Orbis/Orbis_App.h @@ -3,8 +3,8 @@ class C4JStringTable; #include -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp index 7531b25db6..71c5b47133 100644 --- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp @@ -6,42 +6,42 @@ #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 "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" + +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\GameRenderer.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 "../GameRenderer.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +#include "Leaderboards/OrbisLeaderboardManager.h" #include "Network/Orbis_NPToolkit.h" -#include "Orbis\Network\SonyVoiceChat_Orbis.h" +#include "Orbis/Network/SonyVoiceChat_Orbis.h" #define THEME_NAME "584111F70AAAAAAA" #define THEME_FILESIZE 2797568 diff --git a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp index 114e6ae8e9..0dcd81c82e 100644 --- a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp +++ b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "Orbis_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" #include diff --git a/Minecraft.Client/Orbis/Orbis_UIController.cpp b/Minecraft.Client/Orbis/Orbis_UIController.cpp index a6ed530e4c..4cec3467f6 100644 --- a/Minecraft.Client/Orbis/Orbis_UIController.cpp +++ b/Minecraft.Client/Orbis/Orbis_UIController.cpp @@ -2,8 +2,8 @@ #include "Orbis_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Orbis/Orbis_UIController.h b/Minecraft.Client/Orbis/Orbis_UIController.h index fcd901e221..940769e1b7 100644 --- a/Minecraft.Client/Orbis/Orbis_UIController.h +++ b/Minecraft.Client/Orbis/Orbis_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/Orbis/user_malloc.cpp b/Minecraft.Client/Orbis/user_malloc.cpp index b8eac08fa8..79945d3997 100644 --- a/Minecraft.Client/Orbis/user_malloc.cpp +++ b/Minecraft.Client/Orbis/user_malloc.cpp @@ -9,7 +9,7 @@ extern "C" #include #include #include -#include "..\Minecraft.World\System.h" +#include "../Minecraft.World/System.h" static size_t s_heapLength; static size_t s_memLength; diff --git a/Minecraft.Client/OzelotModel.cpp b/Minecraft.Client/OzelotModel.cpp index 9c22cc4b7a..63ab51f64b 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 d56b35f9bb..455757674d 100644 --- a/Minecraft.Client/OzelotRenderer.cpp +++ b/Minecraft.Client/OzelotRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "../Minecraft.World/net.minecraft.world.entity.animal.h" #include "OzelotRenderer.h" OzelotRenderer::OzelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow) diff --git a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp index 1c7edba306..fe96c72740 100644 --- a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp +++ b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp @@ -1,13 +1,13 @@ -#include "..\stdafx.h" +#include "../stdafx.h" #include #include #include #include #include #include -#include "..\..\Common\Audio\SoundEngine.h" -#include "..\..\Common\Consoles_App.h" -#include "..\..\PS3\Miles\include\mss.h" +#include "../../Common/Audio/SoundEngine.h" +#include "../../Common/Consoles_App.h" +#include "../../PS3/Miles/include/mss.h" // This file has the platform specific functions required for PS3 audio diff --git a/Minecraft.Client/PS3/Iggy/include/gdraw.h b/Minecraft.Client/PS3/Iggy/include/gdraw.h index 7cc4ddd0e1..f251273110 100644 --- a/Minecraft.Client/PS3/Iggy/include/gdraw.h +++ b/Minecraft.Client/PS3/Iggy/include/gdraw.h @@ -6,7 +6,7 @@ #ifndef __RAD_INCLUDE_GDRAW_H__ #define __RAD_INCLUDE_GDRAW_H__ -#include "rrcore.h" +#include "rrCore.h" #define IDOC diff --git a/Minecraft.Client/PS3/Iggy/include/iggy.h b/Minecraft.Client/PS3/Iggy/include/iggy.h index 56638a3211..d38ccae67a 100644 --- a/Minecraft.Client/PS3/Iggy/include/iggy.h +++ b/Minecraft.Client/PS3/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp index 2740618666..f35256fa9c 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp @@ -4,19 +4,19 @@ #include "base64.h" -#include "..\PS3_App.h" -#include "..\..\Common\Consoles_App.h" +#include "../PS3_App.h" +#include "../../Common/Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#include "Common/Network/Sony/SQRNetworkManager.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #include #include #include -#include "PS3\PS3Extras\ShutdownManager.h" +#include "PS3/PS3Extras/ShutdownManager.h" #ifdef __PS3__ LeaderboardManager *LeaderboardManager::m_instance = new PS3LeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h index 7a85896da1..dbe6bd7211 100644 --- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h +++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h @@ -1,9 +1,9 @@ #pragma once -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\..\Minecraft.World\x64headers\extraX64.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../../Minecraft.World/x64headers/extraX64.h" -#include "PS3\Passphrase\ps3__np_conf.h" +#include "PS3/Passphrase/ps3__np_conf.h" using namespace std; diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp index a1a57443d6..931e2f9ec7 100644 --- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp @@ -15,9 +15,9 @@ #include "SonyVoiceChat.h" #include "Common/Network/Sony/SonyHttp.h" #endif -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\PS3Extras\PS3Strings.h" -#include "PS3\Network\SonyRemoteStorage_PS3.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../PS3Extras/PS3Strings.h" +#include "PS3/Network/SonyRemoteStorage_PS3.h" int (* SQRNetworkManager_PS3::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = nullptr; void * SQRNetworkManager_PS3::s_SignInCompleteParam = nullptr; diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h index 4953b08fad..371bf35a54 100644 --- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h +++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h @@ -9,7 +9,7 @@ #endif #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp index 7bd101105a..d4f4866385 100644 --- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp +++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "SonyCommerce_PS3.h" -#include "..\PS3Extras\ShutdownManager.h" +#include "../PS3Extras/ShutdownManager.h" #include diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h index 05b48cf85d..a769039d1e 100644 --- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h +++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h @@ -6,7 +6,7 @@ #include #include #include -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" #define SCE_TOOLKIT_NP_SKU_PRICE_LEN (SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \ + SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \ diff --git a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h index ffbc57b0bd..61518006d9 100644 --- a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h +++ b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h" +#include "Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h" class SonyRemoteStorage_PS3 : public SonyRemoteStorage { diff --git a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp index bce76078f7..8f4e756d73 100644 --- a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp +++ b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp @@ -7,7 +7,7 @@ #include #include "C4JSpursJob.h" #include "C4JThread_SPU.h" -// #include "PS3\SPU_Tasks\SPUMemTools\SPUMemTools.h" +// #include "PS3/SPU_Tasks/SPUMemTools/SPUMemTools.h" using namespace cell::Spurs::JobQueue; diff --git a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp index 56dd987832..8f390a11a2 100644 --- a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp +++ b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp @@ -3,9 +3,9 @@ #include "stdafx.h" #include "C4JThread_SPU.h" -#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" -#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" -#include "PS3\SPU_Tasks\LevelRenderChunks\LevelRenderChunks.h" +#include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h" +#include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h" +#include "PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks.h" #define SPURS_MAX_SPU 6 #define SPURS_PPU_THREAD_PRIORITY 2 diff --git a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h index 3576d7ed00..f81fdeefc3 100644 --- a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h +++ b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h @@ -157,7 +157,7 @@ #endif #if defined(_MSC_EXTENSIONS) && !defined( MIDL_PASS ) && !defined(__midl) && !defined(RC_INVOKED) -#include "codeanalysis\sourceannotations.h" +#include "codeanalysis/sourceannotations.h" #endif //============================================================================ diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h index fe003c4a3b..2de05a54d8 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 a04e45d9f5..aab42a0623 100644 --- a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp +++ b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ShutdownManager.h" -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\MinecraftServer.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PS3/PS3_App.cpp b/Minecraft.Client/PS3/PS3_App.cpp index 762866fb2b..a30ba7827d 100644 --- a/Minecraft.Client/PS3/PS3_App.cpp +++ b/Minecraft.Client/PS3/PS3_App.cpp @@ -1,19 +1,19 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\PS3\Network\SonyCommerce_PS3.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "PS3Extras\ShutdownManager.h" -#include "PS3\Network\SonyRemoteStorage_PS3.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../PS3/Network/SonyCommerce_PS3.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "PS3Extras/ShutdownManager.h" +#include "PS3/Network/SonyRemoteStorage_PS3.h" diff --git a/Minecraft.Client/PS3/PS3_App.h b/Minecraft.Client/PS3/PS3_App.h index f9293b6fde..c5ff53c195 100644 --- a/Minecraft.Client/PS3/PS3_App.h +++ b/Minecraft.Client/PS3/PS3_App.h @@ -1,7 +1,7 @@ #pragma once -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/PS3/PS3_Minecraft.cpp b/Minecraft.Client/PS3/PS3_Minecraft.cpp index fb987a9eb0..f006910a33 100644 --- a/Minecraft.Client/PS3/PS3_Minecraft.cpp +++ b/Minecraft.Client/PS3/PS3_Minecraft.cpp @@ -17,9 +17,9 @@ SYS_PROCESS_PARAM(1001, 0x10000); // thread priority, and stack size #include //#include -#include "Leaderboards\PS3LeaderboardManager.h" -#include "PS3\PS3Extras\PS3Strings.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "Leaderboards/PS3LeaderboardManager.h" +#include "PS3/PS3Extras/PS3Strings.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include #include @@ -54,49 +54,49 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign --wrap _malloc_init #if HEAPINSPECTOR_PS3 -#include "HeapInspector\Server\HeapInspectorServer.h" -#include "HeapInspector\Server\PS3\HeapHooks.hpp" +#include "HeapInspector/Server/HeapInspectorServer.h" +#include "HeapInspector/Server/PS3/HeapHooks.hpp" #endif #include "PS3_App.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" - -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" + +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\Common\Console_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\GameRenderer.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../Common/Console_Awards_enum.h" +#include "../../Minecraft.Client/Options.h" +#include "../GameRenderer.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -#include "PS3\PS3Extras\EdgeZLib.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +#include "PS3/PS3Extras/EdgeZLib.h" #include "C4JThread_SPU.h" -#include "Common\Network\Sony\SQRNetworkManager.h" -#include "Common\UI\IUIScene_PauseMenu.h" +#include "Common/Network/Sony/SQRNetworkManager.h" +#include "Common/UI/IUIScene_PauseMenu.h" #include diff --git a/Minecraft.Client/PS3/PS3_PlayerUID.cpp b/Minecraft.Client/PS3/PS3_PlayerUID.cpp index 8256ac21b3..9a2a8a0a78 100644 --- a/Minecraft.Client/PS3/PS3_PlayerUID.cpp +++ b/Minecraft.Client/PS3/PS3_PlayerUID.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "PS3_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" std::size_t PlayerUID::Hash::operator()(const PlayerUID& k) const { diff --git a/Minecraft.Client/PS3/PS3_UIController.cpp b/Minecraft.Client/PS3/PS3_UIController.cpp index 7b634e3b07..9d2f6a93bd 100644 --- a/Minecraft.Client/PS3/PS3_UIController.cpp +++ b/Minecraft.Client/PS3/PS3_UIController.cpp @@ -4,8 +4,8 @@ #include // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PS3/PS3_UIController.h b/Minecraft.Client/PS3/PS3_UIController.h index 0077b8cf4b..f8308a4400 100644 --- a/Minecraft.Client/PS3/PS3_UIController.h +++ b/Minecraft.Client/PS3/PS3_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp index ac71c572a0..da45996a56 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #ifdef __PS3__ #ifndef SN_TARGET_PS3_SPU -// #include "..\..\..\stdafx.h" +// #include "../../../stdafx.h" #endif #endif @@ -10,24 +10,24 @@ #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\Level.h" -#include "..\..\..\..\Minecraft.World\Dimension.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/Level.h" +#include "../../../../Minecraft.World/Dimension.h" // -// #include "..\..\..\Chunk.h" -// #include "..\..\..\TileRenderer.h" -// #include "..\..\..\TileEntityRenderDispatcher.h" -// #include "..\..\..\LevelRenderer.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" -#include "..\..\..\..\Minecraft.World\Icon.h" -#include "..\..\..\..\Minecraft.World\BiomeSource.h" +// #include "../../../Chunk.h" +// #include "../../../TileRenderer.h" +// #include "../../../TileEntityRenderDispatcher.h" +// #include "../../../LevelRenderer.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.chunk.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.tile.entity.h" +#include "../../../../Minecraft.World/Icon.h" +#include "../../../../Minecraft.World/BiomeSource.h" #else -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif //SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h index c733a9285e..8262e41c3b 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h @@ -1,13 +1,13 @@ #pragma once #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" -#include "..\..\..\Tesselator.h" -#include "..\..\..\..\Minecraft.World\LightLayer.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" +#include "../../../Tesselator.h" +#include "../../../../Minecraft.World/LightLayer.h" #endif // SN_TARGET_PS3_SPU -#include "..\..\..\..\Minecraft.World\LightLayer.h" +#include "../../../../Minecraft.World/LightLayer.h" #include "Tile_SPU.h" #include "Tesselator_SPU.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp index fa075e716b..57b39c4d65 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp @@ -4,7 +4,7 @@ #include "ChunkRebuildData.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif // const wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava"; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp index efcd44f01d..8dc2d4738d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp @@ -9,16 +9,16 @@ #include #include #include -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif // SN_TARGET_PS3_SPU #include "Tesselator_SPU.h" static const bool sc_verbose = false; -// #include "..\Minecraft.World\BasicTypeContainers.h" -// #include "..\Minecraft.World\FloatBuffer.h" -// #include "..\Minecraft.World\IntBuffer.h" -// #include "..\Minecraft.World\ByteBuffer.h" +// #include "../Minecraft.World/BasicTypeContainers.h" +// #include "../Minecraft.World/FloatBuffer.h" +// #include "../Minecraft.World/IntBuffer.h" +// #include "../Minecraft.World/ByteBuffer.h" #ifdef SN_TARGET_PS3_SPU diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h index 66e8424ea3..26acd43cf1 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h @@ -6,7 +6,7 @@ typedef unsigned int DWORD; typedef unsigned char byte; #include #else -#include "..\..\..\stdafx.h" +#include "../../../stdafx.h" class ChunkRebuildData; #endif #endif diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp index 22c3a26d35..0172c07b5f 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp @@ -25,7 +25,7 @@ #include #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif static const float MATH_PI = 3.141592654f; @@ -33,20 +33,20 @@ static const float MATH_PI = 3.141592654f; // #include "GameRenderer.h" // #include "Minecraft.h" // #include "Textures.h" -// #include "..\Minecraft.World\net.minecraft.world.level.h" -// #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" -// #include "..\Minecraft.World\net.minecraft.world.level.material.h" -// #include "..\Minecraft.World\net.minecraft.h" -// #include "..\Minecraft.World\net.minecraft.world.h" -// #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" +// #include "../Minecraft.World/net.minecraft.world.level.h" +// #include "../../../Minecraft.World/net.minecraft.world.level.tile.h" +// #include "../Minecraft.World/net.minecraft.world.level.material.h" +// #include "../Minecraft.World/net.minecraft.h" +// #include "../Minecraft.World/net.minecraft.world.h" +// #include "../../../Minecraft.World/net.minecraft.world.level.tile.h" #include "Tesselator_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "Stubs_SPU.h" +#include "stubs_SPU.h" #endif // SN_TARGET_PS3_SPU -// #include "..\..\Minecraft.World\SharedConstants.h" +// #include "../../Minecraft.World/SharedConstants.h" #include "Facing_SPU.h" // #include "EntityTileRenderer.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp index c5a9be4d7f..bdcc5dd736 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp @@ -53,7 +53,7 @@ #include "StemTile_SPU.h" #include "VineTile_SPU.h" #include "MycelTile_SPU.h" -#include "WaterlilyTile_SPU.h" +#include "WaterLilyTile_SPU.h" #include "NetherStalkTile_SPU.h" #include "EnchantmentTableTile_SPU.h" #include "BrewingStandTile_SPU.h" @@ -85,7 +85,7 @@ #include "WoolCarpetTile_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\spu_assert.h" +#include "../Common/spu_assert.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp index 24dd069aa0..1fc3e58f7c 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include "ChunkRebuildData.h" #include "TileRenderer_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" // #define SPU_HEAPSIZE (0*1024) // #define SPU_STACKSIZE (64*1024) diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp index 16ea17bb5b..ce6229b274 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "CompressedTileStorage_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #else -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\TilePos.h" -#include "..\..\..\..\Minecraft.World\LevelChunk.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/TilePos.h" +#include "../../../../Minecraft.World/LevelChunk.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h index 51937a8739..2c8d8ec020 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h @@ -6,8 +6,8 @@ #include "SparseDataStorage_SPU.h" #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" #endif // SN_TARGET_PS3_SPU //#include "xmcore.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp index b25e04e0a1..a02dbe099a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "CompressedTileStorage_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" // #define SPU_HEAPSIZE (128*1024) // #define SPU_STACKSIZE (16*1024) diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp index 7a05169a91..b699a022db 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp @@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "CompressedTileStorage_compress.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp index fa52c3e195..a38f4e9181 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "CompressedTileStorage_getData.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp index 7199b8fc12..2e65994980 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "GameRenderer_updateLightTexture.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp index 11c3604f85..4ddb89a762 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp @@ -15,7 +15,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include "LevelRenderChunks.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp index 0912e33ae3..093b1a0d61 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_FindNearestChunk.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp index f2a7bca0f6..9cfde772de 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_cull.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp index 0c56bd3e06..65db49a68d 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "LevelRenderer_zSort.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp index 755c30d09f..983d99d944 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "PerlinNoiseJob.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp index fc5322b137..65efc923a9 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp @@ -2,7 +2,7 @@ #include "PerlinNoise_SPU.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include int64_t lfloor(double v) diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp index 63259d33ee..b6aa7467a3 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp index be3ebf1495..ff4ec5f5b9 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp @@ -1,11 +1,11 @@ include "stdafx.h" #include "CompressedTileStorage_SPU.h" #ifdef SN_TARGET_PS3_SPU -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #else -#include "..\..\..\..\Minecraft.World\Tile.h" -#include "..\..\..\..\Minecraft.World\TilePos.h" -#include "..\..\..\..\Minecraft.World\LevelChunk.h" +#include "../../../../Minecraft.World/Tile.h" +#include "../../../../Minecraft.World/TilePos.h" +#include "../../../../Minecraft.World/LevelChunk.h" #endif #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h index 46876c53de..547504bac6 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h @@ -4,8 +4,8 @@ #ifndef SN_TARGET_PS3_SPU -#include "..\..\..\stdafx.h" -#include "..\..\..\..\Minecraft.World\Region.h" +#include "../../../stdafx.h" +#include "../../../../Minecraft.World/Region.h" #endif // SN_TARGET_PS3_SPU //#include "xmcore.h" diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp index 10a9b611ff..078142243f 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "Renderer_TextureUpdate.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp index 1430aa2782..24b0725422 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp @@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001 #include #include "Texture_blit.h" -#include "..\Common\DmaData.h" +#include "../Common/DmaData.h" #include diff --git a/Minecraft.Client/PS3/XboxGameMode.cpp b/Minecraft.Client/PS3/XboxGameMode.cpp index 1b55fdd9f3..709a6589d9 100644 --- a/Minecraft.Client/PS3/XboxGameMode.cpp +++ b/Minecraft.Client/PS3/XboxGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XboxGameMode.h" -#include "..\Common\Tutorial\Tutorial.h" +#include "../Common/Tutorial/Tutorial.h" XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/PS3/XboxGameMode.h b/Minecraft.Client/PS3/XboxGameMode.h index 347cdf3082..a9f0d6cd60 100644 --- a/Minecraft.Client/PS3/XboxGameMode.h +++ b/Minecraft.Client/PS3/XboxGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Common\Tutorial\TutorialMode.h" +#include "../Common/Tutorial/TutorialMode.h" class XboxGameMode : public TutorialMode { diff --git a/Minecraft.Client/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/PS3/Xbox_Minecraft.cpp index b2630072e4..b19b65f2b3 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 "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" + +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "QNetManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" +#include "../../Minecraft.Client/Tesselator.h" #include "Xbox_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" #include "Resource.h" diff --git a/Minecraft.Client/PSVita/Iggy/include/gdraw.h b/Minecraft.Client/PSVita/Iggy/include/gdraw.h index 7cc4ddd0e1..f251273110 100644 --- a/Minecraft.Client/PSVita/Iggy/include/gdraw.h +++ b/Minecraft.Client/PSVita/Iggy/include/gdraw.h @@ -6,7 +6,7 @@ #ifndef __RAD_INCLUDE_GDRAW_H__ #define __RAD_INCLUDE_GDRAW_H__ -#include "rrcore.h" +#include "rrCore.h" #define IDOC diff --git a/Minecraft.Client/PSVita/Iggy/include/iggy.h b/Minecraft.Client/PSVita/Iggy/include/iggy.h index 56638a3211..d38ccae67a 100644 --- a/Minecraft.Client/PSVita/Iggy/include/iggy.h +++ b/Minecraft.Client/PSVita/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index c5a44878d4..6f04c515b2 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -2,13 +2,13 @@ #include "PSVitaLeaderboardManager.h" -#include "PSVita\PSVita_App.h" -#include "PSVita\PSVitaExtras\ShutdownManager.h" +#include "PSVita/PSVita_App.h" +#include "PSVita/PSVitaExtras/ShutdownManager.h" -#include "Common\Consoles_App.h" -#include "Common\Network\Sony\SQRNetworkManager.h" +#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/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h index 8101aa3116..4a73e029eb 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Leaderboards\SonyLeaderboardManager.h" -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/SonyLeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" #include "Conf.h" diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 4ba6ae2e53..b1640479bb 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -11,9 +11,9 @@ #include #include -#include "PSVita\PSVitaExtras\Conf.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "PSVita/PSVitaExtras/Conf.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" #define MATCHING_PORT (1) diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h index a5b9513eef..e86684d2a3 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h @@ -8,7 +8,7 @@ #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" // class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp index e38280d82b..e9131661a3 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -9,9 +9,9 @@ #include #include -#include "PSVita\PSVitaExtras\Conf.h" -#include "Common\Network\Sony\SonyHttp.h" -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "PSVita/PSVitaExtras/Conf.h" +#include "Common/Network/Sony/SonyHttp.h" +#include "../../../Minecraft.World/C4JThread.h" // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K ) #define SESSION_IMAGE_PATH "app0:PSVita/session_image.png" diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h index 79befe0393..5a0f280a15 100644 --- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h +++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h @@ -8,7 +8,7 @@ #include -#include "..\..\Common\Network\Sony\SQRNetworkManager.h" +#include "../../Common/Network/Sony/SQRNetworkManager.h" class SQRNetworkPlayer; class ISQRNetworkManagerListener; diff --git a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h index c8f76bf7d8..c06b0e1140 100644 --- a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h +++ b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Network\Sony\SonyCommerce.h" +#include "Common/Network/Sony/SonyCommerce.h" #include #include #include diff --git a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h index 13b37e3edb..808eba0562 100644 --- a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h +++ b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h @@ -1,7 +1,7 @@ #pragma once -#include "Common\Network\Sony\SonyRemoteStorage.h" +#include "Common/Network/Sony/SonyRemoteStorage.h" class SonyRemoteStorage_Vita : public SonyRemoteStorage { diff --git a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp index a04e45d9f5..aab42a0623 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp +++ b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ShutdownManager.h" -#include "..\..\Common\Leaderboards\LeaderboardManager.h" -#include "..\..\MinecraftServer.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../../MinecraftServer.h" #ifdef __PS3__ #include "C4JSpursJob.h" diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp index 8c9236c778..d8fb857377 100644 --- a/Minecraft.Client/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/PSVita/PSVita_App.cpp @@ -1,24 +1,24 @@  #include "stdafx.h" -#include "..\Common\Consoles_App.h" -#include "..\User.h" -#include "..\..\Minecraft.Client\Minecraft.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\BiomeSource.h" -#include "..\..\Minecraft.World\LevelType.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "PSVita\Network\SonyRemoteStorage_Vita.h" -#include "PSVita\Network\SonyCommerce_Vita.h" -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../Common/Consoles_App.h" +#include "../User.h" +#include "../../Minecraft.Client/Minecraft.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/BiomeSource.h" +#include "../../Minecraft.World/LevelType.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "PSVita/Network/SonyRemoteStorage_Vita.h" +#include "PSVita/Network/SonyCommerce_Vita.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #include "PSVita/Network/PSVita_NPToolkit.h" #include #include -#include "Common\UI\UI.h" -#include "PSVita\PSVitaExtras\PSVitaStrings.h" +#include "Common/UI/UI.h" +#include "PSVita/PSVitaExtras/PSVitaStrings.h" #define VITA_COMMERCE_ENABLED CConsoleMinecraftApp app; diff --git a/Minecraft.Client/PSVita/PSVita_App.h b/Minecraft.Client/PSVita/PSVita_App.h index 5e31a3bea7..b4f45d2871 100644 --- a/Minecraft.Client/PSVita/PSVita_App.h +++ b/Minecraft.Client/PSVita/PSVita_App.h @@ -3,8 +3,8 @@ class C4JStringTable; //#include -#include "..\..\Common\Network\Sony\SonyCommerce.h" -#include "..\..\Common\Network\Sony\SonyRemoteStorage.h" +#include "../../Common/Network/Sony/SonyCommerce.h" +#include "../../Common/Network/Sony/SonyRemoteStorage.h" #define PRODUCT_CODE_SIZE 9 #define SAVEFOLDERPREFIX_SIZE 10 diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp index db1e7f0fd9..1993c933bb 100644 --- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp +++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp @@ -3,64 +3,64 @@ #include "stdafx.h" -#include "Leaderboards\PSVitaLeaderboardManager.h" -#include "PSVita\PSVitaExtras\ShutdownManager.h" +#include "Leaderboards/PSVitaLeaderboardManager.h" +#include "PSVita/PSVitaExtras/ShutdownManager.h" //#define HEAPINSPECTOR_PS3 1 // when defining HEAPINSPECTOR_PS3, add this line to the linker settings // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign --wrap _malloc_init #if HEAPINSPECTOR_PS3 -#include "HeapInspector\Server\HeapInspectorServer.h" -#include "HeapInspector\Server\PS3\HeapHooks.hpp" +#include "HeapInspector/Server/HeapInspectorServer.h" +#include "HeapInspector/Server/PS3/HeapHooks.hpp" #endif //#define DISABLE_MILES_SOUND #include "PSVita_App.h" -#include "PSVitaExtras\PSVitaStrings.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" - -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "PSVitaExtras/PSVitaStrings.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" + +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\Common\Console_Awards_enum.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\GameRenderer.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../Common/Console_Awards_enum.h" +#include "../../Minecraft.Client/Options.h" +#include "../GameRenderer.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" //#include "Resource.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -//#include "PS3\PS3Extras\EdgeZLib.h" -#include "..\..\Minecraft.World\C4JThread.h" -#include "Common\Network\Sony\SQRNetworkManager.h" -#include "Common\UI\IUIScene_PauseMenu.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +//#include "PS3/PS3Extras/EdgeZLib.h" +#include "../../Minecraft.World/C4JThread.h" +#include "Common/Network/Sony/SQRNetworkManager.h" +#include "Common/UI/IUIScene_PauseMenu.h" #include "Conf.h" #include "PSVita/Network/PSVita_NPToolkit.h" -#include "PSVita\Network\SonyVoiceChat_Vita.h" -#include "..\..\Minecraft.World\FireworksRecipe.h" +#include "PSVita/Network/SonyVoiceChat_Vita.h" +#include "../../Minecraft.World/FireworksRecipe.h" #include #include diff --git a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp index a678d0a07e..0d75858309 100644 --- a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp +++ b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PSVita_PlayerUID.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/StringHelpers.h" // taken from Boost, there is no TR1 equivalent template diff --git a/Minecraft.Client/PSVita/PSVita_UIController.cpp b/Minecraft.Client/PSVita/PSVita_UIController.cpp index fe6cf75825..c4494deb87 100644 --- a/Minecraft.Client/PSVita/PSVita_UIController.cpp +++ b/Minecraft.Client/PSVita/PSVita_UIController.cpp @@ -2,8 +2,8 @@ #include "PSVita_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/PSVita/PSVita_UIController.h b/Minecraft.Client/PSVita/PSVita_UIController.h index 0d1e934f6d..6ddddb3cea 100644 --- a/Minecraft.Client/PSVita/PSVita_UIController.h +++ b/Minecraft.Client/PSVita/PSVita_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp index b51ab0f488..24c2b78985 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 "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" ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ); diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp index 643dc66959..5747286fc1 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 d9b0ba3a14..2bfcf2a45a 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 f8a8ec230e..7cb051cdbf 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 a17e52dfb0..cd14e8a590 100644 --- a/Minecraft.Client/PauseScreen.cpp +++ b/Minecraft.Client/PauseScreen.cpp @@ -5,10 +5,10 @@ #include "OptionsScreen.h" #include "TitleScreen.h" #include "MultiPlayerLevel.h" -#include "..\Minecraft.World\net.minecraft.locale.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.stats.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.World/net.minecraft.locale.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.stats.h" +#include "../Minecraft.Client/LocalPlayer.h" PauseScreen::PauseScreen() { diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index f24086c1b6..88608cb178 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -7,20 +7,20 @@ #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" #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) -#include "..\Minecraft.Server\ServerLogManager.h" -#include "..\Minecraft.Server\Access\Access.h" -#include "..\Minecraft.World\Socket.h" +#include "../Minecraft.Server/ServerLogManager.h" +#include "../Minecraft.Server/Access/Access.h" +#include "../Minecraft.World/Socket.h" #endif // #ifdef __PS3__ -// #include "PS3\Network\NetworkPlayerSony.h" +// #include "PS3/Network/NetworkPlayerSony.h" // #endif Random *PendingConnection::random = new Random(); diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h index e8a493b097..58b8f7bc1a 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 7425889dd7..3e5e20679c 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 0982e69aeb..61b63e224e 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 bcc3f6ba07..e005982b8c 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" #include diff --git a/Minecraft.Client/PlayerChunkMap.h b/Minecraft.Client/PlayerChunkMap.h index b19f176d21..6043648e02 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 476803a33f..7e5f8c5420 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 1fb7c39888..7c4bb963d4 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -5,37 +5,37 @@ #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\ChatPacket.h" -#include "..\Minecraft.World\StringHelpers.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/ChatPacket.h" +#include "../Minecraft.World/StringHelpers.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" #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) -#include "..\Minecraft.Server\ServerLogManager.h" +#include "../Minecraft.Server/ServerLogManager.h" #endif namespace diff --git a/Minecraft.Client/PlayerConnection.h b/Minecraft.Client/PlayerConnection.h index 0284bc6a2f..2abca94f56 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 ba82ec6acd..b8eb4675f1 100644 --- a/Minecraft.Client/PlayerList.cpp +++ b/Minecraft.Client/PlayerList.cpp @@ -13,32 +13,32 @@ #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 "Windows64\Windows64_Xuid.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 "Windows64/Windows64_Xuid.h" #ifdef _WINDOWS64 -#include "Windows64\Network\WinsockNetLayer.h" +#include "Windows64/Network/WinsockNetLayer.h" #endif -#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/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 #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) -#include "..\Minecraft.Server\Access\Access.h" +#include "../Minecraft.Server/Access/Access.h" extern bool g_Win64DedicatedServer; #endif diff --git a/Minecraft.Client/PlayerList.h b/Minecraft.Client/PlayerList.h index a4ae9c5d7a..0ca0582f4e 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 23dff77f8e..4cbe744cd0 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -6,13 +6,13 @@ #include "ModelPart.h" #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 "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" static unsigned int nametagColorForIndex(int index) { @@ -603,4 +603,4 @@ ResourceLocation *PlayerRenderer::getTextureLocation(shared_ptr entity) { shared_ptr player = dynamic_pointer_cast(entity); return new ResourceLocation(static_cast<_TEXTURE_NAME>(player->getTexture())); -} +} \ No newline at end of file diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h index 494ff795f0..c5ae8250ed 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 24cb2218e8..c07e1f8e83 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 33e0b59ecf..9ed3eca108 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 882a7eae30..ad196f4807 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 575a4510a4..2930fbd6bd 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 a66c73fbd9..39e814c732 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 23d1758b4a..3b4fdfea8b 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 2969b05398..973dd884e9 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 69eb225a0e..628fa4a558 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 dcfd69926b..1cff8196e8 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 3fab1dded5..9c2d80eadc 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 4255201cae..78defed25d 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 7966c5c96e..ec6be9dc7f 100644 --- a/Minecraft.Client/Screen.cpp +++ b/Minecraft.Client/Screen.cpp @@ -5,9 +5,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 953695ab94..4e0bf35f4a 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 c6d417c563..9f6ff0b7ad 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 c7d70c7d3f..03b3b23b24 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 cf93fdc55e..97138e76cc 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 0c98aed53a..fcea62104d 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 306d438421..d0e51ac621 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 0f96e0325d..5198dba626 100644 --- a/Minecraft.Client/ServerConnection.cpp +++ b/Minecraft.Client/ServerConnection.cpp @@ -6,9 +6,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 9d5ec9089d..3d2eb5867a 100644 --- a/Minecraft.Client/ServerLevel.cpp +++ b/Minecraft.Client/ServerLevel.cpp @@ -9,35 +9,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 "../Minecraft.Client/ServerLevelListener.h" +#include "../Minecraft.World/WeighedTreasure.h" #include "TexturePackRepository.h" #include "DLCTexturePack.h" -#include "..\Minecraft.World\ProgressListener.h" -#include "PS3\PS3Extras\ShutdownManager.h" +#include "../Minecraft.World/ProgressListener.h" +#include "PS3/PS3Extras/ShutdownManager.h" #include "PlayerChunkMap.h" WeighedTreasureArray ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/Minecraft.Client/ServerLevel.h b/Minecraft.Client/ServerLevel.h index 77a5cb7829..c4fcedfa8b 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 3884b46964..3ab122ac3f 100644 --- a/Minecraft.Client/ServerLevelListener.cpp +++ b/Minecraft.Client/ServerLevelListener.cpp @@ -8,9 +8,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 5265efb598..8b43af38c7 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 f57e8a3c9b..03eb1e0f99 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\Pos.h" -#include "..\Minecraft.World\Random.h" - -#include "..\Minecraft.World\LevelChunk.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/LevelChunk.h" #include "LevelRenderer.h" diff --git a/Minecraft.Client/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h index aefa4a42f1..1b2111dda4 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 041487f5d5..a237c9f937 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 6de7f88d6e..1150a9dd90 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 9d93e6cbef..c9cfcb9429 100644 --- a/Minecraft.Client/Settings.cpp +++ b/Minecraft.Client/Settings.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Settings.h" -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/StringHelpers.h" #include static wstring ParsePropertyText(const string &text) diff --git a/Minecraft.Client/SheepFurModel.cpp b/Minecraft.Client/SheepFurModel.cpp index 648c56031a..498ca82e9b 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 6694460438..08b83adf4f 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 4345057813..bd3ff04c15 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 3f0b217578..efd864e374 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 7058d1870b..998f354f05 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 a03aaef185..4816a997aa 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 7cdba9e252..b8d3103d67 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/SkullTileRenderer.cpp b/Minecraft.Client/SkullTileRenderer.cpp index 7862043b2e..04ec8aa877 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 = nullptr; diff --git a/Minecraft.Client/SlimeRenderer.cpp b/Minecraft.Client/SlimeRenderer.cpp index ca5e519166..77b6f57315 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 b48978f096..127768d26b 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 eadbf367df..0e62ff58bd 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 "SnowManModel.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 1ab1d40230..7778711991 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 cf63a7309e..37adcb887d 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 cd0797ace8..d9890cb567 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 0cdc14caed..190fbe562c 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 617cce900c..e05cc82960 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 0ee2501d6c..23619c03f9 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 75d14f4e59..8e73aa422b 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 e92c43c0cc..608e069c28 100644 --- a/Minecraft.Client/StatsCounter.cpp +++ b/Minecraft.Client/StatsCounter.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "StatsCounter.h" -#include "..\Minecraft.World\Stat.h" -#include "..\Minecraft.World\Stats.h" -#include "..\Minecraft.World\Achievement.h" -#include "..\Minecraft.World\Achievements.h" -#include "..\Minecraft.Client\LocalPlayer.h" +#include "../Minecraft.World/Stat.h" +#include "../Minecraft.World/Stats.h" +#include "../Minecraft.World/Achievement.h" +#include "../Minecraft.World/Achievements.h" +#include "../Minecraft.Client/LocalPlayer.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../Minecraft.World/net.minecraft.world.item.h" -#include "..\Minecraft.Client\Common\Leaderboards\LeaderboardManager.h" +#include "../Minecraft.Client/Common/Leaderboards/LeaderboardManager.h" Stat** StatsCounter::LARGE_STATS[] = { &Stats::walkOneM, diff --git a/Minecraft.Client/StatsScreen.cpp b/Minecraft.Client/StatsScreen.cpp index c618a30f2e..9e21e3693c 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 = nullptr; diff --git a/Minecraft.Client/StitchSlot.cpp b/Minecraft.Client/StitchSlot.cpp index 8de443ed46..dbe5f59c20 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 b9693f3dab..88ab3e56ab 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 0ac37b2da1..da88536a11 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/StringTable.cpp b/Minecraft.Client/StringTable.cpp index bdee2ca918..1e7298a791 100644 --- a/Minecraft.Client/StringTable.cpp +++ b/Minecraft.Client/StringTable.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "StringTable.h" StringTable::StringTable(void) diff --git a/Minecraft.Client/SurvivalMode.cpp b/Minecraft.Client/SurvivalMode.cpp index 27a992df0b..317af52db9 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 b7305207ab..b042151a0a 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 4c31b0c0b4..6a86966710 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 f629363e17..a33d7904eb 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 9dd29ff08a..d9575da133 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 9015a52dbb..0b37e6d15d 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 fb29118b8d..15a8646505 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 b70ec983e7..7d60f86494 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 4b32d13921..1662b22615 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 b7e58d5fa4..ec2d9264a6 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 11c8fb96bd..2db52aa8d0 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 d6cbe2c339..173f45783f 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 = nullptr; diff --git a/Minecraft.Client/TextureMap.cpp b/Minecraft.Client/TextureMap.cpp index 902dc9d66e..a1eb6f8aed 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 2984e53210..13827ff548 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 8e61342338..fde0af2d26 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 ef926d78bc..12604701a4 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" #include "Common/UI/UI.h" diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp index ba7c028212..778f00ccbf 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 "../Minecraft.Client/MemTextureProcessor.h" #include "MobSkinMemTextureProcessor.h" #include "PreStitchedTextureMap.h" #include "StitchedTexture.h" #include "Texture.h" -#include "..\Minecraft.World\net.minecraft.world.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\StringHelpers.h" +#include "../Minecraft.World/net.minecraft.world.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/StringHelpers.h" #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 1fca56106a..11c3014f3a 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 c709cfd18e..6f4f187775 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 5a1519c7fa..ecef172094 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 a9d5fea77a..c1d93e5c33 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 b77729ab5a..7f630c9613 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 3ef51eb7c7..1f49eea8e4 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 d522963cad..4755a8557d 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 b168e174be..443160c67b 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 848a456c13..046f467c94 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 3ecd667861..7675f93c47 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 c7eb1472c0..f8fa084ce5 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 b8e2f2c054..3867db03db 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.cpp b/Minecraft.Client/Vertex.cpp index 138987296b..88452a4f89 100644 --- a/Minecraft.Client/Vertex.cpp +++ b/Minecraft.Client/Vertex.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "vertex.h" +#include "Vertex.h" Vertex::Vertex(float x, float y, float z, float u, float v) { diff --git a/Minecraft.Client/Vertex.h b/Minecraft.Client/Vertex.h index c52f499f1f..453f1c4e8a 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 cc13eab29e..2af06340fe 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 41a8eb3680..10baceb044 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 4e9121a636..39ccb909dc 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 e8b1bf278d..2ab13a4467 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 0b62435b28..3fa8db42ed 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 669637af9a..e75e431b07 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 0b54a70b73..0d2a7131cc 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 25b8f66ea7..707a5d6352 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 065738af9a..35fe4a2094 100644 --- a/Minecraft.Client/WaterDropParticle.cpp +++ b/Minecraft.Client/WaterDropParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "WaterDropParticle.h" -#include "..\Minecraft.World\JavaMath.h" -#include "..\Minecraft.World\net.minecraft.world.level.h" -#include "..\Minecraft.World\net.minecraft.world.level.material.h" -#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "../Minecraft.World/JavaMath.h" +#include "../Minecraft.World/net.minecraft.world.level.h" +#include "../Minecraft.World/net.minecraft.world.level.material.h" +#include "../Minecraft.World/net.minecraft.world.level.tile.h" WaterDropParticle::WaterDropParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/Minecraft.Client/Windows64/Iggy/include/gdraw.h b/Minecraft.Client/Windows64/Iggy/include/gdraw.h index 7cc4ddd0e1..f251273110 100644 --- a/Minecraft.Client/Windows64/Iggy/include/gdraw.h +++ b/Minecraft.Client/Windows64/Iggy/include/gdraw.h @@ -6,7 +6,7 @@ #ifndef __RAD_INCLUDE_GDRAW_H__ #define __RAD_INCLUDE_GDRAW_H__ -#include "rrcore.h" +#include "rrCore.h" #define IDOC diff --git a/Minecraft.Client/Windows64/Iggy/include/iggy.h b/Minecraft.Client/Windows64/Iggy/include/iggy.h index 56638a3211..d38ccae67a 100644 --- a/Minecraft.Client/Windows64/Iggy/include/iggy.h +++ b/Minecraft.Client/Windows64/Iggy/include/iggy.h @@ -8,7 +8,7 @@ #define IggyVersion "1.2.30" #define IggyFlashVersion "9,1,2,30" -#include "rrcore.h" // base data types, macros +#include "rrCore.h" // base data types, macros RADDEFSTART diff --git a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h index 4141e3f954..a66bc9cc31 100644 --- a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h +++ b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Common\Leaderboards\LeaderboardManager.h" +#include "Common/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp index acc043e5fc..bbf993cc2c 100644 --- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp +++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp @@ -6,15 +6,15 @@ #ifdef _WINDOWS64 #include "WinsockNetLayer.h" -#include "..\..\Common\Network\PlatformNetworkManagerStub.h" -#include "..\..\..\Minecraft.World\Socket.h" +#include "../../Common/Network/PlatformNetworkManagerStub.h" +#include "../../../Minecraft.World/Socket.h" #if defined(MINECRAFT_SERVER_BUILD) -#include "..\..\..\Minecraft.Server\Access\Access.h" -#include "..\..\..\Minecraft.Server\ServerLogManager.h" +#include "../../../Minecraft.Server/Access/Access.h" +#include "../../../Minecraft.Server/ServerLogManager.h" #endif -#include "..\..\..\Minecraft.World\DisconnectPacket.h" -#include "..\..\Minecraft.h" -#include "..\4JLibs\inc\4J_Profile.h" +#include "../../../Minecraft.World/DisconnectPacket.h" +#include "../../Minecraft.h" +#include "../4JLibs/inc/4J_Profile.h" #include diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h index 8a11e391dd..5ecd8acf16 100644 --- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h +++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h @@ -7,7 +7,7 @@ #include #include #include -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" #pragma comment(lib, "Ws2_32.lib") diff --git a/Minecraft.Client/Windows64/PostProcesser.cpp b/Minecraft.Client/Windows64/PostProcesser.cpp index aabb1f6793..9ab7bde1de 100644 --- a/Minecraft.Client/Windows64/PostProcesser.cpp +++ b/Minecraft.Client/Windows64/PostProcesser.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Common\PostProcesser.h" +#include "../Common/PostProcesser.h" #include #include diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp index 369e29094f..d95aa7f620 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 "../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" CConsoleMinecraftApp app; diff --git a/Minecraft.Client/Windows64/Windows64_App.h b/Minecraft.Client/Windows64/Windows64_App.h index 639cec7393..c1f3b79596 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 fa5f4cccbd..acd6e886e4 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -7,46 +7,46 @@ #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 "..\ClientConnection.h" -#include "..\Minecraft.h" -#include "..\ChatScreen.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" + +#include "../ClientConnection.h" +#include "../Minecraft.h" +#include "../ChatScreen.h" #include "KeyboardMouseInput.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -//#include "Social\SocialManager.h" -//#include "Leaderboards\LeaderboardManager.h" -//#include "XUI\XUI_Scene_Container.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +//#include "Social/SocialManager.h" +//#include "Leaderboards/LeaderboardManager.h" +//#include "XUI/XUI_Scene_Container.h" //#include "NetworkManager.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\Gui.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" -#include "..\Settings.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "../Gui.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" +#include "../Settings.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 "Common/PostProcesser.h" -#include "..\GameRenderer.h" -#include "Network\WinsockNetLayer.h" +#include "../GameRenderer.h" +#include "Network/WinsockNetLayer.h" #include "Windows64_Xuid.h" #include "Common/UI/UI.h" @@ -55,7 +55,7 @@ class Renderer; extern Renderer InternalRenderManager; -#include "Xbox/resource.h" +#include "Xbox/Resource.h" #ifdef _MSC_VER #pragma comment(lib, "legacy_stdio_definitions.lib") diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp index 3929aa0496..cd47154cc5 100644 --- a/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -2,8 +2,8 @@ #include "Windows64_UIController.h" // Temp -#include "..\Minecraft.h" -#include "..\Textures.h" +#include "../Minecraft.h" +#include "../Textures.h" #define _ENABLEIGGY diff --git a/Minecraft.Client/Windows64/Windows64_UIController.h b/Minecraft.Client/Windows64/Windows64_UIController.h index 398e971268..1e9dbcbb6f 100644 --- a/Minecraft.Client/Windows64/Windows64_UIController.h +++ b/Minecraft.Client/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\UIController.h" +#include "../Common/UI/UIController.h" class ConsoleUIController : public UIController { diff --git a/Minecraft.Client/WitchRenderer.cpp b/Minecraft.Client/WitchRenderer.cpp index ec2b8a76f2..dc97af8f96 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 626a895053..7d4df88344 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/WolfModel.cpp b/Minecraft.Client/WolfModel.cpp index d459240d06..5969b9a9fb 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 4b7bda6c30..390591554c 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 c4577db884..47dc1b38da 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 9ba0e4dd8d..5587ce8154 100644 --- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h" -#include "..\..\..\Minecraft.World\Mth.h" -#include "..\..\..\Minecraft.World\Random.h" -#include "..\..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.h" -#include "..\..\MultiplayerLocalPlayer.h" +#include "../../../Minecraft.World/net.minecraft.world.entity.h" +#include "../../../Minecraft.World/Mth.h" +#include "../../../Minecraft.World/Random.h" +#include "../../../Minecraft.World/LevelData.h" +#include "../../Minecraft.h" +#include "../../MultiPlayerLocalPlayer.h" #include "SoundEngine.h" -#include "..\..\TexturePackRepository.h" -#include "..\..\TexturePack.h" -#include "..\..\Common\DLC\DLCAudioFile.h" -#include "..\..\DLCTexturePack.h" +#include "../../TexturePackRepository.h" +#include "../../TexturePack.h" +#include "../../Common/DLC/DLCAudioFile.h" +#include "../../DLCTexturePack.h" IXAudio2* g_pXAudio2 = nullptr; // 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 77998d20ca..3ba93061f1 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 2262f34590..4b0e8bae34 100644 --- a/Minecraft.Client/Xbox/Font/XUI_Font.cpp +++ b/Minecraft.Client/Xbox/Font/XUI_Font.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\Tesselator.h" +#include "../../Tesselator.h" #include "XUI_FontData.h" #include "XUI_Font.h" diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp index 88d77d0904..7416e017ff 100644 --- a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp +++ b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\stubs.h" -#include "..\..\Minecraft.h" -#include "..\..\Textures.h" +#include "../../stubs.h" +#include "../../Minecraft.h" +#include "../../Textures.h" #include "XUI_FontData.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/StringHelpers.h" #define USE_NEW 0 diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Xbox/Font/XUI_FontData.h index af18c7a65f..fc2ac6cce8 100644 --- a/Minecraft.Client/Xbox/Font/XUI_FontData.h +++ b/Minecraft.Client/Xbox/Font/XUI_FontData.h @@ -2,7 +2,7 @@ using namespace std; #include -#include "..\..\Common\UI\UIFontData.h" +#include "../../Common/UI/UIFontData.h" // 4J This class is partially based of the ATG font implementation //-------------------------------------------------------------------------------------- diff --git a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp index f6619fd5f2..57024d2e71 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 55967327e5..e7aebf2a4c 100644 --- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp +++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp @@ -2,7 +2,7 @@ #include "XboxLeaderboardManager.h" -#include "..\Network\NetworkPlayerXbox.h" +#include "../Network/NetworkPlayerXbox.h" #ifdef _XBOX LeaderboardManager *LeaderboardManager::m_instance = new XboxLeaderboardManager(); //Singleton instance of the LeaderboardManager diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h index c9990901c1..32b1e8472c 100644 --- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h +++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h @@ -3,7 +3,7 @@ #include #include -#include "..\..\Common\Leaderboards\LeaderboardManager.h" +#include "../../Common/Leaderboards/LeaderboardManager.h" class XboxLeaderboardManager : public LeaderboardManager { diff --git a/Minecraft.Client/Xbox/MinecraftWindows.rc b/Minecraft.Client/Xbox/MinecraftWindows.rc index e4fd4960b8..e93c28afb7 100644 --- a/Minecraft.Client/Xbox/MinecraftWindows.rc +++ b/Minecraft.Client/Xbox/MinecraftWindows.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "Resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ END 1 TEXTINCLUDE BEGIN - "resource.h\0" + "Resource.h\0" END 2 TEXTINCLUDE diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h index 77ef84cc06..2d913d427d 100644 --- a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h +++ b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\Network\NetworkPlayerInterface.h" +#include "../../Common/Network/NetworkPlayerInterface.h" // This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is // managed by PlatformNetworkManagerXbox. diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp index f586f4470b..89a42d5313 100644 --- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp +++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "..\..\..\Minecraft.World\Socket.h" -#include "..\..\..\Minecraft.World\StringHelpers.h" +#include "../../../Minecraft.World/Socket.h" +#include "../../../Minecraft.World/StringHelpers.h" #include "PlatformNetworkManagerXbox.h" #include "NetworkPlayerXbox.h" -#include "..\..\Common\Network\GameNetworkManager.h" +#include "../../Common/Network/GameNetworkManager.h" CPlatformNetworkManagerXbox *g_pPlatformNetworkManager; diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h index 2784726c7b..9125cee831 100644 --- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h +++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h @@ -2,10 +2,10 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\C4JThread.h" -#include "..\..\Common\Network\NetworkPlayerInterface.h" -#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" -#include "..\..\Common\Network\SessionInfo.h" +#include "../../../Minecraft.World/C4JThread.h" +#include "../../Common/Network/NetworkPlayerInterface.h" +#include "../../Common/Network/PlatformNetworkManagerInterface.h" +#include "../../Common/Network/SessionInfo.h" // This is how often we allow a search for new games #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000 diff --git a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp index 086b141ef7..ea6b802855 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 49b0c26af3..beb833df6a 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 "..\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 "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 "SentientManager.h" #include "MinecraftTelemetry.h" diff --git a/Minecraft.Client/Xbox/Social/SocialManager.cpp b/Minecraft.Client/Xbox/Social/SocialManager.cpp index b89fda7094..28372db15f 100644 --- a/Minecraft.Client/Xbox/Social/SocialManager.cpp +++ b/Minecraft.Client/Xbox/Social/SocialManager.cpp @@ -9,7 +9,7 @@ #include "SocialManager.h" #include #include -#include "..\Sentient\SentientManager.h" +#include "../Sentient/SentientManager.h" /////////////////////////////////////////////////////////////////////////// // Constants. diff --git a/Minecraft.Client/Xbox/XML/ATGXmlParser.cpp b/Minecraft.Client/Xbox/XML/ATGXmlParser.cpp index fd8781ea02..2aeaa8698e 100644 --- a/Minecraft.Client/Xbox/XML/ATGXmlParser.cpp +++ b/Minecraft.Client/Xbox/XML/ATGXmlParser.cpp @@ -15,7 +15,7 @@ //------------------------------------------------------------------------------------- #include "stdafx.h" -#include "AtgXmlParser.h" +#include "ATGXmlParser.h" namespace ATG { diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp index a717540bc6..4fafb9fddb 100644 --- a/Minecraft.Client/Xbox/Xbox_App.cpp +++ b/Minecraft.Client/Xbox/Xbox_App.cpp @@ -1,175 +1,175 @@ #include "stdafx.h" -#include "..\Common\UI\UIStructs.h" - -#include "..\Common\XUI\XUI_Intro.h" -#include "..\Common\XUI\XUI_MainMenu.h" -#include "..\Common\XUI\XUI_NewUpdateMessage.h" -#include "..\Common\XUI\XUI_HelpAndOptions.h" -#include "..\Common\XUI\XUI_TextEntry.h" -#include "..\Common\XUI\XUI_HelpHowToPlay.h" -#include "..\Common\XUI\XUI_HowToPlayMenu.h" -#include "..\Common\XUI\XUI_HelpControls.h" -#include "..\Common\XUI\XUI_TextEntry.h" -#include "..\Common\XUI\XUI_LoadSettings.h" -#include "..\Common\XUI\XUI_SettingsAll.h" -#include "..\Common\XUI\XUI_SettingsOptions.h" -#include "..\Common\XUI\XUI_SettingsAudio.h" -#include "..\Common\XUI\XUI_SettingsControl.h" -#include "..\Common\XUI\XUI_SettingsGraphics.h" -#include "..\Common\XUI\XUI_SettingsUI.h" -#include "..\Common\XUI\XUI_Leaderboards.h" -#include "..\Common\XUI\XUI_Debug.h" -#include "..\Common\XUI\XUI_DebugTips.h" -#include "..\Common\XUI\XUI_Reinstall.h" -#include "..\Common\XUI\XUI_Death.h" -#include "..\Common\XUI\XUI_DebugOverlay.h" -#include "..\Common\XUI\XUI_DLCOffers.h" -#include "..\Common\XUI\XUI_SocialPost.h" -#include "..\Common\XUI\XUI_Scene_Container.h" -#include "..\Common\XUI\XUI_Scene_Furnace.h" -#include "..\Common\XUI\XUI_Scene_Inventory.h" -#include "..\Common\XUI\XUI_Scene_Trap.h" -#include "..\Common\XUI\XUI_Control_ComboBox.h" -#include "..\Common\XUI\XUI_MultiGameInfo.h" -#include "..\Common\XUI\XUI_MultiGameJoinLoad.h" -#include "..\Common\XUI\XUI_MultiGameCreate.h" -#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h" -#include "..\Common\XUI\XUI_SignEntry.h" -#include "..\Common\XUI\XUI_InGameInfo.h" -#include "..\Common\XUI\XUI_TrialExitUpsell.h" -#include "..\Common\XUI\XUI_BasePlayer.h" -#include "..\Common\XUI\XUI_PartnernetPassword.h" -#include "..\Common\XUI\XUI_SaveMessage.h" -#include "..\Common\XUI\XUI_Chat.h" -#include "..\Common\XUI\XUI_SkinSelect.h" -#include "..\Common\XUI\XUI_InGameHostOptions.h" -#include "..\Common\XUI\XUI_InGamePlayerOptions.h" -#include "..\Common\XUI\XUI_Scene_Enchant.h" -#include "..\Common\XUI\XUI_Scene_BrewingStand.h" -#include "..\Common\XUI\XUI_XZP_Icons.h" -#include "..\Common\XUI\XUI_Controls.h" -#include "..\Common\XUI\XUI_Scene_Win.h" -#include "..\Common\XUI\XUI_HUD.h" -#include "..\Common\XUI\XUI_DebugSetCamera.h" -//#include "..\Common\XUI\XUI_TransferToXboxOne.h" +#include "../Common/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" #ifdef _DEBUG_MENUS_ENABLED -#include "..\Common\XUI\XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif -#include "..\..\Minecraft.World\Recipy.h" -#include "GameConfig\Minecraft.spa.h" -#include "..\..\Minecraft.Client\Options.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\MinecraftServer.h" -#include "..\GameRenderer.h" -#include "..\ProgressRenderer.h" -#include "..\..\Minecraft.Client\LevelRenderer.h" -#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h" - -#include "..\..\Minecraft.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.World/Recipy.h" +#include "GameConfig/Minecraft.spa.h" +#include "../../Minecraft.Client/Options.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../MinecraftServer.h" +#include "../GameRenderer.h" +#include "../ProgressRenderer.h" +#include "../../Minecraft.Client/LevelRenderer.h" +#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h" + +#include "../../Minecraft.Client/Minecraft.h" + +#include "../ClientConnection.h" +#include "../MultiPlayerLocalPlayer.h" +#include "../../Minecraft.Client/LocalPlayer.h" +#include "../../Minecraft.World/Player.h" +#include "../../Minecraft.World/Inventory.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/FurnaceTileEntity.h" +#include "../../Minecraft.World/Container.h" +#include "../../Minecraft.World/DispenserTileEntity.h" +#include "../../Minecraft.World/SignTileEntity.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../GameMode.h" +#include "Social/SocialManager.h" #include -#include "..\Common\Tutorial\TutorialMode.h" -#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h" -#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h" -#include "4JLibs\inc\4J_Input.h" -#include "Font\XUI_FontRenderer.h" -#include "..\Common\Minecraft_Macros.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\Common\GameRules\ConsoleGameRules.h" -#include "..\Common\GameRules\ConsoleSchematicFile.h" -#include "..\..\Minecraft.World\InputOutputStream.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\User.h" - -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\LevelData.h" -#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\Minecraft.Client\EntityRenderDispatcher.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\TexturePackRepository.h" -#include "..\TexturePack.h" -#include "..\Common\DLC\DLCAudioFile.h" -#include "..\DLCTexturePack.h" - -#include "..\Common\XUI\XUI_Intro.h" -#include "..\Common\XUI\XUI_MainMenu.h" -#include "..\Common\XUI\XUI_NewUpdateMessage.h" -#include "..\Common\XUI\XUI_HelpAndOptions.h" -#include "..\Common\XUI\XUI_TextEntry.h" -#include "..\Common\XUI\XUI_HelpHowToPlay.h" -#include "..\Common\XUI\XUI_HowToPlayMenu.h" -#include "..\Common\XUI\XUI_HelpControls.h" -#include "..\Common\XUI\XUI_TextEntry.h" -#include "..\Common\XUI\XUI_LoadSettings.h" -#include "..\Common\XUI\XUI_SettingsAll.h" -#include "..\Common\XUI\XUI_SettingsOptions.h" -#include "..\Common\XUI\XUI_SettingsAudio.h" -#include "..\Common\XUI\XUI_SettingsControl.h" -#include "..\Common\XUI\XUI_SettingsGraphics.h" -#include "..\Common\XUI\XUI_SettingsUI.h" -#include "..\Common\XUI\XUI_Leaderboards.h" -#include "..\Common\XUI\XUI_Debug.h" -#include "..\Common\XUI\XUI_DebugTips.h" -#include "..\Common\XUI\XUI_Reinstall.h" -#include "..\Common\XUI\XUI_Death.h" -#include "..\Common\XUI\XUI_DebugOverlay.h" -#include "..\Common\XUI\XUI_DLCOffers.h" -#include "..\Common\XUI\XUI_SocialPost.h" -#include "..\Common\XUI\XUI_Scene_Container.h" -#include "..\Common\XUI\XUI_Scene_Furnace.h" -#include "..\Common\XUI\XUI_Scene_Inventory.h" -#include "..\Common\XUI\XUI_Scene_Trap.h" -#include "..\Common\XUI\XUI_Control_ComboBox.h" -#include "..\Common\XUI\XUI_MultiGameInfo.h" -#include "..\Common\XUI\XUI_MultiGameJoinLoad.h" -#include "..\Common\XUI\XUI_MultiGameCreate.h" -#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h" -#include "..\Common\XUI\XUI_SignEntry.h" -#include "..\Common\XUI\XUI_InGameInfo.h" -#include "..\Common\XUI\XUI_TrialExitUpsell.h" -#include "..\Common\XUI\XUI_BasePlayer.h" -#include "..\Common\XUI\XUI_PartnernetPassword.h" -#include "..\Common\XUI\XUI_SaveMessage.h" -#include "..\Common\XUI\XUI_Chat.h" -#include "..\Common\XUI\XUI_SkinSelect.h" -#include "..\Common\XUI\XUI_InGameHostOptions.h" -#include "..\Common\XUI\XUI_InGamePlayerOptions.h" -#include "..\Common\XUI\XUI_Scene_Enchant.h" -#include "..\Common\XUI\XUI_Scene_BrewingStand.h" -#include "..\Common\XUI\XUI_XZP_Icons.h" -#include "..\Common\XUI\XUI_Controls.h" -#include "..\Common\XUI\XUI_Scene_Win.h" -#include "..\Common\XUI\XUI_HUD.h" -#include "..\Common\XUI\XUI_Scene_Anvil.h" -#include "..\Common\XUI\XUI_Scene_Trading.h" -#include "..\Common\XUI\XUI_Teleport.h" +#include "../Common/Tutorial/TutorialMode.h" +#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h" +#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h" +#include "4JLibs/inc/4J_Input.h" +#include "Font/XUI_FontRenderer.h" +#include "../Common/Minecraft_Macros.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../Common/GameRules/ConsoleGameRules.h" +#include "../Common/GameRules/ConsoleSchematicFile.h" +#include "../../Minecraft.World/InputOutputStream.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../User.h" + +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/LevelData.h" +#include "../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../Minecraft.Client/EntityRenderDispatcher.h" +#include "../../Minecraft.World/compression.h" +#include "../TexturePackRepository.h" +#include "../TexturePack.h" +#include "../Common/DLC/DLCAudioFile.h" +#include "../DLCTexturePack.h" + +#include "../Common/XUI/XUI_Intro.h" +#include "../Common/XUI/XUI_MainMenu.h" +#include "../Common/XUI/XUI_NewUpdateMessage.h" +#include "../Common/XUI/XUI_HelpAndOptions.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_HelpHowToPlay.h" +#include "../Common/XUI/XUI_HowToPlayMenu.h" +#include "../Common/XUI/XUI_HelpControls.h" +#include "../Common/XUI/XUI_TextEntry.h" +#include "../Common/XUI/XUI_LoadSettings.h" +#include "../Common/XUI/XUI_SettingsAll.h" +#include "../Common/XUI/XUI_SettingsOptions.h" +#include "../Common/XUI/XUI_SettingsAudio.h" +#include "../Common/XUI/XUI_SettingsControl.h" +#include "../Common/XUI/XUI_SettingsGraphics.h" +#include "../Common/XUI/XUI_SettingsUI.h" +#include "../Common/XUI/XUI_Leaderboards.h" +#include "../Common/XUI/XUI_Debug.h" +#include "../Common/XUI/XUI_DebugTips.h" +#include "../Common/XUI/XUI_Reinstall.h" +#include "../Common/XUI/XUI_Death.h" +#include "../Common/XUI/XUI_DebugOverlay.h" +#include "../Common/XUI/XUI_DLCOffers.h" +#include "../Common/XUI/XUI_SocialPost.h" +#include "../Common/XUI/XUI_Scene_Container.h" +#include "../Common/XUI/XUI_Scene_Furnace.h" +#include "../Common/XUI/XUI_Scene_Inventory.h" +#include "../Common/XUI/XUI_Scene_Trap.h" +#include "../Common/XUI/XUI_Control_ComboBox.h" +#include "../Common/XUI/XUI_MultiGameInfo.h" +#include "../Common/XUI/XUI_MultiGameJoinLoad.h" +#include "../Common/XUI/XUI_MultiGameCreate.h" +#include "../Common/XUI/XUI_MultiGameLaunchMoreOptions.h" +#include "../Common/XUI/XUI_SignEntry.h" +#include "../Common/XUI/XUI_InGameInfo.h" +#include "../Common/XUI/XUI_TrialExitUpsell.h" +#include "../Common/XUI/XUI_BasePlayer.h" +#include "../Common/XUI/XUI_PartnernetPassword.h" +#include "../Common/XUI/XUI_SaveMessage.h" +#include "../Common/XUI/XUI_Chat.h" +#include "../Common/XUI/XUI_SkinSelect.h" +#include "../Common/XUI/XUI_InGameHostOptions.h" +#include "../Common/XUI/XUI_InGamePlayerOptions.h" +#include "../Common/XUI/XUI_Scene_Enchant.h" +#include "../Common/XUI/XUI_Scene_BrewingStand.h" +#include "../Common/XUI/XUI_XZP_Icons.h" +#include "../Common/XUI/XUI_Controls.h" +#include "../Common/XUI/XUI_Scene_Win.h" +#include "../Common/XUI/XUI_HUD.h" +#include "../Common/XUI/XUI_Scene_Anvil.h" +#include "../Common/XUI/XUI_Scene_Trading.h" +#include "../Common/XUI/XUI_Teleport.h" #ifdef _DEBUG_MENUS_ENABLED -#include "..\Common\XUI\XUI_DebugItemEditor.h" +#include "../Common/XUI/XUI_DebugItemEditor.h" #endif #ifndef _CONTENT_PACKAGE -#include "..\Common\XUI\XUI_DebugSchematicCreator.h" +#include "../Common/XUI/XUI_DebugSchematicCreator.h" #endif #include "Xbox_App.h" diff --git a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp index 6606dacf07..bfe0845621 100644 --- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp +++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp @@ -4,36 +4,36 @@ #include "stdafx.h" #include #include -#include "GameConfig\Minecraft.spa.h" -#include "..\MinecraftServer.h" -#include "..\LocalPlayer.h" -#include "..\..\Minecraft.World\ItemInstance.h" -#include "..\..\Minecraft.World\MapItem.h" -#include "..\..\Minecraft.World\Recipes.h" -#include "..\..\Minecraft.World\Recipy.h" -#include "..\..\Minecraft.World\Language.h" -#include "..\..\Minecraft.World\StringHelpers.h" -#include "..\..\Minecraft.World\AABB.h" -#include "..\..\Minecraft.World\Vec3.h" -#include "..\..\Minecraft.World\Level.h" -#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h" -#include "..\ClientConnection.h" -#include "..\User.h" -#include "..\..\Minecraft.World\Socket.h" -#include "..\..\Minecraft.World\ThreadName.h" -#include "..\..\Minecraft.Client\StatsCounter.h" -#include "..\ConnectScreen.h" -#include "Social\SocialManager.h" -#include "Leaderboards\XboxLeaderboardManager.h" -#include "..\Common\XUI\XUI_Scene_Container.h" -#include "..\..\Minecraft.Client\Tesselator.h" -#include "..\..\Minecraft.Client\Options.h" -#include "Sentient\SentientManager.h" -#include "..\..\Minecraft.World\IntCache.h" -#include "..\Textures.h" -#include "..\..\Minecraft.World\compression.h" -#include "..\..\Minecraft.World\OldChunkStorage.h" -//#include "..\..\Minecraft.Client\SoundEngine.h" +#include "GameConfig/Minecraft.spa.h" +#include "../MinecraftServer.h" +#include "../LocalPlayer.h" +#include "../../Minecraft.World/ItemInstance.h" +#include "../../Minecraft.World/MapItem.h" +#include "../../Minecraft.World/Recipes.h" +#include "../../Minecraft.World/Recipy.h" +#include "../../Minecraft.World/Language.h" +#include "../../Minecraft.World/StringHelpers.h" +#include "../../Minecraft.World/AABB.h" +#include "../../Minecraft.World/Vec3.h" +#include "../../Minecraft.World/Level.h" +#include "../../Minecraft.World/net.minecraft.world.level.tile.h" +#include "../ClientConnection.h" +#include "../User.h" +#include "../../Minecraft.World/Socket.h" +#include "../../Minecraft.World/ThreadName.h" +#include "../../Minecraft.Client/StatsCounter.h" +#include "../ConnectScreen.h" +#include "Social/SocialManager.h" +#include "Leaderboards/XboxLeaderboardManager.h" +#include "../Common/XUI/XUI_Scene_Container.h" +#include "../../Minecraft.Client/Tesselator.h" +#include "../../Minecraft.Client/Options.h" +#include "Sentient/SentientManager.h" +#include "../../Minecraft.World/IntCache.h" +#include "../Textures.h" +#include "../../Minecraft.World/compression.h" +#include "../../Minecraft.World/OldChunkStorage.h" +//#include "../../Minecraft.Client/SoundEngine.h" #include diff --git a/Minecraft.Client/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Xbox/Xbox_UIController.cpp index 669b037add..675cabb7ea 100644 --- a/Minecraft.Client/Xbox/Xbox_UIController.cpp +++ b/Minecraft.Client/Xbox/Xbox_UIController.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Xbox_UIController.h" -#include "..\Common\XUI\XUI_Scene_Base.h" -#include "..\Common\XUI\XUI_Scene_Win.h" +#include "../Common/XUI/XUI_Scene_Base.h" +#include "../Common/XUI/XUI_Scene_Win.h" ConsoleUIController ui; diff --git a/Minecraft.Client/Xbox/Xbox_UIController.h b/Minecraft.Client/Xbox/Xbox_UIController.h index cd46059655..05f4dcd81f 100644 --- a/Minecraft.Client/Xbox/Xbox_UIController.h +++ b/Minecraft.Client/Xbox/Xbox_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "..\Common\UI\IUIController.h" +#include "../Common/UI/IUIController.h" class ConsoleUIController : public IUIController { diff --git a/Minecraft.Client/ZombieModel.cpp b/Minecraft.Client/ZombieModel.cpp index 648dd09f85..0b89c66bac 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 10d13b269a..1ff1ec9add 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 d13e1a6917..c49620aa11 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 04a18b13d9..6dda00a15d 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -105,7 +105,7 @@ typedef XNKID SessionID; typedef XUID GameSessionUID; #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) -#include "..\Minecraft.Client\xbox\network\extra.h" +#include "../Minecraft.Client/xbox/network/extra.h" #else #include "extraX64.h" #endif @@ -146,48 +146,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" @@ -201,139 +201,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 "XboxMedia\strings.h" - #include "Xbox\Sentient\SentientTelemetryCommon.h" - #include "Xbox\Sentient\Include\SenClientStats.h" - #include "Xbox\GameConfig\Minecraft.spa.h" - #include "XboxMedia\4J_strings.h" - #include "Xbox\XML\ATGXmlParser.h" - #include "Xbox\Leaderboards\XboxLeaderboardManager.h" - #include "Xbox\Social\SocialManager.h" - #include "Xbox\Audio\SoundEngine.h" - #include "Xbox\Xbox_UIController.h" + #include "Xbox/Xbox_App.h" + #include "Xbox/Sentient/MinecraftTelemetry.h" + #include "Xbox/Sentient/DynamicConfigurations.h" + #include "XboxMedia/strings.h" + #include "Xbox/Sentient/SentientTelemetryCommon.h" + #include "Xbox/Sentient/Include/SenClientStats.h" + #include "Xbox/GameConfig/Minecraft.spa.h" + #include "XboxMedia/4J_strings.h" + #include "Xbox/XML/ATGXmlParser.h" + #include "Xbox/Leaderboards/XboxLeaderboardManager.h" + #include "Xbox/Social/SocialManager.h" + #include "Xbox/Audio/SoundEngine.h" + #include "Xbox/Xbox_UIController.h" #elif defined (__PS3__) #include "extraX64client.h" - #include "PS3\Sentient\MinecraftTelemetry.h" - #include "PS3\Sentient\DynamicConfigurations.h" - #include "PS3\Sentient\SentientTelemetryCommon.h" - #include "PS3Media\strings.h" - #include "PS3\PS3_App.h" - #include "PS3\GameConfig\Minecraft.spa.h" - #include "PS3Media\4J_strings.h" - #include "PS3\XML\ATGXmlParser.h" - #include "PS3\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "PS3\Iggy\include\iggy.h" - #include "PS3\Iggy\gdraw\gdraw_ps3gcm.h" - #include "PS3\PS3_UIController.h" + #include "PS3/Sentient/MinecraftTelemetry.h" + #include "PS3/Sentient/DynamicConfigurations.h" + #include "PS3/Sentient/SentientTelemetryCommon.h" + #include "PS3Media/strings.h" + #include "PS3/PS3_App.h" + #include "PS3/GameConfig/Minecraft.spa.h" + #include "PS3Media/4J_strings.h" + #include "PS3/XML/ATGXmlParser.h" + #include "PS3/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "PS3/Iggy/include/iggy.h" + #include "PS3/Iggy/gdraw/gdraw_ps3gcm.h" + #include "PS3/PS3_UIController.h" #elif defined _DURANGO - #include "Durango\Sentient\MinecraftTelemetry.h" - #include "DurangoMedia\strings.h" - #include "Durango\Durango_App.h" - #include "Durango\Sentient\DynamicConfigurations.h" - #include "Durango\Sentient\TelemetryEnum.h" - #include "Durango\Sentient\SentientTelemetryCommon.h" - #include "Durango\PresenceIds.h" - #include "DurangoMedia\4J_strings.h" - #include "Durango\XML\ATGXmlParser.h" - #include "Durango\Social\SocialManager.h" -#include "Common\Audio\SoundEngine.h" - #include "Durango\Iggy\include\iggy.h" - #include "Durango\Iggy\gdraw\gdraw_d3d11.h" - #include "Durango\Durango_UIController.h" + #include "Durango/Sentient/MinecraftTelemetry.h" + #include "DurangoMedia/strings.h" + #include "Durango/Durango_App.h" + #include "Durango/Sentient/DynamicConfigurations.h" + #include "Durango/Sentient/TelemetryEnum.h" + #include "Durango/Sentient/SentientTelemetryCommon.h" + #include "Durango/PresenceIds.h" + #include "DurangoMedia/4J_strings.h" + #include "Durango/XML/ATGXmlParser.h" + #include "Durango/Social/SocialManager.h" +#include "Common/Audio/SoundEngine.h" + #include "Durango/Iggy/include/iggy.h" + #include "Durango/Iggy/gdraw/gdraw_d3d11.h" + #include "Durango/Durango_UIController.h" #elif defined _WINDOWS64 - #include "Windows64\Sentient\MinecraftTelemetry.h" - #include "Windows64Media\strings.h" - #include "Windows64\Windows64_App.h" - #include "Windows64\Sentient\DynamicConfigurations.h" - #include "Windows64\Sentient\SentientTelemetryCommon.h" - #include "Windows64\GameConfig\Minecraft.spa.h" - #include "Windows64\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Windows64\Iggy\include\iggy.h" - #include "Windows64\Iggy\gdraw\gdraw_d3d11.h" - #include "Windows64\Windows64_UIController.h" + #include "Windows64/Sentient/MinecraftTelemetry.h" + #include "Windows64Media/strings.h" + #include "Windows64/Windows64_App.h" + #include "Windows64/Sentient/DynamicConfigurations.h" + #include "Windows64/Sentient/SentientTelemetryCommon.h" + #include "Windows64/GameConfig/Minecraft.spa.h" + #include "Windows64/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Windows64/Iggy/include/iggy.h" + #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" + #include "Windows64/Windows64_UIController.h" #elif defined __PSVITA__ - #include "PSVita\PSVita_App.h" - #include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this - #include "PSVita\Sentient\SentientManager.h" - #include "PSVita\Sentient\MinecraftTelemetry.h" - #include "PSVita\Sentient\DynamicConfigurations.h" - #include "PSVita\GameConfig\Minecraft.spa.h" - #include "PSVita\XML\ATGXmlParser.h" - #include "PSVita\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "PSVita\Iggy\include\iggy.h" - #include "PSVita\Iggy\gdraw\gdraw_psp2.h" - #include "PSVita\PSVita_UIController.h" + #include "PSVita/PSVita_App.h" + #include "PSVitaMedia/strings.h" // TODO - create PSVita-specific version of this + #include "PSVita/Sentient/SentientManager.h" + #include "PSVita/Sentient/MinecraftTelemetry.h" + #include "PSVita/Sentient/DynamicConfigurations.h" + #include "PSVita/GameConfig/Minecraft.spa.h" + #include "PSVita/XML/ATGXmlParser.h" + #include "PSVita/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "PSVita/Iggy/include/iggy.h" + #include "PSVita/Iggy/gdraw/gdraw_psp2.h" + #include "PSVita/PSVita_UIController.h" #else - #include "Orbis\Sentient\MinecraftTelemetry.h" - #include "OrbisMedia\strings.h" - #include "Orbis\Orbis_App.h" - #include "Orbis\Sentient\SentientTelemetryCommon.h" - #include "Orbis\Sentient\DynamicConfigurations.h" - #include "Orbis\GameConfig\Minecraft.spa.h" - #include "OrbisMedia\4J_strings.h" - #include "Orbis\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Orbis\Iggy\include\iggy.h" - #include "Orbis\Iggy\gdraw\gdraw_orbis.h" - #include "Orbis\Orbis_UIController.h" + #include "Orbis/Sentient/MinecraftTelemetry.h" + #include "OrbisMedia/strings.h" + #include "Orbis/Orbis_App.h" + #include "Orbis/Sentient/SentientTelemetryCommon.h" + #include "Orbis/Sentient/DynamicConfigurations.h" + #include "Orbis/GameConfig/Minecraft.spa.h" + #include "OrbisMedia/4J_strings.h" + #include "Orbis/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Orbis/Iggy/include/iggy.h" + #include "Orbis/Iggy/gdraw/gdraw_orbis.h" + #include "Orbis/Orbis_UIController.h" #endif #ifdef _XBOX -#include "Common\XUI\XUI_CustomMessages.h" -#include "Common\XUI\XUI_Scene_Inventory_Creative.h" -#include "Common\XUI\XUI_FullscreenProgress.h" -#include "Common\XUI\XUI_ConnectingProgress.h" -#include "Common\XUI\XUI_Scene_CraftingPanel.h" -#include "Common\XUI\XUI_TutorialPopup.h" -#include "Common\XUI\XUI_PauseMenu.h" +#include "Common/XUI/XUI_CustomMessages.h" +#include "Common/XUI/XUI_Scene_Inventory_Creative.h" +#include "Common/XUI/XUI_FullscreenProgress.h" +#include "Common/XUI/XUI_ConnectingProgress.h" +#include "Common/XUI/XUI_Scene_CraftingPanel.h" +#include "Common/XUI/XUI_TutorialPopup.h" +#include "Common/XUI/XUI_PauseMenu.h" #endif -#include "Common\ConsoleGameMode.h" -#include "Common\Console_Debug_enum.h" -#include "Common\Console_Awards_enum.h" -#include "Common\Tutorial\TutorialMode.h" -#include "Common\Tutorial\Tutorial.h" -#include "Common\Tutorial\FullTutorialMode.h" -#include "Common\Trial\TrialMode.h" -#include "Common\GameRules\ConsoleGameRules.h" -#include "Common\GameRules\ConsoleSchematicFile.h" -#include "Common\Colours\ColourTable.h" -#include "Common\DLC\DLCSkinFile.h" -#include "Common\DLC\DLCManager.h" -#include "Common\DLC\DLCPack.h" -#include "Common\Telemetry\TelemetryManager.h" +#include "Common/ConsoleGameMode.h" +#include "Common/Console_Debug_enum.h" +#include "Common/Console_Awards_enum.h" +#include "Common/Tutorial/TutorialMode.h" +#include "Common/Tutorial/Tutorial.h" +#include "Common/Tutorial/FullTutorialMode.h" +#include "Common/Trial/TrialMode.h" +#include "Common/GameRules/ConsoleGameRules.h" +#include "Common/GameRules/ConsoleSchematicFile.h" +#include "Common/Colours/ColourTable.h" +#include "Common/DLC/DLCSkinFile.h" +#include "Common/DLC/DLCManager.h" +#include "Common/DLC/DLCPack.h" +#include "Common/Telemetry/TelemetryManager.h" #ifdef _XBOX -//#include "Xbox\Xbox_App.h" +//#include "Xbox/Xbox_App.h" #elif !defined(__PS3__) #include "extraX64client.h" #endif diff --git a/Minecraft.Client/stubs.cpp b/Minecraft.Client/stubs.cpp index af65eb75e1..6caaaf2ca0 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" static const int s_keyToVK[] = { 'A', // KEY_A = 0 diff --git a/Minecraft.Server/Access/Access.cpp b/Minecraft.Server/Access/Access.cpp index 5767a9555c..9f3f7accdb 100644 --- a/Minecraft.Server/Access/Access.cpp +++ b/Minecraft.Server/Access/Access.cpp @@ -2,8 +2,8 @@ #include "Access.h" -#include "..\Common\StringUtils.h" -#include "..\ServerLogger.h" +#include "../Common/StringUtils.h" +#include "../ServerLogger.h" #include #include diff --git a/Minecraft.Server/Access/BanManager.cpp b/Minecraft.Server/Access/BanManager.cpp index 59f5bccc03..e64d5bb558 100644 --- a/Minecraft.Server/Access/BanManager.cpp +++ b/Minecraft.Server/Access/BanManager.cpp @@ -2,12 +2,12 @@ #include "BanManager.h" -#include "..\Common\AccessStorageUtils.h" -#include "..\Common\FileUtils.h" -#include "..\Common\NetworkUtils.h" -#include "..\Common\StringUtils.h" -#include "..\ServerLogger.h" -#include "..\vendor\nlohmann\json.hpp" +#include "../Common/AccessStorageUtils.h" +#include "../Common/FileUtils.h" +#include "../Common/NetworkUtils.h" +#include "../Common/StringUtils.h" +#include "../ServerLogger.h" +#include "../vendor/nlohmann/json.hpp" #include #include diff --git a/Minecraft.Server/Access/WhitelistManager.cpp b/Minecraft.Server/Access/WhitelistManager.cpp index 33ea7e46a7..f4e3fc10d5 100644 --- a/Minecraft.Server/Access/WhitelistManager.cpp +++ b/Minecraft.Server/Access/WhitelistManager.cpp @@ -2,11 +2,11 @@ #include "WhitelistManager.h" -#include "..\Common\AccessStorageUtils.h" -#include "..\Common\FileUtils.h" -#include "..\Common\StringUtils.h" -#include "..\ServerLogger.h" -#include "..\vendor\nlohmann\json.hpp" +#include "../Common/AccessStorageUtils.h" +#include "../Common/FileUtils.h" +#include "../Common/StringUtils.h" +#include "../ServerLogger.h" +#include "../vendor/nlohmann/json.hpp" #include diff --git a/Minecraft.Server/Common/AccessStorageUtils.h b/Minecraft.Server/Common/AccessStorageUtils.h index c5d3477c70..e221b1f2e4 100644 --- a/Minecraft.Server/Common/AccessStorageUtils.h +++ b/Minecraft.Server/Common/AccessStorageUtils.h @@ -3,7 +3,7 @@ #include "FileUtils.h" #include "StringUtils.h" -#include "..\vendor\nlohmann\json.hpp" +#include "../vendor/nlohmann/json.hpp" #include diff --git a/Minecraft.Server/Console/ServerCliEngine.cpp b/Minecraft.Server/Console/ServerCliEngine.cpp index 82bbdcc8ea..b4c791ff9d 100644 --- a/Minecraft.Server/Console/ServerCliEngine.cpp +++ b/Minecraft.Server/Console/ServerCliEngine.cpp @@ -4,35 +4,35 @@ #include "ServerCliParser.h" #include "ServerCliRegistry.h" -#include "commands\IServerCliCommand.h" -#include "commands\ban\CliCommandBan.h" -#include "commands\ban-ip\CliCommandBanIp.h" -#include "commands\ban-list\CliCommandBanList.h" -#include "commands\defaultgamemode\CliCommandDefaultGamemode.h" -#include "commands\enchant\CliCommandEnchant.h" -#include "commands\experience\CliCommandExperience.h" -#include "commands\gamemode\CliCommandGamemode.h" -#include "commands\give\CliCommandGive.h" -#include "commands\help\CliCommandHelp.h" -#include "commands\kill\CliCommandKill.h" -#include "commands\list\CliCommandList.h" -#include "commands\pardon\CliCommandPardon.h" -#include "commands\pardon-ip\CliCommandPardonIp.h" -#include "commands\stop\CliCommandStop.h" -#include "commands\time\CliCommandTime.h" -#include "commands\tp\CliCommandTp.h" -#include "commands\weather\CliCommandWeather.h" -#include "commands\whitelist\CliCommandWhitelist.h" -#include "..\Common\StringUtils.h" -#include "..\ServerShutdown.h" -#include "..\ServerLogger.h" -#include "..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\Minecraft.Client\PlayerList.h" -#include "..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\Minecraft.World\CommandDispatcher.h" -#include "..\..\Minecraft.World\CommandSender.h" -#include "..\..\Minecraft.World\LevelSettings.h" -#include "..\..\Minecraft.World\StringHelpers.h" +#include "commands/IServerCliCommand.h" +#include "commands/ban/CliCommandBan.h" +#include "commands/ban-ip/CliCommandBanIp.h" +#include "commands/ban-list/CliCommandBanList.h" +#include "commands/defaultgamemode/CliCommandDefaultGamemode.h" +#include "commands/enchant/CliCommandEnchant.h" +#include "commands/experience/CliCommandExperience.h" +#include "commands/gamemode/CliCommandGamemode.h" +#include "commands/give/CliCommandGive.h" +#include "commands/help/CliCommandHelp.h" +#include "commands/kill/CliCommandKill.h" +#include "commands/list/CliCommandList.h" +#include "commands/pardon/CliCommandPardon.h" +#include "commands/pardon-ip/CliCommandPardonIp.h" +#include "commands/stop/CliCommandStop.h" +#include "commands/time/CliCommandTime.h" +#include "commands/tp/CliCommandTp.h" +#include "commands/weather/CliCommandWeather.h" +#include "commands/whitelist/CliCommandWhitelist.h" +#include "../Common/StringUtils.h" +#include "../ServerShutdown.h" +#include "../ServerLogger.h" +#include "../../Minecraft.Client/MinecraftServer.h" +#include "../../Minecraft.Client/PlayerList.h" +#include "../../Minecraft.Client/ServerPlayer.h" +#include "../../Minecraft.World/CommandDispatcher.h" +#include "../../Minecraft.World/CommandSender.h" +#include "../../Minecraft.World/LevelSettings.h" +#include "../../Minecraft.World/StringHelpers.h" #include #include diff --git a/Minecraft.Server/Console/ServerCliEngine.h b/Minecraft.Server/Console/ServerCliEngine.h index b2d72bace6..be5735e842 100644 --- a/Minecraft.Server/Console/ServerCliEngine.h +++ b/Minecraft.Server/Console/ServerCliEngine.h @@ -6,8 +6,8 @@ #include #include -#include "..\..\Minecraft.World\ArrayWithLength.h" -#include "..\..\Minecraft.World\CommandsEnum.h" +#include "../../Minecraft.World/ArrayWithLength.h" +#include "../../Minecraft.World/CommandsEnum.h" class GameType; class ServerPlayer; diff --git a/Minecraft.Server/Console/ServerCliInput.cpp b/Minecraft.Server/Console/ServerCliInput.cpp index d873980a02..8e50c6d64c 100644 --- a/Minecraft.Server/Console/ServerCliInput.cpp +++ b/Minecraft.Server/Console/ServerCliInput.cpp @@ -3,8 +3,8 @@ #include "ServerCliInput.h" #include "ServerCliEngine.h" -#include "..\ServerLogger.h" -#include "..\vendor\linenoise\linenoise.h" +#include "../ServerLogger.h" +#include "../vendor/linenoise/linenoise.h" #include #include diff --git a/Minecraft.Server/Console/ServerCliRegistry.cpp b/Minecraft.Server/Console/ServerCliRegistry.cpp index 432907b237..183eb915bc 100644 --- a/Minecraft.Server/Console/ServerCliRegistry.cpp +++ b/Minecraft.Server/Console/ServerCliRegistry.cpp @@ -2,8 +2,8 @@ #include "ServerCliRegistry.h" -#include "commands\IServerCliCommand.h" -#include "..\Common\StringUtils.h" +#include "commands/IServerCliCommand.h" +#include "../Common/StringUtils.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp index 99c1455e0a..96ac178468 100644 --- a/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp +++ b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp @@ -2,18 +2,18 @@ #include "CliCommandBanIp.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\NetworkUtils.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\ServerLogManager.h" -#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\..\Minecraft.World\Connection.h" -#include "..\..\..\..\Minecraft.World\DisconnectPacket.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/NetworkUtils.h" +#include "../../../Common/StringUtils.h" +#include "../../../ServerLogManager.h" +#include "../../../../Minecraft.Client/MinecraftServer.h" +#include "../../../../Minecraft.Client/PlayerConnection.h" +#include "../../../../Minecraft.Client/PlayerList.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" +#include "../../../../Minecraft.World/Connection.h" +#include "../../../../Minecraft.World/DisconnectPacket.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h index 1c116fa684..48199f10f1 100644 --- a/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h +++ b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp index 146416172c..b347dcf9fe 100644 --- a/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp +++ b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp @@ -2,10 +2,10 @@ #include "CliCommandBanList.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\StringUtils.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/StringUtils.h" #include diff --git a/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h index 1db32bc1d0..8d1a4f774e 100644 --- a/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h +++ b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp b/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp index f9855c0cb9..28970b76c7 100644 --- a/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp +++ b/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp @@ -2,13 +2,13 @@ #include "CliCommandBan.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\..\Minecraft.World\DisconnectPacket.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/StringUtils.h" +#include "../../../../Minecraft.Client/PlayerConnection.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" +#include "../../../../Minecraft.World/DisconnectPacket.h" #include diff --git a/Minecraft.Server/Console/commands/ban/CliCommandBan.h b/Minecraft.Server/Console/commands/ban/CliCommandBan.h index 8605474c6d..bae522aca0 100644 --- a/Minecraft.Server/Console/commands/ban/CliCommandBan.h +++ b/Minecraft.Server/Console/commands/ban/CliCommandBan.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.cpp b/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.cpp index ee0e35a20e..051773367e 100644 --- a/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.cpp +++ b/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.cpp @@ -2,13 +2,13 @@ #include "CliCommandDefaultGamemode.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\..\Minecraft.Client\ServerLevel.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../../Minecraft.Client/MinecraftServer.h" +#include "../../../../Minecraft.Client/PlayerList.h" +#include "../../../../Minecraft.Client/ServerLevel.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" +#include "../../../../Minecraft.World/net.minecraft.world.level.storage.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.h b/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.h index 5cc17b34d9..e52cf5315e 100644 --- a/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.h +++ b/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.cpp b/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.cpp index 70d4d7d650..9450047639 100644 --- a/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.cpp +++ b/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.cpp @@ -2,13 +2,13 @@ #include "CliCommandEnchant.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\CommandParsing.h" -#include "..\..\..\..\Minecraft.World\GameCommandPacket.h" -#include "..\..\..\..\Minecraft.World\EnchantItemCommand.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../CommandParsing.h" +#include "../../../../Minecraft.World/GameCommandPacket.h" +#include "../../../../Minecraft.World/EnchantItemCommand.h" +#include "../../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.h b/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.h index 66e330bd02..32ccb7a458 100644 --- a/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.h +++ b/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/experience/CliCommandExperience.cpp b/Minecraft.Server/Console/commands/experience/CliCommandExperience.cpp index 77df99ae32..7fb7f09d95 100644 --- a/Minecraft.Server/Console/commands/experience/CliCommandExperience.cpp +++ b/Minecraft.Server/Console/commands/experience/CliCommandExperience.cpp @@ -2,13 +2,13 @@ #include "CliCommandExperience.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\CommandParsing.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../CommandParsing.h" +#include "../../../Common/StringUtils.h" +#include "../../../../Minecraft.Client/MinecraftServer.h" +#include "../../../../Minecraft.Client/PlayerList.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" #include diff --git a/Minecraft.Server/Console/commands/experience/CliCommandExperience.h b/Minecraft.Server/Console/commands/experience/CliCommandExperience.h index 3fddb21888..65d2606166 100644 --- a/Minecraft.Server/Console/commands/experience/CliCommandExperience.h +++ b/Minecraft.Server/Console/commands/experience/CliCommandExperience.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp index f41660e6ce..e33a31d032 100644 --- a/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp +++ b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp @@ -2,11 +2,11 @@ #include "CliCommandGamemode.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../../Minecraft.Client/MinecraftServer.h" +#include "../../../../Minecraft.Client/PlayerList.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h index 527bb1f9e6..ab0ff5bc1d 100644 --- a/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h +++ b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/give/CliCommandGive.cpp b/Minecraft.Server/Console/commands/give/CliCommandGive.cpp index 20c0949721..e92ee3439c 100644 --- a/Minecraft.Server/Console/commands/give/CliCommandGive.cpp +++ b/Minecraft.Server/Console/commands/give/CliCommandGive.cpp @@ -2,13 +2,13 @@ #include "CliCommandGive.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\CommandParsing.h" -#include "..\..\..\..\Minecraft.World\GameCommandPacket.h" -#include "..\..\..\..\Minecraft.World\GiveItemCommand.h" -#include "..\..\..\..\Minecraft.World\net.minecraft.world.entity.player.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../CommandParsing.h" +#include "../../../../Minecraft.World/GameCommandPacket.h" +#include "../../../../Minecraft.World/GiveItemCommand.h" +#include "../../../../Minecraft.World/net.minecraft.world.entity.player.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/give/CliCommandGive.h b/Minecraft.Server/Console/commands/give/CliCommandGive.h index 7c21d997c1..45aaf53aea 100644 --- a/Minecraft.Server/Console/commands/give/CliCommandGive.h +++ b/Minecraft.Server/Console/commands/give/CliCommandGive.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp b/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp index d4106a9c7f..af525dedb3 100644 --- a/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp +++ b/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp @@ -2,8 +2,8 @@ #include "CliCommandHelp.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliRegistry.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliRegistry.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/help/CliCommandHelp.h b/Minecraft.Server/Console/commands/help/CliCommandHelp.h index 3612442f47..8308e3f8d1 100644 --- a/Minecraft.Server/Console/commands/help/CliCommandHelp.h +++ b/Minecraft.Server/Console/commands/help/CliCommandHelp.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/kill/CliCommandKill.cpp b/Minecraft.Server/Console/commands/kill/CliCommandKill.cpp index 04b2c41912..80bc39c0be 100644 --- a/Minecraft.Server/Console/commands/kill/CliCommandKill.cpp +++ b/Minecraft.Server/Console/commands/kill/CliCommandKill.cpp @@ -2,10 +2,10 @@ #include "CliCommandKill.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\..\Minecraft.World\CommandSender.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../../Minecraft.World/CommandSender.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/kill/CliCommandKill.h b/Minecraft.Server/Console/commands/kill/CliCommandKill.h index e558fac0c8..e071edd4e9 100644 --- a/Minecraft.Server/Console/commands/kill/CliCommandKill.h +++ b/Minecraft.Server/Console/commands/kill/CliCommandKill.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/list/CliCommandList.cpp b/Minecraft.Server/Console/commands/list/CliCommandList.cpp index a9c5a2127a..2b326868b7 100644 --- a/Minecraft.Server/Console/commands/list/CliCommandList.cpp +++ b/Minecraft.Server/Console/commands/list/CliCommandList.cpp @@ -2,10 +2,10 @@ #include "CliCommandList.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\..\Minecraft.Client\PlayerList.h" +#include "../../ServerCliEngine.h" +#include "../../../Common/StringUtils.h" +#include "../../../../Minecraft.Client/MinecraftServer.h" +#include "../../../../Minecraft.Client/PlayerList.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/list/CliCommandList.h b/Minecraft.Server/Console/commands/list/CliCommandList.h index ad26dcbc2c..e29d5125dd 100644 --- a/Minecraft.Server/Console/commands/list/CliCommandList.h +++ b/Minecraft.Server/Console/commands/list/CliCommandList.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp index 3517dbd87d..7e90702ab5 100644 --- a/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp +++ b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp @@ -2,11 +2,11 @@ #include "CliCommandPardonIp.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\NetworkUtils.h" -#include "..\..\..\Common\StringUtils.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/NetworkUtils.h" +#include "../../../Common/StringUtils.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h index 96f4c7fc77..f99a7f62f7 100644 --- a/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h +++ b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp index d1e995e90b..a8a647faeb 100644 --- a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp +++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp @@ -2,11 +2,11 @@ #include "CliCommandPardon.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/StringUtils.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" #include diff --git a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h index a171d42882..4aac03505a 100644 --- a/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h +++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp b/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp index 29e42cd9a2..ec810641b0 100644 --- a/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp +++ b/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp @@ -2,7 +2,7 @@ #include "CliCommandStop.h" -#include "..\..\ServerCliEngine.h" +#include "../../ServerCliEngine.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/stop/CliCommandStop.h b/Minecraft.Server/Console/commands/stop/CliCommandStop.h index 2297c6732b..5f3288fab5 100644 --- a/Minecraft.Server/Console/commands/stop/CliCommandStop.h +++ b/Minecraft.Server/Console/commands/stop/CliCommandStop.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/time/CliCommandTime.cpp b/Minecraft.Server/Console/commands/time/CliCommandTime.cpp index d274993ccd..2c2ebdd3fb 100644 --- a/Minecraft.Server/Console/commands/time/CliCommandTime.cpp +++ b/Minecraft.Server/Console/commands/time/CliCommandTime.cpp @@ -2,11 +2,11 @@ #include "CliCommandTime.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\..\Minecraft.World\GameCommandPacket.h" -#include "..\..\..\..\Minecraft.World\TimeCommand.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Common/StringUtils.h" +#include "../../../../Minecraft.World/GameCommandPacket.h" +#include "../../../../Minecraft.World/TimeCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/time/CliCommandTime.h b/Minecraft.Server/Console/commands/time/CliCommandTime.h index 28cf5e5a91..300bba33ee 100644 --- a/Minecraft.Server/Console/commands/time/CliCommandTime.h +++ b/Minecraft.Server/Console/commands/time/CliCommandTime.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp b/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp index 45dbb28466..9b20f0467b 100644 --- a/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp +++ b/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp @@ -2,12 +2,12 @@ #include "CliCommandTp.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\..\Minecraft.Client\TeleportCommand.h" -#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\..\Minecraft.World\GameCommandPacket.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../../Minecraft.Client/PlayerConnection.h" +#include "../../../../Minecraft.Client/TeleportCommand.h" +#include "../../../../Minecraft.Client/ServerPlayer.h" +#include "../../../../Minecraft.World/GameCommandPacket.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/tp/CliCommandTp.h b/Minecraft.Server/Console/commands/tp/CliCommandTp.h index 6e9ffdd7ff..39ede0a915 100644 --- a/Minecraft.Server/Console/commands/tp/CliCommandTp.h +++ b/Minecraft.Server/Console/commands/tp/CliCommandTp.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/weather/CliCommandWeather.cpp b/Minecraft.Server/Console/commands/weather/CliCommandWeather.cpp index e7f0195429..f97f03bb1f 100644 --- a/Minecraft.Server/Console/commands/weather/CliCommandWeather.cpp +++ b/Minecraft.Server/Console/commands/weather/CliCommandWeather.cpp @@ -2,10 +2,10 @@ #include "CliCommandWeather.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\..\Minecraft.World\GameCommandPacket.h" -#include "..\..\..\..\Minecraft.World\ToggleDownfallCommand.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../../Minecraft.World/GameCommandPacket.h" +#include "../../../../Minecraft.World/ToggleDownfallCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/weather/CliCommandWeather.h b/Minecraft.Server/Console/commands/weather/CliCommandWeather.h index 03498b4737..cea4f66a53 100644 --- a/Minecraft.Server/Console/commands/weather/CliCommandWeather.h +++ b/Minecraft.Server/Console/commands/weather/CliCommandWeather.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp index 037242780f..33f7b35713 100644 --- a/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp +++ b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp @@ -2,11 +2,11 @@ #include "CliCommandWhitelist.h" -#include "..\..\ServerCliEngine.h" -#include "..\..\ServerCliParser.h" -#include "..\..\..\Access\Access.h" -#include "..\..\..\Common\StringUtils.h" -#include "..\..\..\ServerProperties.h" +#include "../../ServerCliEngine.h" +#include "../../ServerCliParser.h" +#include "../../../Access/Access.h" +#include "../../../Common/StringUtils.h" +#include "../../../ServerProperties.h" #include #include diff --git a/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h index 45e21a5e69..700005d828 100644 --- a/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h +++ b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h @@ -1,6 +1,6 @@ #pragma once -#include "..\IServerCliCommand.h" +#include "../IServerCliCommand.h" namespace ServerRuntime { diff --git a/Minecraft.Server/ServerLogManager.cpp b/Minecraft.Server/ServerLogManager.cpp index 84805f7e4e..2992edc94f 100644 --- a/Minecraft.Server/ServerLogManager.cpp +++ b/Minecraft.Server/ServerLogManager.cpp @@ -2,7 +2,7 @@ #include "ServerLogManager.h" -#include "Common\StringUtils.h" +#include "Common/StringUtils.h" #include "ServerLogger.h" #include diff --git a/Minecraft.Server/ServerLogManager.h b/Minecraft.Server/ServerLogManager.h index 1d4abfb5bd..fe150b2118 100644 --- a/Minecraft.Server/ServerLogManager.h +++ b/Minecraft.Server/ServerLogManager.h @@ -3,7 +3,7 @@ #include #include -#include "..\Minecraft.World\DisconnectPacket.h" +#include "../Minecraft.World/DisconnectPacket.h" namespace ServerRuntime { diff --git a/Minecraft.Server/ServerLogger.cpp b/Minecraft.Server/ServerLogger.cpp index 0c7c567f6d..1dcf7c47cb 100644 --- a/Minecraft.Server/ServerLogger.cpp +++ b/Minecraft.Server/ServerLogger.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "ServerLogger.h" -#include "Common\\StringUtils.h" -#include "vendor\\linenoise\\linenoise.h" +#include "Common//StringUtils.h" +#include "vendor//linenoise//linenoise.h" #include #include diff --git a/Minecraft.Server/ServerProperties.cpp b/Minecraft.Server/ServerProperties.cpp index d6ba64e7e2..ddc75a4a53 100644 --- a/Minecraft.Server/ServerProperties.cpp +++ b/Minecraft.Server/ServerProperties.cpp @@ -3,9 +3,9 @@ #include "ServerProperties.h" #include "ServerLogger.h" -#include "Common\\StringUtils.h" -#include "Common\\FileUtils.h" -#include "..\\Minecraft.World\\ChunkSource.h" +#include "Common//StringUtils.h" +#include "Common//FileUtils.h" +#include "..//Minecraft.World//ChunkSource.h" #include #include diff --git a/Minecraft.Server/Windows64/ServerMain.cpp b/Minecraft.Server/Windows64/ServerMain.cpp index a8d5fc66b2..bd568f0c79 100644 --- a/Minecraft.Server/Windows64/ServerMain.cpp +++ b/Minecraft.Server/Windows64/ServerMain.cpp @@ -5,14 +5,14 @@ #include "Input.h" #include "Minecraft.h" #include "MinecraftServer.h" -#include "..\Access\Access.h" -#include "..\Common\StringUtils.h" -#include "..\ServerLogger.h" -#include "..\ServerLogManager.h" -#include "..\ServerProperties.h" -#include "..\ServerShutdown.h" -#include "..\WorldManager.h" -#include "..\Console\ServerCli.h" +#include "../Access/Access.h" +#include "../Common/StringUtils.h" +#include "../ServerLogger.h" +#include "../ServerLogManager.h" +#include "../ServerProperties.h" +#include "../ServerShutdown.h" +#include "../WorldManager.h" +#include "../Console/ServerCli.h" #include "Tesselator.h" #include "Windows64/4JLibs/inc/4J_Render.h" #include "Windows64/GameConfig/Minecraft.spa.h" diff --git a/Minecraft.Server/WorldManager.cpp b/Minecraft.Server/WorldManager.cpp index b9ec3dd90c..9f378d1202 100644 --- a/Minecraft.Server/WorldManager.cpp +++ b/Minecraft.Server/WorldManager.cpp @@ -5,7 +5,7 @@ #include "Minecraft.h" #include "MinecraftServer.h" #include "ServerLogger.h" -#include "Common\\StringUtils.h" +#include "Common//StringUtils.h" #include #include diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp index 93d58cdd7b..0bd6111b93 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 ae30c057cb..1f26badaf9 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 66265765e2..d2c7f00ff2 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 b2593ce3d2..b03db298cb 100644 --- a/Minecraft.World/BiomeCache.h +++ b/Minecraft.World/BiomeCache.h @@ -1,5 +1,5 @@ #pragma once -#include "..\Minecraft.World\JavaIntHash.h" +#include "../Minecraft.World/JavaIntHash.h" class BiomeCache { diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp index 8942267759..27d0a9432a 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 ec72dfcb73..c76d4e04f9 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 cb9d54b667..f195e4fcbf 100644 --- a/Minecraft.World/BucketItem.cpp +++ b/Minecraft.World/BucketItem.cpp @@ -12,10 +12,10 @@ #include "Material.h" #include "ItemInstance.h" #include "BucketItem.h" -#include "..\Minecraft.Client\LocalPlayer.h" -#include "..\Minecraft.Client\ServerPlayer.h" -#include "..\Minecraft.Client\PlayerConnection.h" -#include "..\Minecraft.World\ChatPacket.h" +#include "../Minecraft.Client/LocalPlayer.h" +#include "../Minecraft.Client/ServerPlayer.h" +#include "../Minecraft.Client/PlayerConnection.h" +#include "../Minecraft.World/ChatPacket.h" #include "SoundTypes.h" BucketItem::BucketItem(int id, int content) : Item( id ) diff --git a/Minecraft.World/C4JThread.cpp b/Minecraft.World/C4JThread.cpp index 7993a0f6bc..d07bb9ca42 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 c77ebd281d..9acd229475 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 d9396c43c2..e4924c3216 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 355d8a256a..df084f0a5c 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 83b8e7a4d0..97e26208a7 100644 --- a/Minecraft.World/ClockItem.cpp +++ b/Minecraft.World/ClockItem.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ClockItem.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/MultiPlayerLocalPlayer.h" #include "net.minecraft.world.h" #ifdef __PSVITA__ diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index 35d0b5b84e..4662d604dd 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "net.minecraft.world.Item.h" +#include "net.minecraft.world.item.h" #include "net.minecraft.world.level.tile.h" #include "Recipy.h" #include "Recipes.h" diff --git a/Minecraft.World/Command.cpp b/Minecraft.World/Command.cpp index 2ec6853cae..3816d69e12 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 00870ee485..ba2d7cdade 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 99d18ed082..8dc06dc577 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/CompressedTileStorage.cpp b/Minecraft.World/CompressedTileStorage.cpp index b093f80454..7cdfdbce8a 100644 --- a/Minecraft.World/CompressedTileStorage.cpp +++ b/Minecraft.World/CompressedTileStorage.cpp @@ -6,7 +6,7 @@ #endif #ifdef __PS3__ -#include "..\SPU_Tasks\CompressedTileStorage_compress\CompressedTileStorage_compress.h" +#include "../SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.h" #include "C4JSpursJob.h" static const int sc_maxCompressTiles = 64; static CompressedTileStorage_compress_dataIn g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16))); diff --git a/Minecraft.World/Connection.cpp b/Minecraft.World/Connection.cpp index d445026678..19a033d969 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 diff --git a/Minecraft.World/ConsoleSaveFileOriginal.cpp b/Minecraft.World/ConsoleSaveFileOriginal.cpp index 8a7d1f9ec5..7e00b82a90 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 "../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" #ifdef _XBOX diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp index 3dcae136ea..463ad5d1df 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 25bd579c53..c681eed01a 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 "../Minecraft.World/SharedConstants.h" class Mob; diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp index 0b959fc155..2ecae481d9 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 0cd6b53448..dde588947f 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 b7a2ea7c82..ea650ac390 100644 --- a/Minecraft.World/Dimension.cpp +++ b/Minecraft.World/Dimension.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.level.levelgen.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.storage.h" -#include "dimension.h" +#include "Dimension.h" #include "BiomeSource.h" #include "FixedBiomeSource.h" #include "OldChunkStorage.h" @@ -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 7302d9edcb..776927cb93 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 5d708db8a8..f7e440b31a 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 c84117094c..9c0efbb971 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 f8e4871f52..fe2a87ebe2 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 da469a3a22..166369e0e4 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 924312e591..8168705dfd 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -18,12 +18,12 @@ #include "EntityPos.h" #include "Entity.h" #include "SoundTypes.h" -#include "..\minecraft.Client\HumanoidModel.h" -#include "..\Minecraft.Client\MinecraftServer.h" -#include "..\Minecraft.Client\MultiPlayerLevel.h" -#include "..\Minecraft.Client\MultiplayerLocalPlayer.h" -#include "..\Minecraft.Client\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" const wstring Entity::RIDING_TAG = L"Riding"; diff --git a/Minecraft.World/EntityHorse.cpp b/Minecraft.World/EntityHorse.cpp index 0bf5bc080c..cf5ec2c1ff 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" @@ -558,17 +558,17 @@ int EntityHorse::getDeathSound() int type = getType(); if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_DEATH; //"mob.horse.zombie.death"; + return eSoundType_MOB_HORSE_ZOMBIE_DEATH; //"Mob.horse.zombie.death"; } if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_DEATH; //"mob.horse.skeleton.death"; + return eSoundType_MOB_HORSE_SKELETON_DEATH; //"Mob.horse.skeleton.death"; } if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_DEATH; //"mob.horse.donkey.death"; + return eSoundType_MOB_HORSE_DONKEY_DEATH; //"Mob.horse.donkey.death"; } - return eSoundType_MOB_HORSE_DEATH; //"mob.horse.death"; + return eSoundType_MOB_HORSE_DEATH; //"Mob.horse.death"; } int EntityHorse::getDeathLoot() @@ -604,17 +604,17 @@ int EntityHorse::getHurtSound() int type = getType(); if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"mob.horse.zombie.hit"; + return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"Mob.horse.zombie.hit"; } if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_HIT; //"mob.horse.skeleton.hit"; + return eSoundType_MOB_HORSE_SKELETON_HIT; //"Mob.horse.skeleton.hit"; } if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_HIT; //"mob.horse.donkey.hit"; + return eSoundType_MOB_HORSE_DONKEY_HIT; //"Mob.horse.donkey.hit"; } - return eSoundType_MOB_HORSE_HIT; //"mob.horse.hit"; + return eSoundType_MOB_HORSE_HIT; //"Mob.horse.hit"; } bool EntityHorse::isSaddled() @@ -633,17 +633,17 @@ int EntityHorse::getAmbientSound() int type = getType(); if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"mob.horse.zombie.idle"; + return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"Mob.horse.zombie.idle"; } if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_IDLE; //"mob.horse.skeleton.idle"; + return eSoundType_MOB_HORSE_SKELETON_IDLE; //"Mob.horse.skeleton.idle"; } if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_IDLE; //"mob.horse.donkey.idle"; + return eSoundType_MOB_HORSE_DONKEY_IDLE; //"Mob.horse.donkey.idle"; } - return eSoundType_MOB_HORSE_IDLE; //"mob.horse.idle"; + return eSoundType_MOB_HORSE_IDLE; //"Mob.horse.idle"; } /** @@ -660,9 +660,9 @@ int EntityHorse::getMadSound() } if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"mob.horse.donkey.angry"; + return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"Mob.horse.donkey.angry"; } - return eSoundType_MOB_HORSE_ANGRY; //"mob.horse.angry"; + return eSoundType_MOB_HORSE_ANGRY; //"Mob.horse.angry"; } void EntityHorse::playStepSound(int xt, int yt, int zt, int t) diff --git a/Minecraft.World/ExperienceCommand.cpp b/Minecraft.World/ExperienceCommand.cpp index 9a59d71a0e..94200d347f 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/FireChargeItem.cpp b/Minecraft.World/FireChargeItem.cpp index d3499cdc61..586c3e08af 100644 --- a/Minecraft.World/FireChargeItem.cpp +++ b/Minecraft.World/FireChargeItem.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.h" #include "SoundTypes.h" #include "FireChargeItem.h" -#include "tile.h" +#include "Tile.h" FireChargeItem::FireChargeItem(int id) : Item(id) { diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp index 49f859b513..9f25992564 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 276bf92987..e8525ed8e4 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 541424db05..638b3283c1 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 738a42da2d..d333f861ac 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 dbb790bf00..51189265ed 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 fa06d80d17..7163c14265 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/GlowstoneTile.cpp b/Minecraft.World/GlowstoneTile.cpp index dba4ce9190..5add7c258d 100644 --- a/Minecraft.World/GlowstoneTile.cpp +++ b/Minecraft.World/GlowstoneTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Glowstonetile.h" +#include "GlowstoneTile.h" #include "net.minecraft.world.item.h" Glowstonetile::Glowstonetile(int id, Material *material) : Tile(id, material) diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp index 9be44d0ebd..f5cc33cdac 100644 --- a/Minecraft.World/GrassTile.cpp +++ b/Minecraft.World/GrassTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "GrassTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" @@ -8,7 +8,7 @@ // AP - included for PSVita Alpha cut out optimisation #include "IntBuffer.h" -#include "..\Minecraft.Client\Tesselator.h" +#include "../Minecraft.Client/Tesselator.h" GrassTile::GrassTile(int id) : Tile(id, Material::grass) { diff --git a/Minecraft.World/HangingEntityItem.h b/Minecraft.World/HangingEntityItem.h index d0e828978c..6c1a641d4c 100644 --- a/Minecraft.World/HangingEntityItem.h +++ b/Minecraft.World/HangingEntityItem.h @@ -1,6 +1,6 @@ #pragma once -#include "item.h" +#include "Item.h" class HangingEntity; diff --git a/Minecraft.World/HellDimension.cpp b/Minecraft.World/HellDimension.cpp index a765fd6fb2..9c5cb9efe4 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 f60baf0974..30a8765353 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 a0eda52f7f..7d9ffed92c 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 f8f5deae47..6bb9cbfd79 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 161f4e5605..19126b242d 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 3892d97ee0..904b4901d6 100644 --- a/Minecraft.World/Level.h +++ b/Minecraft.World/Level.h @@ -7,11 +7,11 @@ using namespace std; #include "SavedData.h" #include "Definitions.h" #include "ParticleTypes.h" -#include "biome.h" +#include "Biome.h" #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 584e3df10d..a1387d6cf4 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 68ac77efbe..03fdb08b2e 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 3af9efe962..b805022309 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 358b9c7e11..f13a8c5280 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 f6c4bb769a..efefb7ea5c 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 1ee6eb47c4..bbf11b6734 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 17671112f7..c318fe9b4e 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 35b24721b8..f43d95325e 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 452ddcc433..12b2dcb026 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 ad19a36d4d..4b7e79d43e 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 e5a84122cf..f3cf2387b2 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 2b274215ee..6452e73dc3 100644 --- a/Minecraft.World/MushroomCow.cpp +++ b/Minecraft.World/MushroomCow.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.item.h" #include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.item.h" -#include "..\Minecraft.Client\Textures.h" +#include "../Minecraft.Client/Textures.h" #include "MushroomCow.h" #include "MobCategory.h" #include "AABB.h" diff --git a/Minecraft.World/NetherBridgeFeature.h b/Minecraft.World/NetherBridgeFeature.h index 2fd1701a13..d638e82bc2 100644 --- a/Minecraft.World/NetherBridgeFeature.h +++ b/Minecraft.World/NetherBridgeFeature.h @@ -1,7 +1,7 @@ #pragma once #include "StructureFeature.h" #include "StructureStart.h" -#include "biome.h" +#include "Biome.h" class Random; class NetherBridgeFeature : public StructureFeature diff --git a/Minecraft.World/Ocelot.cpp b/Minecraft.World/Ocelot.cpp index 75c6e0f073..0e367e9040 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 3c05f3578a..a57917e0c6 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 05bf932dcb..1769c2acb2 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/Path.cpp b/Minecraft.World/Path.cpp index afea4a1761..0b2913f20f 100644 --- a/Minecraft.World/Path.cpp +++ b/Minecraft.World/Path.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.world.entity.h" #include "net.minecraft.world.level.pathfinder.h" -#include "path.h" +#include "Path.h" Path::~Path() { diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp index a99af826cd..fbb0d72cd5 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 1be123d7a0..e87d028a10 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 530cbf73b0..36651f7b9d 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 00c7148e41..e4dbcb1195 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 d0ad8d2af6..e493d1c0ee 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 9695afdfd1..fb8539457d 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_t time) : Pos(x, y, z) diff --git a/Minecraft.World/PotionBrewing.cpp b/Minecraft.World/PotionBrewing.cpp index bc5fd8c714..f980977c63 100644 --- a/Minecraft.World/PotionBrewing.cpp +++ b/Minecraft.World/PotionBrewing.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\Minecraft.Client\Minecraft.h" +#include "../Minecraft.Client/Minecraft.h" #include "net.minecraft.world.effect.h" #include "JavaMath.h" #include "SharedConstants.h" diff --git a/Minecraft.World/PreLoginPacket.cpp b/Minecraft.World/PreLoginPacket.cpp index ddcfe19733..d5c2d83217 100644 --- a/Minecraft.World/PreLoginPacket.cpp +++ b/Minecraft.World/PreLoginPacket.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include "PacketListener.h" -#include "PreloginPacket.h" +#include "PreLoginPacket.h" #include "InputOutputStream.h" diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp index a0e7a94bbb..cd305df507 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 e348406b9a..f81cf30345 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/RedStoneItem.cpp b/Minecraft.World/RedStoneItem.cpp index 3d8ee453c6..6e12842ad9 100644 --- a/Minecraft.World/RedStoneItem.cpp +++ b/Minecraft.World/RedStoneItem.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.level.tile.h" #include "ItemInstance.h" #include "GenericStats.h" -#include "RedstoneItem.h" +#include "RedStoneItem.h" RedStoneItem::RedStoneItem(int id) : Item(id) { diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp index f06308f49d..8b596c0ab0 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 598621eb5a..c482b01603 100644 --- a/Minecraft.World/SignTileEntity.cpp +++ b/Minecraft.World/SignTileEntity.cpp @@ -9,10 +9,10 @@ #include "net.minecraft.network.packet.h" #include "SignTileEntity.h" #include -#include "..\Minecraft.Client\ClientConnection.h" -#include "..\Minecraft.Client\Minecraft.h" -#include "..\Minecraft.Client\ServerLevel.h" -#include "..\Minecraft.World\Level.h" +#include "../Minecraft.Client/ClientConnection.h" +#include "../Minecraft.Client/Minecraft.h" +#include "../Minecraft.Client/ServerLevel.h" +#include "../Minecraft.World/Level.h" diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index 98f559c927..fd7e2d2ba4 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 cc325b979d..8285441d69 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 de76ef0649..563455d625 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 05ead6a69c..8a6561bf2c 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 41ac3702f7..f6a780c308 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 5124f668cd..607c5634f0 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 5d7bdd2c87..63b4d9aa03 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 f1b660ebea..c6a5e9a7cc 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 43ff486cf3..bd1247d723 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 476b643cf5..a04c70de63 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 337e343d20..943d9e1d39 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 8577f03dfb..fa0a5837b0 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 7f26d0e894..59c5292f0f 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 c325f1c912..38931b4101 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 8addb3ed03..3f229ef39f 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 "../Minecraft.World/JavaIntHash.h" class Level; class Packet; diff --git a/Minecraft.World/TileItem.cpp b/Minecraft.World/TileItem.cpp index 8d22594db6..4e2e5081d4 100644 --- a/Minecraft.World/TileItem.cpp +++ b/Minecraft.World/TileItem.cpp @@ -10,7 +10,7 @@ using namespace std; #include "net.minecraft.world.h" #include "net.minecraft.stats.h" #include "TileItem.h" -#include "facing.h" +#include "Facing.h" // 4J-PB - for the debug option of not removing items #include diff --git a/Minecraft.World/TimeCommand.cpp b/Minecraft.World/TimeCommand.cpp index 05147983fc..0e4766cbf5 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 526be35346..f90b145a04 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 4e57affe01..afb2bcac51 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" #include "AbstractContainerMenu.h" diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp index 09508bfc43..04028056e5 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 71c37874ac..73d1e057b8 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 7588a67b03..6a71ac9418 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/WoodSlabTile.cpp b/Minecraft.World/WoodSlabTile.cpp index 574dab932d..1bc1932f01 100644 --- a/Minecraft.World/WoodSlabTile.cpp +++ b/Minecraft.World/WoodSlabTile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WoodSlabTile.h" -#include "woodtile.h" -#include "treetile.h" +#include "WoodTile.h" +#include "TreeTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" #include "net.minecraft.world.item.h" diff --git a/Minecraft.World/Zombie.cpp b/Minecraft.World/Zombie.cpp index f982d8475d..51ede82fdf 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 4122922b9a..a4d7e4f24a 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 bceac78c6c..0cf2d7c053 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/net.minecraft.world.item.h b/Minecraft.World/net.minecraft.world.item.h index 07728069df..10ff76f5fb 100644 --- a/Minecraft.World/net.minecraft.world.item.h +++ b/Minecraft.World/net.minecraft.world.item.h @@ -34,7 +34,7 @@ #include "ShearsItem.h" #include "ShovelItem.h" #include "SignItem.h" -#include "SnowBallItem.h" +#include "SnowballItem.h" #include "StoneSlabTileItem.h" #include "TileItem.h" #include "TilePlanterItem.h" diff --git a/Minecraft.World/net.minecraft.world.level.tile.h b/Minecraft.World/net.minecraft.world.level.tile.h index 36c7ac5c68..fb94ddf340 100644 --- a/Minecraft.World/net.minecraft.world.level.tile.h +++ b/Minecraft.World/net.minecraft.world.level.tile.h @@ -44,7 +44,7 @@ #include "FlowerPotTile.h" #include "FurnaceTile.h" #include "GlassTile.h" -#include "Glowstonetile.h" +#include "GlowstoneTile.h" #include "GrassTile.h" #include "GravelTile.h" #include "HalfSlabTile.h" diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index 5b42a0daed..29adbe519b 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -24,7 +24,7 @@ #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 ) @@ -113,7 +113,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" @@ -142,100 +142,100 @@ 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" #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 "Common\BuildVer.h" +#include "Common/BuildVer.h" #ifdef _XBOX -#include "..\Minecraft.Client\Xbox\Xbox_App.h" -#include "..\Minecraft.Client\XboxMedia\strings.h" -#include "..\Minecraft.Client\Xbox\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Xbox\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/Xbox/Xbox_App.h" +#include "../Minecraft.Client/XboxMedia/strings.h" +#include "../Minecraft.Client/Xbox/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Xbox/Sentient/MinecraftTelemetry.h" #elif defined (__PS3__) -#include "..\Minecraft.Client\PS3\PS3_App.h" -#include "..\Minecraft.Client\PS3Media\strings.h" -#include "..\Minecraft.Client\PS3\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\PS3\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/PS3/PS3_App.h" +#include "../Minecraft.Client/PS3Media/strings.h" +#include "../Minecraft.Client/PS3/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/PS3/Sentient/MinecraftTelemetry.h" #elif defined _DURANGO -#include "..\Minecraft.Client\Durango\Durango_App.h" -#include "..\Minecraft.Client\DurangoMedia\strings.h" -//#include "..\Minecraft.Client\Durango\Sentient\SentientManager.h" -#include "..\Minecraft.Client\Durango\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Durango\Sentient\MinecraftTelemetry.h" -#include "..\Minecraft.Client\Durango\Sentient\TelemetryEnum.h" +#include "../Minecraft.Client/Durango/Durango_App.h" +#include "../Minecraft.Client/DurangoMedia/strings.h" +//#include "../Minecraft.Client/Durango/Sentient/SentientManager.h" +#include "../Minecraft.Client/Durango/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Durango/Sentient/MinecraftTelemetry.h" +#include "../Minecraft.Client/Durango/Sentient/TelemetryEnum.h" #elif defined _WINDOWS64 -#include "..\Minecraft.Client\Windows64\Windows64_App.h" -#include "..\Minecraft.Client\Windows64Media\strings.h" -#include "..\Minecraft.Client\Windows64\Sentient\SentientTelemetryCommon.h" -#include "..\Minecraft.Client\Windows64\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/Windows64/Windows64_App.h" +#include "../Minecraft.Client/Windows64Media/strings.h" +#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h" +#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" #elif defined __PSVITA__ -#include "..\Minecraft.Client\PSVita\PSVita_App.h" -#include "..\Minecraft.Client\PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this -#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h" -#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h" +#include "../Minecraft.Client/PSVita/PSVita_App.h" +#include "../Minecraft.Client/PSVitaMedia/strings.h" // TODO - create PSVita-specific version of this +#include "../Minecraft.Client/PSVita/Sentient/SentientManager.h" +#include "../Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h" #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 4af047b5b9..03f1b6ac6d 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 @@ -30,8 +30,8 @@ const int MINECRAFT_NET_MAX_PLAYERS = 256; #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; @@ -41,8 +41,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; @@ -50,15 +50,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; diff --git a/cmake/CopyFileScript.cmake b/cmake/CopyFileScript.cmake index ac156ca14d..2a7c5cba1d 100644 --- a/cmake/CopyFileScript.cmake +++ b/cmake/CopyFileScript.cmake @@ -39,6 +39,9 @@ if(CMAKE_HOST_WIN32) endforeach() elseif(CMAKE_HOST_UNIX) + # Ensure destination directory exists + file(MAKE_DIRECTORY "${COPY_DEST}") + execute_process( COMMAND rsync -av ${COPY_SOURCE} "${COPY_DEST}/" RESULT_VARIABLE rs diff --git a/cmake/CopyFolderScript.cmake b/cmake/CopyFolderScript.cmake index e725b68dce..91225dd0b6 100644 --- a/cmake/CopyFolderScript.cmake +++ b/cmake/CopyFolderScript.cmake @@ -46,6 +46,9 @@ if(CMAKE_HOST_WIN32) message(FATAL_ERROR "robocopy failed (exit code ${rc})") endif() elseif(CMAKE_HOST_UNIX) + # Ensure destination directory exists + file(MAKE_DIRECTORY "${COPY_DEST}") + set(rsync_args -av) foreach(pattern IN LISTS EXCLUDE_FILES) diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000000..f86a22a873 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000000..eef59c57dd --- /dev/null +++ b/flake.nix @@ -0,0 +1,526 @@ +{ + description = "MinecraftConsoles - Minecraft Legacy Console Edition recreation"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + + # Version info + version = "1.6.0560.0"; + + # Windows SDK downloaded via xwin (fixed-output derivation) + windowsSdk = pkgs.stdenvNoCC.mkDerivation { + pname = "windows-sdk-xwin"; + version = "0.6.0"; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-ksSytBUjv/tD3IJzHM9BkAzFjJ+JAGD353Pur0G4rQE="; + + nativeBuildInputs = [ pkgs.xwin pkgs.cacert pkgs.rsync ]; + + dontUnpack = true; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + TEMP_OUT=$(mktemp -d) + + # Download and splat to temp directory first (same filesystem) + xwin --accept-license splat --output "$TEMP_OUT" + + # Copy to actual output (handles cross-device) + mkdir -p $out + rsync -a "$TEMP_OUT/" "$out/" + + runHook postBuild + ''; + + dontInstall = true; + dontFixup = true; + }; + + # Helper to create case-insensitive symlinks for SDK headers/libs + sdkWithSymlinks = pkgs.runCommand "windows-sdk-symlinked" {} '' + cp -r ${windowsSdk} $out + chmod -R u+w $out + + # SDK header symlinks (case sensitivity fixes) + ln -sf $out/sdk/include/shared/sdkddkver.h $out/sdk/include/shared/SDKDDKVer.h 2>/dev/null || true + + # Library symlinks (case sensitivity fixes) + ln -sf $out/sdk/lib/um/x86_64/xinput9_1_0.lib $out/sdk/lib/um/x86_64/XInput9_1_0.lib 2>/dev/null || true + ln -sf $out/sdk/lib/um/x86_64/ws2_32.lib $out/sdk/lib/um/x86_64/Ws2_32.lib 2>/dev/null || true + ''; + + # CMake toolchain file for clang-cl cross-compilation + clangClToolchain = pkgs.writeText "clang-cl-toolchain.cmake" '' + set(CMAKE_SYSTEM_NAME Windows) + set(CMAKE_SYSTEM_PROCESSOR AMD64) + + set(CMAKE_C_COMPILER clang-cl) + set(CMAKE_CXX_COMPILER clang-cl) + set(CMAKE_RC_COMPILER llvm-rc) + set(CMAKE_ASM_MASM_COMPILER llvm-ml) + set(CMAKE_AR llvm-lib) + set(CMAKE_LINKER lld-link) + + set(CMAKE_CROSSCOMPILING TRUE) + + set(CMAKE_C_LINK_EXECUTABLE " -out: ") + set(CMAKE_CXX_LINK_EXECUTABLE " -out: ") + + add_compile_options(-fms-compatibility -fms-extensions) + add_compile_definitions(_WIN64 _AMD64_ WIN32_LEAN_AND_MEAN) + ''; + + # The main build derivation + minecraft-lce-unwrapped = pkgs.stdenv.mkDerivation { + pname = "minecraft-lce-unwrapped"; + inherit version; + + src = pkgs.lib.cleanSourceWith { + src = ./.; + filter = path: type: + let + baseName = baseNameOf path; + in + # Exclude build directories and other non-source files + !(baseName == "build" || + baseName == "result" || + baseName == ".git" || + baseName == ".direnv" || + pkgs.lib.hasPrefix "result-" baseName); + }; + + nativeBuildInputs = with pkgs; [ + llvmPackages.clang-unwrapped # provides clang-cl + llvmPackages.lld # provides lld-link + llvmPackages.llvm # provides llvm-rc, llvm-ml, llvm-lib, llvm-mt + cmake + ninja + rsync + ]; + + # Set up environment for clang-cl + WINSDK = sdkWithSymlinks; + + configurePhase = '' + runHook preConfigure + + export INCLUDE="$WINSDK/crt/include;$WINSDK/sdk/include/um;$WINSDK/sdk/include/ucrt;$WINSDK/sdk/include/shared" + export LIB="$WINSDK/crt/lib/x86_64;$WINSDK/sdk/lib/um/x86_64;$WINSDK/sdk/lib/ucrt/x86_64" + + cmake -S . -B build \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_TOOLCHAIN_FILE=${clangClToolchain} \ + -DCMAKE_C_COMPILER=clang-cl \ + -DCMAKE_CXX_COMPILER=clang-cl \ + -DCMAKE_LINKER=lld-link \ + -DCMAKE_RC_COMPILER=llvm-rc \ + -DCMAKE_MT=llvm-mt \ + -DPLATFORM_DEFINES="_WINDOWS64" \ + -DPLATFORM_NAME="Windows64" \ + -DIGGY_LIBS="iggy_w64.lib;iggyperfmon_w64.lib;iggyexpruntime_w64.lib" \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \ + -DCMAKE_C_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_CXX_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_ASM_MASM_FLAGS="-m64" \ + -DCMAKE_EXE_LINKER_FLAGS="-libpath:$WINSDK/crt/lib/x86_64 -libpath:$WINSDK/sdk/lib/um/x86_64 -libpath:$WINSDK/sdk/lib/ucrt/x86_64" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + cmake --build build --config Release -j $NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{client,server} + + # Install client + cp build/Minecraft.Client/Minecraft.Client.exe $out/client/ + cp build/Minecraft.Client/iggy_w64.dll $out/client/ 2>/dev/null || true + cp -r build/Minecraft.Client/Common $out/client/ 2>/dev/null || true + cp -r build/Minecraft.Client/Windows64 $out/client/ 2>/dev/null || true + + # Install server + cp build/Minecraft.Server/Minecraft.Server.exe $out/server/ + cp build/Minecraft.Server/iggy_w64.dll $out/server/ 2>/dev/null || true + cp -r build/Minecraft.Server/Common $out/server/ 2>/dev/null || true + cp -r build/Minecraft.Server/Windows64 $out/server/ 2>/dev/null || true + + runHook postInstall + ''; + + meta = with pkgs.lib; { + description = "Minecraft Legacy Console Edition recreation (Windows executables)"; + homepage = "https://github.com/minecraft-lce/MinecraftConsoles"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; + }; + + # Wine package using staging for better performance + winePackage = pkgs.wineWow64Packages.staging; + + # Wine prefix base path + winePrefixBase = ".local/share/minecraft-lce"; + + # Wrapped client package + minecraft-lce-client = pkgs.stdenv.mkDerivation { + pname = "minecraft-lce-client"; + inherit version; + + dontUnpack = true; + dontBuild = true; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/minecraft-lce-client + + # Copy game files + cp -r ${minecraft-lce-unwrapped}/client/* $out/share/minecraft-lce-client/ + + # Create wrapper script + cat > $out/bin/minecraft-lce-client << 'WRAPPER' + #!/usr/bin/env bash + set -euo pipefail + + GAME_DIR="@gameDir@" + PERSIST_DIR="''${MC_DATA_DIR:-$HOME/.local/share/minecraft-lce-client}" + + export WINEARCH=win64 + export WINEPREFIX="''${WINEPREFIX:-$HOME/@winePrefixBase@-client}" + + # Wine performance settings + export WINEDLLOVERRIDES="winemenubuilder.exe=d" + export WINEESYNC=1 + export WINEFSYNC=1 + export DXVK_LOG_LEVEL=none + + mkdir -p "$PERSIST_DIR" + mkdir -p "$WINEPREFIX" + + # Create working directory with symlinks to immutable store + WORK_DIR="$(mktemp -d)" + trap 'rm -rf "$WORK_DIR"' EXIT + + cp -rs "$GAME_DIR"/* "$WORK_DIR/" + chmod -R u+w "$WORK_DIR" + + # Setup persistent data directory + mkdir -p "$PERSIST_DIR/GameHDD" + rm -rf "$WORK_DIR/Windows64/GameHDD" 2>/dev/null || true + ln -sf "$PERSIST_DIR/GameHDD" "$WORK_DIR/Windows64/GameHDD" + + cd "$WORK_DIR" + + echo "[info] Starting Minecraft LCE client" + echo "[info] Data directory: $PERSIST_DIR" + echo "[info] Wine prefix: $WINEPREFIX" + + exec wine "$WORK_DIR/Minecraft.Client.exe" "$@" + WRAPPER + + chmod +x $out/bin/minecraft-lce-client + + substituteInPlace $out/bin/minecraft-lce-client \ + --replace "@gameDir@" "$out/share/minecraft-lce-client" \ + --replace "@winePrefixBase@" "${winePrefixBase}" + + # Use wrapProgram to add Wine to PATH (creates proper runtime closure) + wrapProgram $out/bin/minecraft-lce-client \ + --prefix PATH : "${winePackage}/bin" + + runHook postInstall + ''; + + meta = with pkgs.lib; { + description = "Minecraft Legacy Console Edition - Client"; + homepage = "https://github.com/minecraft-lce/MinecraftConsoles"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "minecraft-lce-client"; + }; + }; + + # Wrapped server package + minecraft-lce-server = pkgs.stdenv.mkDerivation { + pname = "minecraft-lce-server"; + inherit version; + + dontUnpack = true; + dontBuild = true; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/minecraft-lce-server + + # Copy game files + cp -r ${minecraft-lce-unwrapped}/server/* $out/share/minecraft-lce-server/ + + # Create wrapper script + cat > $out/bin/minecraft-lce-server << 'WRAPPER' + #!/usr/bin/env bash + set -euo pipefail + + GAME_DIR="@gameDir@" + SERVER_PORT="''${MC_PORT:-25565}" + SERVER_BIND_IP="''${MC_BIND:-0.0.0.0}" + PERSIST_DIR="''${MC_DATA_DIR:-$HOME/.local/share/minecraft-lce-server}" + + export WINEARCH=win64 + export WINEPREFIX="''${WINEPREFIX:-$HOME/@winePrefixBase@-server}" + + # Wine settings + export WINEDLLOVERRIDES="winemenubuilder.exe=d" + export WINEESYNC=1 + export WINEFSYNC=1 + + mkdir -p "$PERSIST_DIR" + mkdir -p "$WINEPREFIX" + + # Create working directory with symlinks to immutable store + WORK_DIR="$(mktemp -d)" + trap 'rm -rf "$WORK_DIR"' EXIT + + cp -rs "$GAME_DIR"/* "$WORK_DIR/" + chmod -R u+w "$WORK_DIR" + + # Setup persistent data + mkdir -p "$PERSIST_DIR/GameHDD" + + for file in server.properties banned-players.json banned-ips.json; do + if [[ ! -f "$PERSIST_DIR/$file" ]]; then + if [[ -f "$WORK_DIR/$file" ]]; then + cp "$WORK_DIR/$file" "$PERSIST_DIR/$file" + else + echo "[]" > "$PERSIST_DIR/$file" + fi + fi + ln -sf "$PERSIST_DIR/$file" "$WORK_DIR/$file" + done + + rm -rf "$WORK_DIR/Windows64/GameHDD" 2>/dev/null || true + ln -sf "$PERSIST_DIR/GameHDD" "$WORK_DIR/Windows64/GameHDD" + + cd "$WORK_DIR" + + # Start Xvfb if no display (server may require a virtual display) + if [[ -z "''${DISPLAY:-}" ]]; then + export DISPLAY=":99" + Xvfb "$DISPLAY" -nolisten tcp -screen 0 64x64x16 & + XVFB_PID=$! + trap 'kill $XVFB_PID 2>/dev/null || true; rm -rf "$WORK_DIR"' EXIT + sleep 1 + echo "[info] Started Xvfb on $DISPLAY" + fi + + echo "[info] Starting Minecraft LCE server on $SERVER_BIND_IP:$SERVER_PORT" + echo "[info] Data directory: $PERSIST_DIR" + echo "[info] Wine prefix: $WINEPREFIX" + + exec wine "$WORK_DIR/Minecraft.Server.exe" -port "$SERVER_PORT" -bind "$SERVER_BIND_IP" "$@" + WRAPPER + + chmod +x $out/bin/minecraft-lce-server + + substituteInPlace $out/bin/minecraft-lce-server \ + --replace "@gameDir@" "$out/share/minecraft-lce-server" \ + --replace "@winePrefixBase@" "${winePrefixBase}" + + # Use wrapProgram to add Wine and Xvfb to PATH (creates proper runtime closure) + wrapProgram $out/bin/minecraft-lce-server \ + --prefix PATH : "${winePackage}/bin:${pkgs.xorg-server}/bin" + + runHook postInstall + ''; + + meta = with pkgs.lib; { + description = "Minecraft Legacy Console Edition - Dedicated Server"; + homepage = "https://github.com/minecraft-lce/MinecraftConsoles"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "minecraft-lce-server"; + }; + }; + + # Build script for development + buildScript = pkgs.writeShellApplication { + name = "minecraft-lce-build"; + runtimeInputs = with pkgs; [ + llvmPackages.clang-unwrapped + llvmPackages.lld + llvmPackages.llvm + cmake + ninja + xwin + rsync + coreutils + cacert + ]; + text = '' + set -euo pipefail + + SOURCE_DIR="''${1:-.}" + BUILD_TYPE="''${2:-Release}" + XWIN_CACHE="''${XWIN_CACHE:-$HOME/.cache/xwin}" + + export XWIN_CACHE + + echo "[info] Checking Windows SDK cache at $XWIN_CACHE" + + if [[ ! -d "$XWIN_CACHE/splat" ]]; then + echo "[info] Downloading Windows SDK and CRT via xwin..." + mkdir -p "$XWIN_CACHE" + xwin --accept-license splat --output "$XWIN_CACHE/splat" + else + echo "[info] Using cached Windows SDK" + fi + + WINSDK="$XWIN_CACHE/splat" + + export INCLUDE="$WINSDK/crt/include;$WINSDK/sdk/include/um;$WINSDK/sdk/include/ucrt;$WINSDK/sdk/include/shared" + export LIB="$WINSDK/crt/lib/x86_64;$WINSDK/sdk/lib/um/x86_64;$WINSDK/sdk/lib/ucrt/x86_64" + + BUILD_DIR="$SOURCE_DIR/build/windows64-clang" + mkdir -p "$BUILD_DIR" + + echo "[info] Configuring with CMake..." + cmake -S "$SOURCE_DIR" -B "$BUILD_DIR" \ + -G Ninja \ + -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ + -DCMAKE_TOOLCHAIN_FILE="${clangClToolchain}" \ + -DCMAKE_C_COMPILER=clang-cl \ + -DCMAKE_CXX_COMPILER=clang-cl \ + -DCMAKE_LINKER=lld-link \ + -DCMAKE_RC_COMPILER=llvm-rc \ + -DCMAKE_MT=llvm-mt \ + -DPLATFORM_DEFINES="_WINDOWS64" \ + -DPLATFORM_NAME="Windows64" \ + -DIGGY_LIBS="iggy_w64.lib;iggyperfmon_w64.lib;iggyexpruntime_w64.lib" \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \ + -DCMAKE_C_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_CXX_FLAGS="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc -imsvc $WINSDK/crt/include -imsvc $WINSDK/sdk/include/ucrt -imsvc $WINSDK/sdk/include/um -imsvc $WINSDK/sdk/include/shared" \ + -DCMAKE_ASM_MASM_FLAGS="-m64" \ + -DCMAKE_EXE_LINKER_FLAGS="-libpath:$WINSDK/crt/lib/x86_64 -libpath:$WINSDK/sdk/lib/um/x86_64 -libpath:$WINSDK/sdk/lib/ucrt/x86_64" + + echo "[info] Building..." + cmake --build "$BUILD_DIR" --config "$BUILD_TYPE" -j "$(nproc)" + + echo "[info] Build complete! Output in $BUILD_DIR" + ''; + }; + + in + { + packages = { + # Main packages - build from source + client = minecraft-lce-client; + server = minecraft-lce-server; + + # Unwrapped (just the Windows executables) + unwrapped = minecraft-lce-unwrapped; + + # Windows SDK (for debugging) + windows-sdk = sdkWithSymlinks; + + default = minecraft-lce-client; + }; + + apps = { + client = { + type = "app"; + program = "${minecraft-lce-client}/bin/minecraft-lce-client"; + }; + server = { + type = "app"; + program = "${minecraft-lce-server}/bin/minecraft-lce-server"; + }; + build = { + type = "app"; + program = "${buildScript}/bin/minecraft-lce-build"; + }; + default = { + type = "app"; + program = "${minecraft-lce-client}/bin/minecraft-lce-client"; + }; + }; + + devShells.default = pkgs.mkShell { + name = "minecraft-lce-dev"; + packages = with pkgs; [ + # Cross-compilation toolchain + llvmPackages.clang-unwrapped + llvmPackages.lld + llvmPackages.llvm + cmake + ninja + xwin + rsync + + # Wine for testing + winePackage + winetricks + + # For running server without display + xvfb-run + + # Useful tools + git + cacert + ]; + + XWIN_CACHE = "$HOME/.cache/xwin"; + + shellHook = '' + echo "MinecraftConsoles development shell" + echo "" + echo "Quick build (uses cached SDK):" + echo " nix build .#client # Build client package" + echo " nix build .#server # Build server package" + echo "" + echo "Development build (in-tree):" + echo " minecraft-lce-build [source_dir] [Release|Debug]" + echo "" + echo "Run:" + echo " nix run .#client" + echo " nix run .#server" + echo "" + echo "Environment variables:" + echo " MC_PORT - Server port (default: 25565)" + echo " MC_BIND - Server bind address (default: 0.0.0.0)" + echo " MC_DATA_DIR - Persistent data directory" + echo " WINEPREFIX - Custom Wine prefix" + echo "" + ''; + }; + } + ); +}