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

Forge version list implementation. Needs integration and testing.

Browse Source
This commit is contained in:
Petr Mrázek 2013-09-16 00:54:39 +02:00
parent 7721c57e5e
commit d38b90530b
37 changed files with 835 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -172,7 +172,7 @@ gui/LabeledToolButton.h
gui/EditNotesDialog.h gui/EditNotesDialog.h
# Base classes and infrastructure # Base classes and infrastructure
logic/InstanceVersion.h logic/BaseVersion.h
logic/MinecraftVersion.h logic/MinecraftVersion.h
logic/InstanceFactory.h logic/InstanceFactory.h
logic/BaseUpdate.h logic/BaseUpdate.h
@ -216,10 +216,14 @@ logic/NostalgiaInstance.h
# Lists # Lists
logic/lists/InstanceList.h logic/lists/InstanceList.h
logic/lists/InstVersionList.h logic/lists/IconList.h
logic/lists/BaseVersionList.h
logic/lists/MinecraftVersionList.h logic/lists/MinecraftVersionList.h
logic/lists/LwjglVersionList.h logic/lists/LwjglVersionList.h
logic/lists/IconList.h logic/lists/ForgeVersionList.h
# misc model/view
logic/EnabledItemFilter.h
# Tasks # Tasks
logic/tasks/Task.h logic/tasks/Task.h
@ -288,10 +292,14 @@ logic/NostalgiaInstance.cpp
# Lists # Lists
logic/lists/InstanceList.cpp logic/lists/InstanceList.cpp
logic/lists/InstVersionList.cpp logic/lists/IconList.cpp
logic/lists/BaseVersionList.cpp
logic/lists/MinecraftVersionList.cpp logic/lists/MinecraftVersionList.cpp
logic/lists/LwjglVersionList.cpp logic/lists/LwjglVersionList.cpp
logic/lists/IconList.cpp logic/lists/ForgeVersionList.cpp
# misc model/view
logic/EnabledItemFilter.cpp
# Tasks # Tasks
logic/tasks/Task.cpp logic/tasks/Task.cpp

45
MultiMC.cpp
View File

@ -9,6 +9,10 @@
#include "gui/mainwindow.h" #include "gui/mainwindow.h"
#include "logic/lists/InstanceList.h" #include "logic/lists/InstanceList.h"
#include "logic/lists/IconList.h" #include "logic/lists/IconList.h"
#include "logic/lists/LwjglVersionList.h"
#include "logic/lists/MinecraftVersionList.h"
#include "logic/lists/ForgeVersionList.h"
#include "logic/InstanceLauncher.h" #include "logic/InstanceLauncher.h"
#include "logic/net/HttpMetaCache.h" #include "logic/net/HttpMetaCache.h"
@ -158,6 +162,21 @@ MultiMC::~MultiMC()
delete m_qt_translator; delete m_qt_translator;
m_qt_translator = nullptr; m_qt_translator = nullptr;
} }
if(m_icons)
{
delete m_icons;
m_icons = nullptr;
}
if(m_lwjgllist)
{
delete m_lwjgllist;
m_lwjgllist = nullptr;
}
if(m_minecraftlist)
{
delete m_minecraftlist;
m_minecraftlist = nullptr;
}
delete m_settings; delete m_settings;
delete m_metacache; delete m_metacache;
} }
@ -276,6 +295,32 @@ IconList* MultiMC::icons()
return m_icons; return m_icons;
} }
LWJGLVersionList* MultiMC::lwjgllist()
{
if ( !m_lwjgllist )
{
m_lwjgllist = new LWJGLVersionList();
}
return m_lwjgllist;
}
ForgeVersionList* MultiMC::forgelist()
{
if ( !m_forgelist )
{
m_forgelist = new ForgeVersionList();
}
return m_forgelist;
}
MinecraftVersionList* MultiMC::minecraftlist()
{
if ( !m_minecraftlist )
{
m_minecraftlist = new MinecraftVersionList();
}
return m_minecraftlist;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

13
MultiMC.h
View File

@ -4,11 +4,14 @@
#include "MultiMCVersion.h" #include "MultiMCVersion.h"
#include "config.h" #include "config.h"
class MinecraftVersionList;
class LWJGLVersionList;
class HttpMetaCache; class HttpMetaCache;
class SettingsObject; class SettingsObject;
class InstanceList; class InstanceList;
class IconList; class IconList;
class QNetworkAccessManager; class QNetworkAccessManager;
class ForgeVersionList;
#if defined(MMC) #if defined(MMC)
#undef MMC #undef MMC
@ -61,6 +64,12 @@ public:
{ {
return m_metacache; return m_metacache;
} }
LWJGLVersionList * lwjgllist();
ForgeVersionList * forgelist();
MinecraftVersionList * minecraftlist();
private: private:
void initGlobalSettings(); void initGlobalSettings();
@ -76,5 +85,9 @@ private:
QNetworkAccessManager * m_qnam = nullptr; QNetworkAccessManager * m_qnam = nullptr;
HttpMetaCache * m_metacache = nullptr; HttpMetaCache * m_metacache = nullptr;
Status m_status = MultiMC::Failed; Status m_status = MultiMC::Failed;
LWJGLVersionList * m_lwjgllist = nullptr;
ForgeVersionList * m_forgelist = nullptr;
MinecraftVersionList * m_minecraftlist = nullptr;
MultiMCVersion m_version = {VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD}; MultiMCVersion m_version = {VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD};
}; };

3
gui/ModListView.cpp
View File

@ -30,6 +30,7 @@ void ModListView::setModel ( QAbstractItemModel* model )
auto head = header(); auto head = header();
head->setStretchLastSection(false); head->setStretchLastSection(false);
head->setSectionResizeMode(0, QHeaderView::Stretch); head->setSectionResizeMode(0, QHeaderView::Stretch);
head->setSectionResizeMode(1, QHeaderView::ResizeToContents); for(int i = 1; i < head->count(); i++)
head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
dropIndicatorPosition(); dropIndicatorPosition();
} }

12
gui/OneSixModEditDialog.cpp
View File

