mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-08 05:48:45 +00:00
Code Issues Projects Releases Wiki Activity

WIP break stuff

Browse Source
This commit is contained in:
Petr Mrázek 2019-02-04 00:18:42 +01:00
parent 62e1bf327d
commit 7b0a812db7
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
api/logic/minecraft/gameoptions/GameOptions.cpp
View File

@ -4,7 +4,7 @@
#include <QSaveFile> #include <QSaveFile>
namespace { namespace {
bool load(const QString& path, std::vector<GameOptionItem> &contents, int & version) bool load(const QString& path, RawGameOptions & contents)
{ {
contents.clear(); contents.clear();
QFile file(path); QFile file(path);
@ -13,7 +13,6 @@ bool load(const QString& path, std::vector<GameOptionItem> &contents, int & vers
qWarning() << "Failed to read options file."; qWarning() << "Failed to read options file.";
return false; return false;
} }
version = 0;
while(!file.atEnd()) while(!file.atEnd())
{ {
auto line = file.readLine(); auto line = file.readLine();
@ -31,32 +30,32 @@ bool load(const QString& path, std::vector<GameOptionItem> &contents, int & vers
qDebug() << "!!" << key << "!!"; qDebug() << "!!" << key << "!!";
if(key == "version") if(key == "version")
{ {
version = value.toInt(); contents.version = value.toInt();
continue; continue;
} }
contents.emplace_back(GameOptionItem{key, value}); contents.mapping[key] = value;
} }
qDebug() << "Loaded" << path << "with version:" << version; qDebug() << "Loaded" << path << "with version:" << contents.version;
return true; return true;
} }
bool save(const QString& path, std::vector<GameOptionItem> &mapping, int version) bool save(const QString& path, RawGameOptions& contents)
{ {
QSaveFile out(path); QSaveFile out(path);
if(!out.open(QIODevice::WriteOnly)) if(!out.open(QIODevice::WriteOnly))
{ {
return false; return false;
} }
if(version != 0) if(contents.version != 0)
{ {
QString versionLine = QString("version:%1\n").arg(version); QString versionLine = QString("version:%1\n").arg(contents.version);
out.write(versionLine.toUtf8()); out.write(versionLine.toUtf8());
} }
auto iter = mapping.begin(); auto iter = contents.mapping.begin();
while (iter != mapping.end()) while (iter != contents.mapping.end())
{ {
out.write(iter->key.toUtf8()); out.write(iter->first.toUtf8());
out.write(":"); out.write(":");
out.write(iter->value.toUtf8()); out.write(iter->second.toUtf8());
out.write("\n"); out.write("\n");
iter++; iter++;
} }
@ -95,7 +94,7 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
int row = index.row(); int row = index.row();
int column = index.column(); int column = index.column();
if (row < 0 || row >= int(contents.size())) if (row < 0 || row >= rowCount())
return QVariant(); return QVariant();
switch (role) switch (role)
@ -103,11 +102,11 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
case Qt::DisplayRole: case Qt::DisplayRole:
if(column == 0) if(column == 0)
{ {
return contents[row].key; return cookedOptions.items[row].id;
} }
else else
{ {
return contents[row].value; return cookedOptions.items[row].default_value;
} }
default: default:
return QVariant(); return QVariant();
@ -117,7 +116,7 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
int GameOptions::rowCount(const QModelIndex&) const int GameOptions::rowCount(const QModelIndex&) const
{ {
return contents.size(); return cookedOptions.items.size();
} }
int GameOptions::columnCount(const QModelIndex&) const int GameOptions::columnCount(const QModelIndex&) const
@ -133,12 +132,12 @@ bool GameOptions::isLoaded() const
bool GameOptions::reload() bool GameOptions::reload()
{ {
beginResetModel(); beginResetModel();
loaded = load(path, contents, version); loaded = load(path, rawOptions);
endResetModel(); endResetModel();
return loaded; return loaded;
} }
bool GameOptions::save() bool GameOptions::save()
{ {
return ::save(path, contents, version); return ::save(path, rawOptions);
} }

39
api/logic/minecraft/gameoptions/GameOptions.h
View File

@ -4,12 +4,46 @@
#include <QString> #include <QString>
#include <QAbstractListModel> #include <QAbstractListModel>
struct RawGameOptions
{
void clear()
{
version = 0;
mapping.clear();
}
std::map<QString, QString> mapping;
int version = 0;
};
struct GameOptionItem struct GameOptionItem
{ {
QString id;
enum ValueType
{
INT,
FLOAT,
BOOL,
FOV_MADNESS,
FPS_MADNESS
} value_type;
enum VisualType
{
} visual_type;
QVariant null_value;
QVariant default_value;
QVariant min_value;
QVariant max_value;
QString key; QString key;
QString value;
}; };
struct CookedGameOptions
{
std::vector<GameOptionItem> items;
};
class GameOptions : public QAbstractListModel class GameOptions : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
@ -27,7 +61,8 @@ public:
bool save(); bool save();
private: private:
std::vector<GameOptionItem> contents; RawGameOptions rawOptions;
CookedGameOptions cookedOptions;
bool loaded = false; bool loaded = false;
QString path; QString path;
int version = 0; int version = 0;