voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 05:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

cleanup

Browse source
This commit is contained in:
MihailRis 2025-03-21 10:05:44 +03:00
parent e442402e43
commit f99d909f34
9 changed files with 19 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/logic/EngineController.cpp
View file

@ -10,6 +10,7 @@
#include "coders/json.hpp"
#include "content/ContentReport.hpp"
#include "content/ContentControl.hpp"
#include "content/PacksManager.hpp"
#include "world/files/WorldConverter.hpp"
#include "world/files/WorldFiles.hpp"
#include "frontend/locale.hpp"
@ -130,12 +131,15 @@ static void show_convert_request(
}
static bool load_world_content(Engine& engine, const io::path& folder) {
auto& paths = engine.getPaths();
auto& contentControl = engine.getContentControl();
paths.setCurrentWorldFolder(folder);
if (engine.isHeadless()) {
engine.loadWorldContent(folder);
contentControl.loadContent(ContentPack::worldPacksList("world:"));
return true;
} else {
return menus::call(engine, [&engine, folder]() {
engine.loadWorldContent(folder);
return menus::call(engine, [&contentControl]() {
contentControl.loadContent(ContentPack::worldPacksList("world:"));
});
}
}
@ -263,10 +267,10 @@ void EngineController::createWorld(
auto folder = paths.getWorldsFolder() / name;
if (engine.isHeadless()) {
engine.loadContent();
engine.getContentControl().loadContent();
paths.setCurrentWorldFolder(folder);
} else if (!menus::call(engine, [this, &paths, folder]() {
engine.loadContent();
engine.getContentControl().loadContent();
paths.setCurrentWorldFolder(folder);
})) {
return;

5
src/logic/scripting/lua/libs/libcore.cpp
View file

@ -6,6 +6,7 @@
#include "constants.hpp"
#include "assets/Assets.hpp"
#include "content/Content.hpp"
#include "content/ContentControl.hpp"
#include "debug/Logger.hpp"
#include "engine/Engine.hpp"
#include "io/engine_paths.hpp"
@ -30,7 +31,7 @@ static int l_get_version(lua::State* L) {
}
static int l_load_content(lua::State* L) {
engine->loadContent();
content_control->loadContent();
return 0;
}
@ -38,7 +39,7 @@ static int l_reset_content(lua::State* L) {
if (level != nullptr) {
throw std::runtime_error("world must be closed before");
}
engine->resetContent();
content_control->resetContent();
return 0;
}

9
src/logic/scripting/lua/libs/libpack.cpp
View file

@ -7,6 +7,7 @@
#include "assets/AssetsLoader.hpp"
#include "content/Content.hpp"
#include "content/ContentControl.hpp"
#include "content/PacksManager.hpp"
#include "engine/Engine.hpp"
#include "graphics/ui/gui_util.hpp"
#include "graphics/ui/elements/Menu.hpp"
@ -44,10 +45,6 @@ static int l_pack_get_installed(lua::State* L) {
/// @brief pack.get_available() -> array<string>
static int l_pack_get_available(lua::State* L) {
io::path worldFolder;
if (level) {
worldFolder = level->getWorld()->wfile->getFolder();
}
PacksManager manager;
manager.setSources(content_control->getDefaultSources());
manager.scan();
@ -150,10 +147,6 @@ static int pack_get_infos(lua::State* L) {
}
}
if (!ids.empty()) {
io::path worldFolder;
if (level) {
worldFolder = level->getWorld()->wfile->getFolder();
}
PacksManager manager;
manager.setSources(content_control->getDefaultSources());
manager.scan();