the final rename

src/assets/Assets.cpp

@@ -6,7 +6,7 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Font.hpp"
 #include "../frontend/UiDocument.hpp"
-#include "../logic/scripting/scripting.h"
+#include "../logic/scripting/scripting.hpp"
 
 Assets::~Assets() {
 }

src/assets/AssetsLoader.cpp

@@ -3,16 +3,16 @@
 #include "Assets.hpp"
 #include "assetload_funcs.hpp"
 #include "../util/ThreadPool.hpp"
-#include "../constants.h"
-#include "../data/dynamic.h"
+#include "../constants.hpp"
+#include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 #include "../coders/imageio.hpp"
-#include "../files/files.h"
-#include "../files/engine_paths.h"
-#include "../content/Content.h"
-#include "../content/ContentPack.h"
+#include "../files/files.hpp"
+#include "../files/engine_paths.hpp"
+#include "../content/Content.hpp"
+#include "../content/ContentPack.hpp"
 #include "../graphics/core/Texture.hpp"
-#include "../logic/scripting/scripting.h"
+#include "../logic/scripting/scripting.hpp"
 
 #include <iostream>
 #include <memory>

src/assets/AssetsLoader.hpp

@@ -3,8 +3,8 @@
 
 #include "Assets.hpp"
 #include "../interfaces/Task.hpp"
-#include "../typedefs.h"
-#include "../delegates.h"
+#include "../typedefs.hpp"
+#include "../delegates.hpp"
 
 #include <string>
 #include <memory>

src/assets/assetload_funcs.cpp

@@ -2,11 +2,12 @@
 
 #include "Assets.hpp"
 #include "AssetsLoader.hpp"
+#include "../data/dynamic.hpp"
 #include "../audio/audio.hpp"
-#include "../files/files.h"
-#include "../files/engine_paths.h"
+#include "../files/files.hpp"
+#include "../files/engine_paths.hpp"
 #include "../coders/imageio.hpp"
-#include "../coders/json.h"
+#include "../coders/json.hpp"
 #include "../coders/GLSLExtension.hpp"
 #include "../graphics/core/Shader.hpp"
 #include "../graphics/core/Texture.hpp"

src/audio/AL/ALAudio.hpp

@@ -2,7 +2,7 @@
 #define SRC_AUDIO_AUDIO_HPP_
 
 #include "../audio.hpp"
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <queue>
 #include <vector>

src/audio/AL/alutil.hpp

@@ -1,7 +1,7 @@
 #ifndef AUDIO_AUDIOUTIL_HPP_
 #define AUDIO_AUDIOUTIL_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <string>
 #include <type_traits>

src/audio/audio.hpp

@@ -1,7 +1,7 @@
 #ifndef AUDIO_AUDIO_HPP_
 #define AUDIO_AUDIO_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <vector>
 #include <memory>

src/coders/GLSLExtension.cpp

@@ -1,9 +1,9 @@
 #include "GLSLExtension.hpp"
 
 #include "../util/stringutil.hpp"
-#include "../typedefs.h"
-#include "../files/files.h"
-#include "../files/engine_paths.h"
+#include "../typedefs.hpp"
+#include "../files/files.hpp"
+#include "../files/engine_paths.hpp"
 
 #include <iostream>
 #include <sstream>

src/coders/binary_json.cpp

@@ -2,6 +2,7 @@
 
 #include "gzip.hpp"
 #include "byte_utils.hpp"
+#include "../data/dynamic.hpp"
 
 #include <stdexcept>
 

src/coders/binary_json.hpp

@@ -1,9 +1,14 @@
 #ifndef CODERS_BINARY_JSON_HPP_
 #define CODERS_BINARY_JSON_HPP_
 
+#include "../typedefs.hpp"
+
 #include <vector>
 #include <memory>
