* Fix include paths. Now it builds properly.

platforms/windows/AppPlatform_windows.cpp

@@ -6,16 +6,17 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "AppPlatform_windows.hpp"
-#include "Mouse.hpp"
-
-#include "thirdparty/stb_image.h"
-#include "thirdparty/stb_image_write.h"
-
+#define WIN32_LEAN_AND_MEAN
 #include <fstream>
 #include <sstream>
 #include <shlobj.h>
 
+#include "AppPlatform_windows.hpp"
+#include "client/player/input/Mouse.hpp"
+
+#include "thirdparty/stb_image.h"
+#include "thirdparty/stb_image_write.h"
+
 extern LPCTSTR g_GameTitle;
 
 void AppPlatform_windows::initConsts()

platforms/windows/AppPlatform_windows.hpp

@@ -10,8 +10,8 @@
 
 #include "compat/GL.hpp"
 #include <ctime>
-#include "Utils.hpp"
 #include "AppPlatform.hpp"
+#include "client/common/Utils.hpp"
 
 #ifdef ORIGINAL_CODE
 #error "This isn't original code. You probably shouldn't try to compile this"

platforms/windows/SoundSystemWindows.cpp

@@ -6,9 +6,9 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-
-#include "../../source/Base/Utils.hpp"
-#include "SoundSystem_windows.hpp"
+#define WIN32_LEAN_AND_MEAN
+#include "SoundSystemWindows.hpp"
+#include "client/common/Utils.hpp"
 
 SoundSystemWindows::SoundSystemWindows()
 {
@@ -105,8 +105,8 @@ void SoundSystemWindows::setListenerAngle(float degyaw, float degpitch)
 		return;
 	}
 
-	float yaw = degyaw * M_PI / 180.f;
-	float pitch = degpitch * M_PI / 180.f;
+	float yaw   = degyaw   * float(M_PI) / 180.f;
+	float pitch = degpitch * float(M_PI) / 180.f;
 
 	float lx = cosf(pitch) * sinf(yaw);
 	float ly = -sinf(pitch);

platforms/windows/SoundSystemWindows.hpp

@@ -21,7 +21,7 @@
 #include <mmsystem.h>
 #include <dsound.h>
 
