From 13ae6c69509fa31f57a0965caee06b6f79d6984b Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Apr 2024 03:53:58 +0300 Subject: [PATCH] core.remove_packs --- res/texts/en_US.txt | 4 +- res/texts/ru_RU.txt | 4 +- src/frontend/menu/menu.h | 6 +++ src/frontend/menu/menu_pause.cpp | 69 ++++++++++++++++++++--------- src/logic/scripting/lua/libcore.cpp | 16 +++++++ 5 files changed, 75 insertions(+), 24 deletions(-) diff --git a/res/texts/en_US.txt b/res/texts/en_US.txt index 99b97604..94d6774b 100644 --- a/res/texts/en_US.txt +++ b/res/texts/en_US.txt @@ -1,7 +1,7 @@ # Menu menu.missing-content=Missing Content! world.convert-request=Content indices have changed! Convert world files? -pack.remove-confirm=Do you want to erase all pack content from the world forever? +pack.remove-confirm=Do you want to erase all pack(s) content from the world forever? error.pack-not-found=Could not to find pack error.dependency-not-found=Dependency pack is not found world.delete-confirm=Do you want to delete world forever? @@ -24,4 +24,4 @@ player.build=Place Block player.flight=Flight player.noclip=No-clip camera.zoom=Zoom -camera.mode=Switch Camera Mode \ No newline at end of file +camera.mode=Switch Camera Mode diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt index bb171626..81040ad5 100644 --- a/res/texts/ru_RU.txt +++ b/res/texts/ru_RU.txt @@ -10,7 +10,7 @@ Converting world...=Выполняется конвертация мира... error.pack-not-found=Не удалось найти пакет error.dependency-not-found=Используемая зависимость не найдена -pack.remove-confirm=Удалить весь поставляемый паком контент из мира (безвозвратно)? +pack.remove-confirm=Удалить весь поставляемый паком/паками контент из мира (безвозвратно)? # Меню menu.New World=Новый Мир @@ -68,4 +68,4 @@ player.attack=Атаковать / Сломать player.build=Поставить Блок player.flight=Полёт camera.zoom=Приближение -camera.mode=Сменить Режим Камеры \ No newline at end of file +camera.mode=Сменить Режим Камеры diff --git a/src/frontend/menu/menu.h b/src/frontend/menu/menu.h index 07bae264..aa9d7ed8 100644 --- a/src/frontend/menu/menu.h +++ b/src/frontend/menu/menu.h @@ -47,6 +47,12 @@ namespace menus { /// @param engine engine instance void delete_world(std::string name, Engine* engine); + void remove_packs( + Engine* engine, + LevelController* controller, + std::vector packs + ); + /// @brief Create development version label at the top-right screen corner void create_version_label(Engine* engine); void create_menus(Engine* engine); diff --git a/src/frontend/menu/menu_pause.cpp b/src/frontend/menu/menu_pause.cpp index deba7513..5566a903 100644 --- a/src/frontend/menu/menu_pause.cpp +++ b/src/frontend/menu/menu_pause.cpp @@ -60,21 +60,23 @@ std::shared_ptr create_pack_panel( if (!pack.creator.empty()) { packpanel->add(guiutil::create( "" )); } - auto descriptionlabel = std::make_shared