Added support for MC 1.0 - 1.5 + arraged feature icons by MC version

Cubitect · Jul 23, 2021 · 93f915a · 93f915a
1 parent 4805092
commit 93f915a
Show file tree

Hide file tree

Showing 11 changed files with 337 additions and 282 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding utilities provided by [cubiomes](https://github.com/Cubitect/cubiomes) and a map viewer for the Minecraft biomes and structure generation.
 
-The tool is designed for high performance and currently supports Minecraft Java Edition 1.6 - 1.17.
+The tool is designed for high performance and supports Minecraft Java Edition main releases 1.0 - 1.17.
 
 
 ## Download

diff --git a/cubiomes b/cubiomes
diff --git a/src/aboutdialog.h b/src/aboutdialog.h
@@ -5,7 +5,7 @@
 
 #define VERS_MAJOR 1
 #define VERS_MINOR 9
-#define VERS_PATCH -1    // negative patch number designates a development version
+#define VERS_PATCH 0    // negative patch number designates a development version
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)

diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp
@@ -10,6 +10,7 @@
 #include <QPixmap>
 #include <QPainter>
 #include <QPainterPath>
+#include <QMessageBox>
 
 
 #define SETUP_BIOME_CHECKBOX(B) do {\
@@ -50,6 +51,10 @@ FilterDialog::FilterDialog(FormConditions *parent, int mcversion, QListWidgetIte
     memset(&cond, 0, sizeof(cond));
     ui->setupUi(this);
 
+    textDescription = new QTextEdit(this);
+    textDescription->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    ui->collapseDescription->init("Description", textDescription, true);
+
     QString mcs = "MC ";
     mcs += (mc2str(mc) ? mc2str(mc) : "?");
     ui->labelMC->setText(mcs);
@@ -360,8 +365,8 @@ void FilterDialog::updateMode()
     ui->lineEditZ1->setToolTip(lowtip);
     ui->lineEditX2->setToolTip(uptip);
     ui->lineEditZ2->setToolTip(uptip);
-    ui->textDescription->setText(ft.desription);
     ui->buttonOk->setEnabled(filterindex != F_SELECT);
+    textDescription->setText(ft.description);
 }
 
 void FilterDialog::enableSet(const int *ids, int n)
@@ -610,19 +615,34 @@ void FilterDialog::on_comboBoxCat_currentIndexChanged(int idx)
     int slot = 0;
     ui->comboBoxType->insertItem(slot, "Select filter", QVariant::fromValue((int)F_SELECT));
 
+    const FilterInfo *ft_list[FILTER_MAX] = {};
+    const FilterInfo *ft;
+
+    for (int i = 1; i < FILTER_MAX; i++)
+    {
+        ft = &g_filterinfo.list[i];
+        if (ft->cat == idx)
+            ft_list[ft->disp] = ft;
+    }
+
     for (int i = 1; i < FILTER_MAX; i++)
     {
-        const FilterInfo &ft = g_filterinfo.list[i];
-        if (ft.cat != idx)
+        ft = ft_list[i];
+        if (!ft)
             continue;
         slot++;
-        if (ft.icon)
-            ui->comboBoxType->insertItem(slot, QIcon(ft.icon), ft.name, i);
+        QVariant vidx = QVariant::fromValue((int)(ft - g_filterinfo.list));
+        if (ft->icon)
+            ui->comboBoxType->insertItem(slot, QIcon(ft->icon), ft->name, vidx);
         else
-            ui->comboBoxType->insertItem(slot, ft.name, i);
+            ui->comboBoxType->insertItem(slot, ft->name, vidx);
 
-        if (mc < ft.mcmin)
+        if (mc < ft->mcmin)
             ui->comboBoxType->setItemData(slot, false, Qt::UserRole-1); // deactivate
+        if (ft == g_filterinfo.list + F_FORTRESS)
+            ui->comboBoxType->insertSeparator(slot++);
+        if (ft == g_filterinfo.list + F_ENDCITY)
+            ui->comboBoxType->insertSeparator(slot++);
     }
 
     updateMode();

diff --git a/src/filterdialog.h b/src/filterdialog.h
@@ -6,6 +6,7 @@
 #include <QSpinBox>
 #include <QLineEdit>
 #include <QListWidgetItem>
+#include <QTextEdit>
 
 #include "search.h"
 #include "formconditions.h"
@@ -46,18 +47,12 @@ class SpinExclude : public QSpinBox
 public slots:
     void change(int v)
     {
+        const char *style = "";
         if (v < 0)
-        {
-            setStyleSheet("background: #28ff0000");
-        }
-        else if (v > 0)
-        {
-            setStyleSheet("background: #2800ff00");
-        }
-        else
-        {
-            setStyleSheet("");
-        }
+            style = "background: #28ff0000";
+        if (v > 0)
+            style = "background: #2800ff00";
+        setStyleSheet(style);
         findChild<QLineEdit*>()->deselect();
     }
 };
@@ -102,6 +97,8 @@ private slots:
 
 private:
     Ui::FilterDialog *ui;
+    QTextEdit *textDescription;
+
     QCheckBox *biomecboxes[256];
     SpinExclude *tempsboxes[9];
     bool custom;
+74 −32		generator.c
+1 −1		generator.h
+5 −0		layers.c
+4 −3		layers.h
+15 −12		tests.c
+12 −0		util.c