@ -22,6 +22,8 @@
#include <QDebug> #include <QDebug>
#include <QEvent> #include <QEvent>
#include <QKeyEvent> #include <QKeyEvent>
#include "logic/OneSixVersion.h"
#include <logic/EnabledItemFilter.h>
OneSixModEditDialog::OneSixModEditDialog(OneSixInstance * inst, QWidget *parent): OneSixModEditDialog::OneSixModEditDialog(OneSixInstance * inst, QWidget *parent):
m_inst(inst), m_inst(inst),
@ -29,9 +31,15 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance * inst, QWidget *parent)
ui(new Ui::OneSixModEditDialog) ui(new Ui::OneSixModEditDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
//TODO: libraries! //libraries!
{ {
// yeah... here be the real dragons. m_version = m_inst->getFullVersion();
auto filter = new EnabledItemFilter(this);
filter->setActive(true);
filter->setSourceModel(m_version.data());
ui->libraryTreeView->setModel(filter);
ui->libraryTreeView->installEventFilter( this );
} }
// Loader mods // Loader mods
{ {

1
gui/OneSixModEditDialog.h
View File

@ -46,6 +46,7 @@ protected:
bool resourcePackListFilter( QKeyEvent* ev ); bool resourcePackListFilter( QKeyEvent* ev );
private: private:
Ui::OneSixModEditDialog *ui; Ui::OneSixModEditDialog *ui;
QSharedPointer<OneSixVersion> m_version;
QSharedPointer<ModList> m_mods; QSharedPointer<ModList> m_mods;
QSharedPointer<ModList> m_resourcepacks; QSharedPointer<ModList> m_resourcepacks;
OneSixInstance * m_inst; OneSixInstance * m_inst;

135
gui/OneSixModEditDialog.ui
View File

@ -6,15 +6,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>543</width> <width>555</width>
<height>423</height> <height>463</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -28,26 +28,121 @@
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
</property>
<property name="tabsClosable">
<bool>false</bool>
</property>
<widget class="QWidget" name="libTab"> <widget class="QWidget" name="libTab">
<attribute name="title"> <attribute name="title">
<string>Library</string> <string>Version</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="ModListView" name="jarModsTreeView"> <layout class="QVBoxLayout" name="verticalLayout_10">
<property name="verticalScrollBarPolicy"> <item>
<enum>Qt::ScrollBarAlwaysOn</enum> <widget class="ModListView" name="libraryTreeView">
</property> <property name="verticalScrollBarPolicy">
<property name="horizontalScrollBarPolicy"> <enum>Qt::ScrollBarAlwaysOn</enum>
<enum>Qt::ScrollBarAlwaysOff</enum> </property>
</property> <property name="horizontalScrollBarPolicy">
</widget> <enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Main Class:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mainClassEdit"/>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="forgeBrn">
<property name="toolTip">
<string>Replace any current custom version with Minecraft Forge</string>
</property>
<property name="text">
<string>Install Forge</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="customizeBtn">
<property name="toolTip">
<string>Create an customized copy of the base version</string>
</property>
<property name="text">
<string>Customize</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="revertBtn">
<property name="toolTip">
<string>Revert to original base version</string>
</property>
<property name="text">
<string>Revert</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="addLibraryBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Add new libraries</string>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeLibraryBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Remove selected libraries</string>
</property>
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -163,7 +258,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>

16
gui/lwjglselectdialog.cpp
View File

@ -13,6 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "MultiMC.h"
#include "lwjglselectdialog.h" #include "lwjglselectdialog.h"
#include "ui_lwjglselectdialog.h" #include "ui_lwjglselectdialog.h"
@ -24,11 +25,12 @@ LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->labelStatus->setVisible(false); ui->labelStatus->setVisible(false);
ui->lwjglListView->setModel(&LWJGLVersionList::get()); auto lwjgllist = MMC->lwjgllist();
ui->lwjglListView->setModel(lwjgllist);
connect(&LWJGLVersionList::get(), SIGNAL(loadingStateUpdated(bool)), SLOT(loadingStateUpdated(bool))); connect(lwjgllist, SIGNAL(loadingStateUpdated(bool)), SLOT(loadingStateUpdated(bool)));
connect(&LWJGLVersionList::get(), SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString))); connect(lwjgllist, SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString)));
loadingStateUpdated(LWJGLVersionList::get().isLoading()); loadingStateUpdated(lwjgllist->isLoading());
} }
LWJGLSelectDialog::~LWJGLSelectDialog() LWJGLSelectDialog::~LWJGLSelectDialog()
@ -38,15 +40,15 @@ LWJGLSelectDialog::~LWJGLSelectDialog()
QString LWJGLSelectDialog::selectedVersion() const QString LWJGLSelectDialog::selectedVersion() const
{ {
return LWJGLVersionList::get().data( return MMC->lwjgllist()->data(
ui->lwjglListView->selectionModel()->currentIndex(), ui->lwjglListView->selectionModel()->currentIndex(),
Qt::DisplayRole).toString(); Qt::DisplayRole).toString();
} }
void LWJGLSelectDialog::on_refreshButton_clicked() void LWJGLSelectDialog::on_refreshButton_clicked()
{ {
if (!LWJGLVersionList::get().isLoading()) if (!MMC->lwjgllist()->isLoading())
LWJGLVersionList::get().loadList(); MMC->lwjgllist()->loadList();
} }
void LWJGLSelectDialog::loadingStateUpdated(bool loading) void LWJGLSelectDialog::loadingStateUpdated(bool loading)

12
gui/mainwindow.cpp
View File

