From 793fd82b903503da24333316348087f97cb2f834 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 13 Mar 2024 13:18:40 +0300
Subject: [PATCH 1/4] wip

---
 src/frontend/menu/menu.cpp       | 10 +++++++++-
 src/frontend/menu/menu.h         | 18 ++++++++++++++++++
 src/frontend/menu/menu_pause.cpp | 10 ++++------
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp
index 757abbaa..e6ee019c 100644
--- a/src/frontend/menu/menu.cpp
+++ b/src/frontend/menu/menu.cpp
@@ -362,9 +362,17 @@ void create_new_world_panel(Engine* engine) {
     auto seedstr = std::to_wstring(randU64());
     auto seedInput = std::make_shared<TextBox>(seedstr, glm::vec4(6.0f));
     panel->add(seedInput);
-
+    
     panel->add(guiutil::gotoButton(langs::get(L"World generator", L"world"), "world_generators", engine->getGUI()->getMenu()));
 
+    panel->add(menus::create_button(L"Content", glm::vec4(10), glm::vec4(1), [=](GUI* gui) {
+        engine->loadAllPacks();
+        auto panel = menus::create_packs_panel(engine->getContentPacks(), engine, false, nullptr, nullptr);
+        auto menu = gui->getMenu();
+        menu->addPage("content-packs", panel);
+        menu->setPage("content-packs");
+    }));
+
     panel->add(menus::create_button(L"Create World", glm::vec4(10), glm::vec4(1, 20, 1, 1), 
     [=](GUI*) {
         if (!nameInput->validate())
diff --git a/src/frontend/menu/menu.h b/src/frontend/menu/menu.h
index 2014c961..774f868f 100644
--- a/src/frontend/menu/menu.h
+++ b/src/frontend/menu/menu.h
@@ -2,16 +2,34 @@
 #define FRONTEND_MENU_MENU_H_
 
 #include <string>
+#include <vector>
+#include <memory>
+#include <functional>
+#include "../../content/ContentPack.h"
+
+
+namespace gui {
+    class Panel;
+}
 
 class Engine;
 class LevelController;
 
+using packconsumer = std::function<void(const ContentPack& pack)>;
+
 namespace menus {
     // implemented in menu_settings.cpp 
     extern void create_settings_panel(Engine* engine);
 
     // implemented in menu_pause.cpp
     extern void create_pause_panel(Engine* engine, LevelController* controller);
+    extern std::shared_ptr<gui::Panel> create_packs_panel(
+        const std::vector<ContentPack>& packs, 
+        Engine* engine, 
+        bool backbutton, 
+        packconsumer callback,
+        packconsumer remover
+    );
 
     /// @brief Load world, convert if required and set to LevelScreen.
     /// @param name world name
diff --git a/src/frontend/menu/menu_pause.cpp b/src/frontend/menu/menu_pause.cpp
index c44d899a..73eb593a 100644
--- a/src/frontend/menu/menu_pause.cpp
+++ b/src/frontend/menu/menu_pause.cpp
@@ -16,9 +16,7 @@
 
 using namespace gui;
 
-using packconsumer = std::function<void(const ContentPack& pack)>;
-
-std::shared_ptr<Panel> create_packs_panel(
+std::shared_ptr<Panel> menus::create_packs_panel(
     const std::vector<ContentPack>& packs, 
     Engine* engine, 
     bool backbutton, 
@@ -39,7 +37,7 @@ std::shared_ptr<Panel> create_packs_panel(
                 callback(pack);
             });
         }
-        auto runtime = engine->getContent()->getPackRuntime(pack.id);
+        auto runtime = engine->getContent() ? engine->getContent()->getPackRuntime(pack.id) : nullptr;
         auto idlabel = std::make_shared<Label>(
             (runtime && runtime->getStats().hasSavingContent()) 
             ? "*["+pack.id+"]" 
@@ -121,7 +119,7 @@ void create_content_panel(Engine* engine, LevelController* controller) {
         }
     }
 
-    auto panel = create_packs_panel(
+    auto panel = menus::create_packs_panel(
         engine->getContentPacks(), engine, false, nullptr, 
         [=](const ContentPack& pack) {
             auto world = level->getWorld();
@@ -143,7 +141,7 @@ void create_content_panel(Engine* engine, LevelController* controller) {
     mainPanel->add(panel);
     mainPanel->add(menus::create_button(
     langs::get(L"Add", L"content"), glm::vec4(10.0f), glm::vec4(1), [=](GUI* gui) {
-        auto panel = create_packs_panel(scanned, engine, true, 
+        auto panel = menus::create_packs_panel(scanned, engine, true, 
         [=](const ContentPack& pack) {
             auto world = level->getWorld();
             auto worldFolder = paths->getWorldFolder();

From d3b720da1c133cd8dee31debcc3f40aea655f637 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 13 Mar 2024 18:30:11 +0300
Subject: [PATCH 2/4] world-creation related menus moved to
 menu_create_world.cpp

---
 src/frontend/menu/menu.cpp              | 142 +-------------------
 src/frontend/menu/menu.h                |   6 +
 src/frontend/menu/menu_create_world.cpp | 167 ++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 141 deletions(-)
 create mode 100644 src/frontend/menu/menu_create_world.cpp

diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp
index e6ee019c..c60359f4 100644
--- a/src/frontend/menu/menu.cpp
+++ b/src/frontend/menu/menu.cpp
@@ -39,16 +39,7 @@ namespace fs = std::filesystem;
 using namespace gui;
 
 namespace menus {
-    std::string generatorID;
-}
-
-inline uint64_t randU64() {
-    srand(time(NULL));
-    return rand() ^ (rand() << 8) ^ 
-        (rand() << 16) ^ (rand() << 24) ^
-        ((uint64_t)rand() << 32) ^ 
-        ((uint64_t)rand() << 40) ^
-        ((uint64_t)rand() << 56);
+    extern std::string generatorID;
 }
 
 void menus::create_version_label(Engine* engine) {
@@ -181,47 +172,6 @@ void create_languages_panel(Engine* engine) {
     panel->add(guiutil::backButton(menu));
 }
 
-static std::string translate_generator_id(std::string& id) {
-    int delimiterPosition = id.find(":");
-    std::string pack = id.substr(0, delimiterPosition);
-    std::string generator = id.substr(delimiterPosition + 1);
-
-    if(pack == "core") {
-        return util::wstr2str_utf8(langs::get(util::str2wstr_utf8(generator), L"world.generators"));
-    } else {
-        return id;
-    }
-}
-
-void create_world_generators_panel(Engine* engine) {
-    auto menu = engine->getGUI()->getMenu();
-    auto panel = menus::create_page(engine, "world_generators", 400, 0.5f, 1);
-    panel->setScrollable(true);
-
-    std::vector<std::string> generatorsIDs = WorldGenerators::getGeneratorsIDs();
-    std::sort(generatorsIDs.begin(), generatorsIDs.end());
-    for (std::string& id : generatorsIDs) {
-        const std::string& fullName = translate_generator_id(id);
-        auto button = std::make_shared<RichButton>(glm::vec2(80, 30));
-
-        auto idlabel = std::make_shared<Label>("["+id+"]");
-        idlabel->setColor(glm::vec4(1, 1, 1, 0.5f));
-        idlabel->setSize(glm::vec2(300, 25));
-        idlabel->setAlign(Align::right);
-
-        button->add(idlabel, glm::vec2(80, 4));
-        button->add(std::make_shared<Label>(fullName), glm::vec2(0, 8));
-        button->listenAction(
-            [=](GUI*) {
-                menus::generatorID = id;
-                menu->back();
-            }
-        );
-        panel->add(button);
-    }
-    panel->add(guiutil::backButton(menu));
-}
-
 void menus::open_world(std::string name, Engine* engine, bool confirmConvert) {
     auto paths = engine->getPaths();
     auto folder = paths->getWorldsFolder()/fs::u8path(name);
@@ -331,96 +281,6 @@ void create_main_menu_panel(Engine* engine) {
     ));
 }
 
-inline uint64_t str2seed(std::wstring seedstr) {
-    if (util::is_integer(seedstr)) {
-        try {
-            return std::stoull(seedstr);
-        } catch (const std::out_of_range& err) {
-            std::hash<std::wstring> hash;
-            return hash(seedstr);
-        }
-    } else {
-        std::hash<std::wstring> hash;
-        return hash(seedstr);
-    }
-}
-
-void create_new_world_panel(Engine* engine) {
-    auto panel = menus::create_page(engine, "new-world", 400, 0.0f, 1);
-
-    panel->add(std::make_shared<Label>(langs::get(L"Name", L"world")));
-    auto nameInput = std::make_shared<TextBox>(L"New World", glm::vec4(6.0f));
-    nameInput->setTextValidator([=](const std::wstring& text) {
-        EnginePaths* paths = engine->getPaths();
-        std::string textutf8 = util::wstr2str_utf8(text);
-        return util::is_valid_filename(text) && 
-                !paths->isWorldNameUsed(textutf8);
-    });
-    panel->add(nameInput);
-
-    panel->add(std::make_shared<Label>(langs::get(L"Seed", L"world")));
-    auto seedstr = std::to_wstring(randU64());
-    auto seedInput = std::make_shared<TextBox>(seedstr, glm::vec4(6.0f));
-    panel->add(seedInput);
-    
-    panel->add(guiutil::gotoButton(langs::get(L"World generator", L"world"), "world_generators", engine->getGUI()->getMenu()));
-
-    panel->add(menus::create_button(L"Content", glm::vec4(10), glm::vec4(1), [=](GUI* gui) {
-        engine->loadAllPacks();
-        auto panel = menus::create_packs_panel(engine->getContentPacks(), engine, false, nullptr, nullptr);
-        auto menu = gui->getMenu();
-        menu->addPage("content-packs", panel);
-        menu->setPage("content-packs");
-    }));
-
-    panel->add(menus::create_button(L"Create World", glm::vec4(10), glm::vec4(1, 20, 1, 1), 
-    [=](GUI*) {
-        if (!nameInput->validate())
-            return;
-
-        std::string name = util::wstr2str_utf8(nameInput->getText());
-        uint64_t seed = str2seed(seedInput->getText());
-        std::cout << "world seed: " << seed << std::endl;
-
-        EnginePaths* paths = engine->getPaths();
-        auto folder = paths->getWorldsFolder()/fs::u8path(name);
-        try {
-            engine->loadAllPacks();
-            engine->loadContent();
-            paths->setWorldFolder(folder);
-        } catch (const contentpack_error& error) {
-            guiutil::alert(
-                engine->getGUI(),
-                langs::get(L"Content Error", L"menu")+L":\n"+
-                util::str2wstr_utf8(
-                    std::string(error.what())+
-                    "\npack '"+error.getPackId()+"' from "+
-                    error.getFolder().u8string()
-                )
-            );
-            return;
-        } catch (const std::runtime_error& error) {
-            guiutil::alert(
-                engine->getGUI(),
-                langs::get(L"Content Error", L"menu")+
-                L": "+util::str2wstr_utf8(error.what())
-            );
-            return;
-        }
-
-        Level* level = World::create(
-            name, menus::generatorID, folder, seed, 
-            engine->getSettings(), 
-            engine->getContent(),
-            engine->getContentPacks()
-        );
-        level->world->wfile->createDirectories();
-        menus::generatorID = WorldGenerators::getDefaultGeneratorID();
-        engine->setScreen(std::make_shared<LevelScreen>(engine, level));
-    }));
-    panel->add(guiutil::backButton(engine->getGUI()->getMenu()));
-}
-
 void create_controls_panel(Engine* engine) {
     auto menu = engine->getGUI()->getMenu();
     auto panel = menus::create_page(engine, "controls", 400, 0.0f, 1);
diff --git a/src/frontend/menu/menu.h b/src/frontend/menu/menu.h
index 774f868f..c7c27bd9 100644
--- a/src/frontend/menu/menu.h
+++ b/src/frontend/menu/menu.h
@@ -21,6 +21,12 @@ namespace menus {
     // implemented in menu_settings.cpp 
     extern void create_settings_panel(Engine* engine);
 
+    // implemented in menu_create_world.cpp
+    extern void create_new_world_panel(Engine* engine);
+
+    // implemented in menu_create_world.cpp
+    extern void create_world_generators_panel(Engine* engine);
+
     // implemented in menu_pause.cpp
     extern void create_pause_panel(Engine* engine, LevelController* controller);
     extern std::shared_ptr<gui::Panel> create_packs_panel(
diff --git a/src/frontend/menu/menu_create_world.cpp b/src/frontend/menu/menu_create_world.cpp
new file mode 100644
index 00000000..71615768
--- /dev/null
+++ b/src/frontend/menu/menu_create_world.cpp
@@ -0,0 +1,167 @@
+#ifndef FRONTEND_MENU_MENU_CREATE_WORLD_H_
+#define FRONTEND_MENU_MENU_CREATE_WORLD_H_
+
+#include "menu.h"
+#include "menu_commons.h"
+#include "../gui/controls.h"
+#include "../gui/containers.h"
+#include "../gui/gui_util.h"
+#include "../locale/langs.h"
+#include "../screens.h"
+#include "../../world/WorldGenerators.h"
+#include "../../files/WorldFiles.h"
+#include "../../world/World.h"
+#include "../../world/Level.h"
+#include "../../util/stringutil.h"
+#include "../../engine.h"
+
+#include <iostream>
+
+using namespace gui;
+
+namespace menus {
+    std::string generatorID;
+}
+
+inline uint64_t randU64() {
+    srand(time(NULL));
+    return rand() ^ (rand() << 8) ^ 
+        (rand() << 16) ^ (rand() << 24) ^
+        ((uint64_t)rand() << 32) ^ 
+        ((uint64_t)rand() << 40) ^
+        ((uint64_t)rand() << 56);
+}
+
+
+inline uint64_t str2seed(std::wstring seedstr) {
+    if (util::is_integer(seedstr)) {
+        try {
+            return std::stoull(seedstr);
+        } catch (const std::out_of_range& err) {
+            std::hash<std::wstring> hash;
+            return hash(seedstr);
+        }
+    } else {
+        std::hash<std::wstring> hash;
+        return hash(seedstr);
+    }
+}
+
+static std::string translate_generator_id(std::string& id) {
+    int delimiterPosition = id.find(":");
+    std::string pack = id.substr(0, delimiterPosition);
+    std::string generator = id.substr(delimiterPosition + 1);
+
+    if(pack == "core") {
+        return util::wstr2str_utf8(langs::get(util::str2wstr_utf8(generator), L"world.generators"));
+    } else {
+        return id;
+    }
+}
+
+void menus::create_world_generators_panel(Engine* engine) {
+    auto menu = engine->getGUI()->getMenu();
+    auto panel = menus::create_page(engine, "world_generators", 400, 0.5f, 1);
+    panel->setScrollable(true);
+
+    std::vector<std::string> generatorsIDs = WorldGenerators::getGeneratorsIDs();
+    std::sort(generatorsIDs.begin(), generatorsIDs.end());
+    for (std::string& id : generatorsIDs) {
+        const std::string& fullName = translate_generator_id(id);
+        auto button = std::make_shared<RichButton>(glm::vec2(80, 30));
+
+        auto idlabel = std::make_shared<Label>("["+id+"]");
+        idlabel->setColor(glm::vec4(1, 1, 1, 0.5f));
+        idlabel->setSize(glm::vec2(300, 25));
+        idlabel->setAlign(Align::right);
+
+        button->add(idlabel, glm::vec2(80, 4));
+        button->add(std::make_shared<Label>(fullName), glm::vec2(0, 8));
+        button->listenAction(
+            [=](GUI*) {
+                menus::generatorID = id;
+                menu->back();
+            }
+        );
+        panel->add(button);
+    }
+    panel->add(guiutil::backButton(menu));
+}
+
+void menus::create_new_world_panel(Engine* engine) {
+    auto panel = menus::create_page(engine, "new-world", 400, 0.0f, 1);
+
+    panel->add(std::make_shared<Label>(langs::get(L"Name", L"world")));
+    auto nameInput = std::make_shared<TextBox>(L"New World", glm::vec4(6.0f));
+    nameInput->setTextValidator([=](const std::wstring& text) {
+        EnginePaths* paths = engine->getPaths();
+        std::string textutf8 = util::wstr2str_utf8(text);
+        return util::is_valid_filename(text) && 
+                !paths->isWorldNameUsed(textutf8);
+    });
+    panel->add(nameInput);
+
+    panel->add(std::make_shared<Label>(langs::get(L"Seed", L"world")));
+    auto seedstr = std::to_wstring(randU64());
+    auto seedInput = std::make_shared<TextBox>(seedstr, glm::vec4(6.0f));
+    panel->add(seedInput);
+    
+    panel->add(guiutil::gotoButton(langs::get(L"World generator", L"world"), "world_generators", engine->getGUI()->getMenu()));
+
+    panel->add(menus::create_button(L"Content", glm::vec4(10), glm::vec4(1), [=](GUI* gui) {
+        engine->loadAllPacks();
+        auto panel = menus::create_packs_panel(engine->getContentPacks(), engine, false, nullptr, nullptr);
+        auto menu = gui->getMenu();
+        menu->addPage("content-packs", panel);
+        menu->setPage("content-packs");
+    }));
+
+    panel->add(menus::create_button(L"Create World", glm::vec4(10), glm::vec4(1, 20, 1, 1), 
+    [=](GUI*) {
+        if (!nameInput->validate())
+            return;
+
+        std::string name = util::wstr2str_utf8(nameInput->getText());
+        uint64_t seed = str2seed(seedInput->getText());
+        std::cout << "world seed: " << seed << std::endl;
+
+        EnginePaths* paths = engine->getPaths();
+        auto folder = paths->getWorldsFolder()/fs::u8path(name);
+        try {
+            engine->loadAllPacks();
+            engine->loadContent();
+            paths->setWorldFolder(folder);
+        } catch (const contentpack_error& error) {
+            guiutil::alert(
+                engine->getGUI(),
+                langs::get(L"Content Error", L"menu")+L":\n"+
+                util::str2wstr_utf8(
+                    std::string(error.what())+
+                    "\npack '"+error.getPackId()+"' from "+
+                    error.getFolder().u8string()
+                )
+            );
+            return;
+        } catch (const std::runtime_error& error) {
+            guiutil::alert(
+                engine->getGUI(),
+                langs::get(L"Content Error", L"menu")+
+                L": "+util::str2wstr_utf8(error.what())
+            );
+            return;
+        }
+
+        Level* level = World::create(
+            name, menus::generatorID, folder, seed, 
+            engine->getSettings(), 
+            engine->getContent(),
+            engine->getContentPacks()
+        );
+        level->world->wfile->createDirectories();
+        menus::generatorID = WorldGenerators::getDefaultGeneratorID();
+        engine->setScreen(std::make_shared<LevelScreen>(engine, level));
+    }));
+    panel->add(guiutil::backButton(engine->getGUI()->getMenu()));
+}
+
+#endif // FRONTEND_MENU_MENU_CREATE_WORLD_H_

From 8602ad71a534e0420970ce88a57303e78cb3bc38 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 13 Mar 2024 20:52:20 +0300
Subject: [PATCH 3/4] controls menu moved to menu_settings.cpp

---
 src/frontend/menu/menu.cpp          | 42 ----------------------------
 src/frontend/menu/menu_settings.cpp | 43 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp
index c60359f4..bddbb9f8 100644
--- a/src/frontend/menu/menu.cpp
+++ b/src/frontend/menu/menu.cpp
@@ -281,52 +281,10 @@ void create_main_menu_panel(Engine* engine) {
     ));
 }
 
-void create_controls_panel(Engine* engine) {
-    auto menu = engine->getGUI()->getMenu();
-    auto panel = menus::create_page(engine, "controls", 400, 0.0f, 1);
-
-    /* Camera sensitivity setting track bar */{
-        panel->add(menus::create_label([=]() {
-            float s = engine->getSettings().camera.sensitivity;
-            return langs::get(L"Mouse Sensitivity", L"settings")+L": "+
-                   util::to_wstring(s, 1);
-        }));
-
-        auto trackbar = std::make_shared<TrackBar>(0.1, 10.0, 2.0, 0.1, 4);
-        trackbar->setSupplier([=]() {
-            return engine->getSettings().camera.sensitivity;
-        });
-        trackbar->setConsumer([=](double value) {
-            engine->getSettings().camera.sensitivity = value;
-        });
-        panel->add(trackbar);
-    }
-
-    auto scrollPanel = std::make_shared<Panel>(glm::vec2(400, 200), glm::vec4(2.0f), 1.0f);
-    scrollPanel->setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.3f));
-    scrollPanel->setMaxLength(400);
-    for (auto& entry : Events::bindings){
-        std::string bindname = entry.first;
-        
-        auto subpanel = std::make_shared<Panel>(glm::vec2(400, 40), glm::vec4(5.0f), 1.0f);
-        subpanel->setColor(glm::vec4(0.0f));
-        subpanel->setOrientation(Orientation::horizontal);
-        subpanel->add(std::make_shared<InputBindBox>(entry.second));
-
-        auto label = std::make_shared<Label>(langs::get(util::str2wstr_utf8(bindname)));
-        label->setMargin(glm::vec4(6.0f));
-        subpanel->add(label);
-        scrollPanel->add(subpanel);
-    }
-    panel->add(scrollPanel);
-    panel->add(guiutil::backButton(menu));
-}
-
 void menus::create_menus(Engine* engine) {
     menus::generatorID = WorldGenerators::getDefaultGeneratorID();
     create_new_world_panel(engine);
     create_settings_panel(engine);
-    create_controls_panel(engine);
     create_languages_panel(engine);
     create_main_menu_panel(engine);
     create_world_generators_panel(engine);
diff --git a/src/frontend/menu/menu_settings.cpp b/src/frontend/menu/menu_settings.cpp
index 1baeb1c3..d2529f14 100644
--- a/src/frontend/menu/menu_settings.cpp
+++ b/src/frontend/menu/menu_settings.cpp
@@ -6,6 +6,7 @@
 #include "../gui/gui_util.h"
 #include "../../engine.h"
 #include "../../util/stringutil.h"
+#include "../../window/Events.h"
 
 #include <glm/glm.hpp>
 
@@ -44,8 +45,50 @@ void create_audio_settings_panel(Engine* engine) {
     panel->add(guiutil::backButton(menu));
 }
 
+static void create_controls_panel(Engine* engine) {
+    auto menu = engine->getGUI()->getMenu();
+    auto panel = menus::create_page(engine, "controls", 400, 0.0f, 1);
+
+    /* Camera sensitivity setting track bar */{
+        panel->add(menus::create_label([=]() {
+            float s = engine->getSettings().camera.sensitivity;
+            return langs::get(L"Mouse Sensitivity", L"settings")+L": "+
+                   util::to_wstring(s, 1);
+        }));
+
+        auto trackbar = std::make_shared<TrackBar>(0.1, 10.0, 2.0, 0.1, 4);
+        trackbar->setSupplier([=]() {
+            return engine->getSettings().camera.sensitivity;
+        });
+        trackbar->setConsumer([=](double value) {
+            engine->getSettings().camera.sensitivity = value;
+        });
+        panel->add(trackbar);
+    }
+
+    auto scrollPanel = std::make_shared<Panel>(glm::vec2(400, 200), glm::vec4(2.0f), 1.0f);
+    scrollPanel->setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.3f));
+    scrollPanel->setMaxLength(400);
+    for (auto& entry : Events::bindings){
+        std::string bindname = entry.first;
+        
+        auto subpanel = std::make_shared<Panel>(glm::vec2(400, 40), glm::vec4(5.0f), 1.0f);
+        subpanel->setColor(glm::vec4(0.0f));
+        subpanel->setOrientation(Orientation::horizontal);
+        subpanel->add(std::make_shared<InputBindBox>(entry.second));
+
+        auto label = std::make_shared<Label>(langs::get(util::str2wstr_utf8(bindname)));
+        label->setMargin(glm::vec4(6.0f));
+        subpanel->add(label);
+        scrollPanel->add(subpanel);
+    }
+    panel->add(scrollPanel);
+    panel->add(guiutil::backButton(menu));
+}
+
 void menus::create_settings_panel(Engine* engine) {
     create_audio_settings_panel(engine);
+    create_controls_panel(engine);
 
     auto menu = engine->getGUI()->getMenu();
     auto panel = menus::create_page(engine, "settings", 400, 0.0f, 1);

From fe4a97b9553a835dad717bd20be46770ca6f3b35 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 13 Mar 2024 23:48:10 +0300
Subject: [PATCH 4/4] feature implementation delayed: refactor required

---
 src/frontend/menu/menu_create_world.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/frontend/menu/menu_create_world.cpp b/src/frontend/menu/menu_create_world.cpp
index 71615768..c2e0b442 100644
--- a/src/frontend/menu/menu_create_world.cpp
+++ b/src/frontend/menu/menu_create_world.cpp
@@ -108,14 +108,6 @@ void menus::create_new_world_panel(Engine* engine) {
     
     panel->add(guiutil::gotoButton(langs::get(L"World generator", L"world"), "world_generators", engine->getGUI()->getMenu()));
 
-    panel->add(menus::create_button(L"Content", glm::vec4(10), glm::vec4(1), [=](GUI* gui) {
-        engine->loadAllPacks();
-        auto panel = menus::create_packs_panel(engine->getContentPacks(), engine, false, nullptr, nullptr);
-        auto menu = gui->getMenu();
-        menu->addPage("content-packs", panel);
-        menu->setPage("content-packs");
-    }));
-
     panel->add(menus::create_button(L"Create World", glm::vec4(10), glm::vec4(1, 20, 1, 1), 
     [=](GUI*) {
         if (!nameInput->validate())