move world-related sources from files/ to world/files

src/content/ContentReport.cpp

@@ -8,7 +8,7 @@
 #include "items/ItemDef.hpp"
 #include "voxels/Block.hpp"
 #include "world/World.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "Content.hpp"
 
 ContentReport::ContentReport(

src/content/ContentReport.hpp

@@ -11,7 +11,7 @@
 #include "typedefs.hpp"
 #include "Content.hpp"
 #include "data/StructLayout.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 
 namespace fs = std::filesystem;
 

src/files/engine_paths.cpp

@@ -9,7 +9,7 @@
 #include "util/stringutil.hpp"
 #include <utility>
 
-#include "WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "debug/Logger.hpp"
 
 static debug::Logger logger("engine-paths");

src/logic/ChunksController.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "content/Content.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "graphics/core/Mesh.hpp"
 #include "lighting/Lighting.hpp"
 #include "maths/voxmaths.hpp"

src/logic/EngineController.cpp

@@ -9,8 +9,8 @@
 #include "debug/Logger.hpp"
 #include "coders/json.hpp"
 #include "content/ContentReport.hpp"
-#include "files/WorldConverter.hpp"
+#include "world/files/WorldConverter.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "frontend/locale.hpp"
 #include "frontend/menu.hpp"
 #include "frontend/screens/LevelScreen.hpp"

src/logic/LevelController.cpp

@@ -4,7 +4,7 @@
 
 #include "debug/Logger.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "maths/voxmaths.hpp"
 #include "objects/Entities.hpp"
 #include "objects/Players.hpp"

src/logic/scripting/lua/libs/libpack.cpp

@@ -7,7 +7,7 @@
 #include "assets/AssetsLoader.hpp"
 #include "content/Content.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "files/engine_paths.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"

src/logic/scripting/lua/libs/libworld.cpp

@@ -6,7 +6,7 @@
 #include "assets/AssetsLoader.hpp"
 #include "coders/json.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "files/engine_paths.hpp"
 #include "files/files.hpp"
 #include "lighting/Lighting.hpp"

src/voxels/Chunks.cpp

@@ -9,7 +9,7 @@
 #include "data/StructLayout.hpp"
 #include "coders/byte_utils.hpp"
 #include "content/Content.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "graphics/core/Mesh.hpp"
 #include "lighting/Lightmap.hpp"
 #include "maths/aabb.hpp"

src/voxels/GlobalChunks.cpp

@@ -5,7 +5,7 @@
 #include "content/Content.hpp"
 #include "coders/json.hpp"
 #include "debug/Logger.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "items/Inventories.hpp"
 #include "lighting/Lightmap.hpp"
 #include "maths/voxmaths.hpp"

src/voxels/compressed_chunks.cpp

@@ -3,7 +3,7 @@
 #include "coders/rle.hpp"
 #include "coders/gzip.hpp"
 
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 
 inline constexpr int HAS_VOXELS = 0x1;
 inline constexpr int HAS_METADATA = 0x2;

src/world/World.cpp

@@ -7,7 +7,7 @@
 #include "content/Content.hpp"
 #include "content/ContentReport.hpp"
 #include "debug/Logger.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "items/Inventories.hpp"
 #include "objects/Entities.hpp"
 #include "objects/Player.hpp"

src/world/files/WorldConverter.cpp

@@ -6,7 +6,7 @@
 #include <utility>
 
 #include "content/ContentReport.hpp"
-#include "files/compatibility.hpp"
+#include "compatibility.hpp"
 #include "debug/Logger.hpp"
 #include "files/files.hpp"
 #include "objects/Player.hpp"

src/world/files/WorldConverter.hpp

@@ -6,7 +6,7 @@
 
 #include "delegates.hpp"
 #include "interfaces/Task.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 #include "typedefs.hpp"
 
 namespace fs = std::filesystem;

src/world/files/WorldFiles.hpp

@@ -11,7 +11,7 @@
 #include "typedefs.hpp"
 #include "voxels/Chunk.hpp"
 #include "WorldRegions.hpp"
-#include "files.hpp"
+#include "files/files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/hash.hpp>
 

src/world/files/WorldRegions.hpp

@@ -13,7 +13,7 @@
 #include "voxels/Chunk.hpp"
 #include "maths/voxmaths.hpp"
 #include "coders/compression.hpp"
-#include "files.hpp"
+#include "files/files.hpp"
 #include "world_regions_fwd.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL

src/world/files/compatibility.hpp

@@ -2,7 +2,7 @@
 
 #include "typedefs.hpp"
 #include "util/Buffer.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 
 namespace compatibility {
     /// @brief Convert region file from version 2 to 3