@ -154,14 +154,14 @@ MainWindow::MainWindow ( QWidget *parent )
// run the things that load and download other things... FIXME: this is NOT the place // run the things that load and download other things... FIXME: this is NOT the place
// FIXME: invisible actions in the background = NOPE. // FIXME: invisible actions in the background = NOPE.
{ {
if (!MinecraftVersionList::getMainList().isLoaded()) if (!MMC->minecraftlist()->isLoaded())
{ {
m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask(); m_versionLoadTask = MMC->minecraftlist()->getLoadTask();
startTask(m_versionLoadTask); startTask(m_versionLoadTask);
} }
if (!LWJGLVersionList::get().isLoaded()) if (!MMC->lwjgllist()->isLoaded())
{ {
LWJGLVersionList::get().loadList(); MMC->lwjgllist()->loadList();
} }
assets_downloader = new OneSixAssets(); assets_downloader = new OneSixAssets();
assets_downloader->start(); assets_downloader->start();
@ -245,7 +245,7 @@ void MainWindow::instanceActivated ( QModelIndex index )
void MainWindow::on_actionAddInstance_triggered() void MainWindow::on_actionAddInstance_triggered()
{ {
if (!MinecraftVersionList::getMainList().isLoaded() && if (!MMC->minecraftlist()->isLoaded() &&
m_versionLoadTask && m_versionLoadTask->isRunning()) m_versionLoadTask && m_versionLoadTask->isRunning())
{ {
QEventLoop waitLoop; QEventLoop waitLoop;
@ -604,7 +604,7 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
VersionSelectDialog vselect(m_selectedInstance->versionList(), this); VersionSelectDialog vselect(m_selectedInstance->versionList(), this);
if (vselect.exec() && vselect.selectedVersion()) if (vselect.exec() && vselect.selectedVersion())
{ {
m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor); m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor());
} }
} }

14
gui/newinstancedialog.cpp
View File

@ -18,7 +18,7 @@
#include "ui_newinstancedialog.h" #include "ui_newinstancedialog.h"
#include "logic/InstanceFactory.h" #include "logic/InstanceFactory.h"
#include "logic/InstanceVersion.h" #include "logic/BaseVersion.h"
#include "logic/lists/IconList.h" #include "logic/lists/IconList.h"
#include "logic/lists/MinecraftVersionList.h" #include "logic/lists/MinecraftVersionList.h"
#include "logic/tasks/Task.h" #include "logic/tasks/Task.h"
@ -48,7 +48,7 @@ NewInstanceDialog::NewInstanceDialog(QWidget *parent) :
taskDlg->exec(loadTask); taskDlg->exec(loadTask);
} }
*/ */
setSelectedVersion(MinecraftVersionList::getMainList().getLatestStable()); setSelectedVersion(MMC->minecraftlist()->getLatestStable());
InstIconKey = "infinity"; InstIconKey = "infinity";
ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey)); ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
} }
@ -63,13 +63,13 @@ void NewInstanceDialog::updateDialogState()
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!instName().isEmpty() && m_selectedVersion); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!instName().isEmpty() && m_selectedVersion);
} }
void NewInstanceDialog::setSelectedVersion(InstVersionPtr version) void NewInstanceDialog::setSelectedVersion(BaseVersionPtr version)
{ {
m_selectedVersion = version; m_selectedVersion = version;
if (m_selectedVersion) if (m_selectedVersion)
{ {
ui->versionTextBox->setText(version->name); ui->versionTextBox->setText(version->name());
} }
else else
{ {
@ -89,18 +89,18 @@ QString NewInstanceDialog::iconKey() const
return InstIconKey; return InstIconKey;
} }
InstVersionPtr NewInstanceDialog::selectedVersion() const BaseVersionPtr NewInstanceDialog::selectedVersion() const
{ {
return m_selectedVersion; return m_selectedVersion;
} }
void NewInstanceDialog::on_btnChangeVersion_clicked() void NewInstanceDialog::on_btnChangeVersion_clicked()
{ {
VersionSelectDialog vselect(&MinecraftVersionList::getMainList(), this); VersionSelectDialog vselect(MMC->minecraftlist(), this);
vselect.exec(); vselect.exec();
if (vselect.result() == QDialog::Accepted) if (vselect.result() == QDialog::Accepted)
{ {
InstVersionPtr version = vselect.selectedVersion(); BaseVersionPtr version = vselect.selectedVersion();
if (version) if (version)
setSelectedVersion(version); setSelectedVersion(version);
} }

8
gui/newinstancedialog.h
View File

@ -17,7 +17,7 @@
#define NEWINSTANCEDIALOG_H #define NEWINSTANCEDIALOG_H
#include <QDialog> #include <QDialog>
#include "logic/InstanceVersion.h" #include "logic/BaseVersion.h"
namespace Ui { namespace Ui {
class NewInstanceDialog; class NewInstanceDialog;
@ -33,13 +33,13 @@ public:
void updateDialogState(); void updateDialogState();
void setSelectedVersion(InstVersionPtr version); void setSelectedVersion(BaseVersionPtr version);
void loadVersionList(); void loadVersionList();
QString instName() const; QString instName() const;
QString iconKey() const; QString iconKey() const;
InstVersionPtr selectedVersion() const; BaseVersionPtr selectedVersion() const;
private slots: private slots:
void on_btnChangeVersion_clicked(); void on_btnChangeVersion_clicked();
@ -49,7 +49,7 @@ private slots:
private: private:
Ui::NewInstanceDialog *ui; Ui::NewInstanceDialog *ui;
InstVersionPtr m_selectedVersion; BaseVersionPtr m_selectedVersion;
QString InstIconKey; QString InstIconKey;
}; };

14
gui/versionselectdialog.cpp
View File

@ -22,11 +22,11 @@
#include <gui/taskdialog.h> #include <gui/taskdialog.h>
#include <logic/InstanceVersion.h> #include <logic/BaseVersion.h>
#include <logic/lists/InstVersionList.h> #include <logic/lists/BaseVersionList.h>
#include <logic/tasks/Task.h> #include <logic/tasks/Task.h>
VersionSelectDialog::VersionSelectDialog(InstVersionList *vlist, QWidget *parent) : VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::VersionSelectDialog) ui(new Ui::VersionSelectDialog)
{ {
@ -69,11 +69,11 @@ void VersionSelectDialog::loadList()
taskDlg->exec(loadTask); taskDlg->exec(loadTask);
} }
InstVersionPtr VersionSelectDialog::selectedVersion() const BaseVersionPtr VersionSelectDialog::selectedVersion() const
{ {
auto currentIndex = ui->listView->selectionModel()->currentIndex(); auto currentIndex = ui->listView->selectionModel()->currentIndex();
auto variant = m_proxyModel->data(currentIndex, InstVersionList::VersionPointerRole); auto variant = m_proxyModel->data(currentIndex, BaseVersionList::VersionPointerRole);
return variant.value<InstVersionPtr>(); return variant.value<BaseVersionPtr>();
} }
void VersionSelectDialog::on_refreshButton_clicked() void VersionSelectDialog::on_refreshButton_clicked()
@ -83,7 +83,7 @@ void VersionSelectDialog::on_refreshButton_clicked()
void VersionSelectDialog::updateFilterState() void VersionSelectDialog::updateFilterState()
{ {
m_proxyModel->setFilterKeyColumn(InstVersionList::TypeColumn); m_proxyModel->setFilterKeyColumn(BaseVersionList::TypeColumn);
QStringList filteredTypes; QStringList filteredTypes;
if (!ui->filterSnapshotsCheckbox->isChecked()) if (!ui->filterSnapshotsCheckbox->isChecked())

10
gui/versionselectdialog.h
View File

@ -19,9 +19,9 @@
#include <QDialog> #include <QDialog>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include "logic/InstanceVersion.h" #include "logic/BaseVersion.h"
class InstVersionList; class BaseVersionList;
namespace Ui namespace Ui
{ {
@ -33,7 +33,7 @@ class VersionSelectDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit VersionSelectDialog(InstVersionList *vlist, QWidget *parent = 0); explicit VersionSelectDialog(BaseVersionList *vlist, QWidget *parent = 0);
~VersionSelectDialog(); ~VersionSelectDialog();
virtual int exec(); virtual int exec();
@ -41,7 +41,7 @@ public:
//! Starts a task that loads the list. //! Starts a task that loads the list.
void loadList(); void loadList();
InstVersionPtr selectedVersion() const; BaseVersionPtr selectedVersion() const;
private slots: private slots:
void on_refreshButton_clicked(); void on_refreshButton_clicked();
@ -51,7 +51,7 @@ private slots:
private: private:
Ui::VersionSelectDialog *ui; Ui::VersionSelectDialog *ui;
InstVersionList *m_vlist; BaseVersionList *m_vlist;
QSortFilterProxyModel *m_proxyModel; QSortFilterProxyModel *m_proxyModel;
}; };

5
logic/BaseInstance.cpp
View File

@ -13,6 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "MultiMC.h"
#include "BaseInstance.h" #include "BaseInstance.h"
#include "BaseInstance_p.h" #include "BaseInstance_p.h"
@ -131,9 +132,9 @@ InstanceList *BaseInstance::instList() const
return NULL; return NULL;
} }
InstVersionList *BaseInstance::versionList() const BaseVersionList *BaseInstance::versionList() const
{ {
return &MinecraftVersionList::getMainList(); return MMC->minecraftlist();
} }
SettingsObject &BaseInstance::settings() const SettingsObject &BaseInstance::settings() const

4
logic/BaseInstance.h
View File

@ -21,7 +21,7 @@
#include <settingsobject.h> #include <settingsobject.h>
#include "inifile.h" #include "inifile.h"
#include "lists/InstVersionList.h" #include "lists/BaseVersionList.h"
class QDialog; class QDialog;
class BaseUpdate; class BaseUpdate;
@ -134,7 +134,7 @@ public:
* \brief Gets a pointer to this instance's version list. * \brief Gets a pointer to this instance's version list.
* \return A pointer to the available version list for this instance. * \return A pointer to the available version list for this instance.
*/ */
virtual InstVersionList *versionList() const; virtual BaseVersionList *versionList() const;
/*! /*!
* \brief Gets this instance's settings object. * \brief Gets this instance's settings object.

45
logic/InstanceVersion.h → logic/BaseVersion.h
View File

@ -19,50 +19,27 @@
/*! /*!
* An abstract base class for versions. * An abstract base class for versions.
*/ */
struct InstVersion struct BaseVersion
{ {
/*!
* Checks if this version is less (older) than the given version.
* \param other The version to compare this one to.
* \return True if this version is older than the given version.
*/
virtual bool operator<(const InstVersion &rhs) const
{
return timestamp < rhs.timestamp;
}
/*!
* Checks if this version is greater (newer) than the given version.
* \param other The version to compare this one to.
* \return True if this version is newer than the given version.
*/
virtual bool operator>( const InstVersion& rhs ) const
{
return timestamp > rhs.timestamp;
}
/*! /*!
* A string used to identify this version in config files. * A string used to identify this version in config files.
* This should be unique within the version list or shenanigans will occur. * This should be unique within the version list or shenanigans will occur.
*/ */
QString descriptor; virtual QString descriptor() = 0;
/*! /*!
* The name of this version as it is displayed to the user. * The name of this version as it is displayed to the user.
* For example: "1.5.1" * For example: "1.5.1"
*/ */
QString name; virtual QString name() = 0;
/*!
* Gets the version's timestamp.
* This is primarily used for sorting versions in a list.
*/
qint64 timestamp;
virtual QString typeString() const /*!
{ * This should return a string that describes
return "InstVersion"; * the kind of version this is (Stable, Beta, Snapshot, whatever)
} */
virtual QString typeString() const = 0;
}; };
typedef QSharedPointer<InstVersion> InstVersionPtr; typedef QSharedPointer<BaseVersion> BaseVersionPtr;
Q_DECLARE_METATYPE( InstVersionPtr ) Q_DECLARE_METATYPE( BaseVersionPtr )

30
logic/EnabledItemFilter.cpp Normal file
View File

@ -0,0 +1,30 @@
#include "EnabledItemFilter.h"
EnabledItemFilter::EnabledItemFilter(QObject* parent)
:QSortFilterProxyModel(parent)
{
}
void EnabledItemFilter::setActive(bool active)
{
m_active = active;
invalidateFilter();
}
bool EnabledItemFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
if(!m_active)
return true;
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
if(sourceModel()->flags(index) & Qt::ItemIsEnabled)
{
return true;
}
return false;
}
bool EnabledItemFilter::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
return QSortFilterProxyModel::lessThan(left, right);
}

16
logic/EnabledItemFilter.h Normal file
View File

@ -0,0 +1,16 @@
#pragma once
#include <QSortFilterProxyModel>
class EnabledItemFilter : public QSortFilterProxyModel
{
Q_OBJECT
public:
EnabledItemFilter(QObject *parent = 0);
void setActive(bool active);
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
private:
bool m_active = false;
};

10
logic/InstanceFactory.cpp
View File

@ -22,7 +22,7 @@
#include "LegacyInstance.h" #include "LegacyInstance.h"
#include "OneSixInstance.h" #include "OneSixInstance.h"
#include "NostalgiaInstance.h" #include "NostalgiaInstance.h"
#include "InstanceVersion.h" #include "BaseVersion.h"
#include "MinecraftVersion.h" #include "MinecraftVersion.h"
#include "inifile.h" #include "inifile.h"
@ -68,7 +68,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
} }
InstanceFactory::InstCreateError InstanceFactory::createInstance( BaseInstance*& inst, InstVersionPtr version, const QString& instDir ) InstanceFactory::InstCreateError InstanceFactory::createInstance( BaseInstance*& inst, BaseVersionPtr version, const QString& instDir )
{ {
QDir rootDir(instDir); QDir rootDir(instDir);
@ -89,19 +89,19 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance( BaseInstance*&
case MinecraftVersion::Legacy: case MinecraftVersion::Legacy:
m_settings->set("InstanceType", "Legacy"); m_settings->set("InstanceType", "Legacy");
inst = new LegacyInstance(instDir, m_settings, this); inst = new LegacyInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor); inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false); inst->setShouldUseCustomBaseJar(false);
break; break;
case MinecraftVersion::OneSix: case MinecraftVersion::OneSix:
m_settings->set("InstanceType", "OneSix"); m_settings->set("InstanceType", "OneSix");
inst = new OneSixInstance(instDir, m_settings, this); inst = new OneSixInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor); inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false); inst->setShouldUseCustomBaseJar(false);
break; break;
case MinecraftVersion::Nostalgia: case MinecraftVersion::Nostalgia:
m_settings->set("InstanceType", "Nostalgia"); m_settings->set("InstanceType", "Nostalgia");
inst = new NostalgiaInstance(instDir, m_settings, this); inst = new NostalgiaInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor); inst->setIntendedVersionId(version->descriptor());
inst->setShouldUseCustomBaseJar(false); inst->setShouldUseCustomBaseJar(false);
break; break;
default: default:

