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

NOISSUE rename MinecraftProfile to ComponentList

Browse Source 
It is realistically a list of components. The fact that it also holds the final
launch parameters is a design bug.
This commit is contained in:
Petr Mrázek
2017-10-11 23:04:24 +02:00
parent 87edaa7dcd
commit fede712a26
21 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/pages/ModFolderPage.cpp
View File

@ -28,7 +28,7 @@
#include "minecraft/ModList.h"
#include "minecraft/Mod.h"
#include "minecraft/VersionFilterData.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/ComponentList.h"
#include <DesktopServices.h>
ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
@ -103,7 +103,7 @@ bool CoreModFolderPage::shouldDisplay() const
auto inst = dynamic_cast<MinecraftInstance *>(m_inst);
if (!inst)
return true;
auto version = inst->getMinecraftProfile();
auto version = inst->getComponentList();
if (!version)
return true;
if(!version->versionPatch("net.minecraftforge"))

18
application/pages/VersionPage.cpp
View File

@ -35,7 +35,7 @@
#include <QString>
#include <QUrl>
#include "minecraft/MinecraftProfile.h"
#include "minecraft/ComponentList.h"
#include "minecraft/auth/MojangAccountList.h"
#include "minecraft/Mod.h"
#include "icons/IconList.h"
@ -104,9 +104,9 @@ VersionPage::VersionPage(MinecraftInstance *inst, QWidget *parent)
ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
reloadMinecraftProfile();
reloadComponentList();
m_profile = m_inst->getMinecraftProfile();
m_profile = m_inst->getComponentList();
if (m_profile)
{
auto proxy = new IconProxy(ui->packageView);
@ -192,7 +192,7 @@ void VersionPage::disableVersionControls()
updateButtons();
}
bool VersionPage::reloadMinecraftProfile()
bool VersionPage::reloadComponentList()
{
try
{
@ -215,7 +215,7 @@ bool VersionPage::reloadMinecraftProfile()
void VersionPage::on_reloadBtn_clicked()
{
reloadMinecraftProfile();
reloadComponentList();
m_container->refreshContainer();
}
@ -230,7 +230,7 @@ void VersionPage::on_removeBtn_clicked()
}
}
updateButtons();
reloadMinecraftProfile();
reloadComponentList();
m_container->refreshContainer();
}
@ -279,7 +279,7 @@ void VersionPage::on_moveUpBtn_clicked()
{
try
{
m_profile->move(currentRow(), MinecraftProfile::MoveUp);
m_profile->move(currentRow(), ComponentList::MoveUp);
}
catch (Exception &e)
{
@ -292,7 +292,7 @@ void VersionPage::on_moveDownBtn_clicked()
{
try
{
m_profile->move(currentRow(), MinecraftProfile::MoveDown);
m_profile->move(currentRow(), ComponentList::MoveDown);
}
catch (Exception &e)
{
@ -345,7 +345,7 @@ void VersionPage::on_changeVersionBtn_clicked()
if (result != QMessageBox::Ok)
return;
m_profile->revertToVanilla();
reloadMinecraftProfile();
reloadComponentList();
}
}
m_inst->setComponentVersion(uid, vselect.selectedVersion()->descriptor());

6
application/pages/VersionPage.h
View File

@ -18,7 +18,7 @@
#include <QWidget>
#include "minecraft/MinecraftInstance.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/ComponentList.h"
#include "BasePage.h"
namespace Ui
@ -76,11 +76,11 @@ private:
protected:
/// FIXME: this shouldn't be necessary!
bool reloadMinecraftProfile();
bool reloadComponentList();
private:
Ui::VersionPage *ui;
std::shared_ptr<MinecraftProfile> m_profile;
std::shared_ptr<ComponentList> m_profile;
MinecraftInstance *m_inst;
int currentIdx = 0;