ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add totalTimePlayed for FTBApp import

Browse Source 
Signed-off-by: chouzz <zhouhua852@gmail.com>
(cherry picked from commit 92113e233a)
This commit is contained in:
chouzz 2024-03-09 19:34:16 +08:00 committed by github-actions[bot]
parent 067fcaf0d9
commit ca3516d26d
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/modplatform/import_ftb/PackHelpers.cpp
View File

@ -43,6 +43,7 @@ Modpack parseDirectory(QString path)
modpack.version = Json::requireString(root, "version", "version"); modpack.version = Json::requireString(root, "version", "version");
modpack.mcVersion = Json::requireString(root, "mcVersion", "mcVersion"); modpack.mcVersion = Json::requireString(root, "mcVersion", "mcVersion");
modpack.jvmArgs = Json::ensureVariant(root, "jvmArgs", {}, "jvmArgs"); modpack.jvmArgs = Json::ensureVariant(root, "jvmArgs", {}, "jvmArgs");
modpack.totalPlayTime = Json::requireInteger(root, "totalPlayTime", "totalPlayTime");
} catch (const Exception& e) { } catch (const Exception& e) {
qDebug() << "Couldn't load ftb instance json: " << e.cause(); qDebug() << "Couldn't load ftb instance json: " << e.cause();
return {}; return {};

1
launcher/modplatform/import_ftb/PackHelpers.h
View File

@ -36,6 +36,7 @@ struct Modpack {
QString name; QString name;
QString version; QString version;
QString mcVersion; QString mcVersion;
int totalPlayTime;
// not needed for instance creation // not needed for instance creation
QVariant jvmArgs; QVariant jvmArgs;

1
launcher/modplatform/import_ftb/PackInstallTask.cpp
View File

@ -55,6 +55,7 @@ void PackInstallTask::copySettings()
instanceSettings->suspendSave(); instanceSettings->suspendSave();
MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
instance.settings()->set("InstanceType", "OneSix"); instance.settings()->set("InstanceType", "OneSix");
instance.settings()->set("totalTimePlayed", m_pack.totalPlayTime / 1000);
if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) { if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) {
instance.settings()->set("OverrideJavaArgs", true); instance.settings()->set("OverrideJavaArgs", true);