-#include "../data/dynamic.h"
+
+namespace dynamic {
+    class Map;
+}
 
 namespace json {
     const int BJSON_END = 0x0;

src/coders/byte_utils.hpp

@@ -1,7 +1,7 @@
 #ifndef CODERS_BYTE_UTILS_HPP_
 #define CODERS_BYTE_UTILS_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <string>
 #include <vector>

src/coders/commons.hpp

@@ -1,9 +1,10 @@
-#ifndef CODERS_COMMONS_H_
-#define CODERS_COMMONS_H_
+#ifndef CODERS_COMMONS_HPP_
+#define CODERS_COMMONS_HPP_
+
+#include "../typedefs.hpp"
 
 #include <string>
 #include <stdexcept>
-#include "../typedefs.h"
 
 inline int is_box(int c) {
     switch (c) {
@@ -102,4 +103,4 @@ public:
     BasicParser(const std::string& file, const std::string& source);
 };
 
-#endif // CODERS_COMMONS_H_
+#endif // CODERS_COMMONS_HPP_

src/coders/gzip.hpp

@@ -1,7 +1,7 @@
 #ifndef CODERS_GZIP_HPP_
 #define CODERS_GZIP_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 #include <vector>
 
 namespace gzip {

src/coders/json.cpp

@@ -1,13 +1,13 @@
-#include "json.h"
+#include "json.hpp"
+
+#include "../data/dynamic.hpp"
+#include "../util/stringutil.hpp"
 
 #include <math.h>
 #include <sstream>
 #include <iomanip>
 #include <memory>
 
-#include "../data/dynamic.h"
-#include "../util/stringutil.hpp"
-
 using namespace json;
 using namespace dynamic;
 

src/coders/json.hpp

@@ -1,10 +1,10 @@
-#ifndef CODERS_JSON_H_
-#define CODERS_JSON_H_
+#ifndef CODERS_JSON_HPP_
+#define CODERS_JSON_HPP_
 
 #include "commons.hpp"
 #include "binary_json.hpp"
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <vector>
 #include <string>
@@ -38,4 +38,4 @@ namespace json {
         const std::string& indent);
 }
 
-#endif // CODERS_JSON_H_
+#endif // CODERS_JSON_HPP_

src/coders/ogg.cpp

@@ -2,7 +2,7 @@
 
 #include "../debug/Logger.hpp"
 #include "../audio/audio.hpp"
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <string>
 #include <vorbis/codec.h>

src/coders/png.cpp

@@ -2,7 +2,7 @@
 
 #include "../graphics/core/ImageData.hpp"
 #include "../graphics/core/Texture.hpp"
-#include "../files/files.h"
+#include "../files/files.hpp"
 #include "../debug/Logger.hpp"
 
 #include <iostream>

src/coders/rle.hpp

@@ -1,7 +1,7 @@
 #ifndef CODERS_RLE_HPP_
 #define CODERS_RLE_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 namespace rle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);

src/coders/toml.cpp

@@ -2,7 +2,7 @@
 
 #include "commons.hpp"
 #include "../data/setting.hpp"
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 #include "../util/stringutil.hpp"
 #include "../files/settings_io.hpp"
 

src/constants.hpp

@@ -1,9 +1,10 @@
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_HPP_
+#define CONSTANTS_HPP_
+
+#include "typedefs.hpp"
 
 #include <limits>
 #include <string>
-#include "typedefs.h"
 
 inline constexpr int ENGINE_VERSION_MAJOR = 0;
 inline constexpr int ENGINE_VERSION_MINOR = 21;
@@ -49,4 +50,4 @@ inline const std::string FONTS_FOLDER = "fonts";
 inline const std::string LAYOUTS_FOLDER = "layouts";
 inline const std::string SOUNDS_FOLDER = "sounds";
 
-#endif // CONSTANTS_H_
+#endif // CONSTANTS_HPP_

src/content/Content.cpp

@@ -1,14 +1,14 @@
-#include "Content.h"
+#include "Content.hpp"
 
 #include <memory>
 #include <stdexcept>
 #include <glm/glm.hpp>
 
-#include "../voxels/Block.h"
-#include "../items/ItemDef.h"
+#include "../voxels/Block.hpp"
+#include "../items/ItemDef.hpp"
 
-#include "ContentPack.h"
-#include "../logic/scripting/scripting.h"
+#include "ContentPack.hpp"
+#include "../logic/scripting/scripting.hpp"
 
 ContentBuilder::~ContentBuilder() {}
 

src/content/Content.hpp

@@ -1,5 +1,5 @@
-#ifndef CONTENT_CONTENT_H_
-#define CONTENT_CONTENT_H_
+#ifndef CONTENT_CONTENT_HPP_
+#define CONTENT_CONTENT_HPP_
 
 #include <string>
 #include <vector>
@@ -7,8 +7,8 @@
 #include <stdexcept>
 #include <unordered_map>
 #include <set>
-#include "../typedefs.h"
-#include "../voxels/Block.h"
+#include "../typedefs.hpp"
+#include "../voxels/Block.hpp"
 
 using DrawGroups = std::set<ubyte>;
 
@@ -146,4 +146,4 @@ public:
     const std::unordered_map<std::string, std::unique_ptr<ContentPackRuntime>>& getPacks() const;
 };
 
-#endif // CONTENT_CONTENT_H_
+#endif // CONTENT_CONTENT_HPP_

src/content/ContentLUT.cpp

@@ -1,12 +1,12 @@
 #include "ContentLUT.hpp"
 
-#include "Content.h"
-#include "../constants.h"
-#include "../files/files.h"
-#include "../coders/json.h"
-#include "../voxels/Block.h"
-#include "../items/ItemDef.h"
-#include "../data/dynamic.h"
+#include "Content.hpp"
+#include "../constants.hpp"
+#include "../files/files.hpp"
+#include "../coders/json.hpp"
+#include "../voxels/Block.hpp"
+#include "../items/ItemDef.hpp"
+#include "../data/dynamic.hpp"
 
 #include <memory>
 

src/content/ContentLUT.hpp

@@ -1,10 +1,10 @@
 #ifndef CONTENT_CONTENT_LUT_HPP_
 #define CONTENT_CONTENT_LUT_HPP_
 
-#include "Content.h"
+#include "Content.hpp"
 
-#include "../typedefs.h"
-#include "../constants.h"
+#include "../typedefs.hpp"
+#include "../constants.hpp"
 
 #include <string>
 #include <vector>

src/content/ContentLoader.cpp

@@ -1,17 +1,17 @@
-#include "ContentLoader.h"
+#include "ContentLoader.hpp"
 
-#include "Content.h"
-#include "ContentPack.h"
-#include "../coders/json.h"
+#include "Content.hpp"
+#include "ContentPack.hpp"
+#include "../coders/json.hpp"
 #include "../core_defs.hpp"
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
-#include "../files/files.h"
-#include "../items/ItemDef.h"
-#include "../logic/scripting/scripting.h"
-#include "../typedefs.h"
+#include "../files/files.hpp"
+#include "../items/ItemDef.hpp"
+#include "../logic/scripting/scripting.hpp"
+#include "../typedefs.hpp"
 #include "../util/listutil.hpp"
-#include "../voxels/Block.h"
+#include "../voxels/Block.hpp"
 
 #include <iostream>
 #include <string>

src/content/ContentLoader.hpp

@@ -1,7 +1,7 @@
-#ifndef CONTENT_CONTENT_LOADER_H_
-#define CONTENT_CONTENT_LOADER_H_
+#ifndef CONTENT_CONTENT_LOADER_HPP_
+#define CONTENT_CONTENT_LOADER_HPP_
 
-#include "../voxels/Block.h"
+#include "../voxels/Block.hpp"
 
 #include <string>
 #include <filesystem>
@@ -38,4 +38,4 @@ public:
     void load(ContentBuilder& builder);
 };
 
-#endif // CONTENT_CONTENT_LOADER_H_
+#endif // CONTENT_CONTENT_LOADER_HPP_

src/content/ContentPack.cpp

@@ -1,12 +1,12 @@
-#include "ContentPack.h"
+#include "ContentPack.hpp"
 
 #include <iostream>
 #include <algorithm>
 
-#include "../coders/json.h"
-#include "../files/files.h"
-#include "../files/engine_paths.h"
-#include "../data/dynamic.h"
+#include "../coders/json.hpp"
+#include "../files/files.hpp"
+#include "../files/engine_paths.hpp"
+#include "../data/dynamic.hpp"
 
 namespace fs = std::filesystem;
 

src/content/ContentPack.hpp

@@ -1,7 +1,7 @@
-#ifndef CONTENT_CONTENT_PACK_H_
-#define CONTENT_CONTENT_PACK_H_
+#ifndef CONTENT_CONTENT_PACK_HPP_
+#define CONTENT_CONTENT_PACK_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <string>
 #include <vector>
