From e1e345613953f93b20d8f7b685630511055b7b81 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 12:45:08 +0300 Subject: [PATCH] content/ --- src/assets/AssetsLoader.cpp | 4 ++-- src/core_defs.cpp | 4 ++-- src/engine.cpp | 6 +++--- src/engine.hpp | 6 +++--- src/files/WorldConverter.cpp | 2 +- src/files/WorldFiles.cpp | 2 +- src/files/WorldFiles.hpp | 2 +- src/files/engine_paths.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 4 ++-- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/items/Inventory.cpp | 2 +- src/items/ItemStack.cpp | 2 +- src/lighting/LightSolver.cpp | 2 +- src/lighting/Lighting.cpp | 2 +- src/logic/BlocksController.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/EngineController.cpp | 2 +- src/logic/PlayerController.cpp | 2 +- src/logic/scripting/lua/libblock.cpp | 2 +- src/logic/scripting/lua/libcamera.cpp | 2 +- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/lua/libitem.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- src/objects/Player.cpp | 2 +- src/voxels/Chunk.cpp | 2 +- src/voxels/Chunks.cpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/voxels/DefaultWorldGenerator.cpp | 2 +- src/voxels/FlatWorldGenerator.cpp | 2 +- src/voxels/WorldGenerator.cpp | 2 +- src/world/Level.cpp | 2 +- src/world/World.cpp | 4 ++-- src/world/World.hpp | 2 +- src/world/WorldGenerators.cpp | 2 +- 46 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 4b26c34f9..750f87ace 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -6,8 +6,8 @@ #include #include -#include "../content/Content.hpp" -#include "../content/ContentPack.hpp" +#include +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../files/engine_paths.hpp" diff --git a/src/core_defs.cpp b/src/core_defs.cpp index 549988d02..ce9979146 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -1,8 +1,8 @@ #include "core_defs.hpp" #include "items/ItemDef.hpp" -#include "content/Content.hpp" -#include "content/ContentBuilder.hpp" +#include +#include #include "files/files.hpp" #include "files/engine_paths.hpp" #include "window/Window.hpp" diff --git a/src/engine.cpp b/src/engine.cpp index 8782749a7..140166f95 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -9,9 +9,9 @@ #include #include #include -#include "content/Content.hpp" -#include "content/ContentBuilder.hpp" -#include "content/ContentLoader.hpp" +#include +#include +#include #include #include "files/files.hpp" #include "files/settings_io.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 49c923123..6869e1da4 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -5,9 +5,9 @@ #include #include -#include "content/content_fwd.hpp" -#include "content/ContentPack.hpp" -#include "content/PacksManager.hpp" +#include +#include +#include #include "files/engine_paths.hpp" #include "util/ObjectsKeeper.hpp" diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 317c82408..b8a23cd81 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" #include "../files/files.hpp" diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 82f98c4a4..3d00e21d0 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../content/Content.hpp" +#include #include #include "../data/dynamic.hpp" #include "../debug/Logger.hpp" diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp index 84f77f87d..c63ecff60 100644 --- a/src/files/WorldFiles.hpp +++ b/src/files/WorldFiles.hpp @@ -7,7 +7,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include #include "../voxels/Chunk.hpp" #include "WorldRegions.hpp" diff --git a/src/files/engine_paths.hpp b/src/files/engine_paths.hpp index 6465905f8..56956d538 100644 --- a/src/files/engine_paths.hpp +++ b/src/files/engine_paths.hpp @@ -6,7 +6,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include namespace fs = std::filesystem; diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 71ffe006b..df5591f0f 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -3,8 +3,8 @@ #include "UiDocument.hpp" #include -#include "../content/Content.hpp" -#include "../content/ContentPack.hpp" +#include +#include #include #include "../graphics/core/Atlas.hpp" #include "../maths/UVRegion.hpp" diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index c41d39b29..c5f7adabd 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -4,7 +4,7 @@ #include #include "../audio/audio.hpp" -#include "../content/Content.hpp" +#include #include "../graphics/core/Atlas.hpp" #include "../graphics/render/BlocksPreview.hpp" #include "../logic/LevelController.hpp" diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 338fa751d..60da236e9 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "../content/Content.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../graphics/ui/elements/CheckBox.hpp" #include "../graphics/ui/elements/TextBox.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 9bc7a7580..a8f53717b 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -5,7 +5,7 @@ #include "UiDocument.hpp" #include -#include "../content/Content.hpp" +#include #include #include #include diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index 6c6823c03..5a266d96c 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include "../files/files.hpp" #include "../util/stringutil.hpp" #include "../data/dynamic.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index f7546360b..5928f1d5b 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -8,7 +8,7 @@ #include "../../debug/Logger.hpp" #include #include "../../files/files.hpp" -#include "../../content/Content.hpp" +#include #include "../../graphics/core/DrawContext.hpp" #include "../../graphics/core/ImageData.hpp" #include "../../graphics/core/PostProcessing.hpp" diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index c9a89eb9e..8e72f59c9 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../content/Content.hpp" +#include #include "../../frontend/ContentGfxCache.hpp" #include "../../voxels/Block.hpp" #include "../../window/Camera.hpp" diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index a249e3245..9ff5c57bd 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -3,7 +3,7 @@ #include "../core/Mesh.hpp" #include "../../maths/UVRegion.hpp" #include -#include "../../content/Content.hpp" +#include #include "../../voxels/Block.hpp" #include "../../voxels/Chunk.hpp" #include "../../voxels/VoxelsVolume.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index f7d0c387b..bf59d4669 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -9,7 +9,7 @@ #include #include -#include "../../content/Content.hpp" +#include #include #include "../../frontend/LevelFrontend.hpp" #include "../../items/Inventory.hpp" diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 7a6fda316..640550cb6 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -1,7 +1,7 @@ #include "InventoryView.hpp" #include -#include "../../../content/Content.hpp" +#include #include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/locale.hpp" #include "../../../items/Inventories.hpp" diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp index 05d6bb5ad..aa96a55e1 100644 --- a/src/items/Inventory.cpp +++ b/src/items/Inventory.cpp @@ -1,6 +1,6 @@ #include "Inventory.hpp" -#include "../content/ContentLUT.hpp" +#include #include "../data/dynamic.hpp" Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) { diff --git a/src/items/ItemStack.cpp b/src/items/ItemStack.cpp index eafbfea68..6a973aa43 100644 --- a/src/items/ItemStack.cpp +++ b/src/items/ItemStack.cpp @@ -1,6 +1,6 @@ #include "ItemStack.hpp" -#include "../content/Content.hpp" +#include #include "ItemDef.hpp" ItemStack::ItemStack() : item(ITEM_EMPTY), count(0) { diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp index d2df6b4b7..bc110aa19 100644 --- a/src/lighting/LightSolver.cpp +++ b/src/lighting/LightSolver.cpp @@ -2,7 +2,7 @@ #include #include "LightSolver.hpp" #include "Lightmap.hpp" -#include "../content/Content.hpp" +#include #include "../voxels/Chunks.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 59876ac49..63f2407d4 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -1,7 +1,7 @@ #include "Lighting.hpp" #include "LightSolver.hpp" #include "Lightmap.hpp" -#include "../content/Content.hpp" +#include #include "../voxels/Chunks.hpp" #include "../voxels/Chunk.hpp" #include "../voxels/voxel.hpp" diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 810a1b9cb..9bc659e2d 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -1,6 +1,6 @@ #include "BlocksController.hpp" -#include "../content/Content.hpp" +#include #include "../items/Inventories.hpp" #include "../items/Inventory.hpp" #include "../lighting/Lighting.hpp" diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 148b78ec4..bf717b972 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../files/WorldFiles.hpp" #include "../graphics/core/Mesh.hpp" #include "../lighting/Lighting.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index ee05f3f88..c03ff7830 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -5,7 +5,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../debug/Logger.hpp" #include #include "../files/WorldConverter.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 9c8381fd2..3a09bed16 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/Content.hpp" +#include #include #include "../items/Inventory.hpp" #include "../items/ItemDef.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index e9d12128c..f6360db93 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../lighting/Lighting.hpp" #include "../../../logic/BlocksController.hpp" #include "../../../logic/LevelController.hpp" diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libcamera.cpp index 74c0ec2a1..ffdf90a3f 100644 --- a/src/logic/scripting/lua/libcamera.cpp +++ b/src/logic/scripting/lua/libcamera.cpp @@ -1,6 +1,6 @@ #include -#include "../../../content/Content.hpp" +#include #include "../../../window/Camera.hpp" #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 33e61a6a7..90152d1bb 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -1,6 +1,6 @@ #include "libentity.hpp" -#include "../../../content/Content.hpp" +#include #include #include "../../../objects/Entities.hpp" #include "../../../objects/EntityDef.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 5c32c8a08..eb55c8bb6 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../../content/Content.hpp" +#include #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/hud.hpp" diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index 85c6cc274..fd7cc14bd 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../items/Inventories.hpp" #include "../../../items/ItemStack.hpp" #include "../../../logic/BlocksController.hpp" diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libitem.cpp index 099172e90..e720c691e 100644 --- a/src/logic/scripting/lua/libitem.cpp +++ b/src/logic/scripting/lua/libitem.cpp @@ -1,4 +1,4 @@ -#include "../../../content/Content.hpp" +#include #include "../../../items/ItemDef.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 59d66e106..acdd459be 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -4,7 +4,7 @@ #include #include -#include "../../../content/Content.hpp" +#include #include #include "../../../files/WorldFiles.hpp" #include "../../../files/engine_paths.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 7b0e84118..9584d608c 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../content/Content.hpp" -#include "../../content/ContentPack.hpp" +#include +#include #include "../../debug/Logger.hpp" #include #include "../../files/engine_paths.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 3404d957d..3331de267 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../data/dynamic_util.hpp" #include "../debug/Logger.hpp" #include diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 1d7a22185..6f0ff3195 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -4,7 +4,7 @@ #include #include -#include "../content/ContentLUT.hpp" +#include #include "../items/Inventory.hpp" #include "../objects/Entities.hpp" #include "../objects/rigging.hpp" diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp index 6a2992210..3201be09b 100644 --- a/src/voxels/Chunk.cpp +++ b/src/voxels/Chunk.cpp @@ -2,7 +2,7 @@ #include -#include "../content/ContentLUT.hpp" +#include #include "../items/Inventory.hpp" #include "../lighting/Lightmap.hpp" #include "voxel.hpp" diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index b9538f1fa..fb6e174ce 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -8,7 +8,7 @@ #include #include -#include "../content/Content.hpp" +#include #include "../files/WorldFiles.hpp" #include "../graphics/core/Mesh.hpp" #include "../lighting/Lightmap.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index c518005d2..834e7a984 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -1,6 +1,6 @@ #include "ChunksStorage.hpp" -#include "../content/Content.hpp" +#include #include "../debug/Logger.hpp" #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp index 98a2bbe74..024877d59 100644 --- a/src/voxels/DefaultWorldGenerator.cpp +++ b/src/voxels/DefaultWorldGenerator.cpp @@ -14,7 +14,7 @@ #include #include -#include "../content/Content.hpp" +#include #include #include "../maths/FastNoiseLite.h" #include "../maths/util.hpp" diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp index b56c12a43..61884fee4 100644 --- a/src/voxels/FlatWorldGenerator.cpp +++ b/src/voxels/FlatWorldGenerator.cpp @@ -1,6 +1,6 @@ #include "FlatWorldGenerator.hpp" -#include "../content/Content.hpp" +#include #include #include "Chunk.hpp" #include "voxel.hpp" diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp index 84d44d257..bb4af8702 100644 --- a/src/voxels/WorldGenerator.cpp +++ b/src/voxels/WorldGenerator.cpp @@ -1,6 +1,6 @@ #include "WorldGenerator.hpp" -#include "../content/Content.hpp" +#include #include "Block.hpp" #include "Chunk.hpp" #include "voxel.hpp" diff --git a/src/world/Level.cpp b/src/world/Level.cpp index 0ea50190f..af8e9f6b5 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -1,6 +1,6 @@ #include "Level.hpp" -#include "../content/Content.hpp" +#include #include "../data/dynamic_util.hpp" #include "../items/Inventories.hpp" #include "../items/Inventory.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index f5546f4f6..bdf2dd87d 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -4,8 +4,8 @@ #include #include -#include "../content/Content.hpp" -#include "../content/ContentLUT.hpp" +#include +#include #include "../debug/Logger.hpp" #include "../files/WorldFiles.hpp" #include "../items/Inventories.hpp" diff --git a/src/world/World.hpp b/src/world/World.hpp index 667be01fc..b48a9f325 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -6,7 +6,7 @@ #include #include -#include "../content/ContentPack.hpp" +#include #include "../data/dynamic.hpp" #include "../interfaces/Serializable.hpp" #include diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp index 759253232..feba8d52c 100644 --- a/src/world/WorldGenerators.cpp +++ b/src/world/WorldGenerators.cpp @@ -2,7 +2,7 @@ #include -#include "../content/Content.hpp" +#include #include "../voxels/FlatWorldGenerator.hpp" #include "../voxels/WorldGenerator.hpp"