fix: Adjust modpack creator workflow to compare with baseline

Signed-off-by: FreesmModders <freesmmodders@users.noreply.github.com>

Author: FreesmModders

launcher/CMakeLists.txt

@@ -1639,8 +1639,8 @@ if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
     target_compile_options(Launcher_logic PRIVATE /wd4100) # C4100 - unused parameter
     target_compile_options(${Launcher_Name} PRIVATE /wd4100) # C4100 - unused parameter
 else()
-    target_compile_options(Launcher_logic PRIVATE -Wno-unused-parameter -Wno-missing-field-initializers)
-    target_compile_options(${Launcher_Name} PRIVATE -Wno-unused-parameter -Wno-missing-field-initializers)
+    target_compile_options(Launcher_logic PRIVATE -Wno-unused-parameter -Wno-missing-field-initializers -Wno-error=sfinae-incomplete)
+    target_compile_options(${Launcher_Name} PRIVATE -Wno-unused-parameter -Wno-missing-field-initializers -Wno-error=sfinae-incomplete)
 endif()
 
 #### The bundle mess! ####

launcher/InstancePageProvider.h

@@ -1,11 +1,11 @@
 #pragma once
+#include "ui/pages/instance/InstanceSettingsPage.h"
+#include "ui/pages/instance/LogPage.h"
 #include <FileSystem.h>
 #include <ui/pages/instance/DataPackPage.h>
 #include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
 #include "ui/pages/BasePageProvider.h"
-#include "ui/pages/instance/InstanceSettingsPage.h"
-#include "ui/pages/instance/LogPage.h"
 #include "ui/pages/instance/ManagedPackPage.h"
 #include "ui/pages/instance/ModFolderPage.h"
 #include "ui/pages/instance/ModpackCreatorPage.h"

launcher/minecraft/mod/ModpackChangelogGenerator.cpp

@@ -378,24 +378,24 @@ ModpackChangelog ModpackChangelogGenerator::generateChangelog()
         previousSnapshot = history.last();
     }
 
-    // Create the new snapshot
-    auto newSnapshot = createSnapshot();
+    // Create a snapshot of the current state but DO NOT save it
+    int nextVersion = previousSnapshot.versionNumber + 1;
+    auto currentSnapshot = buildSnapshotFromCurrentMods(nextVersion);
 
-    // If there was no previous snapshot, return an empty changelog
+    // If there was no previous snapshot, return all mods as added
     if (previousSnapshot.versionNumber == 0) {
         ModpackChangelog changelog;
         changelog.fromVersion = 0;
-        changelog.toVersion = newSnapshot.versionNumber;
-        // First snapshot — treat all mods as "added"
-        for (const auto& mod : newSnapshot.mods) {
+        changelog.toVersion = currentSnapshot.versionNumber;
+        for (const auto& mod : currentSnapshot.mods) {
             ChangelogEntry entry;
             entry.modName = mod.name;
             changelog.addedMods.append(entry);
         }
         return changelog;
     }
 
-    return compareSnapshots(previousSnapshot, newSnapshot);
+    return compareSnapshots(previousSnapshot, currentSnapshot);
 }
 
 QList<ModpackVersionSnapshot> ModpackChangelogGenerator::getVersionHistory() const

launcher/ui/pages/instance/ModpackCreatorPage.cpp

@@ -25,6 +25,7 @@
 #include <QTimer>
 
 #include "minecraft/mod/ModpackChangelogGenerator.h"
+#include "minecraft/MinecraftInstance.h"
 
 ModpackCreatorPage::ModpackCreatorPage(MinecraftInstance* inst, QWidget* parent)
     : QWidget(parent), ui(new Ui::ModpackCreatorPage), m_inst(inst)
@@ -33,7 +34,6 @@ ModpackCreatorPage::ModpackCreatorPage(MinecraftInstance* inst, QWidget* parent)
 
     // Load existing metadata
     auto* settings = m_inst->settings();
-    bool isModpack = settings->get("ModpackCreatorEnabled").toBool();
     QString modpackName = settings->get("ModpackCreatorName").toString();
     QString modpackAuthor = settings->get("ModpackCreatorAuthor").toString();
 
@@ -85,6 +85,15 @@ void ModpackCreatorPage::on_markAsModpackBtn_clicked()
     updateUI();
 }
 
+void ModpackCreatorPage::on_markAsOldVersionBtn_clicked()
+{
+    ModpackChangelogGenerator generator(m_inst);
+    generator.createSnapshot();
+    
+    // Auto-generate the changelog immediately after taking the snapshot to show it
+    on_generateChangelogBtn_clicked();
+}
+
 void ModpackCreatorPage::on_generateChangelogBtn_clicked()
 {
     ModpackChangelogGenerator generator(m_inst);
@@ -167,7 +176,7 @@ void ModpackCreatorPage::refreshVersionInfo()
     int snapshotCount = generator.getSnapshotCount();
 
     if (snapshotCount == 0) {
-        ui->versionInfoLabel->setText(tr("No snapshots yet. Click \"Generate Changelog\" to create the first one."));
+        ui->versionInfoLabel->setText(tr("No snapshots yet. Click \"Mark as Old Version\" to create the baseline."));
     } else {
         auto latest = generator.getLatestSnapshot();
         ui->versionInfoLabel->setText(

launcher/ui/pages/instance/ModpackCreatorPage.h

@@ -20,9 +20,11 @@
 
 #include <QWidget>
 
-#include "minecraft/MinecraftInstance.h"
+#include "BaseInstance.h"
 #include "ui/pages/BasePage.h"
 
+class MinecraftInstance;
+
 namespace Ui {
 class ModpackCreatorPage;
 }
@@ -52,6 +54,7 @@ class ModpackCreatorPage : public QWidget, public BasePage {
 
    private slots:
     void on_markAsModpackBtn_clicked();
+    void on_markAsOldVersionBtn_clicked();
     void on_generateChangelogBtn_clicked();
     void on_copyChangelogBtn_clicked();
     void on_clearHistoryBtn_clicked();

launcher/ui/pages/instance/ModpackCreatorPage.ui

@@ -102,13 +102,26 @@
       <!-- Buttons row -->
       <item>
        <layout class="QHBoxLayout" name="changelogButtonsLayout">
+        <item>
+         <widget class="QPushButton" name="markAsOldVersionBtn">
+          <property name="text">
+           <string>Mark as Old Version</string>
+          </property>
+          <property name="toolTip">
+           <string>Save the current mod list as the baseline to compare against later</string>
+          </property>
+          <property name="minimumHeight">
+           <number>32</number>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="generateChangelogBtn">
           <property name="text">
            <string>Generate Changelog</string>
           </property>
           <property name="toolTip">
-           <string>Create a new version snapshot and compare with the previous one to generate a changelog</string>
+           <string>Compare the current mods with the latest saved old version</string>
           </property>
           <property name="minimumHeight">
            <number>32</number>