Skip to content

Commit

Permalink
Feature changes v2.3.0
Browse files Browse the repository at this point in the history
1) fixed broken system theme on linux since last version (#140)
2) fixed map artifacts at a large zoom (#135)
3) fixed UI freeze when using 48-bit block search with strongly restrictive conditions (#145)
4) fixed analysis of condition trigger not giving proper insight about its activation
5) changed area input to allow flipped coodinates (#133)
6) changed seed type indicator so it is hidden for number input (#149)
7) changed the default scale at which structures are visible so they show up on a coordinate reset (#112)
8) added customization option for the scale at which structures become visible
9) added map loading indicator
10) added "ignore reference" option to exclude the source instance in relative conditions
11) added match-any biome search for 1.17- (#130)
12) added NOT logic gate helper condition (#138)
13) added quick access to biome color editor and structure zoom to preferences dialog
  • Loading branch information
Cubitect committed Jul 29, 2022
1 parent 0dd82e6 commit 08bc6b4
Show file tree
Hide file tree
Showing 29 changed files with 1,178 additions and 667 deletions.
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,22 @@ Non-PC platforms, such as macOS, are not formally supported, but you can check [

Build instructions can be found in the [buildguide](buildguide.md).


## Primary Features Overview

The tool features a map viewer that outlines the biomes of the Overworld,
Nether and End dimensions, with a wide zoom range and with toggles for each
supported structure type. It is simple to cycle through a list of seeds or to
adjust the mincraft version on the fly.

The integrated seed finder is highly customizable using a hierarchical
condition system that allows the user to look for features that are relative to
one another. Conditions can be derived from a large selection of criteria among
structure placement, world spawn point and from the available biomes in an
area. Filters can use logic gates in the form of helper conditions for even
more control and Quad-Hut and Quad-Monument seed generators to quickly look for
seeds that include extremely rare structure constellations.




2 changes: 1 addition & 1 deletion cubiomes
Submodule cubiomes updated 4 files
+402 −244 finders.c
+50 −37 finders.h
+3 −2 util.c
+3 −0 util.h
21 changes: 12 additions & 9 deletions cubiomes-viewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ SOURCES += \
src/formgen48.cpp \
src/formsearchcontrol.cpp \
src/gotodialog.cpp \
src/mapview.cpp \
src/presetdialog.cpp \
src/protobasedialog.cpp \
src/quadlistdialog.cpp \
src/mapview.cpp \
src/quad.cpp \
src/quadlistdialog.cpp \
src/rangedialog.cpp \
src/rangeslider.cpp \
src/search.cpp \
src/searchthread.cpp \
src/structuredialog.cpp \
src/mainwindow.cpp \
src/main.cpp

Expand All @@ -68,25 +69,26 @@ HEADERS += \
src/collapsible.h \
src/conditiondialog.h \
src/configdialog.h \
src/cutil.h \
src/extgendialog.h \
src/exportdialog.h \
src/formconditions.h \
src/formgen48.h \
src/formsearchcontrol.h \
src/gotodialog.h \
src/mapview.h \
src/presetdialog.h \
src/protobasedialog.h \
src/quadlistdialog.h \
src/mapview.h \
src/quad.h \
src/cutil.h \
src/rangedialog.h \
src/rangeslider.h \
src/search.h \
src/searchthread.h \
src/seedtables.h \
src/mainwindow.h \
src/settings.h
src/settings.h \
src/structuredialog.h \
src/mainwindow.h

FORMS += \
src/aboutdialog.ui \
Expand All @@ -102,8 +104,9 @@ FORMS += \
src/presetdialog.ui \
src/protobasedialog.ui \
src/quadlistdialog.ui\
src/mainwindow.ui \
src/rangedialog.ui
src/rangedialog.ui \
src/structuredialog.ui \
src/mainwindow.ui


TRANSLATIONS += \
Expand All @@ -118,7 +121,7 @@ RESOURCES += \

# ----- translations -----

!without_translation: {
translations: {
# automatically run lupdate for pluralization default translation
THIS_FILE = cubiomes-viewer.pro
lupdate.input = THIS_FILE
Expand Down
4 changes: 2 additions & 2 deletions src/aboutdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <QString>

#define VERS_MAJOR 2
#define VERS_MINOR 2
#define VERS_PATCH 2 // negative patch number designates a development version
#define VERS_MINOR 3
#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)
Expand Down
12 changes: 8 additions & 4 deletions src/biomecolordialog.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "biomecolordialog.h"
#include "ui_biomecolordialog.h"
#include "mainwindow.h"

#include "cutil.h"

#include <QPixmap>
Expand Down Expand Up @@ -35,10 +35,9 @@ static QIcon getColorIcon(const QColor& col)
return QIcon(pixmap);
}

BiomeColorDialog::BiomeColorDialog(MainWindow *parent, QString initrc)
BiomeColorDialog::BiomeColorDialog(QWidget *parent, QString initrc)
: QDialog(parent)
, ui(new Ui::BiomeColorDialog)
, parent(parent)
, modified()
{
ui->setupUi(this);
Expand Down Expand Up @@ -170,6 +169,11 @@ int BiomeColorDialog::saveColormap(QString rc, QString desc)
return index;
}

QString BiomeColorDialog::getRc()
{
return activerc;
}

void BiomeColorDialog::setBiomeColor(int id, const QColor &col)
{
buttons[id]->setIcon(getColorIcon(col));
Expand Down Expand Up @@ -269,7 +273,7 @@ void BiomeColorDialog::on_buttonRemove_clicked()
void BiomeColorDialog::on_buttonOk_clicked()
{
on_comboColormaps_currentIndexChanged(ui->comboColormaps->currentIndex());
parent->setBiomeColorRc(activerc);
emit yieldBiomeColorRc(activerc);
accept();
}

Expand Down
9 changes: 5 additions & 4 deletions src/biomecolordialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ namespace Ui {
class BiomeColorDialog;
}

class MainWindow;

class BiomeColorDialog : public QDialog
{
Q_OBJECT

public:
explicit BiomeColorDialog(MainWindow *parent, QString initrc);
explicit BiomeColorDialog(QWidget *parent, QString initrc);
~BiomeColorDialog();

int saveColormap(QString rc, QString desc);
QString getRc();

signals:
void yieldBiomeColorRc(QString path);

public slots:
void setBiomeColor(int id, const QColor &col);
Expand All @@ -34,7 +36,6 @@ private slots:

private:
Ui::BiomeColorDialog *ui;
MainWindow *parent;
QPushButton *buttons[256];
unsigned char colors[256][3];
QString activerc;
Expand Down
Loading

0 comments on commit 08bc6b4

Please sign in to comment.