6
logic/InstanceFactory.h
View File

@ -19,9 +19,9 @@
#include <QMap> #include <QMap>
#include <QList> #include <QList>
#include "InstanceVersion.h" #include "BaseVersion.h"
class InstVersion; class BaseVersion;
class BaseInstance; class BaseInstance;
/*! /*!
@ -61,7 +61,7 @@ public:
* - InstExists if the given instance directory is already an instance. * - InstExists if the given instance directory is already an instance.
* - CantCreateDir if the given instance directory cannot be created. * - CantCreateDir if the given instance directory cannot be created.
*/ */
InstCreateError createInstance(BaseInstance *&inst, InstVersionPtr version, const QString &instDir); InstCreateError createInstance(BaseInstance *&inst, BaseVersionPtr version, const QString &instDir);
/*! /*!
* \brief Loads an instance from the given directory. * \brief Loads an instance from the given directory.

8
logic/LegacyUpdate.cpp
View File

@ -34,15 +34,15 @@ void LegacyUpdate::lwjglStart()
return; return;
} }
auto &list = LWJGLVersionList::get(); auto list = MMC->lwjgllist();
if(!list.isLoaded()) if(!list->isLoaded())
{ {
emitFailed("Too soon! Let the LWJGL list load :)"); emitFailed("Too soon! Let the LWJGL list load :)");
return; return;
} }
setStatus("Downloading new LWJGL."); setStatus("Downloading new LWJGL.");
auto version = list.getVersion(lwjglVersion); auto version = list->getVersion(lwjglVersion);
if(!version) if(!version)
{ {
emitFailed("Game update failed: the selected LWJGL version is invalid."); emitFailed("Game update failed: the selected LWJGL version is invalid.");
@ -170,7 +170,7 @@ void LegacyUpdate::extractLwjgl()
if (name.contains(nativesDir)) if (name.contains(nativesDir))
{ {
int lastSlash = name.lastIndexOf('/'); int lastSlash = name.lastIndexOf('/');
int lastBackSlash = name.lastIndexOf('/'); int lastBackSlash = name.lastIndexOf('\\');
if(lastSlash != -1) if(lastSlash != -1)
name = name.mid(lastSlash+1); name = name.mid(lastSlash+1);
else if(lastBackSlash != -1) else if(lastBackSlash != -1)

29
logic/MinecraftVersion.h
View File

@ -15,17 +15,16 @@
#pragma once #pragma once
#include "InstanceVersion.h" #include "BaseVersion.h"
#include <QStringList> #include <QStringList>
struct MinecraftVersion : public InstVersion struct MinecraftVersion : public BaseVersion
{ {
// From InstVersion: /*!
/* * Gets the version's timestamp.
QString m_descriptor; * This is primarily used for sorting versions in a list.
QString m_name; */
qint64 m_timestamp; qint64 timestamp;
*/
/// The URL that this version will be downloaded from. maybe. /// The URL that this version will be downloaded from. maybe.
QString download_url; QString download_url;
@ -44,6 +43,20 @@ struct MinecraftVersion : public InstVersion
/// is this a snapshot? /// is this a snapshot?
bool is_snapshot = false; bool is_snapshot = false;
QString m_name;
QString m_descriptor;
virtual QString descriptor()
{
return m_descriptor;
}
virtual QString name()
{
return m_name;
}
virtual QString typeString() const virtual QString typeString() const
{ {
QStringList pre_final; QStringList pre_final;

21
logic/OneSixInstance.cpp
View File

@ -214,6 +214,13 @@ bool OneSixInstance::shouldUpdate() const
return true; return true;
} }
bool OneSixInstance::versionIsCustom()
{
QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
QFile versionfile(verpath_custom);
return versionfile.exists();
}
QString OneSixInstance::currentVersionId() const QString OneSixInstance::currentVersionId() const
{ {
return intendedVersionId(); return intendedVersionId();
@ -224,6 +231,13 @@ bool OneSixInstance::reloadFullVersion()
I_D(OneSixInstance); I_D(OneSixInstance);
QString verpath = PathCombine(instanceRoot(), "version.json"); QString verpath = PathCombine(instanceRoot(), "version.json");
{
QString verpath_custom = PathCombine(instanceRoot(), "custom.json");
QFile versionfile(verpath_custom);
if(versionfile.exists())
verpath = verpath_custom;
}
QFile versionfile(verpath); QFile versionfile(verpath);
if(versionfile.exists() && versionfile.open(QIODevice::ReadOnly)) if(versionfile.exists() && versionfile.open(QIODevice::ReadOnly))
{ {
@ -264,7 +278,12 @@ bool OneSixInstance::menuActionEnabled ( QString action_name ) const
QString OneSixInstance::getStatusbarDescription() QString OneSixInstance::getStatusbarDescription()
{ {
return "One Six : " + intendedVersionId(); QString descr = "One Six : " + intendedVersionId();
if(versionIsCustom())
{
descr + " (custom)";
}
return descr;
} }
QString OneSixInstance::loaderModsDir() const QString OneSixInstance::loaderModsDir() const

2
logic/OneSixInstance.h
View File

@ -41,6 +41,8 @@ public:
bool reloadFullVersion(); bool reloadFullVersion();
/// get the current full version info /// get the current full version info
QSharedPointer<OneSixVersion> getFullVersion(); QSharedPointer<OneSixVersion> getFullVersion();
/// is the current version original, or custom?
bool versionIsCustom();
virtual QString defaultBaseJar() const; virtual QString defaultBaseJar() const;
virtual QString defaultCustomBaseJar() const; virtual QString defaultCustomBaseJar() const;

13
logic/OneSixLibrary.cpp
View File

@ -1,12 +1,13 @@
#include "OneSixLibrary.h" #include "OneSixLibrary.h"
#include "OneSixRule.h" #include "OneSixRule.h"
#include "OpSys.h"
void OneSixLibrary::finalize() void OneSixLibrary::finalize()
{ {
QStringList parts = m_name.split ( ':' ); QStringList parts = m_name.split ( ':' );
QString relative = parts[0]; QString relative = parts[0];
relative.replace ( '.','/' ); relative.replace ( '.','/' );
relative += '/' + parts[1] + '/' + parts[2] + '/' + parts[1] + '-' + parts[2]; relative += '/' + parts[1] + '/' + parts[2] + '/' + parts[1] + '-' + parts[2];
if ( !m_is_native ) if ( !m_is_native )
relative += ".jar"; relative += ".jar";
else else
@ -21,9 +22,12 @@ void OneSixLibrary::finalize()
relative += ".jar"; relative += ".jar";
} }
} }
m_decentname = parts[1];
m_decentversion = parts[2];
m_storage_path = relative; m_storage_path = relative;
m_download_path = m_base_url + relative; m_download_path = m_base_url + relative;
if ( m_rules.empty() ) if ( m_rules.empty() )
{ {
m_is_active = true; m_is_active = true;
@ -42,6 +46,11 @@ void OneSixLibrary::finalize()
if ( m_is_native ) if ( m_is_native )
{ {
m_is_active = m_is_active && m_native_suffixes.contains ( currentSystem ); m_is_active = m_is_active && m_native_suffixes.contains ( currentSystem );
m_decenttype = "Native";
}
else
{
m_decenttype = "Java";
} }
} }

22
logic/OneSixLibrary.h
View File

@ -16,6 +16,12 @@ private:
QList<QSharedPointer<Rule> > m_rules; QList<QSharedPointer<Rule> > m_rules;
// derived values used for real things // derived values used for real things
/// a decent name fit for display
QString m_decentname;
/// a decent version fit for display
QString m_decentversion;
/// a decent type fit for display
QString m_decenttype;
/// where to store the lib locally /// where to store the lib locally
QString m_storage_path; QString m_storage_path;
/// where to download the lib from /// where to download the lib from
@ -48,8 +54,24 @@ public:
/// Set the library composite name /// Set the library composite name
void setName(QString name); void setName(QString name);
/// get a decent-looking name
QString name()
{
return m_decentname;
}
/// get a decent-looking version
QString version()
{
return m_decentversion;
}
/// what kind of library is it? (for display)
QString type()
{
return m_decenttype;
}
/// Set the url base for downloads /// Set the url base for downloads
void setBaseUrl(QString base_url); void setBaseUrl(QString base_url);
/// Call this to mark the library as 'native' (it's a zip archive with DLLs) /// Call this to mark the library as 'native' (it's a zip archive with DLLs)
void setIsNative(); void setIsNative();
/// Attach a name suffix to the specified OS native /// Attach a name suffix to the specified OS native

47
logic/OneSixUpdate.cpp
View File

@ -49,7 +49,7 @@ void OneSixUpdate::executeTask()
} }
// Get a pointer to the version object that corresponds to the instance's version. // Get a pointer to the version object that corresponds to the instance's version.
targetVersion = MinecraftVersionList::getMainList().findVersion(intendedVersion).dynamicCast<MinecraftVersion>(); targetVersion = MMC->minecraftlist()->findVersion(intendedVersion).dynamicCast<MinecraftVersion>();
if(targetVersion == nullptr) if(targetVersion == nullptr)
{ {
// don't do anything if it was invalid // don't do anything if it was invalid
@ -72,7 +72,7 @@ void OneSixUpdate::versionFileStart()
setStatus("Getting the version files from Mojang."); setStatus("Getting the version files from Mojang.");
QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/"); QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
urlstr += targetVersion->descriptor + "/" + targetVersion->descriptor + ".json"; urlstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".json";
auto job = new DownloadJob("Version index"); auto job = new DownloadJob("Version index");
job->add(QUrl(urlstr)); job->add(QUrl(urlstr));
specificVersionDownloadJob.reset(job); specificVersionDownloadJob.reset(job);
@ -85,31 +85,46 @@ void OneSixUpdate::versionFileStart()
void OneSixUpdate::versionFileFinished() void OneSixUpdate::versionFileFinished()
{ {
DownloadPtr DlJob = specificVersionDownloadJob->first(); DownloadPtr DlJob = specificVersionDownloadJob->first();
OneSixInstance * inst = (OneSixInstance *) m_inst;
QString version_id = targetVersion->descriptor; QString version_id = targetVersion->descriptor();
QString inst_dir = m_inst->instanceRoot(); QString inst_dir = m_inst->instanceRoot();
// save the version file in $instanceId/version.json // save the version file in $instanceId/version.json
{ {
QString version1 = PathCombine(inst_dir, "/version.json"); QString version1 = PathCombine(inst_dir, "/version.json");
ensureFilePathExists(version1); ensureFilePathExists(version1);
// FIXME: detect errors here, download to a temp file, swap // FIXME: detect errors here, download to a temp file, swap
QFile vfile1 (version1); QSaveFile vfile1 (version1);
vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly ); if(!vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly ))
vfile1.write(DlJob.dynamicCast<ByteArrayDownload>()->m_data); {
vfile1.close(); emitFailed("Can't open " + version1 + " for writing.");
return;
}
auto data = DlJob.dynamicCast<ByteArrayDownload>()->m_data;
qint64 actual = 0;
if((actual = vfile1.write(data)) != data.size())
{
emitFailed("Failed to write into " + version1 + ". Written " + actual + " out of " + data.size() + '.');
return;
}
if(!vfile1.commit())
{
emitFailed("Can't commit changes to " + version1);
return;
}
} }
// the version is downloaded safely. update is 'done' at this point // the version is downloaded safely. update is 'done' at this point
m_inst->setShouldUpdate(false); m_inst->setShouldUpdate(false);
// save the version file in versions/$version/$version.json
/* // delete any custom version inside the instance (it's no longer relevant, we did an update)
//QString version2 = QString("versions/") + version_id + "/" + version_id + ".json"; QString custom = PathCombine(inst_dir, "/custom.json");
//ensurePathExists(version2); QFile finfo(custom);
//QFile vfile2 (version2); if(finfo.exists())
//vfile2.open(QIODevice::Truncate | QIODevice::WriteOnly ); {
//vfile2.write(DlJob->m_data); finfo.remove();
//vfile2.close(); }
*/ inst->reloadFullVersion();
jarlibStart(); jarlibStart();
} }

