NOISSUE no means no, #2

Tweak GenericName for Linux desktop entry

CMakeLists.txt

@@ -46,7 +46,7 @@ set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetc
 ######## Set version numbers ########
 set(MultiMC_VERSION_MAJOR    0)
 set(MultiMC_VERSION_MINOR    6)
-set(MultiMC_VERSION_HOTFIX   8)
+set(MultiMC_VERSION_HOTFIX   10)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -88,7 +88,6 @@ find_package(Qt5Concurrent REQUIRED)
 find_package(Qt5Network REQUIRED)
 find_package(Qt5Test REQUIRED)
 find_package(Qt5Xml REQUIRED)
-find_package(Qt5Multimedia REQUIRED)
 
 # The Qt5 cmake files don't provide its install paths, so ask qmake.
 include(QMakeQuery)

api/logic/minecraft/OneSixVersionFormat.cpp

@@ -151,6 +151,10 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
             QJsonObject libObj = requireObject(libVal);
             // parse the library
             auto lib = libraryFromJson(libObj, filename);
+            if(lib->rawName().artifactId() == "ForgeWrapper") {
+                out->mainClass.clear();
+                out->addProblem(ProblemSeverity::Error, QObject::tr("Forge workarounds have no place in MultiMC."));
+            }
             out->libraries.append(lib);
         }
     };

application/CMakeLists.txt

@@ -297,7 +297,7 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
 
 # Add executable
 add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS})
-target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics Qt5::Multimedia)
+target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics)
 if(DEFINED MultiMC_APP_BINARY_NAME)
     set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}")
 endif()

application/MainWindow.cpp

@@ -1285,7 +1285,7 @@ void MainWindow::downloadUpdates(GoUpdate::Status status)
 
 void MainWindow::onCatToggled(bool state)
 {
-    setCatBackground(state, false);
+    setCatBackground(state);
     MMC->settings()->set("TheCat", state);
 }
 
@@ -1299,9 +1299,8 @@ T non_stupid_abs(T in)
 }
 }
 
-void MainWindow::setCatBackground(bool enabled, bool initial)
+void MainWindow::setCatBackground(bool enabled)
 {
-    static int currentMeow = 0;
     if (enabled)
     {
         QDateTime now = QDateTime::currentDateTime();
@@ -1318,28 +1317,9 @@ GroupView
     background-repeat: none;
     background-color:palette(base);
 })").arg(cat));
-        if(!initial) {
-            const char * sounds[] = {
-                "/home/peterix/meows/Fiona52fixed.wav",
-                "/home/peterix/meows/Fiona72.wav",
-                "/home/peterix/meows/Fiona76.wav",
-                "/home/peterix/meows/Fiona81.wav",
-                "/home/peterix/meows/Fiona85.wav"
-            };
-            qDebug() << "PLAY MEOW" << currentMeow;
-            meow.setSource(QUrl::fromLocalFile(sounds[currentMeow]));
-            meow.setLoopCount(1);
-            meow.play();
-            int newMeow = qrand() % 4;
-            if(newMeow == currentMeow) {
-                newMeow++;
-            }
-            currentMeow = newMeow;
-        }
     }
     else
     {
-        meow.stop();
         view->setStyleSheet(QString());
     }
 }

application/MainWindow.h

@@ -20,7 +20,6 @@
 #include <QMainWindow>
 #include <QProcess>
 #include <QTimer>
-#include <QtMultimedia/QSoundEffect>
 
 #include "BaseInstance.h"
 #include "minecraft/auth/MojangAccount.h"
@@ -58,6 +57,8 @@ public:
     void checkInstancePathForProblems();
 
     void updatesAllowedChanged(bool allowed);
+
+    void droppedURLs(QList<QUrl> urls);
 signals:
     void isClosing();
 
@@ -181,8 +182,6 @@ private slots:
      */
     void downloadUpdates(GoUpdate::Status status);
 
-    void droppedURLs(QList<QUrl> urls);
-
     void konamiTriggered();
 
     void globalSettingsClosed();
@@ -190,7 +189,7 @@ private slots:
 private:
     void addInstance(QString url = QString());
     void activateInstance(InstancePtr instance);
-    void setCatBackground(bool enabled, bool initial = true);
+    void setCatBackground(bool enabled);
     void updateInstanceToolIcon(QString new_icon);
     void setSelectedInstanceById(const QString &id);
 
@@ -201,8 +200,6 @@ private:
 private:
     std::unique_ptr<Ui> ui;
 
-    QSoundEffect meow;
-
     // these are managed by Qt's memory management model!
     GroupView *view = nullptr;
     InstanceProxyModel *proxymodel = nullptr;

