From 8f9c7eb7ff6ae58d374d56c2e83aa97e6708c8f8 Mon Sep 17 00:00:00 2001
From: InfiniteCoder <info@infinitecoder.org>
Date: Mon, 5 Aug 2024 23:59:42 +0300
Subject: [PATCH] data/

---
 src/assets/AssetsLoader.cpp                  | 2 +-
 src/assets/assetload_funcs.cpp               | 2 +-
 src/coders/binary_json.cpp                   | 2 +-
 src/coders/binary_json.hpp                   | 2 +-
 src/coders/commons.hpp                       | 2 +-
 src/coders/json.cpp                          | 2 +-
 src/coders/json.hpp                          | 2 +-
 src/coders/toml.cpp                          | 4 ++--
 src/coders/toml.hpp                          | 2 +-
 src/content/Content.hpp                      | 2 +-
 src/content/ContentLUT.hpp                   | 2 +-
 src/content/ContentLoader.cpp                | 2 +-
 src/content/ContentPack.cpp                  | 2 +-
 src/files/WorldConverter.cpp                 | 2 +-
 src/files/WorldFiles.cpp                     | 2 +-
 src/files/WorldRegions.cpp                   | 2 +-
 src/files/WorldRegions.hpp                   | 2 +-
 src/files/files.cpp                          | 2 +-
 src/files/settings_io.hpp                    | 2 +-
 src/frontend/locale.cpp                      | 2 +-
 src/frontend/menu.cpp                        | 2 +-
 src/frontend/menu.hpp                        | 2 +-
 src/graphics/ui/elements/TrackBar.hpp        | 2 +-
 src/items/Inventory.cpp                      | 2 +-
 src/logic/CommandsInterpreter.hpp            | 2 +-
 src/logic/scripting/lua/libjson.cpp          | 2 +-
 src/logic/scripting/lua/libtoml.cpp          | 2 +-
 src/logic/scripting/lua/lua_engine.hpp       | 2 +-
 src/logic/scripting/scripting.hpp            | 2 +-
 src/logic/scripting/scripting_functional.hpp | 2 +-
 src/objects/Entities.cpp                     | 2 +-
 src/objects/Entities.hpp                     | 2 +-
 src/objects/Player.hpp                       | 2 +-
 src/objects/rigging.cpp                      | 2 +-
 src/settings.hpp                             | 2 +-
 src/window/Events.cpp                        | 2 +-
 src/world/Level.cpp                          | 2 +-
 src/world/World.hpp                          | 2 +-
 38 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index b3e42f123..d4b6d5ed5 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -8,7 +8,7 @@
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include <content/ContentPack.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index de105d403..e8a73e6f4 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -11,7 +11,7 @@
 #include <coders/json.hpp>
 #include <coders/obj.hpp>
 #include <constants.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 #include "../frontend/UiDocument.hpp"
diff --git a/src/coders/binary_json.cpp b/src/coders/binary_json.cpp
index b71ac9338..0603328a6 100644
--- a/src/coders/binary_json.cpp
+++ b/src/coders/binary_json.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "byte_utils.hpp"
 #include "gzip.hpp"
 
