mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-11-20 08:10:11 +00:00
Code Issues Projects Releases Wiki Activity

Attempt at fixing FTB

Browse Source
This commit is contained in:
Jan Dalheimer 2014-05-23 18:19:20 +02:00
parent e17364de6b
commit 15920aa9d0
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
MultiMC.cpp
View File

@ -358,9 +358,9 @@ void MultiMC::initGlobalSettings()
// FTB // FTB
m_settings->registerSetting("TrackFTBInstances", false); m_settings->registerSetting("TrackFTBInstances", false);
m_settings->registerSetting("FTBLauncherRoot"); QString ftbDataDefault;
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
QString ftbDefault = QDir::home().absoluteFilePath(".ftblauncher"); QString ftbDefault = ftbDataDefault = QDir::home().absoluteFilePath(".ftblauncher");
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
wchar_t buf[APPDATA_BUFFER_SIZE]; wchar_t buf[APPDATA_BUFFER_SIZE];
wchar_t newBuf[APPDATA_BUFFER_SIZE]; wchar_t newBuf[APPDATA_BUFFER_SIZE];
@ -372,10 +372,7 @@ void MultiMC::initGlobalSettings()
else else
{ {
newFtbDefault = QDir(QString::fromWCharArray(newBuf)).absoluteFilePath("ftblauncher"); newFtbDefault = QDir(QString::fromWCharArray(newBuf)).absoluteFilePath("ftblauncher");
QLOG_DEBUG() << "New FTB path from environment variable:" << QString::fromWCharArray(newBuf) << newFtbDefault;
} }
if (!QFile::exists(QDir(newFtbDefault).absoluteFilePath("ftblaunch.cfg")))
{
if (!GetEnvironmentVariableW(L"APPDATA", buf, APPDATA_BUFFER_SIZE)) if (!GetEnvironmentVariableW(L"APPDATA", buf, APPDATA_BUFFER_SIZE))
{ {
QLOG_FATAL() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken. If you aren't on windows, how the **** are you running the windows build????"; QLOG_FATAL() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken. If you aren't on windows, how the **** are you running the windows build????";
@ -383,40 +380,24 @@ void MultiMC::initGlobalSettings()
else else
{ {
oldFtbDefault = QDir(QString::fromWCharArray(buf)).absoluteFilePath("ftblauncher"); oldFtbDefault = QDir(QString::fromWCharArray(buf)).absoluteFilePath("ftblauncher");
QLOG_DEBUG() << "Old FTB path from environment variable" << QString::fromWCharArray(buf) << oldFtbDefault; }
if (QFile::exists(QDir(oldFtbDefault).absoluteFilePath("ftblaunch.cfg"))) if (QFile::exists(QDir(newFtbDefault).absoluteFilePath("ftblaunch.cfg")))
{ {
QLOG_INFO() << "Using old FTB path"; QLOG_INFO() << "Old FTB setup";
ftbDefault = ftbDataDefault = oldFtbDefault;
}
else
{
QLOG_INFO() << "New FTB setup";
ftbDefault = oldFtbDefault; ftbDefault = oldFtbDefault;
} ftbDataDefault = newFtbDefault;
else
{
QLOG_INFO() << "No FTB detected";
}
}
}
else
{
QLOG_INFO() << "Using new FTB path";
ftbDefault = newFtbDefault;
}
QLOG_INFO() << "Default FTB path:" << ftbDefault;
if (m_settings->get("FTBLauncherRoot").toString().isEmpty()
|| (m_settings->get("FTBLauncherRoot").toString() == oldFtbDefault
&& ftbDefault != oldFtbDefault))
{
QLOG_DEBUG() << "Resetting FTB path";
m_settings->set("FTBLauncherRoot", QString());
} }
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
QString ftbDefault = QString ftbDefault = ftbDataDefault =
PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
#endif #endif
if (m_settings->get("FTBLauncherRoot").toString().isEmpty()) m_settings->registerSetting("FTBLauncherDataRoot", ftbDataDefault);
{ m_settings->registerSetting("FTBLauncherRoot", ftbDefault);
m_settings->set("FTBLauncherRoot", ftbDefault);
}
QLOG_INFO() << "FTB Launcher located at" << m_settings->get("FTBLauncherRoot").toString();
m_settings->registerSetting("FTBRoot"); m_settings->registerSetting("FTBRoot");
if (m_settings->get("FTBRoot").isNull()) if (m_settings->get("FTBRoot").isNull())