[Impl] Add suggestions to name edits of "loot_table" and "tag" entry

types

LootTable:
- Now allow "empty" loot context in writing JSON.

StringIndexMap:
- Fix the stringOf() method returns an empty string at index 0.

Author: IoeCmcomc

src/datawidgetcontroller.cpp

@@ -324,7 +324,7 @@ int StringIndexMap::indexOf(const QString &str) const {
 }
 
 QString StringIndexMap::stringOf(const int index) const {
-    return (index > 0 && index < m_indexToString.size())
+    return (index >= 0 && index < m_indexToString.size())
                ? m_indexToString.at(index) : QString();
 }
 

src/loottable.cpp

@@ -73,9 +73,9 @@ void LootTable::fromJson(QJsonObject &&root) {
 QJsonObject LootTable::toJson() const {
     QJsonObject root;
 
-    if (ui->lootTableTypeCombo->currentIndex() == 0) {
-        return {};
-    }
+    // if (ui->lootTableTypeCombo->currentIndex() == 0) {
+    //     return {};
+    // }
     const QString &&type = QStringLiteral("minecraft:") +
                            types[ui->lootTableTypeCombo->currentIndex()];
 

src/loottableentry.cpp

@@ -11,8 +11,8 @@
 
 
 LootTableEntry::LootTableEntry(QWidget *parent) :
-    QTabWidget(parent), ui(new Ui::LootTableEntry),
-    m_typeCtrl(nullptr, "type") {
+    QTabWidget(parent), m_typeCtrl(nullptr, "type"),
+    ui(new Ui::LootTableEntry) {
     ui->setupUi(this);
     setTabEnabled(ENTRIES_TAB, false);
 
@@ -33,6 +33,20 @@ LootTableEntry::LootTableEntry(QWidget *parent) :
     ui->itemSlot->setAcceptMultiple(false);
     ui->itemSlot->setAcceptTag(false);
 
+    m_lootTableModel.setRegistry(QStringLiteral("loot_table"),
+                                 GameInfoModel::PrependPrefix |
+                                 GameInfoModel::DontShowIcons);
+    m_lootTableModel.setDatapackCategory(QStringLiteral("loot_tables"), true);
+    ui->tableNameEdit->setCompleter(m_lootTableModel.createCompleter());
+
+    m_itemTagModel.setInfo(QStringLiteral(
+                               "tag/item"),
+                           GameInfoModel::PrependPrefix |
+                           GameInfoModel::DontShowIcons |
+                           GameInfoModel::ForceKeyAsName);
+    m_itemTagModel.setDatapackCategory(QStringLiteral("tags/items"), true);
+    ui->tagNameEdit->setCompleter(m_itemTagModel.createCompleter());
+
     m_typeCtrl.setWidget(ui->multiPageWidget);
     m_controller.addMapping(QStringLiteral("functions"),
                             ui->functionsInterface);

src/loottableentry.h

@@ -2,6 +2,7 @@
 #define LOOTTABLEENTRY_H
 
 #include "datawidgetcontroller.h"
+#include "gameinfomodel.h"
 
 #include <QTabWidget>
 #include <QHBoxLayout>
@@ -34,6 +35,8 @@ private /*slots*/ :
     void updateConditionsTab(int size);
 
 private:
+    GameInfoModel m_lootTableModel;
+    GameInfoModel m_itemTagModel;
     DataWidgetControllerRecord m_controller;
     DataWidgetControllerMultiPageWidget m_typeCtrl;
     Ui::LootTableEntry *ui;

src/tagselectordialog.cpp

@@ -11,27 +11,24 @@
 
 TagSelectorDialog::TagSelectorDialog(QWidget *parent,
                                      CodeFile::FileType type) :
-    QDialog(parent),
-    ui(new Ui::TagSelectorDialog) {
+    QDialog(parent), ui(new Ui::TagSelectorDialog) {
     ui->setupUi(this);
 
     filterModel.setParent(ui->tagListView);
     model.setParent(this);
-    setupTagTreeView(type);
+    setupTagView(type);
     connect(ui->tagFilterBox, &QLineEdit::textChanged,
             this, [this](const QString &input) {
         filterModel.setFilterRegularExpression(input);
     });
 
     connect(ui->tagListView->selectionModel(),
             &QItemSelectionModel::selectionChanged,
-            this,
-            &TagSelectorDialog::checkOK);
+            this, &TagSelectorDialog::checkOK);
 
     connect(ui->tagListView->selectionModel(),
             &QItemSelectionModel::selectionChanged,
-            this,
-            &TagSelectorDialog::showDetails);
+            this, &TagSelectorDialog::showDetails);
 
     selectButton = new QPushButton(tr("Select"), this);
     ui->buttonBox->removeButton(ui->buttonBox->button(QDialogButtonBox::Ok));
@@ -46,15 +43,15 @@ TagSelectorDialog::~TagSelectorDialog() {
     delete ui;
 }
 
-void TagSelectorDialog::setupTagTreeView(
+void TagSelectorDialog::setupTagView(
     CodeFile::FileType type = CodeFile::ItemTag) {
     model.setParent(ui->tagListView);
     filterModel.setSourceModel(&model);
     filterModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
     filterModel.setFilterRole(Qt::DisplayRole);
     ui->tagListView->setModel(&filterModel);
 
-    QString tagStr = QStringLiteral("tag/");
+    QString &&tagStr = QStringLiteral("tag/");
     switch (type) {
         case CodeFile::BlockTag:
             tagStr += QStringLiteral("block");
@@ -80,22 +77,22 @@ void TagSelectorDialog::setupTagTreeView(
             break;
     }
 
-    auto tagStrSplited = tagStr.split('/');
+    auto &&tagStrSplited = tagStr.split('/');
     std::transform(tagStrSplited.cbegin(), tagStrSplited.cend(),
                    tagStrSplited.begin(), [](const QString &str) -> QString {
         return str + 's';
     });
-    auto tagDir = tagStrSplited.join('/');
+    const QString &tagDir = tagStrSplited.join('/');
 
-    auto fileIDList = Glhp::fileIdList(QDir::currentPath(), tagDir);
+    const auto &fileIDList = Glhp::fileIdList(QDir::currentPath(), tagDir);
     for (const auto &id : fileIDList) {
         model.appendRow(new QStandardItem(id));
     }
 
-    MCRTagInfo = Game::getInfo(tagStr);
+    m_tagInfo = Game::getInfo(tagStr);
 
-    auto tagIter = MCRTagInfo.constBegin();
-    while ((tagIter != MCRTagInfo.constEnd())) {
+    auto tagIter = m_tagInfo.constBegin();
+    while ((tagIter != m_tagInfo.constEnd())) {
         auto *item = new QStandardItem(
             QStringLiteral("minecraft:") + tagIter.key());
         model.appendRow(item);
@@ -104,34 +101,31 @@ void TagSelectorDialog::setupTagTreeView(
 }
 
 QString TagSelectorDialog::getInternalSelectedID() {
-    auto indexes = ui->tagListView->selectionModel()->selectedIndexes();
+    const auto indexes = ui->tagListView->selectionModel()->selectedIndexes();
 
     if (indexes.isEmpty()) return QString();
 
-    QStandardItem *item =
+    const QStandardItem *item =
         model.itemFromIndex(filterModel.mapToSource(indexes[0]));
     auto id = item->text();
     return id;
 }
 
 QString TagSelectorDialog::getSelectedID() {
-    const auto &&internalID = getInternalSelectedID();
-    const auto  &id         = internalID;
-
-    return '#' + id;
+    return '#' + getInternalSelectedID();
 }
 
 void TagSelectorDialog::checkOK() {
     selectButton->setEnabled(!getInternalSelectedID().isEmpty());
 }
 
 void TagSelectorDialog::showDetails() {
-    auto id = getInternalSelectedID();
+    QString &&id = getInternalSelectedID();
 
     if (!id.isEmpty()) {
         Glhp::removePrefix(id, "minecraft:"_QL1);
-        if (MCRTagInfo.contains(id)) {
-            const auto details = MCRTagInfo[id].toString();
+        if (m_tagInfo.contains(id)) {
+            const auto details = m_tagInfo[id].toString();
             ui->tagDetailsLabel->setText(details);
             return;
         }

src/tagselectordialog.h

@@ -1,7 +1,6 @@
 #ifndef TAGSELECTORDIALOG_H
 #define TAGSELECTORDIALOG_H
 
-#include "mainwindow.h"
 #include "codefile.h"
 
 #include <QDialog>
@@ -13,8 +12,7 @@ namespace Ui {
     class TagSelectorDialog;
 }
 
-class TagSelectorDialog : public QDialog
-{
+class TagSelectorDialog : public QDialog {
     Q_OBJECT
 
 public:
@@ -31,11 +29,11 @@ protected slots:
 private:
     QSortFilterProxyModel filterModel;
     QStandardItemModel model;
-    QVariantMap MCRTagInfo;
+    QVariantMap m_tagInfo;
     Ui::TagSelectorDialog *ui;
     QPushButton *selectButton = nullptr;
 
-    void setupTagTreeView(CodeFile::FileType type);
+    void setupTagView(CodeFile::FileType type);
     QString getInternalSelectedID();
 };