From 30925df319944fbda95194596f8d6170c8aa9cf3 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 16 Aug 2024 18:39:44 +0300
Subject: [PATCH] move WorldGenerator to world/generator

---
 src/logic/ChunksController.cpp                     | 2 +-
 src/logic/scripting/lua/libcore.cpp                | 2 +-
 src/voxels/Chunks.cpp                              | 1 -
 src/world/World.cpp                                | 2 +-
 src/{voxels => world/generator}/WorldGenerator.cpp | 6 +++---
 src/{voxels => world/generator}/WorldGenerator.hpp | 0
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename src/{voxels => world/generator}/WorldGenerator.cpp (93%)
 rename src/{voxels => world/generator}/WorldGenerator.hpp (100%)

diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 29d9e65f..d84ed8d4 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -15,9 +15,9 @@
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
 #include "voxels/ChunksStorage.hpp"
-#include "voxels/WorldGenerator.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
+#include "world/generator/WorldGenerator.hpp"
 
 const uint MAX_WORK_PER_FRAME = 128;
 const uint MIN_SURROUNDING = 9;
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index a1f4ee20..3ab665c2 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -12,7 +12,7 @@
 #include "logic/LevelController.hpp"
 #include "window/Events.hpp"
 #include "window/Window.hpp"
-#include "voxels/WorldGenerator.hpp"
+#include "world/generator/WorldGenerator.hpp"
 #include "world/Level.hpp"
 #include "api_lua.hpp"
 
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 1dbfd5a1..6725074a 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -20,7 +20,6 @@
 #include "world/LevelEvents.hpp"
 #include "Block.hpp"
 #include "Chunk.hpp"
-#include "WorldGenerator.hpp"
 #include "voxel.hpp"
 
 Chunks::Chunks(
diff --git a/src/world/World.cpp b/src/world/World.cpp
index a694d146..daab3ada 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -15,7 +15,7 @@
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
 #include "voxels/ChunksStorage.hpp"
-#include "voxels/WorldGenerator.hpp"
+#include "world/generator/WorldGenerator.hpp"
 #include "world/generator/GeneratorDef.hpp"
 #include "Level.hpp"
 
diff --git a/src/voxels/WorldGenerator.cpp b/src/world/generator/WorldGenerator.cpp
similarity index 93%
rename from src/voxels/WorldGenerator.cpp
rename to src/world/generator/WorldGenerator.cpp
index 4217edd5..41454fff 100644
--- a/src/voxels/WorldGenerator.cpp
+++ b/src/world/generator/WorldGenerator.cpp
@@ -1,9 +1,9 @@
 #include "WorldGenerator.hpp"
 
 #include "content/Content.hpp"
-#include "Block.hpp"
-#include "Chunk.hpp"
-#include "voxel.hpp"
+#include "voxels/Block.hpp"
+#include "voxels/Chunk.hpp"
+#include "voxels/voxel.hpp"
 #include "world/generator/GeneratorDef.hpp"
 
 WorldGenerator::WorldGenerator(
diff --git a/src/voxels/WorldGenerator.hpp b/src/world/generator/WorldGenerator.hpp
similarity index 100%
rename from src/voxels/WorldGenerator.hpp
rename to src/world/generator/WorldGenerator.hpp