ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-05-10 09:18:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Backport release-10.x] fix: parse world_gen_settings.dat for seed (#5089)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2026-02-23 00:18:46 +02:00 committed by GitHub
parent cc4cc25739 02f23939f5
commit dc2cd96557
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
launcher/minecraft/World.cpp
View file

@ -153,18 +153,23 @@ QByteArray serializeLevelDat(nbt::tag_compound* levelInfo)
return val;
}
QString getLevelDatFromFS(const QFileInfo& file)
QString getDatFromFS(const QFileInfo& root, QString file)
{
QDir worldDir(file.filePath());
if (!file.isDir() || !worldDir.exists("level.dat")) {
QDir worldDir(root.filePath());
if (!root.isDir() || !worldDir.exists(file)) {
return QString();
}
return worldDir.absoluteFilePath("level.dat");
return worldDir.absoluteFilePath(file);
}
QByteArray getLevelDatDataFromFS(const QFileInfo& file)
QString getLevelDatFromFS(const QFileInfo& file)
{
auto fullFilePath = getLevelDatFromFS(file);
return getDatFromFS(file, "level.dat");
}
QByteArray getDatDataFromFS(const QFileInfo& root, QString file)
{
auto fullFilePath = getDatFromFS(root, file);
if (fullFilePath.isNull()) {
return QByteArray();
}
@ -175,6 +180,16 @@ QByteArray getLevelDatDataFromFS(const QFileInfo& file)
return f.readAll();
}
QByteArray getLevelDatDataFromFS(const QFileInfo& file)
{
return getDatDataFromFS(file, "level.dat");
}
QByteArray getWorldGenDataFromFS(const QFileInfo& file)
{
return getDatDataFromFS(file, "data/minecraft/world_gen_settings.dat");
}
bool putLevelDatDataToFS(const QFileInfo& file, QByteArray& data)
{
auto fullFilePath = getLevelDatFromFS(file);
@ -229,6 +244,8 @@ bool World::resetIcon()
return false;
}
int64_t loadSeed(QByteArray data);
void World::readFromFS(const QFileInfo& file)
{
auto bytes = getLevelDatDataFromFS(file);
@ -238,6 +255,12 @@ void World::readFromFS(const QFileInfo& file)
}
loadFromLevelDat(bytes);
m_levelDatTime = file.lastModified();
if (m_randomSeed == 0) {
auto bytes = getWorldGenDataFromFS(file);
if (!bytes.isEmpty()) {
m_randomSeed = loadSeed(bytes);
}
}
}
void World::readFromZip(const QFileInfo& file)
@ -393,6 +416,28 @@ GameType read_gametype(nbt::value& parent, const char* name)
} // namespace
int64_t loadSeed(QByteArray data)
{
auto levelData = parseLevelDat(data);
if (!levelData) {
return 0;
}
nbt::value* valPtr = nullptr;
try {
valPtr = &levelData->at("data");
} catch (const std::out_of_range& e) {
return 0;
}
nbt::value& val = *valPtr;
try {
return read_long(val, "seed").value_or(0);
} catch (const std::out_of_range&) {
}
return 0;
}
void World::loadFromLevelDat(QByteArray data)
{
auto levelData = parseLevelDat(data);