71
logic/OneSixVersion.cpp
View File

@ -28,3 +28,74 @@ QList<QSharedPointer<OneSixLibrary> > OneSixVersion::getActiveNativeLibs()
} }
QVariant OneSixVersion::data(const QModelIndex& index, int role) const
{
if(!index.isValid())
return QVariant();
int row = index.row();
int column = index.column();
if(row < 0 || row >= libraries.size())
return QVariant();
if(role == Qt::DisplayRole)
{
switch(column)
{
case 0:
return libraries[row]->name();
case 1:
return libraries[row]->type();
case 2:
return libraries[row]->version();
default:
return QVariant();
}
}
return QVariant();
}
Qt::ItemFlags OneSixVersion::flags(const QModelIndex& index) const
{
if(!index.isValid())
return Qt::NoItemFlags;
int row = index.row();
if(libraries[row]->isActive())
{
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren;
}
else
{
return Qt::ItemNeverHasChildren;
}
//return QAbstractListModel::flags(index);
}
QVariant OneSixVersion::headerData ( int section, Qt::Orientation orientation, int role ) const
{
if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
return QVariant();
switch (section)
{
case 0:
return QString("Name");
case 1:
return QString("Type");
case 2:
return QString("Version");
default:
return QString();
}
}
int OneSixVersion::rowCount(const QModelIndex& parent) const
{
return libraries.size();
}
int OneSixVersion::columnCount(const QModelIndex& parent) const
{
return 3;
}

