the shortcut

src/data/dynamic.cpp

@@ -325,6 +325,11 @@ Map& Map::put(std::string key, bool value){
     return *this;
 }
 
+Map& Map::put(std::string key, std::unique_ptr<Value> value) {
+    values.emplace(key, value.release());
+    return *this;
+}
+
 List& Map::putList(std::string key) {
     List* arr = new List();
     put(key, arr);

src/data/dynamic.h

@@ -115,6 +115,7 @@ namespace dynamic {
         Map& put(std::string key, Map* value);
         Map& put(std::string key, List* value);
         Map& put(std::string key, bool value);
+        Map& put(std::string key, std::unique_ptr<Value> value);
 
         List& putList(std::string key);
         Map& putMap(std::string key);

src/frontend/InventoryView.h

@@ -6,7 +6,7 @@
 #include <glm/glm.hpp>
 
 #include "../graphics/ui/elements/UINode.hpp"
-#include "../graphics/ui/elements/layout/Container.hpp"
+#include "../graphics/ui/elements/Container.hpp"
 #include "../items/ItemStack.h"
 #include "../typedefs.h"
 

src/frontend/debug_panel.cpp

@@ -6,10 +6,10 @@
 #include "../delegates.h"
 #include "../engine.h"
 #include "../graphics/core/Mesh.h"
-#include "../graphics/ui/elements/control/CheckBox.hpp"
+#include "../graphics/ui/elements/CheckBox.hpp"
-#include "../graphics/ui/elements/control/TextBox.hpp"
+#include "../graphics/ui/elements/TextBox.hpp"
-#include "../graphics/ui/elements/control/TrackBar.hpp"
+#include "../graphics/ui/elements/TrackBar.hpp"
-#include "../graphics/ui/elements/control/InputBindBox.hpp"
+#include "../graphics/ui/elements/InputBindBox.hpp"
 #include "../graphics/render/WorldRenderer.h"
 #include "../objects/Player.h"
 #include "../physics/Hitbox.h"

src/frontend/hud.cpp

@@ -16,9 +16,9 @@
 #include "../graphics/render/BlocksPreview.h"
 #include "../graphics/render/WorldRenderer.h"
 #include "../graphics/ui/elements/UINode.hpp"
-#include "../graphics/ui/elements/layout/Menu.hpp"
+#include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/elements/layout/Panel.hpp"
+#include "../graphics/ui/elements/Panel.hpp"
-#include "../graphics/ui/elements/display/Plotter.hpp"
+#include "../graphics/ui/elements/Plotter.hpp"
 #include "../graphics/ui/GUI.h"
 #include "../items/Inventories.h"
 #include "../items/Inventory.h"

src/frontend/menu.cpp

@@ -7,9 +7,9 @@
 #include "../engine.h"
 #include "../interfaces/Task.h"
 #include "../files/engine_paths.h"
-#include "../graphics/ui/elements/display/Label.hpp"
+#include "../graphics/ui/elements/Label.hpp"
-#include "../graphics/ui/elements/layout/Panel.hpp"
+#include "../graphics/ui/elements/Panel.hpp"
-#include "../graphics/ui/elements/layout/Menu.hpp"
+#include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/gui_util.h"
 #include "../graphics/ui/GUI.h"
 #include "../logic/scripting/scripting.h"

src/frontend/screens.cpp

@@ -10,7 +10,7 @@
 #include "../graphics/core/Shader.h"
 #include "../graphics/core/TextureAnimation.h"
 #include "../graphics/render/WorldRenderer.h"
-#include "../graphics/ui/elements/layout/Menu.hpp"
+#include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/GUI.h"
 #include "../logic/ChunksController.h"
 #include "../logic/LevelController.h"

src/graphics/ui/GUI.cpp

@@ -1,6 +1,6 @@
 #include "GUI.h"
 #include "elements/UINode.hpp"
-#include "elements/layout/Menu.hpp"
+#include "elements/Menu.hpp"
 
 #include <iostream>
 #include <algorithm>

src/graphics/ui/elements/Button.cpp

@@ -1,8 +1,8 @@
 #include "Button.hpp"
 
-#include "../display/Label.hpp"
+#include "Label.hpp"
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
 
 using namespace gui;
 

src/graphics/ui/elements/Button.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
 #define GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
 
-#include "../layout/Panel.hpp"
+#include "Panel.hpp"
 
 namespace gui {
     class Label;

src/graphics/ui/elements/CheckBox.cpp

@@ -1,8 +1,8 @@
 #include "CheckBox.hpp"
 
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../display/Label.hpp"
+#include "Label.hpp"
 
 using namespace gui;
 

src/graphics/ui/elements/CheckBox.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
 #define GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
 
-#include "../layout/Panel.hpp"
+#include "Panel.hpp"
 
 namespace gui {
     class CheckBox : public UINode {

src/graphics/ui/elements/Container.cpp

@@ -1,7 +1,7 @@
 #include "Container.hpp"
 
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
 
 using namespace gui;
 

src/graphics/ui/elements/Container.hpp

@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
 #define GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
 
-#include "../UINode.hpp"
+#include "UINode.hpp"
-#include "../commons.hpp"
+#include "commons.hpp"
 
 #include <vector>
 

src/graphics/ui/elements/Image.cpp

@@ -1,10 +1,10 @@
 #include "Image.hpp"
 
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../core/Texture.h"
+#include "../../core/Texture.h"
-#include "../../../../assets/Assets.h"
+#include "../../../assets/Assets.h"
-#include "../../../../maths/UVRegion.h"
+#include "../../../maths/UVRegion.h"
 
 using namespace gui;
 

src/graphics/ui/elements/Image.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
 #define GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
 
-#include "../UINode.hpp"
+#include "UINode.hpp"
 
 namespace gui {
     class Image : public UINode {

src/graphics/ui/elements/InputBindBox.cpp

@@ -1,9 +1,9 @@
 #include "InputBindBox.hpp"
 
-#include "../display/Label.hpp"
+#include "Label.hpp"
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../../util/stringutil.h"
+#include "../../../util/stringutil.h"
 
 using namespace gui;
 

src/graphics/ui/elements/InputBindBox.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
 #define GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
 
-#include "../layout/Panel.hpp"
+#include "Panel.hpp"
 
 namespace gui {
     class Label;

src/graphics/ui/elements/Label.cpp

@@ -1,10 +1,10 @@
 #include "Label.hpp"
 
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../core/Font.h"
+#include "../../core/Font.h"
-#include "../../../../assets/Assets.h"
+#include "../../../assets/Assets.h"
-#include "../../../../util/stringutil.h"
+#include "../../../util/stringutil.h"
 
 using namespace gui;
 

src/graphics/ui/elements/Label.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_LABEL_HPP_
 #define GRAPHICS_UI_ELEMENTS_LABEL_HPP_
 
-#include "../UINode.hpp"
+#include "UINode.hpp"
 
 namespace gui {
     class Label : public UINode {

src/graphics/ui/elements/Panel.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_PANEL_HPP_
 #define GRAPHICS_UI_ELEMENTS_PANEL_HPP_
 
-#include "../commons.hpp"
+#include "commons.hpp"
 #include "Container.hpp"
 
 namespace gui {

src/graphics/ui/elements/Plotter.cpp

@@ -1,10 +1,10 @@
 #include "Plotter.hpp"
 
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../core/Font.h"
+#include "../../core/Font.h"
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../../assets/Assets.h"
+#include "../../../assets/Assets.h"
-#include "../../../../util/stringutil.h"
+#include "../../../util/stringutil.h"
 
 using namespace gui;
 

src/graphics/ui/elements/Plotter.hpp

@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 
-#include "../UINode.hpp"
+#include "UINode.hpp"
-#include "../../../../typedefs.h"
+#include "../../../typedefs.h"
 
 #include <memory>
 #include <glm/glm.hpp>

src/graphics/ui/elements/TextBox.cpp

@@ -1,12 +1,12 @@
 #include "TextBox.hpp"
 
-#include "../display/Label.hpp"
+#include "Label.hpp"
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../core/Font.h"
+#include "../../core/Font.h"
-#include "../../../../assets/Assets.h"
+#include "../../../assets/Assets.h"
-#include "../../../../util/stringutil.h"
+#include "../../../util/stringutil.h"
-#include "../../../../window/Events.h"
+#include "../../../window/Events.h"
 
 using namespace gui;
 

src/graphics/ui/elements/TextBox.hpp

@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
 #define GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
 
-#include "../layout/Panel.hpp"
+#include "Panel.hpp"
-#include "../display/Label.hpp"
+#include "Label.hpp"
 
 class Font;
 

src/graphics/ui/elements/TrackBar.cpp

@@ -1,8 +1,8 @@
 #include "TrackBar.hpp"
 
-#include "../../../core/GfxContext.h"
+#include "../../core/GfxContext.h"
-#include "../../../core/Batch2D.h"
+#include "../../core/Batch2D.h"
-#include "../../../../assets/Assets.h"
+#include "../../../assets/Assets.h"
 
 using namespace gui;
 

src/graphics/ui/elements/TrackBar.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
 #define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
 
-#include "../UINode.hpp"
+#include "UINode.hpp"
 
 namespace gui {
     class TrackBar : public UINode {

src/graphics/ui/elements/UINode.cpp

@@ -1,6 +1,6 @@
 #include "UINode.hpp"
 
-#include "layout/Container.hpp"
+#include "Container.hpp"
 #include "../../core/Batch2D.h"
 
 using gui::UINode;

src/graphics/ui/gui_util.cpp

@@ -1,7 +1,7 @@
 #include "gui_util.h"
-#include "elements/display/Label.hpp"
+#include "elements/Label.hpp"
-#include "elements/layout/Menu.hpp"
+#include "elements/Menu.hpp"
-#include "elements/control/Button.hpp"
+#include "elements/Button.hpp"
 #include "gui_xml.h"
 
 #include <glm/glm.hpp>

src/graphics/ui/gui_xml.cpp

@@ -3,13 +3,13 @@
 #include <charconv>
 #include <stdexcept>
 
-#include "elements/layout/Panel.hpp"
+#include "elements/Panel.hpp"
-#include "elements/display/Image.hpp"
+#include "elements/Image.hpp"
-#include "elements/control/Button.hpp"
+#include "elements/Button.hpp"
-#include "elements/control/CheckBox.hpp"
+#include "elements/CheckBox.hpp"
-#include "elements/control/TextBox.hpp"
+#include "elements/TextBox.hpp"
-#include "elements/control/TrackBar.hpp"
+#include "elements/TrackBar.hpp"
-#include "elements/control/InputBindBox.hpp"
+#include "elements/InputBindBox.hpp"
 
 #include "../../frontend/locale/langs.h"
 #include "../../logic/scripting/scripting.h"

src/logic/EngineController.cpp

@@ -8,10 +8,10 @@
 #include "../frontend/locale/langs.h"
 #include "../frontend/screens.h"
 #include "../frontend/menu.hpp"
-#include "../graphics/ui/elements/display/Label.hpp"
+#include "../graphics/ui/elements/Label.hpp"
-#include "../graphics/ui/elements/control/Button.hpp"
+#include "../graphics/ui/elements/Button.hpp"
-#include "../graphics/ui/elements/layout/Panel.hpp"
+#include "../graphics/ui/elements/Panel.hpp"
-#include "../graphics/ui/elements/layout/Menu.hpp"
+#include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/gui_util.h"
 #include "../interfaces/Task.h"
 #include "../util/stringutil.h"

src/logic/scripting/lua/libgui.cpp

@@ -10,12 +10,12 @@
 #include "../../../assets/Assets.h"
 #include "../../../graphics/ui/gui_util.h"
 #include "../../../graphics/ui/elements/UINode.hpp"
-#include "../../../graphics/ui/elements/control/Button.hpp"
+#include "../../../graphics/ui/elements/Button.hpp"
-#include "../../../graphics/ui/elements/control/CheckBox.hpp"
+#include "../../../graphics/ui/elements/CheckBox.hpp"
-#include "../../../graphics/ui/elements/control/TextBox.hpp"
+#include "../../../graphics/ui/elements/TextBox.hpp"
-#include "../../../graphics/ui/elements/control/TrackBar.hpp"
+#include "../../../graphics/ui/elements/TrackBar.hpp"
-#include "../../../graphics/ui/elements/layout/Panel.hpp"
+#include "../../../graphics/ui/elements/Panel.hpp"
-#include "../../../graphics/ui/elements/layout/Menu.hpp"
+#include "../../../graphics/ui/elements/Menu.hpp"
 #include "../../../frontend/UiDocument.h"
 #include "../../../frontend/locale/langs.h"
 #include "../../../util/stringutil.h"