@@ -116,4 +116,4 @@ public:
     }
 };
 
-#endif // CONTENT_CONTENT_PACK_H_
+#endif // CONTENT_CONTENT_PACK_HPP_

src/content/PacksManager.hpp

@@ -1,7 +1,7 @@
 #ifndef CONTENT_PACKS_MANAGER_HPP_
 #define CONTENT_PACKS_MANAGER_HPP_
 
-#include "ContentPack.h"
+#include "ContentPack.hpp"
 
 #include <vector>
 #include <filesystem>

src/core_defs.cpp

@@ -1,11 +1,11 @@
 #include "core_defs.hpp"
 
-#include "items/ItemDef.h"
-#include "content/Content.h"
+#include "items/ItemDef.hpp"
+#include "content/Content.hpp"
 #include "window/Window.hpp"
 #include "window/Events.hpp"
 #include "window/input.hpp"
-#include "voxels/Block.h"
+#include "voxels/Block.hpp"
 
 // All in-game definitions (blocks, items, etc..)
 void corecontent::setup(ContentBuilder* builder) {

src/data/dynamic.cpp

@@ -1,4 +1,4 @@
-#include "dynamic.h"
+#include "dynamic.hpp"
 
 #include <stdexcept>
 

src/data/dynamic.hpp

@@ -1,12 +1,13 @@
-#ifndef DATA_DYNAMIC_H_
-#define DATA_DYNAMIC_H_
+#ifndef DATA_DYNAMIC_HPP_
+#define DATA_DYNAMIC_HPP_
+
+#include "../typedefs.hpp"
 
 #include <string>
 #include <vector>
 #include <memory>
 #include <variant>
 #include <unordered_map>
-#include "../typedefs.h"
 
 namespace dynamic {
     class Map;
@@ -129,4 +130,4 @@ namespace dynamic {
     };
 }
 
-#endif // DATA_DYNAMIC_H_
+#endif // DATA_DYNAMIC_HPP_

src/data/setting.hpp

@@ -1,13 +1,13 @@
-#ifndef DATA_SETTING_H_
-#define DATA_SETTING_H_
+#ifndef DATA_SETTING_HPP_
+#define DATA_SETTING_HPP_
 
 #include <limits>
 #include <string>
 #include <vector>
 #include <unordered_map>
 
-#include "../typedefs.h"
-#include "../delegates.h"
+#include "../typedefs.hpp"
+#include "../delegates.hpp"
 
 enum class setting_format {
     simple, percent
@@ -177,4 +177,4 @@ public:
     virtual std::string toString() const override;
 };
 
-#endif // DATA_SETTING_H_
+#endif // DATA_SETTING_HPP_

src/delegates.hpp

@@ -1,5 +1,5 @@
-#ifndef DELEGATES_H_
-#define DELEGATES_H_
+#ifndef DELEGATES_HPP_
+#define DELEGATES_HPP_
 
 #include <glm/glm.hpp>
 #include <functional>
@@ -22,4 +22,4 @@ using boolconsumer = std::function<void(bool)>;
 using int_array_consumer = std::function<void(const int[], size_t)>;
 using wstringchecker = std::function<bool(const std::wstring&)>;
 
-#endif // DELEGATES_H_
+#endif // DELEGATES_HPP_

src/engine.cpp

@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hpp"
 
 #define GLEW_STATIC
 
@@ -7,11 +7,11 @@
 #include "audio/audio.hpp"
 #include "coders/GLSLExtension.hpp"
 #include "coders/imageio.hpp"
-#include "coders/json.h"
+#include "coders/json.hpp"
 #include "coders/toml.hpp"
-#include "content/ContentLoader.h"
+#include "content/ContentLoader.hpp"
 #include "core_defs.hpp"
-#include "files/files.h"
+#include "files/files.hpp"
 #include "files/settings_io.hpp"
 #include "frontend/locale.hpp"
 #include "frontend/menu.hpp"
@@ -23,16 +23,16 @@
 #include "graphics/core/Shader.hpp"
 #include "graphics/ui/GUI.hpp"
 #include "logic/EngineController.hpp"
-#include "logic/scripting/scripting.h"
+#include "logic/scripting/scripting.hpp"
 #include "util/listutil.hpp"
 #include "util/platform.hpp"
-#include "voxels/DefaultWorldGenerator.h"
-#include "voxels/FlatWorldGenerator.h"
+#include "voxels/DefaultWorldGenerator.hpp"
+#include "voxels/FlatWorldGenerator.hpp"
 #include "window/Camera.hpp"
 #include "window/Events.hpp"
 #include "window/input.hpp"
 #include "window/Window.hpp"
-#include "world/WorldGenerators.h"
+#include "world/WorldGenerators.hpp"
 
 #include <iostream>
 #include <assert.h>

src/engine.hpp

@@ -1,15 +1,15 @@
-#ifndef SRC_ENGINE_H_
-#define SRC_ENGINE_H_
+#ifndef ENGINE_HPP_
+#define ENGINE_HPP_
 
-#include "delegates.h"
-#include "settings.h"
-#include "typedefs.h"
+#include "delegates.hpp"
+#include "settings.hpp"
+#include "typedefs.hpp"
 
 #include "assets/Assets.hpp"
-#include "content/Content.h"
-#include "content/ContentPack.h"
+#include "content/Content.hpp"
+#include "content/ContentPack.hpp"
 #include "content/PacksManager.hpp"
-#include "files/engine_paths.h"
+#include "files/engine_paths.hpp"
 #include "util/ObjectsKeeper.hpp"
 
 #include <filesystem>
@@ -142,4 +142,4 @@ public:
     SettingsHandler& getSettingsHandler();
 };
 
-#endif // SRC_ENGINE_H_
+#endif // ENGINE_HPP_

src/files/WorldConverter.cpp

@@ -1,14 +1,14 @@
-#include "WorldConverter.h"
+#include "WorldConverter.hpp"
 
-#include "WorldFiles.h"
+#include "WorldFiles.hpp"
 
 #include "../content/ContentLUT.hpp"
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
-#include "../files/files.h"
-#include "../objects/Player.h"
+#include "../files/files.hpp"
+#include "../objects/Player.hpp"
 #include "../util/ThreadPool.hpp"
-#include "../voxels/Chunk.h"
+#include "../voxels/Chunk.hpp"
 
 #include <memory>
 #include <iostream>

