mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-25 15:16:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix FTB.

Browse Source 
Add support of private packs.
Fix instance ID problems related to FTB instances.
This commit is contained in:
Petr Mrázek 2014-01-15 22:49:37 +01:00
parent 555cbe00ce
commit d85e820a07
6 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logic/BaseInstance.h
View File

@ -57,7 +57,7 @@ public:
/// The instance's ID. The ID SHALL be determined by MMC internally. The ID IS guaranteed to
/// be unique.
QString id() const;
virtual QString id() const;
/// get the type of this instance
QString instanceType() const;

5
logic/LegacyFTBInstance.cpp
View File

@ -14,3 +14,8 @@ bool LegacyFTBInstance::menuActionEnabled(QString action_name) const
{
return false;
}
QString LegacyFTBInstance::id() const
{
return "FTB/" + BaseInstance::id();
}

1
logic/LegacyFTBInstance.h
View File

@ -10,4 +10,5 @@ public:
QObject *parent = 0);
virtual QString getStatusbarDescription();
virtual bool menuActionEnabled(QString action_name) const;
virtual QString id() const;
};

5
logic/OneSixFTBInstance.cpp
View File

@ -92,6 +92,11 @@ OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *set
}
}
QString OneSixFTBInstance::id() const
{
return "FTB/" + BaseInstance::id();
}
QString OneSixFTBInstance::getStatusbarDescription()
{
return "OneSix FTB: " + intendedVersionId();

2
logic/OneSixFTBInstance.h
View File

@ -15,6 +15,8 @@ public:
virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override;
virtual QString id() const;
private:
std::shared_ptr<OneSixLibrary> m_forge;
};

73
logic/lists/InstanceList.cpp
View File

@ -308,45 +308,52 @@ void InstanceList::loadForgeInstances(QMap<QString, QString> groupMap)
return;
}
dir.cd("ModPacks");
auto fpath = dir.absoluteFilePath("modpacks.xml");
QFile f(fpath);
QLOG_INFO() << "Discovering FTB instances -- " << fpath;
if (!f.open(QFile::ReadOnly))
return;
// read the FTB packs XML.
QXmlStreamReader reader(&f);
while (!reader.atEnd())
auto allFiles = dir.entryList(QDir::Readable | QDir::Files, QDir::Name);
for(auto filename: allFiles)
{
switch (reader.readNext())
if(!filename.endsWith(".xml"))
continue;
auto fpath = dir.absoluteFilePath(filename);
QFile f(fpath);
QLOG_INFO() << "Discovering FTB instances -- " << fpath;
if (!f.open(QFile::ReadOnly))
continue;
// read the FTB packs XML.
QXmlStreamReader reader(&f);
while (!reader.atEnd())
{
case QXmlStreamReader::StartElement:
{
if (reader.name() == "modpack")
switch (reader.readNext())
{
QXmlStreamAttributes attrs = reader.attributes();
FTBRecord record;
record.dir = attrs.value("dir").toString();
QDir test(dataDir.absoluteFilePath(record.dir));
if(!test.exists())
continue;
record.name = attrs.value("name").toString();
record.logo = attrs.value("logo").toString();
record.mcVersion = attrs.value("mcVersion").toString();
record.description = attrs.value("description").toString();
records.append(record);
case QXmlStreamReader::StartElement:
{
if (reader.name() == "modpack")
{
QXmlStreamAttributes attrs = reader.attributes();
FTBRecord record;
record.dir = attrs.value("dir").toString();
QDir test(dataDir.absoluteFilePath(record.dir));
if(!test.exists())
continue;
record.name = attrs.value("name").toString();
record.logo = attrs.value("logo").toString();
record.mcVersion = attrs.value("mcVersion").toString();
record.description = attrs.value("description").toString();
records.append(record);
}
break;
}
case QXmlStreamReader::EndElement:
break;
case QXmlStreamReader::Characters:
break;
default:
break;
}
break;
}
case QXmlStreamReader::EndElement:
break;
case QXmlStreamReader::Characters:
break;
default:
break;
}
f.close();
}
f.close();
if(!records.size())
{
QLOG_INFO() << "No FTB instances to load.";