diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 7a460c066..1dc791b19 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -25,7 +25,7 @@ const uint MIN_SURROUNDING = 9; ChunksController::ChunksController(Level& level) : level(level), generator(std::make_unique( - level.content.generators.require(level.getWorld()->getGenerator()), + level.content.generators.require(level.environment.generator), level.content, level.getWorld()->getSeed() )) {} diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 9231ffe67..7637b250e 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -179,7 +179,7 @@ void EngineController::onMissingContent( if (engine.isHeadless()) { throw std::runtime_error( "missing content: " + - json::stringify(create_missing_content_report(report), true, " ") + util::quote(json::stringify(create_missing_content_report(report), true, " ")) ); } else { engine.setScreen(std::make_shared(engine)); @@ -268,7 +268,7 @@ inline uint64_t str2seed(const std::string& seedstr) { void EngineController::createWorld( const std::string& name, const std::string& seedstr, - const std::string& generatorID + const std::string& environment ) { uint64_t seed = str2seed(seedstr); @@ -279,17 +279,31 @@ void EngineController::createWorld( paths.setCurrentWorldFolder(folder); engine.getContentControl().loadContent(); }); + const auto& generators = engine.getContentControl().get()->generators; + + // generator-based environments must die in 1.0 + bool genBasedEnv = false; + if (auto genDef = generators.find(environment)) { + genBasedEnv = true; + } auto& contentControl = engine.getContentControl(); auto level = World::create( name, - generatorID, + genBasedEnv ? "" : environment, + genBasedEnv ? environment : "", folder, seed, engine.getSettings(), *contentControl.get(), contentControl.getContentPacks() ); + + // generator-based environment initialization + if (genBasedEnv) { + level->environment.generator = environment; + } + if (!engine.isHeadless()) { level->players->create(localPlayer); } diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index 870fed923..6f992ba4c 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -149,7 +149,7 @@ void LevelController::saveWorld() { world->wfile->createDirectories(); scripting::on_world_save(); level->onSave(); - level->getWorld()->write(level.get()); + level->getWorld()->write(*level); } void LevelController::onWorldQuit() { diff --git a/src/logic/scripting/lua/libs/libworld.cpp b/src/logic/scripting/lua/libs/libworld.cpp index c2d6be43c..9c50b6c0b 100644 --- a/src/logic/scripting/lua/libs/libworld.cpp +++ b/src/logic/scripting/lua/libs/libworld.cpp @@ -125,7 +125,7 @@ static int l_is_night(lua::State* L) { } static int l_get_generator(lua::State* L) { - return lua::pushstring(L, require_world_info().generator); + return lua::pushstring(L, require_level().environment.generator); } static int l_get_chunk_data(lua::State* L) { diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index fec65d7de..7d921a4fa 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -127,7 +127,7 @@ void Player::teleport(glm::vec3 position) { void Player::attemptToChooseSpawnpoint() { // looks bad to be here tbh const auto& generatorDef = - level.content.generators.require(level.getWorld()->getGenerator()); + level.content.generators.require(level.environment.generator); int minHeight = generatorDef.playerMinSpawnHeight; int maxHeight = generatorDef.playerMaxSpawnHeight; diff --git a/src/world/Environment.cpp b/src/world/Environment.cpp index 932880200..29c3ef476 100644 --- a/src/world/Environment.cpp +++ b/src/world/Environment.cpp @@ -22,6 +22,7 @@ dv::value Environment::serialize() const { {"clouds", sky.clouds}, {"sprites", std::move(skySpritesList)}, })}, + {"generator", generator} }); } @@ -44,4 +45,5 @@ void Environment::deserialize(const dv::value& src) { } } } + src.at("generator").get(generator); } diff --git a/src/world/Environment.hpp b/src/world/Environment.hpp index feb244178..c2efa828a 100644 --- a/src/world/Environment.hpp +++ b/src/world/Environment.hpp @@ -56,6 +56,8 @@ public: }; } sky; + std::string generator; + Environment() = default; dv::value serialize() const override; diff --git a/src/world/Level.cpp b/src/world/Level.cpp index e6d9000e1..9e40e90cd 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -31,6 +31,7 @@ Level::Level( entities(std::make_unique(*this)), players(std::make_unique(*this)), pathfinding(std::make_unique(*this)) { + const auto& worldInfo = world->getInfo(); auto& cameraIndices = content.getIndices(ResourceType::CAMERA); for (size_t i = 0; i < cameraIndices.size(); i++) { diff --git a/src/world/World.cpp b/src/world/World.cpp index 6508a4dab..2acc7edaa 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -65,12 +65,12 @@ void World::writeResources(const Content& content) { io::write_json(wfile->getResourcesFile(), root); } -void World::write(Level* level) { - level->chunks->saveAll(); - info.nextEntityId = level->entities->peekNextID(); +void World::write(Level& level) { + level.chunks->saveAll(); + info.nextEntityId = level.entities->peekNextID(); wfile->write(this, &content); - auto playerFile = level->players->serialize(); + auto playerFile = level.players->serialize(); io::write_json(wfile->getPlayerFile(), playerFile); writeResources(content); @@ -78,7 +78,8 @@ void World::write(Level* level) { std::unique_ptr World::create( const std::string& name, - const std::string& generator, + const std::string& environment, + const std::string& generatorOverride, const io::path& directory, uint64_t seed, EngineSettings& settings, @@ -87,7 +88,8 @@ std::unique_ptr World::create( ) { WorldInfo info {}; info.name = name; - info.generator = generator; + info.environment = environment; + info.explicitGenerator = generatorOverride; info.seed = seed; auto world = std::make_unique( info, @@ -101,7 +103,7 @@ std::unique_ptr World::create( logger.info() << "created world '" << name << "' (" << directory.string() << ")"; } - logger.info() << "world seed: " << seed << " generator: " << generator; + logger.info() << "world seed: " << seed << " environment: " << environment; return std::make_unique(std::move(world), content, settings); } @@ -122,16 +124,19 @@ std::unique_ptr World::load( << worldFilesPtr->getFolder().string() << ")"; logger.info() << "world version: " << info->major << "." << info->minor << " seed: " << info->seed - << " generator: " << info->generator; + << " environment: " << info->environment; - auto world = std::make_unique( + auto worldPtr = std::make_unique( info.value(), std::move(worldFilesPtr), content, packs ); + auto world = worldPtr.get(); auto& wfile = world->wfile; wfile->readResourcesData(content); - auto level = std::make_unique(std::move(world), content, settings); - + auto level = std::make_unique(std::move(worldPtr), content, settings); + if (world->getEnvironment().empty()) { + level->environment.generator = world->getInfo().explicitGenerator; + } io::path file = wfile->getPlayerFile(); if (!io::is_regular_file(file)) { logger.warning() << "player.json does not exists"; @@ -163,8 +168,8 @@ void World::setName(const std::string& name) { this->info.name = name; } -void World::setGenerator(const std::string& generator) { - this->info.generator = generator; +void World::setEnvironment(const std::string& environment) { + this->info.environment = environment; } bool World::hasPack(const std::string& id) const { @@ -186,8 +191,8 @@ uint64_t World::getSeed() const { return info.seed; } -std::string World::getGenerator() const { - return info.generator; +std::string World::getEnvironment() const { + return info.environment; } const std::vector& World::getPacks() const { @@ -196,7 +201,8 @@ const std::vector& World::getPacks() const { void WorldInfo::deserialize(const dv::value& root) { name = root["name"].asString(); - generator = root["generator"].asString(generator); + root.at("environment").get(environment); + root.at("generator").get(explicitGenerator); seed = root["seed"].asInteger(seed); if (root.has("version")) { @@ -226,7 +232,11 @@ dv::value WorldInfo::serialize() const { versionobj["minor"] = ENGINE_VERSION_MINOR; root["name"] = name; - root["generator"] = generator; + if (environment.empty()) { + root["generator"] = explicitGenerator; + } else { + root["environment"] = environment; + } root["seed"] = seed; auto& timeobj = root.object("time"); diff --git a/src/world/World.hpp b/src/world/World.hpp index 725b91823..14649fb1b 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -23,7 +23,8 @@ public: struct WorldInfo : public Serializable { std::string name; - std::string generator; + std::string environment; + std::string explicitGenerator; uint64_t seed; int64_t nextInventoryId = 1; int64_t nextPlayerId = 0; @@ -76,7 +77,7 @@ public: void updateTimers(float delta); /// @brief Write all unsaved level data to the world directory - void write(Level* level); + void write(Level& level); /// @brief Check world indices and generate ContentReport if convert required /// @param directory world directory @@ -98,7 +99,8 @@ public: /// @return Level instance containing World instance static std::unique_ptr create( const std::string& name, - const std::string& generator, + const std::string& environment, + const std::string& generatorOverride, const io::path& directory, uint64_t seed, EngineSettings& settings, @@ -123,7 +125,7 @@ public: void setName(const std::string& name); void setSeed(uint64_t seed); - void setGenerator(const std::string& generator); + void setEnvironment(const std::string& environment); /// @brief Check if world has content-pack installed /// @param id content-pack id @@ -137,7 +139,7 @@ public: uint64_t getSeed() const; /// @brief Get world generator id - std::string getGenerator() const; + std::string getEnvironment() const; bool isNameless() const { return info.name.empty();