src/files/WorldConverter.hpp

@@ -1,12 +1,12 @@
-#ifndef FILES_WORLD_CONVERTER_H_
-#define FILES_WORLD_CONVERTER_H_
+#ifndef FILES_WORLD_CONVERTER_HPP_
+#define FILES_WORLD_CONVERTER_HPP_
 
 #include <queue>
 #include <memory>
 #include <filesystem>
 
-#include "../typedefs.h"
-#include "../delegates.h"
+#include "../typedefs.hpp"
+#include "../delegates.hpp"
 #include "../interfaces/Task.hpp"
 
 namespace fs = std::filesystem;
@@ -63,4 +63,4 @@ public:
     );
 };
 
-#endif // FILES_WORLD_CONVERTER_H_
+#endif // FILES_WORLD_CONVERTER_HPP_

src/files/WorldFiles.cpp

@@ -1,24 +1,24 @@
-#include "WorldFiles.h"
+#include "WorldFiles.hpp"
 
 #include "../coders/byte_utils.hpp"
-#include "../coders/json.h"
-#include "../constants.h"
-#include "../content/Content.h"
+#include "../coders/json.hpp"
+#include "../constants.hpp"
+#include "../content/Content.hpp"
 #include "../core_defs.hpp"
-#include "../data/dynamic.h"
-#include "../items/Inventory.h"
-#include "../items/ItemDef.h"
-#include "../lighting/Lightmap.h"
-#include "../maths/voxmaths.h"
-#include "../objects/Player.h"
-#include "../physics/Hitbox.h"
-#include "../typedefs.h"
+#include "../data/dynamic.hpp"
+#include "../items/Inventory.hpp"
+#include "../items/ItemDef.hpp"
+#include "../lighting/Lightmap.hpp"
+#include "../maths/voxmaths.hpp"
+#include "../objects/Player.hpp"
+#include "../physics/Hitbox.hpp"
+#include "../typedefs.hpp"
 #include "../util/data_io.hpp"
-#include "../voxels/Block.h"
-#include "../voxels/Chunk.h"
-#include "../voxels/voxel.h"
+#include "../voxels/Block.hpp"
+#include "../voxels/Chunk.hpp"
+#include "../voxels/voxel.hpp"
 #include "../window/Camera.hpp"
-#include "../world/World.h"
+#include "../world/World.hpp"
 
 #include <cassert>
 #include <iostream>

src/files/WorldFiles.hpp

@@ -1,13 +1,13 @@
-#ifndef FILES_WORLD_FILES_H_
-#define FILES_WORLD_FILES_H_
+#ifndef FILES_WORLD_FILES_HPP_
+#define FILES_WORLD_FILES_HPP_
 
 #include "WorldRegions.hpp"
 
-#include "files.h"
-#include "../typedefs.h"
-#include "../settings.h"
-#include "../content/ContentPack.h"
-#include "../voxels/Chunk.h"
+#include "files.hpp"
+#include "../typedefs.hpp"
+#include "../settings.hpp"
+#include "../content/ContentPack.hpp"
+#include "../voxels/Chunk.hpp"
 
 #include <vector>
 #include <string>
@@ -73,4 +73,4 @@ public:
     }
 };
 
-#endif // FILES_WORLD_FILES_H_
+#endif // FILES_WORLD_FILES_HPP_

src/files/WorldRegions.cpp

@@ -1,10 +1,11 @@
 #include "WorldRegions.hpp"
 
-#include "../coders/rle.hpp"
-#include "../util/data_io.hpp"
 #include "../coders/byte_utils.hpp"
-#include "../maths/voxmaths.h"
-#include "../items/Inventory.h"
+#include "../coders/rle.hpp"
+#include "../data/dynamic.hpp"
+#include "../items/Inventory.hpp"
+#include "../maths/voxmaths.hpp"
+#include "../util/data_io.hpp"
 
 #include <cstring>
 

src/files/WorldRegions.hpp

@@ -1,10 +1,10 @@
 #ifndef FILES_WORLD_REGIONS_HPP_
 #define FILES_WORLD_REGIONS_HPP_
 
-#include "files.h"
-#include "../typedefs.h"
+#include "files.hpp"
+#include "../typedefs.hpp"
 #include "../util/BufferPool.hpp"
-#include "../voxels/Chunk.h"
+#include "../voxels/Chunk.hpp"
 
 #include <mutex>
 #include <memory>

src/files/engine_paths.cpp

@@ -1,4 +1,4 @@
-#include "engine_paths.h"
+#include "engine_paths.hpp"
 
 #include <stack>
 #include <sstream>
@@ -6,8 +6,8 @@
 #include <algorithm>
 
 #include "../util/stringutil.hpp"
-#include "../typedefs.h"
-#include "WorldFiles.h"
+#include "../typedefs.hpp"
+#include "WorldFiles.hpp"
 
 const fs::path SCREENSHOTS_FOLDER {"screenshots"};
 const fs::path CONTROLS_FILE {"controls.json"};

src/files/engine_paths.hpp

@@ -1,12 +1,12 @@
-#ifndef FILES_ENGINE_PATHS_H_
-#define FILES_ENGINE_PATHS_H_
+#ifndef FILES_ENGINE_PATHS_HPP_
+#define FILES_ENGINE_PATHS_HPP_
 
 #include <string>
 #include <vector>
 #include <stdexcept>
 #include <filesystem>
 
-#include "../content/ContentPack.h"
+#include "../content/ContentPack.hpp"
 
 namespace fs = std::filesystem;
 
@@ -58,4 +58,4 @@ public:
     const fs::path& getMainRoot() const;
 };
 
-#endif // FILES_ENGINE_PATHS_H_
+#endif // FILES_ENGINE_PATHS_HPP_

src/files/files.cpp

@@ -1,9 +1,9 @@
-#include "files.h"
+#include "files.hpp"
 
-#include "../coders/json.h"
+#include "../coders/json.hpp"
 #include "../coders/gzip.hpp"
 #include "../util/stringutil.hpp"
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 
 #include <fstream>
 #include <iostream>

src/files/files.hpp

@@ -1,12 +1,12 @@
-#ifndef FILES_FILES_H_
-#define FILES_FILES_H_
+#ifndef FILES_FILES_HPP_
+#define FILES_FILES_HPP_
 
 #include <string>
 #include <vector>
 #include <memory>
 #include <fstream>
 #include <filesystem>
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -69,4 +69,4 @@ namespace files {
     std::vector<std::string> read_list(fs::path file);
 }
 
