WIP break stuff

Update changelog.md

api/logic/minecraft/gameoptions/GameOptions.cpp

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

api/logic/minecraft/gameoptions/GameOptions.h

@@ -4,12 +4,46 @@
 #include <QString>
 #include <QAbstractListModel>
 
+struct RawGameOptions
+{
+    void clear()
+    {
+        version = 0;
+        mapping.clear();
+    }
+    std::map<QString, QString> mapping;
+    int version = 0;
+};
+
 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 value;
 };
 
+struct CookedGameOptions
+{
+    std::vector<GameOptionItem> items;
+};
+
+
+
 class GameOptions : public QAbstractListModel
 {
     Q_OBJECT
@@ -27,7 +61,8 @@ public:
     bool save();
 
 private:
-    std::vector<GameOptionItem> contents;
+    RawGameOptions rawOptions;
+    CookedGameOptions cookedOptions;
     bool loaded = false;
     QString path;
     int version = 0;

changelog.md

@@ -12,7 +12,7 @@ Make sure you have the following packages before you update:
 
 - Arch: `qt5-base`
 - Debian/Ubuntu: `qt5-default`
-- CentOS/RHEL: `qt5-qtbase`
+- CentOS/RHEL/Fedora: `qt5-qtbase-gui`
 - Suse: `libqt5-qtbase`
 
 MultiMC on linux is built with Qt 5.4 and older versions of Qt will not work.
@@ -1170,4 +1170,4 @@ Long time coming, this release brought a lot of incremental improvements and fix
 - Added additional information to the about dialog.
 
 ## MultiMC 0.0
-- Initial release.
+- Initial release.