Add cmakelists

CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.16)
+project(minecraft LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+file(GLOB_RECURSE WORLD_SOURCES ${PROJECT_SOURCE_DIR}/src/world/*.cpp)
+add_library(world STATIC ${WORLD_SOURCES})
+
+target_include_directories(world PUBLIC
+    ${PROJECT_SOURCE_DIR}/src/world
+    ${PROJECT_SOURCE_DIR}/src/world/x64headers
+    ${PROJECT_SOURCE_DIR}/src/client
+    ${PROJECT_SOURCE_DIR}/include
+)

Minecraft.World/stdafx.h

@@ -1,247 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-#pragma once
-
-#ifdef __PS3__
-#else
-#define AUTO_VAR(_var, _val) auto _var = _val
-#endif
-
-#if ( defined _XBOX || defined _WINDOWS64  || defined _DURANGO )
-typedef unsigned __int64 __uint64;
-#endif
-
-#ifdef _WINDOWS64
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-#include <malloc.h>
-#include <tchar.h>
-// TODO: reference additional headers your program requires here
-#include <d3d11.h>
-#endif
-
-#ifdef _DURANGO
-#include <xdk.h>
-#include <wrl.h>
-#include <d3d11_x.h>
-#include <DirectXMath.h>
-using namespace DirectX;
-#include <pix.h>
-#include "..\Minecraft.Client\Durango\DurangoExtras\DurangoStubs.h"
-#endif
-
-#if (defined __PS3__ || defined _XBOX )
-// C RunTime Header Files
-#include <stdlib.h>
-#endif
-
-#ifdef __ORBIS__
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <scebase.h>
-#include <kernel.h>
-#include <fios2.h>
-#include <message_dialog.h>
-#endif
-
-#ifdef _XBOX
-#include <xtl.h>
-#include <xboxmath.h>
-#include <xuiapp.h>
-#include <xact3.h>
-typedef XINVITE_INFO INVITE_INFO;
-typedef XUID PlayerUID;
-typedef XNKID SessionID;
-typedef XUID GameSessionUID;
-#endif
-
-#ifdef __PS3__
-#include <cell/l10n.h>
-#include <cell/pad.h>
-#include <cell/cell_fs.h>
-#include <sys/process.h>
-#include <sys/ppu_thread.h>
-#include <cell/sysmodule.h>
-#include <sysutil/sysutil_common.h>
-#include <sysutil/sysutil_savedata.h>
-#include <sysutil/sysutil_sysparam.h>
-
-
-#include "Ps3Types.h"
-#include "Ps3Stubs.h"
-#include "PS3Maths.h"
-
-#elif defined __ORBIS__
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-#include "OrbisTypes.h"
-#include "OrbisStubs.h"
-#include "OrbisMaths.h"
-#elif defined __PSVITA__
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-#include <touch.h>
-#include "PSVitaTypes.h"
-#include "PSVitaStubs.h"
-#include "PSVitaMaths.h"
-#else
-#include <unordered_map>
-#include <unordered_set>
-#include <sal.h>
-#include <vector>
-#endif //__PS3__
-
-#include <memory>
-
-#include <list>
-#include <map>
-#include <set>
-#include <queue>
-#include <deque>
-#include <algorithm>
-#include <math.h>
-#include <limits>
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <exception>
-
-#ifndef __PS3__			// the PS3 lib assert is rubbish, and aborts the code, we define our own in PS3Types.h
-#include <assert.h>
-#endif
-
-#ifndef _XBOX
-#include "extraX64.h"
-#else
-#include "..\Minecraft.Client\xbox\network\extra.h"
-#endif
-
-#include "Definitions.h"
-#include "Class.h"
-#include "Exceptions.h"
-#include "Mth.h"
-#include "StringHelpers.h"
-#include "ArrayWithLength.h"
-#include "Random.h"
-#include "TilePos.h"
-#include "ChunkPos.h"
-#include "compression.h"
-#include "PerformanceTimer.h"
-
-
-#ifdef _FINAL_BUILD
-#define printf BREAKTHECOMPILE
-#define wprintf BREAKTHECOMPILE
-#undef OutputDebugString
-#define OutputDebugString BREAKTHECOMPILE
-#define OutputDebugStringA BREAKTHECOMPILE
-#define OutputDebugStringW BREAKTHECOMPILE
-#endif
-
-
-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"
-#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"
-#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"
-#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"
-#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"
-#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"
-#endif
-
-#include "..\Minecraft.Client\Common\Network\GameNetworkManager.h"
-
-// #ifdef _XBOX
-#include "..\Minecraft.Client\Common\UI\UIEnums.h"
-#include "..\Minecraft.Client\Common\App_defines.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"
-#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\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"
-
-#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"
-
-#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"
-
-#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"
-
-#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"
-#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"
-#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"

src/client/AbstractContainerScreen.cpp

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

src/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 "InputOutputStream.h"
+#include "StringHelpers.h"
 
 AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
 {

src/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 "System.h"
+#include "net.minecraft.locale.h"
+#include "net.minecraft.stats.h"
+#include "SharedConstants.h"
 
 AchievementPopup::AchievementPopup(Minecraft *mc)
 {

src/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 "System.h"
+#include "net.minecraft.locale.h"
+#include "net.minecraft.world.level.tile.h"
+#include "JavaMath.h"
 
 
 

src/client/AchievementScreen.h

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

src/client/ArchiveFile.cpp

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

src/client/ArchiveFile.h

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

src/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 "net.minecraft.world.entity.projectile.h"
+#include "Mth.h"
 
 void ArrowRenderer::render(shared_ptr<Entity> _arrow, double x, double y, double z, float rot, float a)
 {

src/client/BlazeModel.cpp

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

src/client/BlazeRenderer.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BlazeModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "net.minecraft.world.entity.monster.h"
 #include "BlazeRenderer.h"
 
 BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f)

src/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 "net.minecraft.world.entity.item.h"
+#include "Mth.h"
 
 BoatRenderer::BoatRenderer()  : EntityRenderer()
 {

src/client/BookModel.cpp

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

src/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 "net.minecraft.world.level.tile.h"
+#include "net.minecraft.world.item.h"
+#include "net.minecraft.world.h"
 
 void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
 {	

src/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 "Random.h"
+#include "Mth.h"
+#include "JavaMath.h"
+#include "net.minecraft.world.level.h"
+#include "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)
 	{

src/client/BufferedImage.cpp

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

src/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 "net.minecraft.world.entity.player.h"
+#include "net.minecraft.world.level.h"
+#include "net.minecraft.world.level.tile.h"
+#include "TilePos.h"
 
 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;

src/client/Camera.h

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

src/client/ChatScreen.cpp

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

src/client/ChestRenderer.cpp

@@ -3,8 +3,8 @@
 #include "ChestModel.h"
 #include "LargeChestModel.h"
 #include "ModelPart.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "net.minecraft.world.level.tile.entity.h"
+#include "net.minecraft.world.level.tile.h"
 
 ChestRenderer::ChestRenderer()
 {

src/client/ChickenModel.cpp

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

src/client/ChickenRenderer.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Mth.h"
 #include "ChickenRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "net.minecraft.world.entity.animal.h"
 
 ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow)
 {

src/client/Chunk.cpp

@@ -2,10 +2,10 @@
 #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 "net.minecraft.world.level.h"
+#include "net.minecraft.world.level.chunk.h"
+#include "net.minecraft.world.level.tile.h"
+#include "net.minecraft.world.level.tile.entity.h"
 #include "LevelRenderer.h"
 
 #ifdef __PS3__

src/client/Chunk.h

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

src/client/ClientConnection.cpp

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

src/client/ClientConnection.h

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

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

src/client/Common/Audio/Consoles_SoundEngine.h

@@ -1,25 +1,25 @@
 #pragma once
 
-#include "..\..\..\Minecraft.World\SoundTypes.h"
+#include "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
-#include "..\..\windows64\Miles\include\mss.h"
+#include "windows64\Miles\include\mss.h"
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2
-#include "..\..\Orbis\Miles\include\mss.h"
+#include "Orbis\Miles\include\mss.h"
 #endif
 
 typedef struct

src/client/Common/Audio/SoundEngine.cpp

@@ -2,21 +2,21 @@
 
 #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 "MultiplayerLocalPlayer.h"
+#include "net.minecraft.world.level.h"
+#include "..\leveldata.h"
+#include "..\mth.h"
+#include "TexturePackRepository.h"
+#include "DLCTexturePack.h"
+#include "Common/DLC/DLCAudioFile.h"
 
 #ifdef __PSVITA__
 #include <audioout.h>
 #endif
 
 #ifdef _WINDOWS64
-#include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
-#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h"
+#include "..\Windows64\Windows64_App.h"
+#include "..\Windows64\Miles\include\imssapi.h"
 #endif
 
 #ifdef __ORBIS__

src/client/Common/Audio/SoundEngine.h

@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "..\..\Minecraft.World\SoundTypes.h"
+#include "..\SoundTypes.h"
 
 enum eMUSICFILES
 {

src/client/Common/C4JMemoryPoolAllocator.h

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "..\Minecraft.Client\Common\C4JMemoryPool.h"
+#include "Common/C4JMemoryPool.h"
 
 // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations.
 

src/client/Common/Colours/ColourTable.cpp

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

src/client/Common/Consoles_App.cpp

@@ -1,47 +1,47 @@
 
 #include "stdafx.h"
 
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
+#include "..\Recipy.h"
+#include "..\Options.h"
+#include "..\AABB.h"
+#include "..\Vec3.h"
 #include "..\MinecraftServer.h"
 #include "..\MultiPlayerLevel.h"
 #include "..\GameRenderer.h"
 #include "..\ProgressRenderer.h"
-#include "..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\LevelRenderer.h"
+#include "..\MobSkinMemTextureProcessor.h"
+#include "..\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 "..\LocalPlayer.h"
+#include "..\Player.h"
+#include "..\Inventory.h"
+#include "..\Level.h"
+#include "..\FurnaceTileEntity.h"
+#include "..\Container.h"
+#include "..\DispenserTileEntity.h"
+#include "..\SignTileEntity.h"
+#include "..\StatsCounter.h"
 #include "..\GameMode.h"
 #include "..\Xbox\Social\SocialManager.h"
 #include "Tutorial\TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
+#include "..\Xbox\XML\ATGXmlParser.h"
+#include "..\Xbox\XML\xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\PlayerList.h"
+#include "..\ServerPlayer.h"
 #include "GameRules\ConsoleGameRules.h"
 #include "GameRules\ConsoleSchematicFile.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\InputOutputStream.h"
+#include "..\LevelSettings.h"
 #include "..\User.h"
-#include "..\..\Minecraft.World\LevelData.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\Minecraft.Client\EntityRenderDispatcher.h"
-#include "..\..\Minecraft.World\compression.h"
+#include "..\LevelData.h"
+#include "..\net.minecraft.world.entity.player.h"
+#include "..\EntityRenderDispatcher.h"
+#include "..\compression.h"
 #include "..\TexturePackRepository.h"
 #include "..\DLCTexturePack.h"
 #include "DLC\DLCPack.h"

src/client/Common/Consoles_App.h

@@ -13,7 +13,7 @@ using namespace std;
 #endif
 #include "UI\UIStructs.h"
 
-#include "..\..\Minecraft.World\DisconnectPacket.h"
+#include "..\DisconnectPacket.h"
 #include <xsocialpost.h>
 
 #include "..\StringTable.h"

src/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)

src/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)
 {	

src/client/Common/DLC/DLCGameRulesHeader.cpp

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

src/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)
 {	

src/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 "StringHelpers.h"
+#include "Minecraft.h"
+#include "TexturePackRepository.h"
 
 WCHAR *DLCManager::wchTypeNamesA[]=
 {

src/client/Common/DLC/DLCPack.cpp

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

src/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 "Player.h"
+#include "StringHelpers.h"
 
 DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {

src/client/Common/DLC/DLCSkinFile.h

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