-#endif /* FILES_FILES_H_ */
+#endif /* FILES_FILES_HPP_ */

src/files/settings_io.cpp

@@ -3,9 +3,9 @@
 #include "../window/Events.hpp"
 #include "../window/input.hpp"
 #include "../coders/toml.hpp"
-#include "../coders/json.h"
+#include "../coders/json.hpp"
 #include "../debug/Logger.hpp"
-#include "../settings.h"
+#include "../settings.hpp"
 
 #include <memory>
 

src/files/settings_io.hpp

@@ -1,7 +1,7 @@
 #ifndef FILES_SETTINGS_IO_HPP_
 #define FILES_SETTINGS_IO_HPP_
 
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 
 #include <string>
 #include <memory>

src/frontend/ContentGfxCache.cpp

@@ -3,12 +3,12 @@
 #include "UiDocument.hpp"
 
 #include "../assets/Assets.hpp"
-#include "../content/Content.h"
-#include "../content/ContentPack.h"
+#include "../content/Content.hpp"
+#include "../content/ContentPack.hpp"
 #include "../core_defs.hpp"
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
-#include "../voxels/Block.h"
+#include "../voxels/Block.hpp"
 
 #include <string>
 

src/frontend/ContentGfxCache.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
 #define FRONTEND_BLOCKS_GFX_CACHE_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <memory>
 

src/frontend/LevelFrontend.cpp

@@ -4,13 +4,13 @@
 
 #include "../assets/Assets.hpp"
 #include "../audio/audio.hpp"
-#include "../content/Content.h"
+#include "../content/Content.hpp"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/render/BlocksPreview.hpp"
-#include "../logic/LevelController.h"
-#include "../logic/PlayerController.h"
-#include "../voxels/Block.h"
-#include "../world/Level.h"
+#include "../logic/LevelController.hpp"
+#include "../logic/PlayerController.hpp"
+#include "../voxels/Block.hpp"
+#include "../world/Level.hpp"
 
 LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) 
   : level(controller->getLevel()),

src/frontend/UiDocument.cpp

@@ -1,10 +1,10 @@
 #include "UiDocument.hpp"
 
-#include "../files/files.h"
+#include "../files/files.hpp"
 #include "../graphics/ui/elements/UINode.hpp"
 #include "../graphics/ui/elements/InventoryView.hpp"
 #include "../graphics/ui/gui_xml.hpp"
