Revert "feat: add toggle for quilt beacon"

This reverts commit 89aaedc06c.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

launcher/Application.cpp

@@ -9,7 +9,6 @@
  *  Copyright (C) 2022 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -580,9 +579,6 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("IgnoreJavaCompatibility", false);
         m_settings->registerSetting("IgnoreJavaWizard", false);
 
-        // Mod loader settings
-        m_settings->registerSetting("DisableQuiltBeacon", false);
-
         // Native library workarounds
         m_settings->registerSetting("UseNativeOpenAL", false);
         m_settings->registerSetting("CustomOpenALPath", "");

launcher/minecraft/MinecraftInstance.cpp

@@ -3,8 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
- *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>\
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
- *  Copyright (c) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -185,10 +184,6 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
         m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
 
-        // Mod loader specific options
-        auto modLoaderSettings = m_settings->registerSetting("OverrideModLoaderSettings", false);
-        m_settings->registerOverride(global_settings->getSetting("DisableQuiltBeacon"), modLoaderSettings);
-
         m_settings->set("InstanceType", "OneSix");
     }
 
@@ -434,12 +429,6 @@ QStringList MinecraftInstance::extraArguments()
         list.append("-javaagent:" + jar[0] + (agent->argument().isEmpty() ? "" : "=" + agent->argument()));
     }
 
-    {
-        const auto loaders = version->getModLoaders();
-        if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool())
-            list.append("-Dloader.disable_beacon=true");
-    }
-
     {
         QString openALPath;
         QString glfwPath;

launcher/ui/pages/global/MinecraftPage.cpp

@@ -2,7 +2,6 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
- *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -119,9 +118,6 @@ void MinecraftPage::applySettings()
     // Miscellaneous
     s->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked());
     s->set("QuitAfterGameStop", ui->quitAfterGameStopCheck->isChecked());
-
-    // Mod loader settings
-    s->set("DisableQuiltBeacon", ui->disableQuiltBeaconCheckBox->isChecked());
 }
 
 void MinecraftPage::loadSettings()
@@ -172,8 +168,6 @@ void MinecraftPage::loadSettings()
 
     ui->closeAfterLaunchCheck->setChecked(s->get("CloseAfterLaunch").toBool());
     ui->quitAfterGameStopCheck->setChecked(s->get("QuitAfterGameStop").toBool());
-
-    ui->disableQuiltBeaconCheckBox->setChecked(s->get("DisableQuiltBeacon").toBool());
 }
 
 void MinecraftPage::retranslate()

launcher/ui/pages/global/MinecraftPage.ui

@@ -190,22 +190,6 @@
        <string>Tweaks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_12">
-       <item>
-        <widget class="QGroupBox" name="modLoaderSettingsGroupBox">
-         <property name="title">
-          <string>Mod loader settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_13">
-          <item>
-           <widget class="QCheckBox" name="disableQuiltBeaconCheckBox">
-            <property name="text">
-             <string>Disable Quilt's Beacon</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="nativeLibWorkaroundGroupBox">
          <property name="title">

launcher/ui/pages/instance/InstanceSettingsPage.cpp

@@ -3,7 +3,6 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2023 seth <getchoo at tuta dot io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -254,14 +253,6 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("InstanceAccountId");
     }
 
-    bool overrideModLoaderSettings = ui->modLoaderSettingsGroupBox->isChecked();
-    m_settings->set("OverrideModLoaderSettings", overrideModLoaderSettings);
-    if (overrideModLoaderSettings) {
-        m_settings->set("DisableQuiltBeacon", ui->disableQuiltBeaconCheckBox->isChecked());
-    } else {
-        m_settings->reset("DisableQuiltBeacon");
-    }
-
     // FIXME: This should probably be called by a signal instead
     m_instance->updateRuntimeContext();
 }
@@ -365,10 +356,6 @@ void InstanceSettingsPage::loadSettings()
 
     ui->instanceAccountGroupBox->setChecked(m_settings->get("UseAccountForInstance").toBool());
     updateAccountsMenu();
-
-    // Mod loader specific settings
-    ui->modLoaderSettingsGroupBox->setChecked(m_settings->get("OverrideModLoaderSettings").toBool());
-    ui->disableQuiltBeaconCheckBox->setChecked(m_settings->get("DisableQuiltBeacon").toBool());
 }
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()

launcher/ui/pages/instance/InstanceSettingsPage.ui

@@ -583,28 +583,6 @@
        <string>Miscellaneous</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
-       <item>
-        <widget class="QGroupBox" name="modLoaderSettingsGroupBox">
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <property name="title">
-          <string>Mod loader settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="VerticalLayout_16">
-          <item>
-           <widget class="QCheckBox" name="disableQuiltBeaconCheckBox">
-            <property name="text">
-             <string>Disable Quilt's Beacon</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="gameTimeGroupBox">
          <property name="enabled">