11
logic/OneSixVersion.h
View File

@ -2,8 +2,14 @@
#include <QtCore> #include <QtCore>
class OneSixLibrary; class OneSixLibrary;
class OneSixVersion class OneSixVersion : public QAbstractListModel
{ {
public:
virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const;
virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
virtual int columnCount ( const QModelIndex& parent ) const;
virtual Qt::ItemFlags flags(const QModelIndex& index) const;
public: public:
/// the ID - determines which jar to use! ACTUALLY IMPORTANT! /// the ID - determines which jar to use! ACTUALLY IMPORTANT!
QString id; QString id;
@ -58,6 +64,7 @@ public:
// QList<Rule> rules; // QList<Rule> rules;
public: public:
OneSixVersion() OneSixVersion()
{ {
minimumLauncherVersion = 0xDEADBEEF; minimumLauncherVersion = 0xDEADBEEF;
@ -65,4 +72,4 @@ public:
QList<QSharedPointer<OneSixLibrary> > getActiveNormalLibs(); QList<QSharedPointer<OneSixLibrary> > getActiveNormalLibs();
QList<QSharedPointer<OneSixLibrary> > getActiveNativeLibs(); QList<QSharedPointer<OneSixLibrary> > getActiveNativeLibs();
}; };

36
logic/lists/InstVersionList.cpp → logic/lists/BaseVersionList.cpp
View File

@ -13,33 +13,33 @@
* limitations under the License. * limitations under the License.
*/ */
#include "logic/lists/InstVersionList.h" #include "logic/lists/BaseVersionList.h"
#include "logic/InstanceVersion.h" #include "logic/BaseVersion.h"
InstVersionList::InstVersionList(QObject *parent) : BaseVersionList::BaseVersionList(QObject *parent) :
QAbstractListModel(parent) QAbstractListModel(parent)
{ {
} }
InstVersionPtr InstVersionList::findVersion( const QString& descriptor ) BaseVersionPtr BaseVersionList::findVersion( const QString& descriptor )
{ {
for (int i = 0; i < count(); i++) for (int i = 0; i < count(); i++)
{ {
if (at(i)->descriptor == descriptor) if (at(i)->descriptor() == descriptor)
return at(i); return at(i);
} }
return InstVersionPtr(); return BaseVersionPtr();
} }
InstVersionPtr InstVersionList::getLatestStable() const BaseVersionPtr BaseVersionList::getLatestStable() const
{ {
if (count() <= 0) if (count() <= 0)
return InstVersionPtr(); return BaseVersionPtr();
else else
return at(0); return at(0);
} }
QVariant InstVersionList::data(const QModelIndex &index, int role) const QVariant BaseVersionList::data(const QModelIndex &index, int role) const
{ {
if (!index.isValid()) if (!index.isValid())
return QVariant(); return QVariant();
@ -48,7 +48,7 @@ QVariant InstVersionList::data(const QModelIndex &index, int role) const
return QVariant(); return QVariant();
InstVersionPtr version = at(index.row()); BaseVersionPtr version = at(index.row());
switch (role) switch (role)
{ {
@ -56,20 +56,17 @@ QVariant InstVersionList::data(const QModelIndex &index, int role) const
switch (index.column()) switch (index.column())
{ {
case NameColumn: case NameColumn:
return version->name; return version->name();
case TypeColumn: case TypeColumn:
return version->typeString(); return version->typeString();
case TimeColumn:
return version->timestamp;
default: default:
return QVariant(); return QVariant();
} }
case Qt::ToolTipRole: case Qt::ToolTipRole:
return version->descriptor; return version->descriptor();
case VersionPointerRole: case VersionPointerRole:
return qVariantFromValue(version); return qVariantFromValue(version);
@ -79,7 +76,7 @@ QVariant InstVersionList::data(const QModelIndex &index, int role) const
} }
} }
QVariant InstVersionList::headerData(int section, Qt::Orientation orientation, int role) const QVariant BaseVersionList::headerData(int section, Qt::Orientation orientation, int role) const
{ {
switch (role) switch (role)
{ {
@ -91,9 +88,6 @@ QVariant InstVersionList::headerData(int section, Qt::Orientation orientation, i
case TypeColumn: case TypeColumn:
return "Type"; return "Type";
case TimeColumn:
return "Time";
default: default:
return QVariant(); return QVariant();
@ -117,13 +111,13 @@ QVariant InstVersionList::headerData(int section, Qt::Orientation orientation, i
} }
} }
int InstVersionList::rowCount(const QModelIndex &parent) const int BaseVersionList::rowCount(const QModelIndex &parent) const
{ {
// Return count // Return count
return count(); return count();
} }
int InstVersionList::columnCount(const QModelIndex &parent) const int BaseVersionList::columnCount(const QModelIndex &parent) const
{ {
return 2; return 2;
} }

14
logic/lists/InstVersionList.h → logic/lists/BaseVersionList.h
View File

@ -20,7 +20,7 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QSharedPointer> #include <QSharedPointer>
#include "logic/InstanceVersion.h" #include "logic/BaseVersion.h"
class Task; class Task;
@ -36,7 +36,7 @@ class Task;
* all have a default implementation, but they can be overridden by plugins to * all have a default implementation, but they can be overridden by plugins to
* change the behavior of the list. * change the behavior of the list.
*/ */
class InstVersionList : public QAbstractListModel class BaseVersionList : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -57,7 +57,7 @@ public:
TimeColumn TimeColumn
}; };
explicit InstVersionList(QObject *parent = 0); explicit BaseVersionList(QObject *parent = 0);
/*! /*!
* \brief Gets a task that will reload the version list. * \brief Gets a task that will reload the version list.
@ -71,7 +71,7 @@ public:
virtual bool isLoaded() = 0; virtual bool isLoaded() = 0;
//! Gets the version at the given index. //! Gets the version at the given index.
virtual const InstVersionPtr at(int i) const = 0; virtual const BaseVersionPtr at(int i) const = 0;
//! Returns the number of versions in the list. //! Returns the number of versions in the list.
virtual int count() const = 0; virtual int count() const = 0;
@ -90,14 +90,14 @@ public:
* \return A const pointer to the version with the given descriptor. NULL if * \return A const pointer to the version with the given descriptor. NULL if
* one doesn't exist. * one doesn't exist.
*/ */
virtual InstVersionPtr findVersion(const QString &descriptor); virtual BaseVersionPtr findVersion(const QString &descriptor);
/*! /*!
* \brief Gets the latest stable version of this instance type. * \brief Gets the latest stable version of this instance type.
* This is the version that will be selected by default. * This is the version that will be selected by default.
* By default, this is simply the first version in the list. * By default, this is simply the first version in the list.
*/ */
virtual InstVersionPtr getLatestStable() const; virtual BaseVersionPtr getLatestStable() const;
/*! /*!
* Sorts the version list. * Sorts the version list.
@ -117,5 +117,5 @@ protected slots:
* then copies the versions and sets their parents correctly. * then copies the versions and sets their parents correctly.
* \param versions List of versions whose parents should be set. * \param versions List of versions whose parents should be set.
*/ */
virtual void updateListData(QList<InstVersionPtr > versions) = 0; virtual void updateListData(QList<BaseVersionPtr > versions) = 0;
}; };

