Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 13:47:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code spaghetti and more chaos

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-01-27 22:47:28 +02:00
parent 4cd236ed80
commit 7317105e4d
21 changed files with 613 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/java/JavaRuntime.cpp
View File

@ -62,7 +62,7 @@ MetaPtr parseJavaMeta(const QJsonObject& in)
}
if (in.contains("version")) {
auto obj = Json::requireObject(in, "checksum");
auto obj = Json::requireObject(in, "version");
auto name = Json::ensureString(obj, "name", "");
auto major = Json::ensureInteger(obj, "major", 0);
auto minor = Json::ensureInteger(obj, "minor", 0);

21
launcher/java/JavaVersion.cpp
View File

@ -113,19 +113,20 @@ bool JavaVersion::operator>(const JavaVersion& rhs)
JavaVersion::JavaVersion(int major, int minor, int security, int build, QString name)
: m_major(major), m_minor(minor), m_security(security), m_name(name), m_parseable(true)
{
QStringList versions;
if (build != 0) {
m_prerelease = QString::number(build);
m_string = m_prerelease;
versions.push_front(m_prerelease);
}
if (m_security != 0)
m_string = QString::number(m_security) + "." + m_string;
else if (!m_string.isEmpty()) {
m_string = "0." + m_string;
}
versions.push_front(QString::number(m_security));
else if (!versions.isEmpty())
versions.push_front("0");
if (m_minor != 0)
m_string = QString::number(m_minor) + "." + m_string;
else if (!m_string.isEmpty()) {
m_string = "0." + m_string;
}
m_string = QString::number(m_major) + "." + m_string;
versions.push_front(QString::number(m_minor));
else if (!versions.isEmpty())
versions.push_front("0");
versions.push_front(QString::number(m_major));
m_string = versions.join(".");
}

2
launcher/java/download/ArchiveJavaDownloader.cpp
View File

@ -43,7 +43,7 @@ void ArchiveJavaDownloader::executeTask()
if (m_checksum_type == "sha256") {
hashType = QCryptographicHash::Algorithm::Sha256;
}
action->addValidator(new Net::ChecksumValidator(hashType, m_checksum_hash.toLatin1()));
action->addValidator(new Net::ChecksumValidator(hashType, QByteArray::fromHex(m_checksum_hash.toUtf8())));
}
download->addNetAction(action);
auto fullPath = entry->getFullPath();

2
launcher/java/download/ManifestJavaDownloader.cpp
View File

@ -46,7 +46,7 @@ void ManifestJavaDownloader::executeTask()
if (m_checksum_type == "sha256") {
hashType = QCryptographicHash::Algorithm::Sha256;
}
action->addValidator(new Net::ChecksumValidator(hashType, m_checksum_hash.toLatin1()));
action->addValidator(new Net::ChecksumValidator(hashType, QByteArray::fromHex(m_checksum_hash.toUtf8())));
}
download->addNetAction(action);