application/MultiMC.cpp

@@ -34,6 +34,7 @@
 #include <QNetworkAccessManager>
 #include <QTranslator>
 #include <QLibraryInfo>
+#include <QList>
 #include <QStringList>
 #include <QDebug>
 #include <QStyleFactory>
@@ -173,6 +174,10 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
         // --alive
         parser.addSwitch("alive");
         parser.addDocumentation("alive", "Write a small '" + liveCheckFile + "' file after MultiMC starts");
+        // --import
+        parser.addOption("import");
+        parser.addShortOpt("import", 'I');
+        parser.addDocumentation("import", "Import instance from specified zip (local path or URL)");
 
         // parse the arguments
         try
@@ -207,6 +212,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
     }
     m_instanceIdToLaunch = args["launch"].toString();
     m_liveCheck = args["alive"].toBool();
+    m_zipToImport = args["import"].toUrl();
 
     QString origcwdPath = QDir::currentPath();
     QString binPath = applicationDirPath();
@@ -278,13 +284,20 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
         connect(m_peerInstance, &LocalPeer::messageReceived, this, &MultiMC::messageReceived);
         if(m_peerInstance->isClient())
         {
+            int timeout = 2000;
+
             if(m_instanceIdToLaunch.isEmpty())
             {
-                m_peerInstance->sendMessage("activate", 2000);
+                m_peerInstance->sendMessage("activate", timeout);
+
+                if(!m_zipToImport.isEmpty())
+                {
+                    m_peerInstance->sendMessage("import " + m_zipToImport.toString(), timeout);
+                }
             }
             else
             {
-                m_peerInstance->sendMessage(m_instanceIdToLaunch, 2000);
+                m_peerInstance->sendMessage("launch " + m_instanceIdToLaunch, timeout);
             }
             m_status = MultiMC::Succeeded;
             return;
@@ -812,6 +825,11 @@ void MultiMC::performMainStartupAction()
         showMainWindow(false);
         qDebug() << "<> Main window shown.";
     }
+    if(!m_zipToImport.isEmpty())
+    {
+        qDebug() << "<> Importing instance from zip:" << m_zipToImport;
+        m_mainWindow->droppedURLs({ m_zipToImport });
+    }
 }
 
 void MultiMC::showFatalErrorMessage(const QString& title, const QString& content)
@@ -848,18 +866,40 @@ void MultiMC::messageReceived(const QString& message)
         qDebug() << "Received message" << message << "while still initializing. It will be ignored.";
         return;
     }
-    if(message == "activate")
+
+    QStringList args = message.split(' ');
+    QString command = args.takeFirst();
+
+    if(command == "activate")
     {
         showMainWindow();
     }
-    else
+    else if(command == "import")
     {
-        auto inst = instances()->getInstanceById(message);
+        if(args.isEmpty())
+        {
+            qWarning() << "Received" << command << "message without a zip path/URL.";
+            return;
+        }
+        m_mainWindow->droppedURLs({ QUrl(args.takeFirst()) });
+    }
+    else if(command == "launch")
+    {
+        if(args.isEmpty())
+        {
+            qWarning() << "Received" << command << "message without an instance ID.";
+            return;
+        }
+        auto inst = instances()->getInstanceById(args.takeFirst());
         if(inst)
         {
             launch(inst, true, nullptr);
         }
     }
+    else
+    {
+        qWarning() << "Received invalid message" << message;
+    }
 }
 
 void MultiMC::analyticsSettingChanged(const Setting&, QVariant value)

application/MultiMC.h

@@ -6,6 +6,7 @@
 #include <QFlag>
 #include <QIcon>
 #include <QDateTime>
+#include <QUrl>
 #include <updater/GoUpdate.h>
 
 #include <BaseInstance.h>
@@ -221,5 +222,6 @@ private:
 public:
     QString m_instanceIdToLaunch;
     bool m_liveCheck = false;
+    QUrl m_zipToImport;
     std::unique_ptr<QFile> logFile;
 };

application/package/linux/multimc.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=MultiMC
-GenericName=MultiMC
+GenericName=Minecraft Launcher
 Comment=Free, open source launcher and instance manager for Minecraft.
 Type=Application
 Terminal=false

changelog.md

@@ -42,7 +42,7 @@ MultiMC also migrated to a new continuous deployment system, which makes everyth
 
 - GH-2787: "Download All" button works again.
 
-- When dependencies are customized, the la ncher will not try to update them in an infinite loop when something else requires a different version.
+- When a component is customized, the launcher will not try to update it in an infinite loop when something else requires a different version.
 
 # Previous releases