200
logic/lists/ForgeVersionList.cpp Normal file
View File

@ -0,0 +1,200 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "ForgeVersionList.h"
#include <logic/net/DownloadJob.h>
#include "MultiMC.h"
#include <QtNetwork>
#include <QtXml>
#include <QRegExp>
#define JSON_URL "http://files.minecraftforge.net/minecraftforge/json"
ForgeVersionList::ForgeVersionList(QObject* parent): BaseVersionList(parent)
{
}
Task *ForgeVersionList::getLoadTask()
{
return new ForgeListLoadTask(this);
}
bool ForgeVersionList::isLoaded()
{
return m_loaded;
}
const BaseVersionPtr ForgeVersionList::at(int i) const
{
return m_vlist.at(i);
}
int ForgeVersionList::count() const
{
return m_vlist.count();
}
/*
bool cmpVersions(BaseVersionPtr first, BaseVersionPtr second)
{
const BaseVersion & left = *first;
const BaseVersion & right = *second;
return left > right;
}
void MinecraftVersionList::sort()
{
beginResetModel();
qSort(m_vlist.begin(), m_vlist.end(), cmpVersions);
endResetModel();
}
*/
BaseVersionPtr ForgeVersionList::getLatestStable() const
{
return BaseVersionPtr();
}
void ForgeVersionList::updateListData(QList<BaseVersionPtr > versions)
{
beginResetModel();
m_vlist = versions;
m_loaded = true;
endResetModel();
// NOW SORT!!
// sort();
}
void ForgeVersionList::sort()
{
// NO-OP for now
}
ForgeListLoadTask::ForgeListLoadTask(ForgeVersionList* vlist): Task()
{
m_list = vlist;
}
void ForgeListLoadTask::executeTask()
{
auto job = new DownloadJob("Version index");
job->add(QUrl(JSON_URL));
listJob.reset(job);
connect(listJob.data(), SIGNAL(succeeded()), SLOT(list_downloaded()));
connect(listJob.data(), SIGNAL(failed()), SLOT(versionFileFailed()));
connect(listJob.data(), SIGNAL(progress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
listJob->start();
}
void ForgeListLoadTask::list_downloaded()
{
auto DlJob = listJob->first();
auto data = DlJob.dynamicCast<ByteArrayDownload>()->m_data;
QJsonParseError jsonError;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
DlJob.reset();
if (jsonError.error != QJsonParseError::NoError)
{
emitFailed("Error parsing version list JSON:" + jsonError.errorString());
return;
}
if(!jsonDoc.isObject())
{
emitFailed("Error parsing version list JSON: jsonDoc is not an object");
return;
}
QJsonObject root = jsonDoc.object();
// Now, get the array of versions.
if(!root.value("builds").isArray())
{
emitFailed("Error parsing version list JSON: version list object is missing 'builds' array");
return;
}
QJsonArray builds = root.value("builds").toArray();
QList<BaseVersionPtr > tempList;
for (int i = 0; i < builds.count(); i++)
{
// Load the version info.
if(!builds[i].isObject())
{
//FIXME: log this somewhere
continue;
}
QJsonObject obj = builds[i].toObject();
int build_nr = obj.value("build").toDouble(0);
if(!build_nr)
continue;
QJsonArray files = root.value("files").toArray();
QString url, jobbuildver, mcver, buildtype, filename;
QString changelog_url, installer_url;
bool valid = false;
for(int j = 0; j < files.count(); j++)
{
if(!files[j].isObject())
continue;
QJsonObject file = files[j].toObject();
buildtype = file.value("buildtype").toString();
if((buildtype == "client" || buildtype == "universal") && !valid)
{
mcver = file.value("mcver").toString();
url = file.value("url").toString();
jobbuildver = file.value("jobbuildver").toString();
int lastSlash = url.lastIndexOf('/');
filename = url.mid(lastSlash+1);
valid = true;
}
else if(buildtype == "changelog")
{
QString ext = file.value("ext").toString();
if(ext.isEmpty())
continue;
changelog_url = file.value("url").toString();
}
else if(buildtype == "installer")
{
installer_url = file.value("url").toString();
}
}
if(valid)
{
// Now, we construct the version object and add it to the list.
QSharedPointer<ForgeVersion> fVersion(new ForgeVersion());
fVersion->universal_url = url;
fVersion->changelog_url = changelog_url;
fVersion->installer_url = installer_url;
fVersion->jobbuildver = jobbuildver;
fVersion->mcver = mcver;
fVersion->filename = filename;
fVersion->m_buildnr = build_nr;
tempList.append(fVersion);
}
}
m_list->updateListData(tempList);
emitSucceeded();
return;
}

98
logic/lists/ForgeVersionList.h Normal file
View File

@ -0,0 +1,98 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <QObject>
#include <QAbstractListModel>
#include <QSharedPointer>
#include <QUrl>
#include <QNetworkReply>
#include "BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/net/DownloadJob.h"
class ForgeVersion;
typedef QSharedPointer<ForgeVersion> PtrForgeVersion;
struct ForgeVersion : public BaseVersion
{
virtual QString descriptor()
{
return filename;
};
virtual QString name()
{
return "Forge " + jobbuildver + " (" + mcver + ")";
};
virtual QString typeString() const
{
if(installer_url.isEmpty())
return "Universal";
else
return "Installer";
};
int m_buildnr = 0;
QString universal_url;
QString changelog_url;
QString installer_url;
QString jobbuildver;
QString mcver;
QString filename;
};
class ForgeVersionList : public BaseVersionList
{
Q_OBJECT
public:
friend class ForgeListLoadTask;
explicit ForgeVersionList(QObject *parent = 0);
virtual Task *getLoadTask();
virtual bool isLoaded();
virtual const BaseVersionPtr at(int i) const;
virtual int count() const;
virtual void sort();
virtual BaseVersionPtr getLatestStable() const;
protected:
QList<BaseVersionPtr > m_vlist;
bool m_loaded;
protected slots:
virtual void updateListData(QList<BaseVersionPtr > versions);
};
class ForgeListLoadTask : public Task
{
Q_OBJECT
public:
explicit ForgeListLoadTask(ForgeVersionList *vlist);
virtual void executeTask();
protected slots:
void list_downloaded();
protected:
DownloadJobPtr listJob;
ForgeVersionList *m_list;
};

8
logic/lists/LwjglVersionList.cpp
View File

@ -24,14 +24,6 @@
#define RSS_URL "http://sourceforge.net/api/file/index/project-id/58488/mtime/desc/rss" #define RSS_URL "http://sourceforge.net/api/file/index/project-id/58488/mtime/desc/rss"
LWJGLVersionList mainVersionList;
LWJGLVersionList &LWJGLVersionList::get()
{
return mainVersionList;
}
LWJGLVersionList::LWJGLVersionList(QObject *parent) : LWJGLVersionList::LWJGLVersionList(QObject *parent) :
QAbstractListModel(parent) QAbstractListModel(parent)
{ {

2
logic/lists/LwjglVersionList.h
View File

@ -53,8 +53,6 @@ class LWJGLVersionList : public QAbstractListModel
public: public:
explicit LWJGLVersionList(QObject *parent = 0); explicit LWJGLVersionList(QObject *parent = 0);
static LWJGLVersionList &get();
bool isLoaded() { return m_vlist.length() > 0; } bool isLoaded() { return m_vlist.length() > 0; }
const PtrLWJGLVersion getVersion(const QString &versionName); const PtrLWJGLVersion getVersion(const QString &versionName);

34
logic/lists/MinecraftVersionList.cpp
View File

@ -34,10 +34,8 @@
#define ASSETS_URLBASE "http://assets.minecraft.net/" #define ASSETS_URLBASE "http://assets.minecraft.net/"
#define MCN_URLBASE "http://sonicrules.org/mcnweb.py" #define MCN_URLBASE "http://sonicrules.org/mcnweb.py"
MinecraftVersionList mcVList;
MinecraftVersionList::MinecraftVersionList(QObject *parent) : MinecraftVersionList::MinecraftVersionList(QObject *parent) :
InstVersionList(parent) BaseVersionList(parent)
{ {
} }
@ -52,7 +50,7 @@ bool MinecraftVersionList::isLoaded()
return m_loaded; return m_loaded;
} }
const InstVersionPtr MinecraftVersionList::at(int i) const const BaseVersionPtr MinecraftVersionList::at(int i) const
{ {
return m_vlist.at(i); return m_vlist.at(i);
} }
@ -62,11 +60,11 @@ int MinecraftVersionList::count() const
return m_vlist.count(); return m_vlist.count();
} }
bool cmpVersions(InstVersionPtr first, InstVersionPtr second) bool cmpVersions(BaseVersionPtr first, BaseVersionPtr second)
{ {
const InstVersion & left = *first; auto left = first.dynamicCast<MinecraftVersion>();
const InstVersion & right = *second; auto right = second.dynamicCast<MinecraftVersion>();
return left > right; return left->timestamp > right->timestamp;
} }
void MinecraftVersionList::sort() void MinecraftVersionList::sort()
@ -76,7 +74,7 @@ void MinecraftVersionList::sort()
endResetModel(); endResetModel();
} }
InstVersionPtr MinecraftVersionList::getLatestStable() const BaseVersionPtr MinecraftVersionList::getLatestStable() const
{ {
for (int i = 0; i < m_vlist.length(); i++) for (int i = 0; i < m_vlist.length(); i++)
{ {
@ -86,15 +84,10 @@ InstVersionPtr MinecraftVersionList::getLatestStable() const
return m_vlist.at(i); return m_vlist.at(i);
} }
} }
return InstVersionPtr(); return BaseVersionPtr();
} }
MinecraftVersionList &MinecraftVersionList::getMainList() void MinecraftVersionList::updateListData(QList<BaseVersionPtr > versions)
{
return mcVList;
}
void MinecraftVersionList::updateListData(QList<InstVersionPtr > versions)
{ {
beginResetModel(); beginResetModel();
m_vlist = versions; m_vlist = versions;
@ -214,7 +207,7 @@ void MCVListLoadTask::list_downloaded()
} }
QJsonArray versions = root.value("versions").toArray(); QJsonArray versions = root.value("versions").toArray();
QList<InstVersionPtr > tempList; QList<BaseVersionPtr > tempList;
for (int i = 0; i < versions.count(); i++) for (int i = 0; i < versions.count(); i++)
{ {
bool is_snapshot = false; bool is_snapshot = false;
@ -280,7 +273,7 @@ void MCVListLoadTask::list_downloaded()
// Now, we construct the version object and add it to the list. // Now, we construct the version object and add it to the list.
QSharedPointer<MinecraftVersion> mcVersion(new MinecraftVersion()); QSharedPointer<MinecraftVersion> mcVersion(new MinecraftVersion());
mcVersion->name = mcVersion->descriptor = versionID; mcVersion->m_name = mcVersion->m_descriptor = versionID;
mcVersion->timestamp = versionTime.toMSecsSinceEpoch(); mcVersion->timestamp = versionTime.toMSecsSinceEpoch();
mcVersion->download_url = dlUrl; mcVersion->download_url = dlUrl;
mcVersion->is_latest = is_latest; mcVersion->is_latest = is_latest;
@ -293,8 +286,3 @@ void MCVListLoadTask::list_downloaded()
emitSucceeded(); emitSucceeded();
return; return;
} }
// FIXME: we should have a local cache of the version list and a local cache of version data
bool MCVListLoadTask::loadFromVList()
{
}

