diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index f4890e8f..0a81970e 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -128,11 +128,11 @@ fs::path ContentPack::findPack( if (fs::is_directory(folder)) { return folder; } - folder = paths->getUserfiles() / fs::path("content") / fs::path(name); + folder = paths->getUserFilesFolder() / fs::path("content") / fs::path(name); if (fs::is_directory(folder)) { return folder; } - return paths->getResources() / fs::path("content") / fs::path(name); + return paths->getResourcesFolder() / fs::path("content") / fs::path(name); } ContentPackRuntime::ContentPackRuntime(ContentPack info, scriptenv env) diff --git a/src/core_defs.cpp b/src/core_defs.cpp index 0fd648b9..1c00d0c7 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -25,7 +25,7 @@ void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) { ItemDef& item = builder->items.create("core:empty"); item.iconType = item_icon_type::none; - auto bindsFile = paths->getResources()/fs::path("bindings.toml"); + auto bindsFile = paths->getResourcesFolder()/fs::path("bindings.toml"); if (fs::is_regular_file(bindsFile)) { Events::loadBindings( bindsFile.u8string(), files::read_string(bindsFile) diff --git a/src/engine.cpp b/src/engine.cpp index 7bbff33b..b00294ed 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -83,7 +83,7 @@ Engine::Engine(EngineSettings& settings, SettingsHandler& settingsHandler, Engin paths->prepare(); loadSettings(); - auto resdir = paths->getResources(); + auto resdir = paths->getResourcesFolder(); controller = std::make_unique(this); if (Window::initialize(&this->settings.display)){ @@ -105,7 +105,7 @@ Engine::Engine(EngineSettings& settings, SettingsHandler& settingsHandler, Engin if (settings.ui.language.get() == "auto") { settings.ui.language.set(langs::locale_by_envlocale( platform::detect_locale(), - paths->getResources() + paths->getResourcesFolder() )); } if (ENGINE_DEBUG_BUILD) { @@ -162,7 +162,7 @@ void Engine::updateHotkeys() { void Engine::saveScreenshot() { auto image = Window::takeScreenshot(); image->flipY(); - fs::path filename = paths->getScreenshotFile("png"); + fs::path filename = paths->getNewScreenshotFile("png"); imageio::write(filename.string(), image.get()); logger.info() << "saved screenshot as " << filename.u8string(); } @@ -252,8 +252,8 @@ PacksManager Engine::createPacksManager(const fs::path& worldFolder) { PacksManager manager; manager.setSources({ worldFolder/fs::path("content"), - paths->getUserfiles()/fs::path("content"), - paths->getResources()/fs::path("content") + paths->getUserFilesFolder()/fs::path("content"), + paths->getResourcesFolder()/fs::path("content") }); return manager; } @@ -296,7 +296,7 @@ static void load_configs(const fs::path& root) { } void Engine::loadContent() { - auto resdir = paths->getResources(); + auto resdir = paths->getResourcesFolder(); std::vector names; for (auto& pack : contentPacks) { @@ -307,7 +307,7 @@ void Engine::loadContent() { corecontent::setup(paths, &contentBuilder); paths->setContentPacks(&contentPacks); - PacksManager manager = createPacksManager(paths->getWorldFolder()); + PacksManager manager = createPacksManager(paths->getCurrentWorldFolder()); manager.scan(); names = manager.assembly(names); contentPacks = manager.getAll(names); @@ -318,7 +318,7 @@ void Engine::loadContent() { ContentLoader(&pack, contentBuilder).load(); load_configs(pack.folder); } - load_configs(paths->getResources()); + load_configs(paths->getResourcesFolder()); content = contentBuilder.build(); resPaths = std::make_unique(resdir, resRoots); @@ -329,7 +329,7 @@ void Engine::loadContent() { } void Engine::resetContent() { - auto resdir = paths->getResources(); + auto resdir = paths->getResourcesFolder(); resPaths = std::make_unique(resdir, std::vector()); contentPacks.clear(); content.reset(); @@ -349,17 +349,17 @@ void Engine::loadWorldContent(const fs::path& folder) { PacksManager manager; manager.setSources({ folder/fs::path("content"), - paths->getUserfiles()/fs::path("content"), - paths->getResources()/fs::path("content") + paths->getUserFilesFolder()/fs::path("content"), + paths->getResourcesFolder()/fs::path("content") }); manager.scan(); contentPacks = manager.getAll(manager.assembly(packNames)); - paths->setWorldFolder(folder); + paths->setCurrentWorldFolder(folder); loadContent(); } void Engine::loadAllPacks() { - PacksManager manager = createPacksManager(paths->getWorldFolder()); + PacksManager manager = createPacksManager(paths->getCurrentWorldFolder()); manager.scan(); auto allnames = manager.getAllNames(); contentPacks = manager.getAll(manager.assembly(allnames)); @@ -376,7 +376,7 @@ void Engine::setScreen(std::shared_ptr screen) { } void Engine::setLanguage(std::string locale) { - langs::setup(paths->getResources(), std::move(locale), contentPacks); + langs::setup(paths->getResourcesFolder(), std::move(locale), contentPacks); gui->getMenu()->setPageLoader(menus::create_page_loader(this)); } diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index c6a20036..21eb8855 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -79,7 +79,7 @@ LevelScreen::~LevelScreen() { saveWorldPreview(); scripting::on_frontend_close(); controller->onWorldQuit(); - engine->getPaths()->setWorldFolder(fs::path()); + engine->getPaths()->setCurrentWorldFolder(fs::path()); } void LevelScreen::saveWorldPreview() { diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 0017aa29..5d000a1e 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -30,7 +30,7 @@ EngineController::EngineController(Engine* engine) : engine(engine) { } void EngineController::deleteWorld(const std::string& name) { - fs::path folder = engine->getPaths()->getWorldFolder(name); + fs::path folder = engine->getPaths()->getWorldFolderByName(name); guiutil::confirm( engine->getGUI(), langs::get(L"delete-confirm", L"world") + L" (" + @@ -189,7 +189,7 @@ void EngineController::createWorld( if (!menus::call(engine, [this, paths, folder]() { engine->loadContent(); - paths->setWorldFolder(folder); + paths->setCurrentWorldFolder(folder); })) { return; } diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 5c9d26c1..108ac196 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -17,7 +17,7 @@ using namespace scripting; static int l_pack_get_folder(lua::State* L) { std::string packName = lua::tostring(L, 1); if (packName == "core") { - auto folder = engine->getPaths()->getResources().u8string() + "/"; + auto folder = engine->getPaths()->getResourcesFolder().u8string() + "/"; return lua::pushstring(L, folder); } for (auto& pack : engine->getContentPacks()) { diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index 4300aec6..0581f71a 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -71,7 +71,7 @@ static int l_world_get_seed(lua::State* L) { static int l_world_exists(lua::State* L) { auto name = lua::require_string(L, 1); - auto worldsDir = engine->getPaths()->getWorldFolder(name); + auto worldsDir = engine->getPaths()->getWorldFolderByName(name); return lua::pushboolean(L, fs::is_directory(worldsDir)); } diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 5d3b95c0..27c66535 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -38,7 +38,7 @@ LevelController* scripting::controller = nullptr; static void load_script(const fs::path& name, bool throwable) { auto paths = scripting::engine->getPaths(); - fs::path file = paths->getResources() / fs::path("scripts") / name; + fs::path file = paths->getResourcesFolder() / fs::path("scripts") / name; std::string src = files::read_string(file); auto L = lua::get_main_thread(); diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 9485e6f8..f64789a4 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -48,14 +48,14 @@ bool perform_keyword( if (!fs::is_directory(fs::path(token))) { throw std::runtime_error(token + " is not a directory"); } - paths.setResources(fs::path(token)); + paths.setResourcesFolder(fs::path(token)); std::cout << "resources folder: " << token << std::endl; } else if (keyword == "--dir") { auto token = reader.next(); if (!fs::is_directory(fs::path(token))) { fs::create_directories(fs::path(token)); } - paths.setUserfiles(fs::path(token)); + paths.setUserFilesFolder(fs::path(token)); std::cout << "userfiles folder: " << token << std::endl; } else if (keyword == "--help" || keyword == "-h") { std::cout << "VoxelEngine command-line arguments:" << std::endl;