* Fix include paths. Now it builds properly.

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
 {