-#include "../logic/scripting/scripting.h"
+#include "../logic/scripting/scripting.hpp"
 
 UiDocument::UiDocument(
     std::string id, 

src/frontend/UiDocument.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_UI_DOCUMENT_HPP_
 #define FRONTEND_UI_DOCUMENT_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 #include <string>
 #include <memory>

src/frontend/debug_panel.cpp

@@ -1,20 +1,20 @@
 #include "../audio/audio.hpp"
-#include "../delegates.h"
-#include "../engine.h"
+#include "../delegates.hpp"
+#include "../engine.hpp"
 #include "../graphics/core/Mesh.hpp"
 #include "../graphics/ui/elements/CheckBox.hpp"
 #include "../graphics/ui/elements/TextBox.hpp"
 #include "../graphics/ui/elements/TrackBar.hpp"
 #include "../graphics/ui/elements/InputBindBox.hpp"
 #include "../graphics/render/WorldRenderer.hpp"
-#include "../objects/Player.h"
-#include "../physics/Hitbox.h"
+#include "../objects/Player.hpp"
+#include "../physics/Hitbox.hpp"
 #include "../util/stringutil.hpp"
-#include "../voxels/Block.h"
-#include "../voxels/Chunk.h"
-#include "../voxels/Chunks.h"
-#include "../world/Level.h"
-#include "../world/World.h"
+#include "../voxels/Block.hpp"
+#include "../voxels/Chunk.hpp"
+#include "../voxels/Chunks.hpp"
+#include "../world/Level.hpp"
+#include "../world/World.hpp"
 
 #include <string>
 #include <memory>

src/frontend/hud.cpp

@@ -5,10 +5,10 @@
 #include "UiDocument.hpp"
 
 #include "../assets/Assets.hpp"
-#include "../content/Content.h"
+#include "../content/Content.hpp"
 #include "../core_defs.hpp"
-#include "../delegates.h"
-#include "../engine.h"
+#include "../delegates.hpp"
+#include "../engine.hpp"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Batch2D.hpp"
 #include "../graphics/core/Batch3D.hpp"
@@ -25,24 +25,24 @@
 #include "../graphics/ui/elements/UINode.hpp"
 #include "../graphics/ui/gui_util.hpp"
 #include "../graphics/ui/GUI.hpp"
-#include "../items/Inventories.h"
-#include "../items/Inventory.h"
-#include "../items/ItemDef.h"
-#include "../logic/scripting/scripting.h"
-#include "../maths/voxmaths.h"
-#include "../objects/Player.h"
-#include "../physics/Hitbox.h"
-#include "../typedefs.h"
+#include "../items/Inventories.hpp"
+#include "../items/Inventory.hpp"
+#include "../items/ItemDef.hpp"
+#include "../logic/scripting/scripting.hpp"
+#include "../maths/voxmaths.hpp"
+#include "../objects/Player.hpp"
+#include "../physics/Hitbox.hpp"
+#include "../typedefs.hpp"
 #include "../util/stringutil.hpp"
-#include "../voxels/Block.h"
-#include "../voxels/Chunk.h"
-#include "../voxels/Chunks.h"
+#include "../voxels/Block.hpp"
+#include "../voxels/Chunk.hpp"
+#include "../voxels/Chunks.hpp"
 #include "../window/Camera.hpp"
 #include "../window/Events.hpp"
 #include "../window/input.hpp"
 #include "../window/Window.hpp"
-#include "../world/Level.h"
-#include "../world/World.h"
+#include "../world/Level.hpp"
+#include "../world/World.hpp"
 
 #include <assert.h>
 #include <memory>

src/frontend/hud.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_HUD_HPP_
 #define FRONTEND_HUD_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 #include "../util/ObjectsKeeper.hpp"
 
 #include <string>

src/frontend/locale.cpp

@@ -1,11 +1,11 @@
 #include "locale.hpp"
 
-#include "../coders/json.h"
+#include "../coders/json.hpp"
 #include "../coders/commons.hpp"
-#include "../content/ContentPack.h"
-#include "../files/files.h"
+#include "../content/ContentPack.hpp"
+#include "../files/files.hpp"
 #include "../util/stringutil.hpp"
-#include "../data/dynamic.h"
+#include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 
 static debug::Logger logger("locale");

src/frontend/locale.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_LOCALES_HPP_
 #define FRONTEND_LOCALES_HPP_
 
-#include "../content/ContentPack.h"
+#include "../content/ContentPack.hpp"
 
 #include <string>
 #include <vector>

src/frontend/menu.cpp

@@ -3,16 +3,16 @@
 #include "locale.hpp"
 #include "UiDocument.hpp"
 
-#include "../delegates.h"
-#include "../engine.h"
-#include "../data/dynamic.h"
+#include "../delegates.hpp"
+#include "../engine.hpp"
+#include "../data/dynamic.hpp"
 #include "../interfaces/Task.hpp"
-#include "../files/engine_paths.h"
+#include "../files/engine_paths.hpp"
 #include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/gui_util.hpp"
 #include "../graphics/ui/GUI.hpp"
-#include "../logic/scripting/scripting.h"
-#include "../settings.h"
+#include "../logic/scripting/scripting.hpp"
+#include "../settings.hpp"
 #include "../coders/commons.hpp"
 #include "../util/stringutil.hpp"
 #include "../window/Window.hpp"

src/frontend/screens/LevelScreen.cpp

@@ -5,22 +5,22 @@
 #include "../../debug/Logger.hpp"
 #include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"
-#include "../../graphics/core/PostProcessing.h"
+#include "../../graphics/core/PostProcessing.hpp"
 #include "../../graphics/core/DrawContext.hpp"
 #include "../../graphics/core/Viewport.hpp"
 #include "../../graphics/core/ImageData.hpp"
 #include "../../graphics/ui/GUI.hpp"
 #include "../../graphics/ui/elements/Menu.hpp"
 #include "../../graphics/render/WorldRenderer.hpp"
-#include "../../logic/LevelController.h"
+#include "../../logic/LevelController.hpp"
 #include "../../logic/scripting/scripting_hud.hpp"
-#include "../../physics/Hitbox.h"
-#include "../../voxels/Chunks.h"
-#include "../../world/Level.h"
-#include "../../world/World.h"
+#include "../../physics/Hitbox.hpp"
+#include "../../voxels/Chunks.hpp"
+#include "../../world/Level.hpp"
+#include "../../world/World.hpp"
 #include "../../window/Camera.hpp"
 #include "../../window/Events.hpp"
-#include "../../engine.h"
+#include "../../engine.hpp"
 
 static debug::Logger logger("level-screen");
 

src/frontend/screens/MenuScreen.cpp

@@ -7,7 +7,7 @@
 #include "../../graphics/core/Texture.hpp"
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
-#include "../../engine.h"
+#include "../../engine.hpp"
 
 MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
     engine->resetContent();

src/frontend/screens/Screen.cpp

@@ -1,7 +1,7 @@
 #include "Screen.hpp"
 
 #include "../../graphics/core/Batch2D.hpp"
-#include "../../engine.h"
+#include "../../engine.hpp"
 
 Screen::Screen(Engine* engine) : engine(engine), batch(new Batch2D(1024)) {
 }

src/graphics/core/Atlas.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 #include <unordered_map>
 #include "../../maths/UVRegion.hpp"
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 class ImageData;
 class Texture;

src/graphics/core/Batch3D.cpp

@@ -4,7 +4,7 @@
 #include "Texture.hpp"
 
 #include <GL/glew.h>
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 inline constexpr uint B3D_VERTEX_SIZE = 9;
 

src/graphics/core/Batch3D.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_CORE_BATCH3D_HPP_
 
 #include "../../maths/UVRegion.hpp"
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <memory>
 #include <stdlib.h>

src/graphics/core/DrawContext.hpp

@@ -4,7 +4,7 @@
 #include "commons.hpp"
 #include "Viewport.hpp"
 #include "../../window/Window.hpp"
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 class Batch2D;
 class Framebuffer;

src/graphics/core/Font.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 class Texture;
 class Batch2D;

src/graphics/core/Framebuffer.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
 #define GRAPHICS_CORE_FRAMEBUFFER_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <memory>
 

src/graphics/core/ImageData.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
 #define GRAPHICS_CORE_IMAGE_DATA_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 enum class ImageFormat {
     rgb888,

src/graphics/core/Mesh.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_CORE_MESH_HPP_
 
 #include <stdlib.h>
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 struct vattr {
     ubyte size;

src/graphics/core/PostProcessing.cpp

@@ -1,4 +1,4 @@
-#include "PostProcessing.h"
+#include "PostProcessing.hpp"
 #include "Mesh.hpp"
 #include "Shader.hpp"
 #include "Texture.hpp"

src/graphics/core/Shader.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_SHADER_HPP_
 #define GRAPHICS_CORE_SHADER_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <string>
 #include <unordered_map>

src/graphics/core/Texture.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <memory>
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 #include "ImageData.hpp"
 
 class Texture {

src/graphics/core/TextureAnimation.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
 #define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <glm/glm.hpp>
 #include <vector>

src/graphics/core/Viewport.hpp

@@ -3,7 +3,7 @@
 
 #include <glm/glm.hpp>
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 class Viewport {
     uint width;

src/graphics/render/BlocksPreview.cpp

@@ -1,10 +1,10 @@
 #include "BlocksPreview.hpp"
 
 #include "../../assets/Assets.hpp"
-#include "../../constants.h"
-#include "../../content/Content.h"
+#include "../../constants.hpp"
+#include "../../content/Content.hpp"
 #include "../../frontend/ContentGfxCache.hpp"
-#include "../../voxels/Block.h"
+#include "../../voxels/Block.hpp"
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
 #include "../core/Atlas.hpp"

src/graphics/render/BlocksPreview.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
 #define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
 
-#include "../../typedefs.h"
+#include "../../typedefs.hpp"
 
 #include <glm/glm.hpp>
 #include <memory>

src/graphics/render/BlocksRenderer.cpp

@@ -2,15 +2,15 @@
 
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.hpp"
-#include "../../constants.h"
-#include "../../content/Content.h"
-#include "../../voxels/Block.h"
-#include "../../voxels/Chunk.h"
-#include "../../voxels/VoxelsVolume.h"
-#include "../../voxels/ChunksStorage.h"
-#include "../../lighting/Lightmap.h"
+#include "../../constants.hpp"
+#include "../../content/Content.hpp"
+#include "../../voxels/Block.hpp"
+#include "../../voxels/Chunk.hpp"
+#include "../../voxels/VoxelsVolume.hpp"
+#include "../../voxels/ChunksStorage.hpp"
+#include "../../lighting/Lightmap.hpp"
 #include "../../frontend/ContentGfxCache.hpp"
-#include "../../settings.h"
+#include "../../settings.hpp"
 
 #include <glm/glm.hpp>
 

src/graphics/render/BlocksRenderer.hpp

@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <vector>
 #include <glm/glm.hpp>
-#include "../../voxels/voxel.h"
-#include "../../typedefs.h"
+#include "../../voxels/voxel.hpp"
+#include "../../typedefs.hpp"
 
 class Content;
 class Mesh;

src/graphics/render/ChunksRenderer.cpp

@@ -2,9 +2,9 @@
 #include "BlocksRenderer.hpp"
 #include "../../debug/Logger.hpp"
 #include "../../graphics/core/Mesh.hpp"
-#include "../../voxels/Chunk.h"
-#include "../../world/Level.h"
-#include "../../settings.h"
+#include "../../voxels/Chunk.hpp"
+#include "../../world/Level.hpp"
+#include "../../settings.hpp"
 
 #include <iostream>
 #include <glm/glm.hpp>

src/graphics/render/ChunksRenderer.hpp

@@ -7,8 +7,8 @@
 #include <unordered_map>
 #include <glm/glm.hpp>
 
-#include "../../voxels/Block.h"
-#include "../../voxels/ChunksStorage.h"
+#include "../../voxels/Block.hpp"
+#include "../../voxels/ChunksStorage.hpp"
 #include "../../util/ThreadPool.hpp"
 
 class Mesh;

src/graphics/render/Skybox.hpp

@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.h"
-#include "../../maths/fastmaths.h"
+#include "../../typedefs.hpp"
+#include "../../maths/fastmaths.hpp"
 
 class Mesh;
 class Shader;

src/graphics/render/WorldRenderer.cpp

@@ -4,31 +4,31 @@
 #include "Skybox.hpp"
 
 #include "../../assets/Assets.hpp"
-#include "../../content/Content.h"
-#include "../../engine.h"
+#include "../../content/Content.hpp"
+#include "../../engine.hpp"
 #include "../../frontend/LevelFrontend.hpp"
-#include "../../items/Inventory.h"
-#include "../../items/ItemDef.h"
-#include "../../items/ItemStack.h"
-#include "../../logic/PlayerController.h"
+#include "../../items/Inventory.hpp"
+#include "../../items/ItemDef.hpp"
+#include "../../items/ItemStack.hpp"
+#include "../../logic/PlayerController.hpp"
 #include "../../maths/FrustumCulling.hpp"
-#include "../../maths/voxmaths.h"
-#include "../../objects/Player.h"
-#include "../../settings.h"
-#include "../../voxels/Block.h"
-#include "../../voxels/Chunk.h"
-#include "../../voxels/Chunks.h"
+#include "../../maths/voxmaths.hpp"
+#include "../../objects/Player.hpp"
+#include "../../settings.hpp"
+#include "../../voxels/Block.hpp"
+#include "../../voxels/Chunk.hpp"
+#include "../../voxels/Chunks.hpp"
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
-#include "../../world/Level.h"
-#include "../../world/LevelEvents.h"
-#include "../../world/World.h"
+#include "../../world/Level.hpp"
+#include "../../world/LevelEvents.hpp"
+#include "../../world/World.hpp"
 #include "../core/Atlas.hpp"
 #include "../core/Batch3D.hpp"
 #include "../core/DrawContext.hpp"
 #include "../core/LineBatch.hpp"
 #include "../core/Mesh.hpp"
-#include "../core/PostProcessing.h"
+#include "../core/PostProcessing.hpp"
 #include "../core/Shader.hpp"
 #include "../core/Texture.hpp"
 

src/graphics/ui/GUI.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_GUI_GUI_HPP_
 #define FRONTEND_GUI_GUI_HPP_
 
-#include "../../delegates.h"
+#include "../../delegates.hpp"
 
 #include <queue>
 #include <memory>

src/graphics/ui/elements/InventoryView.cpp

@@ -1,19 +1,19 @@
 #include "InventoryView.hpp"
 #include "../../../assets/Assets.hpp"
-#include "../../../content/Content.h"
+#include "../../../content/Content.hpp"
 #include "../../../frontend/LevelFrontend.hpp"
-#include "../../../items/Inventories.h"
-#include "../../../items/Inventory.h"
-#include "../../../items/ItemDef.h"
-#include "../../../items/ItemStack.h"
-#include "../../../logic/scripting/scripting.h"
-#include "../../../maths/voxmaths.h"
-#include "../../../objects/Player.h"
+#include "../../../items/Inventories.hpp"
+#include "../../../items/Inventory.hpp"
+#include "../../../items/ItemDef.hpp"
+#include "../../../items/ItemStack.hpp"
+#include "../../../logic/scripting/scripting.hpp"
+#include "../../../maths/voxmaths.hpp"
+#include "../../../objects/Player.hpp"
 #include "../../../util/stringutil.hpp"
-#include "../../../voxels/Block.h"
+#include "../../../voxels/Block.hpp"
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
-#include "../../../world/Level.h"
+#include "../../../world/Level.hpp"
 #include "../../core/Atlas.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../core/Font.hpp"

src/graphics/ui/elements/InventoryView.hpp

@@ -1,10 +1,10 @@
-#ifndef FRONTEND_INVENTORY_VIEW_H_
-#define FRONTEND_INVENTORY_VIEW_H_
+#ifndef FRONTEND_INVENTORY_VIEW_HPP_
+#define FRONTEND_INVENTORY_VIEW_HPP_
 
 #include "UINode.hpp"
 #include "Container.hpp"
-#include "../../../typedefs.h"
-#include "../../../constants.h"
+#include "../../../typedefs.hpp"
+#include "../../../constants.hpp"
 
 #include <vector>
 #include <functional>
@@ -137,4 +137,4 @@ namespace gui {
     };
 }
 
-#endif // FRONTEND_INVENTORY_VIEW_H_
+#endif // FRONTEND_INVENTORY_VIEW_HPP_

src/graphics/ui/elements/Plotter.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 
 #include "UINode.hpp"
-#include "../../../typedefs.h"
+#include "../../../typedefs.hpp"
 
 #include <memory>
 #include <glm/glm.hpp>

src/graphics/ui/elements/UINode.hpp

@@ -1,7 +1,7 @@
-#ifndef GRAPHICS_UI_ELEMENTS_UINODE_H_
-#define GRAPHICS_UI_ELEMENTS_UINODE_H_
+#ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
+#define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
 
-#include "../../../delegates.h"
+#include "../../../delegates.hpp"
 #include "../../../window/input.hpp"
 
 #include <glm/glm.hpp>
@@ -215,4 +215,4 @@ namespace gui {
     };
 }
 
-#endif // GRAPHICS_UI_ELEMENTS_UINODE_H_
+#endif // GRAPHICS_UI_ELEMENTS_UINODE_HPP_

src/graphics/ui/gui_util.cpp

@@ -5,10 +5,10 @@
 #include "elements/Button.hpp"
 #include "gui_xml.hpp"
 
-#include "../../logic/scripting/scripting.h"
+#include "../../logic/scripting/scripting.hpp"
 #include "../../frontend/locale.hpp"
 #include "../../util/stringutil.hpp"
-#include "../../delegates.h"
+#include "../../delegates.hpp"
 
 #include <glm/glm.hpp>
 

src/graphics/ui/gui_util.hpp

@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 #include "GUI.hpp"
-#include "../../typedefs.h"
-#include "../../delegates.h"
+#include "../../typedefs.hpp"
+#include "../../delegates.hpp"
 
 namespace gui {
     class Button;

src/graphics/ui/gui_xml.cpp

@@ -12,9 +12,9 @@
 
 #include "../../frontend/menu.hpp"
 #include "../../frontend/locale.hpp"
-#include "../../items/Inventory.h"
-#include "../../logic/scripting/scripting.h"
-#include "../../maths/voxmaths.h"
+#include "../../items/Inventory.hpp"
+#include "../../logic/scripting/scripting.hpp"
+#include "../../maths/voxmaths.hpp"
 #include "../../util/stringutil.hpp"
 #include "../../window/Events.hpp"
 

src/interfaces/Object.hpp

@@ -1,5 +1,5 @@
-#ifndef OBJECT_H
-#define OBJECT_H
+#ifndef OBJECT_HPP_
+#define OBJECT_HPP_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -23,4 +23,4 @@ public:
     virtual void destroyed() {  }
 };
 
-#endif /* OBJECT_H */
+#endif // OBJECT_HPP_

src/interfaces/Serializable.hpp

@@ -1,8 +1,9 @@
-#ifndef SERIALIZABLE_H
-#define SERIALIZABLE_H
+#ifndef SERIALIZABLE_HPP_
+#define SERIALIZABLE_HPP_
+
+#include "../coders/json.hpp"
 
 #include <memory>
-#include "../coders/json.h"
 
 class Serializable {
 public:
@@ -11,4 +12,4 @@ public:
     virtual void deserialize(dynamic::Map* src) = 0;
 };
 
-#endif /* SERIALIZABLE_H */
+#endif // SERIALIZABLE_HPP_

src/interfaces/Task.hpp

@@ -1,7 +1,7 @@
 #ifndef INTERFACES_TASK_HPP_
 #define INTERFACES_TASK_HPP_
 
-#include "../typedefs.h"
+#include "../typedefs.hpp"
 
 /// @brief Task is a finite process interface.
 /// 'work' is a metric of task progress/remaining work (jobs/bytes/something other)

src/items/Inventories.cpp

@@ -1,9 +1,9 @@
-#include "Inventories.h"
+#include "Inventories.hpp"
 
 #include <algorithm>
 
-#include "../world/Level.h"
-#include "../world/World.h"
+#include "../world/Level.hpp"
+#include "../world/World.hpp"
 
 Inventories::Inventories(Level& level) : level(level) {
 }

src/items/Inventories.hpp

@@ -1,12 +1,12 @@
-#ifndef ITEMS_INVENTORIES_H_
-#define ITEMS_INVENTORIES_H_
+#ifndef ITEMS_INVENTORIES_HPP_
+#define ITEMS_INVENTORIES_HPP_
 
 #include <string>
 #include <memory>
 #include <unordered_map>
 
-#include "Inventory.h"
-#include "../maths/util.h"
+#include "Inventory.hpp"
+#include "../maths/util.hpp"
 
 class Level;
 
@@ -41,4 +41,4 @@ public:
     const inventories_map& getMap() const;
 };
 
-#endif // ITEMS_INVENTORIES_H_
+#endif // ITEMS_INVENTORIES_HPP_

src/items/Inventory.cpp

@@ -1,5 +1,6 @@
-#include "Inventory.h"
+#include "Inventory.hpp"
 
+#include "../data/dynamic.hpp"
 #include "../content/ContentLUT.hpp"
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {

src/items/Inventory.hpp

@@ -1,14 +1,17 @@
-#ifndef ITEMS_INVENTORY_H_
-#define ITEMS_INVENTORY_H_
+#ifndef ITEMS_INVENTORY_HPP_
+#define ITEMS_INVENTORY_HPP_
+
+#include "ItemStack.hpp"
+
+#include "../typedefs.hpp"
+#include "../interfaces/Serializable.hpp"
 
 #include <vector>
 #include <memory>
 
-#include "ItemStack.h"
-
-#include "../typedefs.h"
-#include "../data/dynamic.h"
-#include "../interfaces/Serializable.h"
+namespace dynamic {
+    class Map;
+}
 
 class ContentLUT;
 class ContentIndices;
@@ -57,4 +60,4 @@ public:
     static const size_t npos;
 };
 
-#endif // ITEMS_INVENTORY_H_
+#endif // ITEMS_INVENTORY_HPP_

src/items/ItemDef.cpp

@@ -1,4 +1,4 @@
-#include "ItemDef.h"
+#include "ItemDef.hpp"
 #include "../util/stringutil.hpp"
 
 ItemDef::ItemDef(std::string name) : name(name) {