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

GH-2087 remove the revert to vanilla functionality, add file download button to version page

Browse Source
This commit is contained in:
Petr Mrázek
2018-01-05 04:26:46 +01:00
parent ee341b78ba
commit 0636c03d7c
6 changed files with 30 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
api/logic/minecraft/ComponentList.cpp
View File

@ -743,42 +743,6 @@ Component * ComponentList::getComponent(int index)
return d->components[index].get();
}
bool ComponentList::isVanilla()
{
for(auto patchptr: d->components)
{
if(patchptr->isCustom())
return false;
}
return true;
}
bool ComponentList::revertToVanilla()
{
// remove patches, if present
auto VersionPatchesCopy = d->components;
for(auto & it: VersionPatchesCopy)
{
if (!it->isCustom())
{
continue;
}
if(it->isRevertible() || it->isRemovable())
{
if(!remove(it->getID()))
{
qWarning() << "Couldn't remove" << it->getID() << "from profile!";
invalidateLaunchProfile();
scheduleSave();
return false;
}
}
}
invalidateLaunchProfile();
scheduleSave();
return true;
}
QVariant ComponentList::data(const QModelIndex &index, int role) const
{
if (!index.isValid())

6
api/logic/minecraft/ComponentList.h
View File

@ -59,12 +59,6 @@ public:
/// call this to explicitly mark the component list as loaded - this is used to build a new component list from scratch.
void buildingFromScratch();
/// is this version unchanged by the user?
bool isVanilla();
/// remove any customizations on top of whatever 'vanilla' means
bool revertToVanilla();
/// install more jar mods
void installJarMods(QStringList selectedFiles);

10
api/logic/minecraft/MinecraftInstance.cpp
View File

@ -398,14 +398,8 @@ QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session) cons
// blatant self-promotion.
token_mapping["profile_name"] = token_mapping["version_name"] = "MultiMC5";
if(m_components->isVanilla())
{
token_mapping["version_type"] = profile->getMinecraftVersionType();
}
else
{
token_mapping["version_type"] = "custom";
}
token_mapping["version_type"] = profile->getMinecraftVersionType();
QString absRootDir = QDir(minecraftRoot()).absolutePath();
token_mapping["game_directory"] = absRootDir;