-#include "SoundData.hpp"
+#include "client/sound/SoundData.hpp"
 
 class SoundSystemWindows
 {

source/client/gui/Gui.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "Minecraft.hpp"
-#include "IngameBlockSelectionScreen.hpp"
-#include "ItemRenderer.hpp"
+#include "client/gui/screens/IngameBlockSelectionScreen.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
 
 #ifdef _WIN32
 #pragma warning(disable : 4244)

source/client/gui/screens/CreateWorldScreen.cpp

@@ -9,7 +9,7 @@
 #include "CreateWorldScreen.hpp"
 #include "SelectWorldScreen.hpp"
 #include "ProgressScreen.hpp"
-#include "Util.hpp"
+#include "client/common/Util.hpp"
 
 CreateWorldScreen::CreateWorldScreen() :
 	m_textName(1, 0, 0, 0, 0, "", "Unnamed world"),

source/client/gui/screens/IngameBlockSelectionScreen.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "IngameBlockSelectionScreen.hpp"
-#include "ItemRenderer.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
 
 std::string g_sNotAvailableInDemoVersion = "Not available in the demo version";
 

source/client/gui/screens/SelectWorldScreen.cpp

@@ -11,7 +11,7 @@
 #include "CreateWorldScreen.hpp"
 #include "ProgressScreen.hpp"
 #include "StartMenuScreen.hpp"
-#include "Util.hpp"
+#include "client/common/Util.hpp"
 
 SelectWorldScreen::SelectWorldScreen() :
 	m_btnDelete   (1, "Delete"),

source/client/model/Model.hpp

@@ -9,7 +9,8 @@
 #pragma once
 
 #include "Cube.hpp"
-#include "Mob.hpp"
+
+class Mob;
 
 class Model
 {

source/client/model/PolygonQuad.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 #include <utility>
-#include "VertexPT.hpp"
-#include "Tesselator.hpp"
-#include "Utils.hpp" // to configure 1 thing
+#include "client/renderer/VertexPT.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "GameMods.hpp"
 
 class PolygonQuad
 {

source/client/network/Packets/AddPlayerPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 AddPlayerPacket::AddPlayerPacket(const RakNet::RakNetGUID& guid, RakNet::RakString name, int id, float x, float y, float z)
 {

source/client/network/Packets/ChunkDataPacket.cpp

@@ -6,8 +6,8 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
-#include "LevelChunk.hpp"
+#include "../Packet.hpp"
+#include "world/level/levelgen/chunk/LevelChunk.hpp"
 
 void ChunkDataPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/LoginPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void LoginPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/MessagePacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void MessagePacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/MovePlayerPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void MovePlayerPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/PlaceBlockPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void PlaceBlockPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/PlayerEquipmentPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void PlayerEquipmentPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/RemoveBlockPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void RemoveBlockPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/RemoveEntityPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void RemoveEntityPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/RequestChunkPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void RequestChunkPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/StartGamePacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void StartGamePacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/Packets/UpdateBlockPacket.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Packet.hpp"
+#include "../Packet.hpp"
 
 void UpdateBlockPacket::handle(const RakNet::RakNetGUID& guid, NetEventCallback* pCallback)
 {

source/client/network/ServerSideNetworkHandler.hpp

@@ -11,7 +11,8 @@
 #include "NetEventCallback.hpp"
 #include "Minecraft.hpp"
 #include "RakNetInstance.hpp"
-#include "LevelListener.hpp"
+#include "world/level/LevelListener.hpp"
+
 class Minecraft;
 
 class ServerSideNetworkHandler : public NetEventCallback, public LevelListener

source/client/player/input/ITurnInput.cpp

@@ -6,8 +6,8 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
+#include "client/common/Utils.hpp"
 #include "ITurnInput.hpp"
-#include "Utils.hpp"
 
 float ITurnInput::getDeltaTime()
 {

source/client/player/input/KeyboardInput.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Options.hpp"
+#include "client/common/Options.hpp"
 
 class KeyboardInput
 {

source/client/renderer/Chunk.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "Chunk.hpp"
-#include "Level.hpp"
-#include "Region.hpp"
+#include "world/level/Level.hpp"
+#include "world/level/Region.hpp"
 #include "TileRenderer.hpp"
 
 int Chunk::updates;

source/client/renderer/Chunk.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"
 #include "FrustumCuller.hpp"
 #include "RenderList.hpp"
 #include "Tesselator.hpp"

source/client/renderer/Culler.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "AABB.hpp"
+#include "client/common/AABB.hpp"
 
 class Culler
 {

source/client/renderer/DynamicTexture.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "DynamicTexture.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"
 
 DynamicTexture::DynamicTexture(int a2) : m_textureIndex(a2)
 {

source/client/renderer/Frustum.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Matrix.hpp"
-#include "AABB.hpp"
+#include "client/common/Matrix.hpp"
+#include "client/common/AABB.hpp"
 
 class Frustum
 {

source/client/renderer/FrustumCuller.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Vec3.hpp"
+#include "client/common/Vec3.hpp"
 #include "Culler.hpp"
 #include "Frustum.hpp"
 

source/client/renderer/ItemInHandRenderer.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "ItemInstance.hpp"
+#include "world/item/ItemInstance.hpp"
 #include "TileRenderer.hpp"
 
 class Minecraft;

source/client/renderer/LevelRenderer.hpp

@@ -10,9 +10,8 @@
 
 #include <algorithm>
 #include <sstream>
-
 #include "compat/GL.hpp"
-#include "LevelListener.hpp"
+#include "world/level/LevelListener.hpp"
 #include "Textures.hpp"
 #include "RenderList.hpp"
 #include "TileRenderer.hpp"

source/client/renderer/LightUpdate.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "LightUpdate.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 void LightUpdate::update(Level* pLevel)
 {

source/client/renderer/Tesselator.cpp

@@ -8,7 +8,6 @@
 
 #include "compat/GL.hpp"
 #include "Tesselator.hpp"
-#include "Utils.hpp"
 
 int dword_2514A4 = 0;
 

source/client/renderer/TileRenderer.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "Region.hpp"
-#include "Chunk.hpp"
-#include "Tesselator.hpp"
+#include "world/level/Region.hpp"
+#include "client/renderer/Chunk.hpp"
+#include "client/renderer/Tesselator.hpp"
 
 #ifndef ENH_SHADE_HELD_TILES
 #define RENDER_TILE_ARG_PATCH

source/client/renderer/WaterSideTexture.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "DynamicTexture.hpp"
-#include "Tile.hpp"
+#include "world/tile/Tile.hpp"
 
 WaterSideTexture::WaterSideTexture() : DynamicTexture(Tile::water->m_TextureFrame + 1)
 {

source/client/renderer/WaterTexture.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "DynamicTexture.hpp"
-#include "Tile.hpp"
+#include "world/tile/Tile.hpp"
 
 WaterTexture::WaterTexture() : DynamicTexture(Tile::water->m_TextureFrame)
 {

source/client/renderer/entity/EntityRenderDispatcher.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "EntityRenderDispatcher.hpp"
-#include "ItemInHandRenderer.hpp"
 #include "Minecraft.hpp"
+#include "../ItemInHandRenderer.hpp"
 
 EntityRenderDispatcher* EntityRenderDispatcher::instance;
 float EntityRenderDispatcher::xOff, EntityRenderDispatcher::yOff, EntityRenderDispatcher::zOff;

source/client/renderer/entity/EntityRenderer.hpp

@@ -8,8 +8,9 @@
 
 #pragma once
 
-#include "HumanoidModel.hpp"
-#include "Font.hpp"
+#include "client/common/AABB.hpp"
+#include "client/model/HumanoidModel.hpp"
+#include "client/renderer/Font.hpp"
 
 class EntityRenderDispatcher;
 

source/client/renderer/entity/FallingTileRenderer.cpp

@@ -6,10 +6,10 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Utils.hpp" // include the utils only to let us know what enhancements we have
+#include "GameMods.hpp"
 #if defined(ENH_ALLOW_SAND_GRAVITY)
 #include "FallingTileRenderer.hpp"
-#include "FallingTile.hpp"
+#include "world/entity/FallingTile.hpp"
 
 FallingTileRenderer::FallingTileRenderer()
 {

source/client/renderer/entity/FallingTileRenderer.hpp

@@ -7,10 +7,13 @@
  ********************************************************************/
 
 #pragma once
+
+#include "GameMods.hpp"
+
 #if defined(ENH_ALLOW_SAND_GRAVITY)
 
 #include "EntityRenderer.hpp"
-#include "TileRenderer.hpp"
+#include "../TileRenderer.hpp"
 
 class FallingTileRenderer : public EntityRenderer
 {

source/client/renderer/entity/HumanoidMobRenderer.cpp

@@ -8,10 +8,10 @@
 
 #include "HumanoidMobRenderer.hpp"
 #include "EntityRenderDispatcher.hpp"
-#include "ItemInHandRenderer.hpp"
-#include "ItemInstance.hpp"
-#include "TileRenderer.hpp"
-#include "Player.hpp"
+#include "client/renderer/ItemInHandRenderer.hpp"
+#include "client/renderer/TileRenderer.hpp"
+#include "world/entity/Player.hpp"
+#include "world/item/ItemInstance.hpp"
 
 HumanoidMobRenderer::HumanoidMobRenderer(HumanoidModel* pModel, float f) : MobRenderer(pModel, f)
 {

source/client/renderer/entity/ItemRenderer.cpp

@@ -8,11 +8,10 @@
 
 #include <sstream>
 #include "ItemRenderer.hpp"
-#include "TileRenderer.hpp"
-#include "ItemEntity.hpp"
 #include "EntityRenderDispatcher.hpp"
+#include "client/renderer/TileRenderer.hpp"
+#include "world/entity/ItemEntity.hpp"
 
-// @TODO: ItemSpriteRenderer. Unused relative
 TileRenderer* ItemRenderer::tileRenderer = new TileRenderer;
 
 const uint8_t g_ItemFrames[C_MAX_TILES] =

source/client/renderer/entity/ItemRenderer.hpp

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "EntityRenderer.hpp"
-#include "ItemInstance.hpp"
-#include "TileRenderer.hpp"
+#include "../TileRenderer.hpp"
+#include "world/item/ItemInstance.hpp"
 
 class ItemRenderer : public EntityRenderer
 {

source/client/renderer/entity/TntRenderer.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "TntRenderer.hpp"
-#include "PrimedTnt.hpp"
+#include "world/entity/PrimedTnt.hpp"
 
 TntRenderer::TntRenderer()
 {

source/client/renderer/entity/TntRenderer.hpp

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "EntityRenderer.hpp"
-#include "TileRenderer.hpp"
+#include "../TileRenderer.hpp"
 
 class TntRenderer : public EntityRenderer
 {

source/client/renderer/entity/TripodCameraRenderer.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 #include "EntityRenderer.hpp"
-#include "Tile.hpp"
-#include "TileRenderer.hpp"
-#include "TripodCamera.hpp"
+#include "client/renderer/TileRenderer.hpp"
+#include "world/tile/Tile.hpp"
+#include "world/entity/TripodCamera.hpp"
 
 class TripodCameraRenderer : public EntityRenderer
 {

source/client/sound/SoundEngine.hpp

@@ -8,15 +8,15 @@
 
 #pragma once
 
+#include "client/common/Options.hpp"
+#include "client/common/Random.hpp"
 #include "SoundSystem.hpp"
 #include "SoundRepository.hpp"
-#include "Options.hpp"
-#include "Random.hpp"
 
 // Platform specific type for the sound system.
 
 #ifdef _WIN32
-#include "../../platforms/windows/SoundSystem_windows.hpp"
+#include "../../platforms/windows/SoundSystemWindows.hpp"
 #define SOUND_SYSTEM_TYPE SoundSystemWindows
 #else
 #define SOUND_SYSTEM_TYPE SoundSystem

source/client/sound/SoundRepository.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "SoundRepository.hpp"
-#include "Utils.hpp"
-#include "Mth.hpp"
+#include "client/common/Utils.hpp"
+#include "client/common/Mth.hpp"
 
 void SoundRepository::add(const std::string& name, SoundDesc& sd)
 {

source/world/entity/Entity.cpp

@@ -8,7 +8,7 @@
 
 #include "Entity.hpp"
 #include "Player.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 int Entity::entityCounter;
 Random Entity::sharedRandom;

source/world/entity/FallingTile.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "FallingTile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 FallingTile::FallingTile(Level* level) : Entity(level)
 {

source/world/entity/ItemEntity.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "ItemEntity.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 ItemEntity::ItemEntity(Level* level) : Entity(level)
 #ifndef ORIGINAL_CODE

source/world/entity/LocalPlayer.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "Player.hpp"
-#include "User.hpp"
-#include "KeyboardInput.hpp"
+#include "world/entity/Player.hpp"
+#include "client/player/input/KeyboardInput.hpp"
+#include "client/player/input/User.hpp"
 
 class Minecraft;
 

source/world/entity/Mob.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Mob.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 Mob::Mob(Level* pLevel) : Entity(pLevel)
 {

source/world/entity/Player.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Player.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 Player::Player(Level* pLevel) : Mob(pLevel)
 {

source/world/entity/PrimedTnt.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "PrimedTnt.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 PrimedTnt::PrimedTnt(Level* level) : Entity(level)
 {

source/world/entity/TripodCamera.cpp

@@ -8,7 +8,7 @@
 
 #include "TripodCamera.hpp"
 #include "Player.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 TripodCamera::TripodCamera(Level* level, Player* player, float x, float y, float z) : Mob(level)
 {

source/world/gamemode/GameMode.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Level.hpp"
-#include "ItemInstance.hpp"
+#include "world/level/Level.hpp"
+#include "world/item/ItemInstance.hpp"
 
 class Minecraft;
 

source/world/item/CameraItem.cpp

@@ -7,9 +7,9 @@
  ********************************************************************/
 
 #include "Item.hpp"
-#include "TripodCamera.hpp"
-#include "Level.hpp"
-#include "Player.hpp"
+#include "world/level/Level.hpp"
+#include "world/entity/TripodCamera.hpp"
+#include "world/entity/Player.hpp"
 
 CameraItem::CameraItem(int id) : Item(id)
 {

source/world/item/DoorItem.cpp

@@ -7,9 +7,9 @@
  ********************************************************************/
 
 #include "Item.hpp"
-#include "Tile.hpp"
-#include "Player.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
+#include "world/entity/Player.hpp"
+#include "world/tile/Tile.hpp"
 
 DoorItem::DoorItem(int id, Material* pMtl) : Item(id)
 {

source/world/item/Inventory.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "Player.hpp"
-#include "ItemInstance.hpp"
+#include <vector>
+#include "world/item/ItemInstance.hpp"
+#include "world/entity/Player.hpp"
 
 class Player; // in case we're included from Player.hpp
 

source/world/item/Item.hpp

@@ -9,10 +9,9 @@
 #pragma once
 
 #include <string>
-#include "Utils.hpp"
-
+#include "client/common/Utils.hpp"
+#include "world/level/Material.hpp"
 #include "ItemInstance.hpp"
-#include "Material.hpp"
 
 #define C_MAX_ITEMS (C_MAX_TILES * 2)
 

source/world/item/ItemInstance.cpp

@@ -8,7 +8,7 @@
 
 #include <sstream>
 #include "ItemInstance.hpp"
-#include "Tile.hpp"
+#include "world/tile/Tile.hpp"
 
 void ItemInstance::init(int itemID, int amount, int auxValue)
 {

source/world/item/TileItem.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "Item.hpp"
-#include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
+#include "world/tile/Tile.hpp"
 
 TileItem::TileItem(int id) : Item(id)
 {

source/world/item/TilePlanterItem.cpp

@@ -7,8 +7,8 @@
  ********************************************************************/
 
 #include "Item.hpp"
-#include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
+#include "world/tile/Tile.hpp"
 
 TilePlanterItem::TilePlanterItem(int id, int place) : Item(id)
 {

source/world/level/Dimension.cpp

@@ -7,9 +7,9 @@
  ********************************************************************/
 
 #include "Dimension.hpp"
-#include "TestChunkSource.hpp"
-#include "RandomLevelSource.hpp"
-#include "ChunkCache.hpp"
+#include "world/level/levelgen/chunk/TestChunkSource.hpp"
+#include "world/level/levelgen/chunk/RandomLevelSource.hpp"
+#include "world/level/levelgen/chunk/ChunkCache.hpp"
 
 Dimension* Dimension::getNew(int type)
 {

source/world/level/Dimension.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "Vec3.hpp"
-#include "BiomeSource.hpp"
+#include "client/common/Vec3.hpp"
+#include "world/level/levelgen/biome/BiomeSource.hpp"
+#include "world/level/levelgen/chunk/ChunkSource.hpp"
 #include "Level.hpp"
-#include "ChunkSource.hpp"
 
 class Level; // if included from Level.hpp
 

source/world/level/Explosion.hpp

@@ -10,7 +10,7 @@
 
 #include <set>
 #include "Level.hpp"
-#include "Entity.hpp"
+#include "world/entity/Entity.hpp"
 
 class Explosion
 {

source/world/level/Level.cpp

@@ -6,9 +6,9 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
+#include "client/common/Util.hpp"
+#include "world/level/levelgen/chunk/ChunkCache.hpp"
 #include "Level.hpp"
-#include "ChunkCache.hpp"
-#include "Util.hpp"
 #include "Explosion.hpp"
 #include "Region.hpp"
 

source/world/level/LevelListener.hpp

@@ -7,8 +7,9 @@
  ********************************************************************/
 
 #pragma once
+
 #include <string>
-#include "TripodCamera.hpp"
+#include "world/entity/TripodCamera.hpp"
 
 class LevelListener
 {

source/world/level/TickNextTickData.hpp

@@ -7,7 +7,8 @@
  ********************************************************************/
 
 #pragma once
-#include "LongHack.hpp"
+
+#include "client/common/LongHack.hpp"
 
 struct TickNextTickData
 {

source/world/level/levelgen/biome/Biome.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Biome.hpp"
-#include "Tile.hpp"
+#include "world/tile/Tile.hpp"
 
 Biome
 * Biome::rainForest,

source/world/level/levelgen/biome/Biome.hpp

@@ -9,10 +9,9 @@
 #pragma once
 
 #include <string>
-
-#include "Feature.hpp"
-#include "PerlinNoise.hpp"
-#include "Utils.hpp"
+#include "client/common/PerlinNoise.hpp"
+#include "client/common/Utils.hpp"
+#include "world/level/levelgen/feature/Feature.hpp"
 
 class Biome
 {

source/world/level/levelgen/biome/BiomeSource.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "BiomeSource.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 BiomeSource::BiomeSource()
 {

source/world/level/levelgen/chunk/ChunkCache.cpp

@@ -8,7 +8,7 @@
 
 #include "LevelChunk.hpp"
 #include "ChunkCache.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 ChunkCache::ChunkCache(Level* pLevel, ChunkStorage* pStor, ChunkSource* pSrc)
 {

source/world/level/levelgen/chunk/ChunkCache.hpp

@@ -10,7 +10,9 @@
 
 #include <cstring>
 #include "ChunkSource.hpp"
-#include "ChunkStorage.hpp"
+#include "world/level/storage/ChunkStorage.hpp"
+#include "world/level/Level.hpp"
+
 class Level;
 
 class ChunkCache : public ChunkSource

source/world/level/levelgen/chunk/ChunkSource.cpp

@@ -7,7 +7,6 @@
  ********************************************************************/
 
 #include "ChunkSource.hpp"
-#include "Level.hpp"
 
 ChunkSource::~ChunkSource()
 {

source/world/level/levelgen/chunk/LevelChunk.cpp

@@ -6,7 +6,7 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool LevelChunk::touchedSky = false;
 

source/world/level/levelgen/chunk/LevelChunk.hpp

@@ -11,9 +11,9 @@
 #include <cstring>
 #include <vector>
 #include <algorithm>
-#include "AABB.hpp"
-#include "Utils.hpp"
-#include "LightLayer.hpp"
+#include "client/common/AABB.hpp"
+#include "client/common/Utils.hpp"
+#include "client/renderer/LightLayer.hpp"
 
 class Level;
 class Entity;

source/world/level/levelgen/chunk/PerformanceTestChunkSource.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "PerformanceTestChunkSource.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 LevelChunk* PerformanceTestChunkSource::create(int x, int z)
 {

source/world/level/levelgen/chunk/RandomLevelSource.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "RandomLevelSource.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 #define TEST_CAVES
 

source/world/level/levelgen/chunk/RandomLevelSource.hpp

@@ -14,11 +14,11 @@
 
 #include <unordered_map>
 #include "ChunkSource.hpp"
-#include "PerlinNoise.hpp"
-#include "Utils.hpp"
-#include "BiomeSource.hpp"
-#include "Feature.hpp"
-#include "LargeCaveFeature.hpp"
+#include "client/common/PerlinNoise.hpp"
+#include "client/common/Utils.hpp"
+#include "world/level/levelgen/biome/BiomeSource.hpp"
+#include "world/level/levelgen/feature/Feature.hpp"
+#include "world/level/levelgen/feature/LargeCaveFeature.hpp"
 
 class RandomLevelSource : public ChunkSource
 {

source/world/level/levelgen/chunk/TestChunkSource.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "TestChunkSource.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 TestChunkSource::TestChunkSource(Level* pLevel)
 {

source/world/level/levelgen/chunk/TestChunkSource.hpp

@@ -9,8 +9,9 @@
 #pragma once
 
 #include <cstring>
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"
 #include "ChunkSource.hpp"
+
 class Level;
 
 class TestChunkSource : public ChunkSource

source/world/level/levelgen/feature/BirchFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool BirchFeature::place(Level* level, Random* random, int x, int y, int z)
 {

source/world/level/levelgen/feature/ClayFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 ClayFeature::ClayFeature(int id, int count)
 {

source/world/level/levelgen/feature/Feature.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Random.hpp"
+#include "client/common/Random.hpp"
 
 class Level;
 

source/world/level/levelgen/feature/FlowerFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 FlowerFeature::FlowerFeature(int id)
 {

source/world/level/levelgen/feature/LargeCaveFeature.cpp

@@ -117,7 +117,7 @@ void LargeCaveFeature::addTunnel(int x, int z, TileID* tiles, float rx, float ry
         {
             float v55 = rx - v65;
             float v54 = rz - v64;
-            float v53 = (x4 - x3);
+            float v53 = float(x4 - x3);
             float v52 = (x1 + 2.0f) + 16.0f;
             if (((((rx - v65) * (rx - v65))
                 + ((rz - v64) * (rz - v64)))
@@ -172,7 +172,7 @@ void LargeCaveFeature::addTunnel(int x, int z, TileID* tiles, float rx, float ry
                             {
                                 for (int n = v48 - 1; n >= v49; --n)
                                 {
-                                    float v35 = ((float(n) + 0.5) - ry) / v58;
+                                    float v35 = ((float(n) + 0.5f) - ry) / v58;
                                     if (v35 > -0.7f
                                         && v40 * v40 + v35 * v35 + v38 * v38 < 1.0f)
                                     {

source/world/level/levelgen/feature/LargeFeature.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "LargeFeature.hpp"
-#include "Random.hpp"
-#include "Level.hpp"
+#include "client/common/Random.hpp"
+#include "world/level/Level.hpp"
 
 class LargeFeature
 {

source/world/level/levelgen/feature/OreFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 OreFeature::OreFeature(int id, int count)
 {

source/world/level/levelgen/feature/PineFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool PineFeature::place(Level* level, Random* random, int x, int y, int z)
 {

source/world/level/levelgen/feature/ReedsFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool ReedsFeature::place(Level* level, Random* random, int x, int y, int z)
 {

source/world/level/levelgen/feature/SpringFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 SpringFeature::SpringFeature(int id)
 {

source/world/level/levelgen/feature/SpruceFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool SpruceFeature::place(Level* level, Random* random, int x, int y, int z)
 {

source/world/level/levelgen/feature/TreeFeature.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "Feature.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 
 bool TreeFeature::place(Level* level, Random* random, int x, int y, int z)
 {

source/world/level/storage/ExternalFileLevelStorage.cpp

@@ -7,7 +7,7 @@
  ********************************************************************/
 
 #include "ExternalFileLevelStorage.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 #include "GetTime.h"
 
 #ifndef DEMO

source/world/level/storage/ExternalFileLevelStorageSource.cpp

@@ -8,7 +8,7 @@
 
 #include "ExternalFileLevelStorageSource.hpp"
 #include "ExternalFileLevelStorage.hpp"
-#include "Util.hpp"
+#include "client/common/Util.hpp"
 
 #ifndef DEMO
 

source/world/level/storage/LevelData.hpp

@@ -9,11 +9,10 @@
 #pragma once
 
 #include <string>
-
-#include "Utils.hpp"
-#include "Vec3.hpp"
-#include "Inventory.hpp"
 #include "BitStream.h"
+#include "client/common/Utils.hpp"
+#include "client/common/Vec3.hpp"
+#include "world/item/Inventory.hpp"
 
 struct PlayerData
 {