Adding ability to search for text seeds and random seeds

cubiomes-viewer.pro

@@ -20,6 +20,9 @@ greaterThan(QT_MAJOR_VERSION, 5) {
     DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00
 } else {
     QMAKE_CXXFLAGS += -std=gnu++11
+    equals(QMAKE_CXX, g++) {
+        QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    }
 }
 
 win32: {
@@ -54,10 +57,6 @@ static_gnu: {
     LIBS += -static -static-libgcc -static-libstdc++
 }
 
-gcc {
-    greaterThan(QMAKE_GCC_MAJOR_VERSION, 9): QMAKE_CXXFLAGS += -Wno-deprecated-copy
-}
-
 CONFIG(debug, debug|release): {
     CUTARGET = debug
 } else {

etc/com.github.cubitect.cubiomes-viewer.metainfo.xml

@@ -13,6 +13,15 @@
   </description>
 
   <releases>
+    <release version="4.1.2" date="2024-11-10">
+      <description>
+        <p>Changes:</p>
+        <ul>
+          <li>Renamed 1.21.3 to 1.21 WD and 1.21.2 to 1.21.3 to match the Winter Drop</li>
+          <li>Fixed the World Spawn for 1.21.2+</li>
+        </ul>
+      </description>
+    </release>
     <release version="4.1.0" date="2024-10-07">
       <description>
         <p>Changes:</p>

src/aboutdialog.h

@@ -6,7 +6,7 @@
 
 #define VERS_MAJOR 4
 #define VERS_MINOR 1
-#define VERS_PATCH 1   // negative patch number designates a development version
+#define VERS_PATCH 2   // 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)

src/conditiondialog.cpp

@@ -42,8 +42,7 @@ ConditionDialog::ConditionDialog(FormConditions *parent, MapView *mapview, Confi
     textDescription->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
     ui->collapseDescription->init(tr("Description/Notes"), textDescription, true);
 
-    const char *p_mcs = mc2str(wi.mc);
-    QString mcs = tr("MC %1", "Minecraft version").arg(p_mcs ? p_mcs : "?");
+    QString mcs = tr("MC %1", "Minecraft version").arg(mc2str(wi.mc));
     ui->labelMC->setText(mcs);
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
     ui->textEditLua->setTabStopWidth(txtWidth(ui->textEditLua->font(), "    "));

src/config.cpp

@@ -91,7 +91,7 @@ bool WorldInfo::read(const QString& line)
     if (sscanf(p, "#MC:       %8[^\n]", buf) == 1)
     {
         mc = str2mc(buf);
-        if (mc < 0)
+        if (mc == MC_UNDEF)
             mc = MC_DEFAULT;
         return true;
     }

src/config.h

@@ -15,7 +15,7 @@
 
 #define PRECOMPUTE48_BUFSIZ ((int64_t)1 << 30)
 
-enum { MC_DEFAULT = MC_1_21_2 };
+enum { MC_DEFAULT = MC_1_21_3 };
 
 struct ExtGenConfig
 {
@@ -223,7 +223,7 @@ struct Gen48Config
 };
 
 // search type options from combobox
-enum { SEARCH_INC = 0, SEARCH_BLOCKS = 1, SEARCH_LIST = 2, SEARCH_48ONLY = 3 };
+enum { SEARCH_INC = 0, SEARCH_BLOCKS = 1, SEARCH_LIST = 2, SEARCH_48ONLY = 3, SEARCH_TEXT = 4, SEARCH_RANDOM = 5 };
 
 struct SearchConfig
 {

src/formsearchcontrol.cpp

@@ -122,6 +122,8 @@ FormSearchControl::FormSearchControl(MainWindow *parent)
     ui->comboSearchType->addItem(tr("incremental"), SEARCH_INC);
     ui->comboSearchType->addItem(tr("48-bit only"), SEARCH_48ONLY);
     ui->comboSearchType->addItem(tr("48-bit family blocks"), SEARCH_BLOCKS);
+    ui->comboSearchType->addItem(tr("text seeds"), SEARCH_TEXT);
+    ui->comboSearchType->addItem(tr("random seeds"), SEARCH_RANDOM);
     ui->comboSearchType->addItem(tr("seed list from file..."), SEARCH_LIST);
 
     model = new SeedTableModel(ui->results);

src/mainwindow.cpp

@@ -361,7 +361,7 @@ bool MainWindow::getSeed(WorldInfo *wi, bool applyrand)
     bool ok = true;
     const std::string& mcs = ui->comboBoxMC->currentText().toStdString();
     wi->mc = str2mc(mcs.c_str());
-    if (wi->mc < 0)
+    if (wi->mc == MC_UNDEF)
     {
         if (applyrand)
             qDebug() << "Unknown MC version: " << mcs.c_str();
@@ -386,13 +386,6 @@ bool MainWindow::getSeed(WorldInfo *wi, bool applyrand)
 
 bool MainWindow::setSeed(WorldInfo wi, int dim)
 {
-    const char *mcstr = mc2str(wi.mc);
-    if (!mcstr)
-    {
-        qDebug() << "Unknown MC version: " << wi.mc;
-        return false;
-    }
-
     if (dim == DIM_OVERWORLD)
         dimactions[0]->setChecked(true);
     if (dim == DIM_NETHER)
@@ -440,7 +433,7 @@ bool MainWindow::setSeed(WorldInfo wi, int dim)
         ui->comboY->addItem(QString::number(wi.y));
     ui->comboY->setCurrentIndex(i);
 
-    ui->comboBoxMC->setCurrentText(mcstr);
+    ui->comboBoxMC->setCurrentText(mc2str(wi.mc));
     ui->seedEdit->setText(QString::asprintf("%" PRId64, (int64_t)wi.seed));
     getMapView()->setSeed(wi, dim, lopt);
 
@@ -703,12 +696,10 @@ void MainWindow::setMCList(bool experimental)
     {
         if (!experimental && mc != wi.mc)
         {
-            if (mc <= MC_1_0 || mc == MC_1_16_1 || mc == MC_1_19_2 || mc == MC_1_21_3)
+            if (mc <= MC_1_0 || mc == MC_1_16_1 || mc == MC_1_19_2 || mc == MC_1_21_1 || mc == MC_1_21_WD)
                 continue;
         }
-        const char *mcs = mc2str(mc);
-        if (mcs)
-            mclist.append(mcs);
+        mclist.append(mc2str(mc));
     }
     const QString s = mc2str(wi.mc);
     ui->comboBoxMC->setEnabled(false);

src/scripts.cpp

@@ -140,13 +140,7 @@ static int l_getStructures(lua_State *L)
         return 0;
     }
 
-    int dim = DIM_OVERWORLD;
-    if (sconf.properties & STRUCT_NETHER)
-        dim = DIM_NETHER;
-    else if (sconf.properties & STRUCT_END)
-        dim = DIM_END;
-
-    env->init4Dim(dim);
+    env->init4Dim(sconf.dim);
 
     if (styp == End_City)
     {

src/search.cpp

@@ -1735,10 +1735,10 @@ testCondAt(
         {
             for (int rx = rx1; rx <= rx2; rx++)
             {
-                if (cond->skipref && rx == at.x >> 4 && rz == at.z >> 4)
-                    continue;
                 if (isSlimeChunk(env->seed, rx, rz))
                 {
+                    if (cond->skipref && rx == at.x >> 4 && rz == at.z >> 4)
+                        continue;
                     if (cond->count == 0)
                     {
                         return COND_FAILED;

src/search.h

@@ -506,7 +506,7 @@ static const struct FilterList : private FilterInfo
         };
 
         list[F_CHAMBERS] = FilterInfo{
-            CAT_STRUCT, 1, LOC_RAD, Trial_Chambers, 1, BR_CLUST, MC_1_21, MC_NEWEST, 0, 0, disp++,
+            CAT_STRUCT, 1, LOC_RAD, Trial_Chambers, 1, BR_CLUST, MC_1_21_1, MC_NEWEST, 0, 0, disp++,
             "chambers",
             QT_TRANSLATE_NOOP("Filter", "Trial chambers"),
             ""

src/searchthread.cpp

@@ -542,6 +542,32 @@ void SearchMaster::preSearch()
             isdone = true;
     }
 
+
+    if (searchtype == SEARCH_TEXT)
+    {
+        smin = (int64_t)(-1LL << 31);
+        smax = (1LL << 31) - 1;
+        seed = sstart;
+        if (seed < smin)
+            seed = smin;
+        prog = seed - smin;
+        scnt = (smax + 1) * 2;
+        if ((int64_t)seed > (int64_t)smax)
+            isdone = true;
+    }
+
+    if (searchtype == SEARCH_RANDOM)
+    {
+        smax = MASK48;
+        seed = sstart = 0;
+        if (seed < smin)
+            seed = smin;
+        prog = seed - smin;
+        scnt = smax - smin;
+        if (seed > smax)
+            isdone = true;
+    }
+
     if (searchtype == SEARCH_BLOCKS)
     {
         if (!slist.empty())
@@ -844,6 +870,21 @@ bool SearchMaster::requestItem(SearchWorker *item)
             isdone = true;
     }
 
+    if (searchtype == SEARCH_TEXT)
+    {
+        seed += itemsize;
+        if ((int64_t)seed > (int64_t)smax)
+            isdone = true;
+    }
+
+
+    if (searchtype == SEARCH_RANDOM)
+    {
+        seed += itemsize;
+        if (seed > smax)
+            isdone = true;
+    }
+
     if (searchtype == SEARCH_BLOCKS)
     {
         if (!slist.empty())
@@ -1056,6 +1097,53 @@ void SearchWorker::run()
         }
         break;
 
+    case SEARCH_TEXT:
+        while (!*env.stop && getNextItem())
+        {
+            seed = sstart;
+            for (int i = 0; i < scnt; i++)
+            {
+                env.setSeed(seed);
+                if (testTreeAt(origin, &env, PASS_FULL_64, nullptr) == COND_OK)
+                {
+                    if (!*env.stop)
+                        emit result(seed);
+                }
+
+                if (seed == (1LL << 31) - 1)
+                {   // done
+                    break;
+                }
+                seed++;
+            }
+        }
+        break;
+
+    case SEARCH_RANDOM:
+        uint64_t rng;
+        while (!*env.stop && getNextItem())
+        {
+            seed = sstart;
+            for (uint64_t i = 0; i < (uint64_t) scnt; i++)
+            {
+                setSeed(&rng, seed);
+                rng = nextLong(&rng);
+                env.setSeed(rng);
+                if (testTreeAt(origin, &env, PASS_FULL_64, nullptr) == COND_OK)
+                {
+                    if (!*env.stop)
+                        emit result(rng);
+                }
+
+                if (seed >= MASK48)
+                {   // done
+                    break;
+                }
+                seed++;
+            }
+        }
+        break;
+
     case SEARCH_BLOCKS:
         while (!*env.stop && getNextItem())
         {   // seed = ([..] << 48) | low

src/tabstructures.cpp

@@ -67,15 +67,10 @@ void AnalysisStructures::runStructs(Generator *g)
         if (!getStructureConfig_override(stype, wi.mc, &sconf))
             continue;
 
-        int sdim = DIM_OVERWORLD;
-        if (sconf.properties & STRUCT_NETHER)
-            sdim = DIM_NETHER;
-        if (sconf.properties & STRUCT_END)
-            sdim = DIM_END;
-        if (dim != DIM_UNDEF && dim != sdim)
+        if (dim != DIM_UNDEF && dim != sconf.dim)
             continue;
 
-        getStructs(&st, sconf, wi, sdim, area.x1, area.z1, area.x2, area.z2);
+        getStructs(&st, sconf, wi, sconf.dim, area.x1, area.z1, area.x2, area.z2);
         if (st.empty())
             continue;
 
@@ -94,7 +89,7 @@ void AnalysisStructures::runStructs(Generator *g)
             item->setData(C_X, Qt::DisplayRole, QVariant::fromValue(vp.p.x));
             item->setData(C_Z, Qt::DisplayRole, QVariant::fromValue(vp.p.z));
             item->setData(0, Qt::UserRole+0, QVariant::fromValue(wi.seed));
-            item->setData(0, Qt::UserRole+1, QVariant::fromValue(sdim));
+            item->setData(0, Qt::UserRole+1, QVariant::fromValue(sconf.dim));
             item->setData(0, Qt::UserRole+2, QVariant::fromValue(vp.p));
             QStringList sinfo = vp.detail();
             if (!sinfo.empty())