21
logic/lists/MinecraftVersionList.h
View File

@ -20,14 +20,14 @@
#include <QSet> #include <QSet>
#include <QSharedPointer> #include <QSharedPointer>
#include "InstVersionList.h" #include "BaseVersionList.h"
#include "logic/tasks/Task.h" #include "logic/tasks/Task.h"
#include "logic/MinecraftVersion.h" #include "logic/MinecraftVersion.h"
class MCVListLoadTask; class MCVListLoadTask;
class QNetworkReply; class QNetworkReply;
class MinecraftVersionList : public InstVersionList class MinecraftVersionList : public BaseVersionList
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -37,25 +37,19 @@ public:
virtual Task *getLoadTask(); virtual Task *getLoadTask();
virtual bool isLoaded(); virtual bool isLoaded();
virtual const InstVersionPtr at(int i) const; virtual const BaseVersionPtr at(int i) const;
virtual int count() const; virtual int count() const;
virtual void sort(); virtual void sort();
virtual InstVersionPtr getLatestStable() const; virtual BaseVersionPtr getLatestStable() const;
/*!
* Gets the main version list instance.
*/
static MinecraftVersionList &getMainList();
protected: protected:
QList<InstVersionPtr > m_vlist; QList<BaseVersionPtr> m_vlist;
bool m_loaded; bool m_loaded;
protected slots: protected slots:
virtual void updateListData(QList<InstVersionPtr > versions); virtual void updateListData(QList<BaseVersionPtr > versions);
}; };
class MCVListLoadTask : public Task class MCVListLoadTask : public Task
@ -72,9 +66,6 @@ protected slots:
void list_downloaded(); void list_downloaded();
protected: protected:
//! Loads versions from Mojang's official version list.
bool loadFromVList();
QNetworkReply *vlistReply; QNetworkReply *vlistReply;
MinecraftVersionList *m_list; MinecraftVersionList *m_list;
MinecraftVersion *m_currentStable; MinecraftVersion *m_currentStable;