CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: reformat

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2023-08-14 18:16:53 +02:00
parent 779f70057b
commit 91ba4cf75e
603 changed files with 15840 additions and 16257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/minecraft/launch/ClaimAccount.cpp
View File

@ -4,10 +4,9 @@
#include "Application.h"
#include "minecraft/auth/AccountList.h"
ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchStep(parent)
ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session) : LaunchStep(parent)
{
if(session->status == AuthSession::Status::PlayableOnline && !session->demo)
{
if (session->status == AuthSession::Status::PlayableOnline && !session->demo) {
auto accounts = APPLICATION->accounts();
m_account = accounts->getAccountByProfileName(session->player_name);
}
@ -15,8 +14,7 @@ ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session): LaunchSt
void ClaimAccount::executeTask()
{
if(m_account)
{
if (m_account) {
lock.reset(new UseLock(m_account));
emitSucceeded();
}

17
launcher/minecraft/launch/ClaimAccount.h
View File

@ -18,20 +18,17 @@
#include <launch/LaunchStep.h>
#include <minecraft/auth/MinecraftAccount.h>
class ClaimAccount: public LaunchStep
{
class ClaimAccount : public LaunchStep {
Q_OBJECT
public:
explicit ClaimAccount(LaunchTask *parent, AuthSessionPtr session);
virtual ~ClaimAccount() {};
public:
explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
virtual ~ClaimAccount(){};
void executeTask() override;
void finalize() override;
bool canAbort() const override
{
return false;
}
private:
bool canAbort() const override { return false; }
private:
std::unique_ptr<UseLock> lock;
MinecraftAccountPtr m_account;
};

14
launcher/minecraft/launch/CreateGameFolders.cpp
View File

@ -1,27 +1,23 @@
#include "CreateGameFolders.h"
#include "minecraft/MinecraftInstance.h"
#include "launch/LaunchTask.h"
#include "FileSystem.h"
#include "launch/LaunchTask.h"
#include "minecraft/MinecraftInstance.h"
CreateGameFolders::CreateGameFolders(LaunchTask* parent): LaunchStep(parent)
{
}
CreateGameFolders::CreateGameFolders(LaunchTask* parent) : LaunchStep(parent) {}
void CreateGameFolders::executeTask()
{
auto instance = m_parent->instance();
std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
if(!FS::ensureFolderPathExists(minecraftInstance->gameRoot()))
{
if (!FS::ensureFolderPathExists(minecraftInstance->gameRoot())) {
emit logLine("Couldn't create the main game folder", MessageLevel::Error);
emitFailed(tr("Couldn't create the main game folder"));
return;
}
// HACK: this is a workaround for MCL-3732 - 'server-resource-packs' folder is created.
if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->gameRoot(), "server-resource-packs")))
{
if (!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->gameRoot(), "server-resource-packs"))) {
emit logLine("Couldn't create the 'server-resource-packs' folder", MessageLevel::Error);
}
emitSucceeded();

18
launcher/minecraft/launch/CreateGameFolders.h
View File

@ -15,23 +15,17 @@
#pragma once
#include <launch/LaunchStep.h>
#include <LoggedProcess.h>
#include <launch/LaunchStep.h>
#include <minecraft/auth/AuthSession.h>
// Create the main .minecraft for the instance and any other necessary folders
class CreateGameFolders: public LaunchStep
{
class CreateGameFolders : public LaunchStep {
Q_OBJECT
public:
explicit CreateGameFolders(LaunchTask *parent);
virtual ~CreateGameFolders() {};
public:
explicit CreateGameFolders(LaunchTask* parent);
virtual ~CreateGameFolders(){};
virtual void executeTask();
virtual bool canAbort() const
{
return false;
}
virtual bool canAbort() const { return false; }
};

46
launcher/minecraft/launch/ExtractNatives.cpp
View File

@ -14,26 +14,25 @@
*/
#include "ExtractNatives.h"
#include <minecraft/MinecraftInstance.h>
#include <launch/LaunchTask.h>
#include <minecraft/MinecraftInstance.h>
#include <quazip/quazip.h>
#include <quazip/quazipdir.h>
#include "MMCZip.h"
#include "FileSystem.h"
#include <QDir>
#include "FileSystem.h"
#include "MMCZip.h"
#ifdef major
#undef major
#undef major
#endif
#ifdef minor
#undef minor
#undef minor
#endif
static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
static QString replaceSuffix(QString target, const QString& suffix, const QString& replacement)
{
if (!target.endsWith(suffix))
{
if (!target.endsWith(suffix)) {
return target;
}
target.resize(target.length() - suffix.length());
@ -43,17 +42,14 @@ static QString replaceSuffix (QString target, const QString &suffix, const QStri
static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibHack, bool nativeOpenAL, bool nativeGLFW)
{
QuaZip zip(source);
if(!zip.open(QuaZip::mdUnzip))
{
if (!zip.open(QuaZip::mdUnzip)) {
return false;
}
QDir directory(targetFolder);
if (!zip.goToFirstFile())
{
if (!zip.goToFirstFile()) {
return false;
}
do
{
do {
QString name = zip.getCurrentFileName();
auto lowercase = name.toLower();
if (nativeGLFW && name.contains("glfw")) {
@ -62,19 +58,16 @@ static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibH
if (nativeOpenAL && name.contains("openal")) {
continue;
}
if(applyJnilibHack)
{
if (applyJnilibHack) {
name = replaceSuffix(name, ".jnilib", ".dylib");
}
QString absFilePath = directory.absoluteFilePath(name);
if (!JlCompress::extractFile(&zip, "", absFilePath))
{
if (!JlCompress::extractFile(&zip, "", absFilePath)) {
return false;
}
} while (zip.goToNextFile());
zip.close();
if(zip.getZipError()!=0)
{
if (zip.getZipError() != 0) {
return false;
}
return true;
@ -85,8 +78,7 @@ void ExtractNatives::executeTask()
auto instance = m_parent->instance();
std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
auto toExtract = minecraftInstance->getNativeJars();
if(toExtract.isEmpty())
{
if (toExtract.isEmpty()) {
emitSucceeded();
return;
}
@ -94,14 +86,12 @@ void ExtractNatives::executeTask()
bool nativeOpenAL = settings->get("UseNativeOpenAL").toBool();
bool nativeGLFW = settings->get("UseNativeGLFW").toBool();
auto outputPath = minecraftInstance->getNativePath();
auto outputPath = minecraftInstance->getNativePath();
auto javaVersion = minecraftInstance->getJavaVersion();
bool jniHackEnabled = javaVersion.major() >= 8;
for(const auto &source: toExtract)
{
if(!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW))
{
const char *reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
for (const auto& source : toExtract) {
if (!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW)) {
const char* reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
emit logLine(QString(reason).arg(source, outputPath), MessageLevel::Fatal);
emitFailed(tr(reason).arg(source, outputPath));
}

14
launcher/minecraft/launch/ExtractNatives.h
View File

@ -20,19 +20,13 @@
#include "minecraft/auth/AuthSession.h"
// FIXME: temporary wrapper for existing task.
class ExtractNatives: public LaunchStep
{
class ExtractNatives : public LaunchStep {
Q_OBJECT
public:
explicit ExtractNatives(LaunchTask *parent) : LaunchStep(parent){};
public:
explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ExtractNatives(){};
void executeTask() override;
bool canAbort() const override
{
return false;
}
bool canAbort() const override { return false; }
void finalize() override;
};

104
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -35,29 +35,27 @@
#include "LauncherPartLaunch.h"
#include <QStandardPaths>
#include <QRegularExpression>
#include <QStandardPaths>
#include "Application.h"
#include "Commandline.h"
#include "FileSystem.h"
#include "launch/LaunchTask.h"
#include "minecraft/MinecraftInstance.h"
#include "FileSystem.h"
#include "Commandline.h"
#include "Application.h"
#ifdef Q_OS_LINUX
#include "gamemode_client.h"
#endif
LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
LauncherPartLaunch::LauncherPartLaunch(LaunchTask* parent) : LaunchStep(parent)
{
auto instance = parent->instance();
if (instance->settings()->get("CloseAfterLaunch").toBool())
{
std::shared_ptr<QMetaObject::Connection> connection{new QMetaObject::Connection};
if (instance->settings()->get("CloseAfterLaunch").toBool()) {
std::shared_ptr<QMetaObject::Connection> connection{ new QMetaObject::Connection };
*connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, [[maybe_unused]] MessageLevel::Enum level) {
qDebug() << lines;
if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0)
{
if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0) {
APPLICATION->closeAllWindows();
disconnect(*connection);
}
@ -71,7 +69,7 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
#ifdef Q_OS_WIN
// returns 8.3 file format from long path
#include <windows.h>
QString shortPathName(const QString & file)
QString shortPathName(const QString& file)
{
auto input = file.toStdWString();
std::wstring output;
@ -81,15 +79,15 @@ QString shortPathName(const QString & file)
// when it succeeds, it returns length excluding null character
// See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
output.resize(length);
GetShortPathNameW(input.c_str(),(LPWSTR)output.c_str(),length);
output.resize(length-1);
GetShortPathNameW(input.c_str(), (LPWSTR)output.c_str(), length);
output.resize(length - 1);
QString ret = QString::fromStdWString(output);
return ret;
}
#endif
// if the string survives roundtrip through local 8bit encoding...
bool fitsInLocal8bit(const QString & string)
bool fitsInLocal8bit(const QString& string)
{
return string == QString::fromLocal8Bit(string.toLocal8Bit());
}
@ -97,9 +95,8 @@ bool fitsInLocal8bit(const QString & string)
void LauncherPartLaunch::executeTask()
{
QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
if (jarPath.isEmpty())
{
const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
if (jarPath.isEmpty()) {
const char* reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
emit logLine(tr(reason), MessageLevel::Fatal);
emitFailed(tr(reason));
return;
@ -125,12 +122,9 @@ void LauncherPartLaunch::executeTask()
auto natPath = minecraftInstance->getNativePath();
#ifdef Q_OS_WIN
if (!fitsInLocal8bit(natPath))
{
if (!fitsInLocal8bit(natPath)) {
args << "-Djava.library.path=" + shortPathName(natPath);
}
else
{
} else {
args << "-Djava.library.path=" + natPath;
}
#else
@ -140,14 +134,10 @@ void LauncherPartLaunch::executeTask()
args << "-cp";
#ifdef Q_OS_WIN
QStringList processed;
for(auto & item: classPath)
{
if (!fitsInLocal8bit(item))
{
for (auto& item : classPath) {
if (!fitsInLocal8bit(item)) {
processed << shortPathName(item);
}
else
{
} else {
processed << item;
}
}
@ -160,14 +150,12 @@ void LauncherPartLaunch::executeTask()
qDebug() << args.join(' ');
QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
if(!wrapperCommandStr.isEmpty())
{
if (!wrapperCommandStr.isEmpty()) {
auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
auto wrapperCommand = wrapperArgs.takeFirst();
auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
if (realWrapperCommand.isEmpty())
{
const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
if (realWrapperCommand.isEmpty()) {
const char* reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
emitFailed(tr(reason).arg(wrapperCommand));
return;
@ -175,18 +163,14 @@ void LauncherPartLaunch::executeTask()
emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::Launcher);
args.prepend(javaPath);
m_process.start(wrapperCommand, wrapperArgs + args);
}
else
{
} else {
m_process.start(javaPath, args);
}
#ifdef Q_OS_LINUX
if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode)
{
if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode) {
auto pid = m_process.processId();
if (pid)
{
if (pid) {
gamemode_request_start_for(pid);
}
}
@ -195,25 +179,21 @@ void LauncherPartLaunch::executeTask()
void LauncherPartLaunch::on_state(LoggedProcess::State state)
{
switch(state)
{
case LoggedProcess::FailedToStart:
{
switch (state) {
case LoggedProcess::FailedToStart: {
//: Error message displayed if instace can't start
const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
const char* reason = QT_TR_NOOP("Could not launch Minecraft!");
emit logLine(reason, MessageLevel::Fatal);
emitFailed(tr(reason));
return;
}
case LoggedProcess::Aborted:
case LoggedProcess::Crashed:
{
case LoggedProcess::Crashed: {
m_parent->setPid(-1);
emitFailed(tr("Game crashed."));
return;
}
case LoggedProcess::Finished:
{
case LoggedProcess::Finished: {
auto instance = m_parent->instance();
if (instance->settings()->get("CloseAfterLaunch").toBool())
APPLICATION->showMainWindow();
@ -221,14 +201,13 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
m_parent->setPid(-1);
// if the exit code wasn't 0, report this as a crash
auto exitCode = m_process.exitCode();
if(exitCode != 0)
{
if (exitCode != 0) {
emitFailed(tr("Game crashed."));
return;
}
//FIXME: make this work again
// m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
// run post-exit
// FIXME: make this work again
// m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
// run post-exit
emitSucceeded();
break;
}
@ -247,15 +226,14 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
}
}
void LauncherPartLaunch::setWorkingDirectory(const QString &wd)
void LauncherPartLaunch::setWorkingDirectory(const QString& wd)
{
m_process.setWorkingDirectory(wd);
}
void LauncherPartLaunch::proceed()
{
if(mayProceed)
{
if (mayProceed) {
QString launchString("launch\n");
m_process.write(launchString.toUtf8());
mayProceed = false;
@ -264,17 +242,13 @@ void LauncherPartLaunch::proceed()
bool LauncherPartLaunch::abort()
{
if(mayProceed)
{
if (mayProceed) {
mayProceed = false;
QString launchString("abort\n");
m_process.write(launchString.toUtf8());
}
else
{
} else {
auto state = m_process.state();
if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
{
if (state == LoggedProcess::Running || state == LoggedProcess::Starting) {
m_process.kill();
}
}

32
launcher/minecraft/launch/LauncherPartLaunch.h
View File

@ -15,41 +15,31 @@
#pragma once
#include <launch/LaunchStep.h>
#include <LoggedProcess.h>
#include <launch/LaunchStep.h>
#include <minecraft/auth/AuthSession.h>
#include "MinecraftServerTarget.h"
class LauncherPartLaunch: public LaunchStep
{
class LauncherPartLaunch : public LaunchStep {
Q_OBJECT
public:
explicit LauncherPartLaunch(LaunchTask *parent);
virtual ~LauncherPartLaunch() {};
public:
explicit LauncherPartLaunch(LaunchTask* parent);
virtual ~LauncherPartLaunch(){};
virtual void executeTask();
virtual bool abort();
virtual void proceed();
virtual bool canAbort() const
{
return true;
}
void setWorkingDirectory(const QString &wd);
void setAuthSession(AuthSessionPtr session)
{
m_session = session;
}
virtual bool canAbort() const { return true; }
void setWorkingDirectory(const QString& wd);
void setAuthSession(AuthSessionPtr session) { m_session = session; }
void setServerToJoin(MinecraftServerTargetPtr serverToJoin)
{
m_serverToJoin = std::move(serverToJoin);
}
void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); }
private slots:
private slots:
void on_state(LoggedProcess::State state);
private:
private:
LoggedProcess m_process;
QString m_command;
AuthSessionPtr m_session;

31
launcher/minecraft/launch/MinecraftServerTarget.cpp
View File

@ -18,50 +18,43 @@
#include <QStringList>
// FIXME: the way this is written, it can't ever do any sort of validation and can accept total junk
MinecraftServerTarget MinecraftServerTarget::parse(const QString &fullAddress) {
MinecraftServerTarget MinecraftServerTarget::parse(const QString& fullAddress)
{
QStringList split = fullAddress.split(":");
// The logic below replicates the exact logic minecraft uses for parsing server addresses.
// While the conversion is not lossless and eats errors, it ensures the same behavior
// within Minecraft and Prism Launcher when entering server addresses.
if (fullAddress.startsWith("["))
{
if (fullAddress.startsWith("[")) {
int bracket = fullAddress.indexOf("]");
if (bracket > 0)
{
if (bracket > 0) {
QString ipv6 = fullAddress.mid(1, bracket - 1);
QString port = fullAddress.mid(bracket + 1).trimmed();
if (port.startsWith(":") && !ipv6.isEmpty())
{
if (port.startsWith(":") && !ipv6.isEmpty()) {
port = port.mid(1);
split = QStringList({ ipv6, port });
}
else
{
split = QStringList({ipv6});
} else {
split = QStringList({ ipv6 });
}
}
}
if (split.size() > 2)
{
split = QStringList({fullAddress});
if (split.size() > 2) {
split = QStringList({ fullAddress });
}
QString realAddress = split[0];
quint16 realPort = 25565;
if (split.size() > 1)
{
if (split.size() > 1) {
bool ok;
realPort = split[1].toUInt(&ok);
if (!ok)
{
if (!ok) {
realPort = 25565;
}
}
return MinecraftServerTarget { realAddress, realPort };
return MinecraftServerTarget{ realAddress, realPort };
}

2
launcher/minecraft/launch/MinecraftServerTarget.h
View File

@ -23,7 +23,7 @@ struct MinecraftServerTarget {
QString address;
quint16 port;
static MinecraftServerTarget parse(const QString &fullAddress);
static MinecraftServerTarget parse(const QString& fullAddress);
};
typedef std::shared_ptr<MinecraftServerTarget> MinecraftServerTargetPtr;

25
launcher/minecraft/launch/ModMinecraftJar.cpp
View File

@ -34,9 +34,9 @@
*/
#include "ModMinecraftJar.h"
#include "launch/LaunchTask.h"
#include "MMCZip.h"
#include "FileSystem.h"
#include "MMCZip.h"
#include "launch/LaunchTask.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h"
@ -44,20 +44,17 @@ void ModMinecraftJar::executeTask()
{
auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
if(!m_inst->getJarMods().size())
{
if (!m_inst->getJarMods().size()) {
emitSucceeded();
return;
}
// nuke obsolete stripped jar(s) if needed
if(!FS::ensureFolderPathExists(m_inst->binRoot()))
{
if (!FS::ensureFolderPathExists(m_inst->binRoot())) {
emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
}
auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
if(!removeJar())
{
if (!removeJar()) {
emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
}
@ -65,14 +62,12 @@ void ModMinecraftJar::executeTask()
auto components = m_inst->getPackProfile();
auto profile = components->getProfile();
auto jarMods = m_inst->getJarMods();
if(jarMods.size())
{
if (jarMods.size()) {
auto mainJar = profile->getMainJar();
QStringList jars, temp1, temp2, temp3, temp4;
mainJar->getApplicableFiles(m_inst->runtimeContext(), jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath());
auto sourceJarPath = jars[0];
if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
{
if (!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods)) {
emitFailed(tr("Failed to create the custom Minecraft jar file."));
return;
}
@ -90,10 +85,8 @@ bool ModMinecraftJar::removeJar()
auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
QFile finalJar(finalJarPath);
if(finalJar.exists())
{
if(!finalJar.remove())
{
if (finalJar.exists()) {
if (!finalJar.remove()) {
return false;
}
}

15
launcher/minecraft/launch/ModMinecraftJar.h
View File

@ -18,19 +18,16 @@
#include <launch/LaunchStep.h>
#include <memory>
class ModMinecraftJar: public LaunchStep
{
class ModMinecraftJar : public LaunchStep {
Q_OBJECT
public:
explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
public:
explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ModMinecraftJar(){};
virtual void executeTask() override;
virtual bool canAbort() const override
{
return false;
}
virtual bool canAbort() const override { return false; }
void finalize() override;
private:
private:
bool removeJar();
};

79
launcher/minecraft/launch/PrintInstanceInfo.cpp
View File

@ -16,50 +16,44 @@
#include <fstream>
#include <string>
#include "PrintInstanceInfo.h"
#include <launch/LaunchTask.h>
#include "PrintInstanceInfo.h"
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
namespace {
#if defined(Q_OS_LINUX)
void probeProcCpuinfo(QStringList &log)
void probeProcCpuinfo(QStringList& log)
{
std::ifstream cpuin("/proc/cpuinfo");
for (std::string line; std::getline(cpuin, line);)
{
if (strncmp(line.c_str(), "model name", 10) == 0)
{
for (std::string line; std::getline(cpuin, line);) {
if (strncmp(line.c_str(), "model name", 10) == 0) {
log << QString::fromStdString(line.substr(13, std::string::npos));
break;
}
}
}
void runLspci(QStringList &log)
void runLspci(QStringList& log)
{
// FIXME: fixed size buffers...
char buff[512];
int gpuline = -1;
int cline = 0;
FILE * lspci = popen("lspci -k", "r");
FILE* lspci = popen("lspci -k", "r");
if (!lspci)
return;
while (fgets(buff, 512, lspci) != NULL)
{
while (fgets(buff, 512, lspci) != NULL) {
std::string str(buff);
if (str.length() < 9)
continue;
if (str.substr(8, 3) == "VGA")
{
if (str.substr(8, 3) == "VGA") {
gpuline = cline;
log << QString::fromStdString(str.substr(35, std::string::npos));
}
if (gpuline > -1 && gpuline != cline)
{
if (cline - gpuline < 3)
{
if (gpuline > -1 && gpuline != cline) {
if (cline - gpuline < 3) {
log << QString::fromStdString(str.substr(1, std::string::npos));
}
}
@ -68,54 +62,47 @@ void runLspci(QStringList &log)
pclose(lspci);
}
#elif defined(Q_OS_FREEBSD)
void runSysctlHwModel(QStringList &log)
void runSysctlHwModel(QStringList& log)
{
char buff[512];
FILE *hwmodel = popen("sysctl hw.model", "r");
while (fgets(buff, 512, hwmodel) != NULL)
{
log << QString::fromUtf8(buff);
break;
FILE* hwmodel = popen("sysctl hw.model", "r");
while (fgets(buff, 512, hwmodel) != NULL) {
log << QString::fromUtf8(buff);
break;
}
pclose(hwmodel);
}
void runPciconf(QStringList &log)
void runPciconf(QStringList& log)
{
char buff[512];
std::string strcard;
FILE *pciconf = popen("pciconf -lv -a vgapci0", "r");
while (fgets(buff, 512, pciconf) != NULL)
{
if (strncmp(buff, " vendor", 10) == 0)
{
std::string str(buff);
strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2)));
strcard.append(" ");
}
else if (strncmp(buff, " device", 10) == 0)
{
std::string str2(buff);
strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2)));
}
log << QString::fromStdString(strcard);
break;
FILE* pciconf = popen("pciconf -lv -a vgapci0", "r");
while (fgets(buff, 512, pciconf) != NULL) {
if (strncmp(buff, " vendor", 10) == 0) {
std::string str(buff);
strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2)));
strcard.append(" ");
} else if (strncmp(buff, " device", 10) == 0) {
std::string str2(buff);
strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2)));
}
log << QString::fromStdString(strcard);
break;
}
pclose(pciconf);
}
#endif
void runGlxinfo(QStringList & log)
void runGlxinfo(QStringList& log)
{
// FIXME: fixed size buffers...
char buff[512];
FILE *glxinfo = popen("glxinfo", "r");
FILE* glxinfo = popen("glxinfo", "r");
if (!glxinfo)
return;
while (fgets(buff, 512, glxinfo) != NULL)
{
if (strncmp(buff, "OpenGL version string:", 22) == 0)
{
while (fgets(buff, 512, glxinfo) != NULL) {
if (strncmp(buff, "OpenGL version string:", 22) == 0) {
log << QString::fromUtf8(buff);
break;
}
@ -123,7 +110,7 @@ void runGlxinfo(QStringList & log)
pclose(glxinfo);
}
}
} // namespace
#endif
void PrintInstanceInfo::executeTask()

18
launcher/minecraft/launch/PrintInstanceInfo.h
View File

@ -21,21 +21,17 @@
#include "minecraft/launch/MinecraftServerTarget.h"
// FIXME: temporary wrapper for existing task.
class PrintInstanceInfo: public LaunchStep
{
class PrintInstanceInfo : public LaunchStep {
Q_OBJECT
public:
explicit PrintInstanceInfo(LaunchTask *parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) :
LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin) {};
public:
explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
: LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin){};
virtual ~PrintInstanceInfo(){};
virtual void executeTask();
virtual bool canAbort() const
{
return false;
}
private:
virtual bool canAbort() const { return false; }
private:
AuthSessionPtr m_session;
MinecraftServerTargetPtr m_serverToJoin;
};

7
launcher/minecraft/launch/ReconstructAssets.cpp
View File

@ -14,10 +14,10 @@
*/
#include "ReconstructAssets.h"
#include "launch/LaunchTask.h"
#include "minecraft/AssetsUtils.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h"
#include "minecraft/AssetsUtils.h"
#include "launch/LaunchTask.h"
void ReconstructAssets::executeTask()
{
@ -27,8 +27,7 @@ void ReconstructAssets::executeTask()
auto profile = components->getProfile();
auto assets = profile->getMinecraftAssets();
if(!AssetsUtils::reconstructAssets(assets->id, minecraftInstance->resourcesDir()))
{
if (!AssetsUtils::reconstructAssets(assets->id, minecraftInstance->resourcesDir())) {
emit logLine("Failed to reconstruct Minecraft assets.", MessageLevel::Error);
}

12
launcher/minecraft/launch/ReconstructAssets.h
View File

@ -18,16 +18,12 @@
#include <launch/LaunchStep.h>
#include <memory>
class ReconstructAssets: public LaunchStep
{
class ReconstructAssets : public LaunchStep {
Q_OBJECT
public:
explicit ReconstructAssets(LaunchTask *parent) : LaunchStep(parent){};
public:
explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ReconstructAssets(){};
void executeTask() override;
bool canAbort() const override
{
return false;
}
bool canAbort() const override { return false; }
};

12
launcher/minecraft/launch/ScanModFolders.cpp
View File

@ -34,9 +34,9 @@
*/
#include "ScanModFolders.h"
#include "launch/LaunchTask.h"
#include "MMCZip.h"
#include "FileSystem.h"
#include "MMCZip.h"
#include "launch/LaunchTask.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/mod/ModFolderModel.h"
@ -46,19 +46,19 @@ void ScanModFolders::executeTask()
auto loaders = m_inst->loaderModList();
connect(loaders.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::modsDone);
if(!loaders->update()) {
if (!loaders->update()) {
m_modsDone = true;
}
auto cores = m_inst->coreModList();
connect(cores.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::coreModsDone);
if(!cores->update()) {
if (!cores->update()) {
m_coreModsDone = true;
}
auto nils = m_inst->nilModList();
connect(nils.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::nilModsDone);
if(!nils->update()) {
if (!nils->update()) {
m_nilModsDone = true;
}
checkDone();
@ -84,7 +84,7 @@ void ScanModFolders::nilModsDone()
void ScanModFolders::checkDone()
{
if(m_modsDone && m_coreModsDone && m_nilModsDone) {
if (m_modsDone && m_coreModsDone && m_nilModsDone) {
emitSucceeded();
}
}

19
launcher/minecraft/launch/ScanModFolders.h
View File

@ -18,26 +18,23 @@
#include <launch/LaunchStep.h>
#include <memory>
class ScanModFolders: public LaunchStep
{
class ScanModFolders : public LaunchStep {
Q_OBJECT
public:
explicit ScanModFolders(LaunchTask *parent) : LaunchStep(parent) {};
public:
explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ScanModFolders(){};
virtual void executeTask() override;
virtual bool canAbort() const override
{
return false;
}
private slots:
virtual bool canAbort() const override { return false; }
private slots:
void coreModsDone();
void modsDone();
void nilModsDone();
private:
private:
void checkDone();
private: // DATA
private: // DATA
bool m_modsDone = false;
bool m_nilModsDone = false;
bool m_coreModsDone = false;

22
launcher/minecraft/launch/VerifyJavaInstall.cpp
View File

@ -36,10 +36,11 @@
#include "VerifyJavaInstall.h"
#include "java/JavaVersion.h"
#include "minecraft/PackProfile.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h"
void VerifyJavaInstall::executeTask() {
void VerifyJavaInstall::executeTask()
{
auto instance = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
auto packProfile = instance->getPackProfile();
auto settings = instance->settings();
@ -50,28 +51,27 @@ void VerifyJavaInstall::executeTask() {
JavaVersion javaVersion(storedVersion);
if (compatibleMajors.isEmpty() || compatibleMajors.contains(javaVersion.major()))
{
if (compatibleMajors.isEmpty() || compatibleMajors.contains(javaVersion.major())) {
emitSucceeded();
return;
}
if (ignoreCompatibility)
{
if (ignoreCompatibility) {
emit logLine(tr("Java major version is incompatible. Things might break."), MessageLevel::Warning);
emitSucceeded();
return;
}
emit logLine(tr("This instance is not compatible with Java version %1.\n"
"Please switch to one of the following Java versions for this instance:").arg(javaVersion.major()),
"Please switch to one of the following Java versions for this instance:")
.arg(javaVersion.major()),
MessageLevel::Error);
for (auto major : compatibleMajors)
{
for (auto major : compatibleMajors) {
emit logLine(tr("Java version %1").arg(major), MessageLevel::Error);
}
emit logLine(tr("Go to instance Java settings to change your Java version or disable the Java compatibility check if you know what you're doing."), MessageLevel::Error);
emit logLine(tr("Go to instance Java settings to change your Java version or disable the Java compatibility check if you know what "
"you're doing."),
MessageLevel::Error);
emitFailed(QString("Incompatible Java major version"));
}

9
launcher/minecraft/launch/VerifyJavaInstall.h
View File

@ -41,13 +41,10 @@
class VerifyJavaInstall : public LaunchStep {
Q_OBJECT
public:
explicit VerifyJavaInstall(LaunchTask *parent) : LaunchStep(parent) {
};
public:
explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent){};
~VerifyJavaInstall() override = default;
void executeTask() override;
bool canAbort() const override {
return false;
}
bool canAbort() const override { return false; }
};