diff --git a/src/coders/binary_json.hpp b/src/coders/binary_json.hpp
index f0d34efa2..9bcdf04e8 100644
--- a/src/coders/binary_json.hpp
+++ b/src/coders/binary_json.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace dynamic {
     class Map;
diff --git a/src/coders/commons.hpp b/src/coders/commons.hpp
index 9fe62dca7..6a16b7d4c 100644
--- a/src/coders/commons.hpp
+++ b/src/coders/commons.hpp
@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 
 inline int is_box(int c) {
diff --git a/src/coders/json.cpp b/src/coders/json.cpp
index 654de28be..77cce7104 100644
--- a/src/coders/json.cpp
+++ b/src/coders/json.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <util/stringutil.hpp>
 #include "commons.hpp"
 
diff --git a/src/coders/json.hpp b/src/coders/json.hpp
index 0a5ff4680..8254eeb55 100644
--- a/src/coders/json.hpp
+++ b/src/coders/json.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 #include "binary_json.hpp"
 
diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp
index cebaabd49..dc5624cda 100644
--- a/src/coders/toml.cpp
+++ b/src/coders/toml.cpp
@@ -6,8 +6,8 @@
 #include <iomanip>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
-#include "../data/setting.hpp"
+#include <data/dynamic.hpp>
+#include <data/setting.hpp>
 #include <files/settings_io.hpp>
 #include <util/stringutil.hpp>
 #include "commons.hpp"
diff --git a/src/coders/toml.hpp b/src/coders/toml.hpp
index 283199696..032e1cf63 100644
--- a/src/coders/toml.hpp
+++ b/src/coders/toml.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class SettingsHandler;
 
diff --git a/src/content/Content.hpp b/src/content/Content.hpp
index 5d0611b19..e8e8a2d70 100644
--- a/src/content/Content.hpp
+++ b/src/content/Content.hpp
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 #include "content_fwd.hpp"
 
 using DrawGroups = std::set<ubyte>;
diff --git a/src/content/ContentLUT.hpp b/src/content/ContentLUT.hpp
index 1d85f81b8..12723073c 100644
--- a/src/content/ContentLUT.hpp
+++ b/src/content/ContentLUT.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <constants.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 #include "Content.hpp"
 
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 1f1a68cc3..67f1965ec 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -8,7 +8,7 @@
 
 #include <coders/json.hpp>
 #include <core_defs.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
 #include <items/ItemDef.hpp>
diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index a50b69eb0..f4890e8f0 100644
--- a/src/content/ContentPack.cpp
+++ b/src/content/ContentPack.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include <coders/json.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 
diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp
index 1fc30a20e..da0f625ea 100644
--- a/src/files/WorldConverter.cpp
+++ b/src/files/WorldConverter.cpp
@@ -6,7 +6,7 @@
 #include <utility>
 
 #include <content/ContentLUT.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
 #include <objects/Player.hpp>
diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
index b2e0f0c54..15f1be609 100644
--- a/src/files/WorldFiles.cpp
+++ b/src/files/WorldFiles.cpp
@@ -13,7 +13,7 @@
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include <core_defs.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <items/Inventory.hpp>
 #include <items/ItemDef.hpp>
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index 77dfe0d16..a2112f86c 100644
--- a/src/files/WorldRegions.cpp
+++ b/src/files/WorldRegions.cpp
@@ -6,7 +6,7 @@
 
 #include <coders/byte_utils.hpp>
 #include <coders/rle.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <items/Inventory.hpp>
 #include "../maths/voxmaths.hpp"
 #include <util/data_io.hpp>
diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp
index 22d6ff3a6..11e32980c 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -9,7 +9,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 #include <typedefs.hpp>
 #include <util/BufferPool.hpp>
 #include <voxels/Chunk.hpp>
diff --git a/src/files/files.cpp b/src/files/files.cpp
index d5b9939d4..cf36a635f 100644
--- a/src/files/files.cpp
+++ b/src/files/files.cpp
@@ -11,7 +11,7 @@
 #include <coders/gzip.hpp>
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;
diff --git a/src/files/settings_io.hpp b/src/files/settings_io.hpp
index 3daee10de..1bb84d32d 100644
--- a/src/files/settings_io.hpp
+++ b/src/files/settings_io.hpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class Setting;
 struct EngineSettings;
diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp
index 4a5bba124..fd562ffe5 100644
--- a/src/frontend/locale.cpp
+++ b/src/frontend/locale.cpp
@@ -7,7 +7,7 @@
 #include <content/ContentPack.hpp>
 #include <files/files.hpp>
 #include <util/stringutil.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 
 static debug::Logger logger("locale");
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 0c2850613..531183eb3 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -6,7 +6,7 @@
 
 #include <delegates.hpp>
 #include <engine.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Task.hpp"
 #include <files/engine_paths.hpp>
 #include <graphics/ui/elements/Menu.hpp>
diff --git a/src/frontend/menu.hpp b/src/frontend/menu.hpp
index b54cd822c..8c9afafed 100644
--- a/src/frontend/menu.hpp
+++ b/src/frontend/menu.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_MENU_MENU_HPP_
 #define FRONTEND_MENU_MENU_HPP_
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <graphics/ui/elements/Menu.hpp>
 
 #include <string>
diff --git a/src/graphics/ui/elements/TrackBar.hpp b/src/graphics/ui/elements/TrackBar.hpp
index 6e055e61e..a2c99ca75 100644
--- a/src/graphics/ui/elements/TrackBar.hpp
+++ b/src/graphics/ui/elements/TrackBar.hpp
@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
 
 #include "UINode.hpp"
-#include "../../../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace gui {
     class TrackBar : public UINode {
diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp
index aa96a55e1..cd719b836 100644
--- a/src/items/Inventory.cpp
+++ b/src/items/Inventory.cpp
@@ -1,7 +1,7 @@
 #include "Inventory.hpp"
 
 #include <content/ContentLUT.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {
 }
diff --git a/src/logic/CommandsInterpreter.hpp b/src/logic/CommandsInterpreter.hpp
index f0886de23..8a132ac43 100644
--- a/src/logic/CommandsInterpreter.hpp
+++ b/src/logic/CommandsInterpreter.hpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 namespace cmd {
     enum class ArgType { number, integer, enumvalue, selector, string };
diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libjson.cpp
index f30b7cf29..ec9d13813 100644
--- a/src/logic/scripting/lua/libjson.cpp
+++ b/src/logic/scripting/lua/libjson.cpp
@@ -1,5 +1,5 @@
 #include <coders/json.hpp>
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 static int l_json_stringify(lua::State* L) {
diff --git a/src/logic/scripting/lua/libtoml.cpp b/src/logic/scripting/lua/libtoml.cpp
index 06a793993..bc3e8b4bf 100644
--- a/src/logic/scripting/lua/libtoml.cpp
+++ b/src/logic/scripting/lua/libtoml.cpp
@@ -1,5 +1,5 @@
 #include <coders/toml.hpp>
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/lua_engine.hpp b/src/logic/scripting/lua/lua_engine.hpp
index d57c62c4c..5799cffa6 100644
--- a/src/logic/scripting/lua/lua_engine.hpp
+++ b/src/logic/scripting/lua/lua_engine.hpp
@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include "../scripting_functional.hpp"
 #include "lua_util.hpp"
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index f955a5275..45e6ecf9a 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include <typedefs.hpp>
 #include "scripting_functional.hpp"
diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp
index 40ccb5962..19da0fa70 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -4,7 +4,7 @@
 #include <glm/glm.hpp>
 #include <string>
 
-#include "../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include <typedefs.hpp>
 
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 9aef67b87..1bd6d13af 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -5,7 +5,7 @@
 
 #include <assets/Assets.hpp>
 #include <content/Content.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <debug/Logger.hpp>
 #include <engine.hpp>
 #include <graphics/core/DrawContext.hpp>
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index 3e882554f..3118fff0f 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -6,7 +6,7 @@
 #include <optional>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>
 #include <util/Clock.hpp>
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 4037356cd..013fc7322 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <optional>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Object.hpp"
 #include "../interfaces/Serializable.hpp"
 #include <settings.hpp>
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index cc3e59750..2987a7400 100644
--- a/src/objects/rigging.cpp
+++ b/src/objects/rigging.cpp
@@ -2,7 +2,7 @@
 
 #include <assets/Assets.hpp>
 #include <coders/json.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <graphics/core/Model.hpp>
 #include <graphics/render/ModelBatch.hpp>
 
diff --git a/src/settings.hpp b/src/settings.hpp
index 23a35ac5d..486a3f2d8 100644
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "data/setting.hpp"
+#include <data/setting.hpp>
 #include <constants.hpp>
 #include <typedefs.hpp>
 
diff --git a/src/window/Events.cpp b/src/window/Events.cpp
index a99818ffc..2cb13087a 100644
--- a/src/window/Events.cpp
+++ b/src/window/Events.cpp
@@ -167,7 +167,7 @@ void Events::setPosition(float xpos, float ypos) {
 
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 std::string Events::writeBindings() {
     dynamic::Map obj;
diff --git a/src/world/Level.cpp b/src/world/Level.cpp
index f7aa062b0..d6a668d49 100644
--- a/src/world/Level.cpp
+++ b/src/world/Level.cpp
@@ -1,7 +1,7 @@
 #include "Level.hpp"
 
 #include <content/Content.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <items/Inventories.hpp>
 #include <items/Inventory.hpp>
 #include "../lighting/Lighting.hpp"
diff --git a/src/world/World.hpp b/src/world/World.hpp
index 1bd516f86..f6c70877a 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <content/ContentPack.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Serializable.hpp"
 #include <typedefs.hpp>
 #include <util/timeutil.hpp>