diff --git a/README.md b/README.md index 4e7dfb162..a2e197dc1 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ Fjord Launcher is a **fork** of Prism Launcher. It is **not** endorsed by or aff - [Support for alternative auth servers](doc/alternative-auth-servers.md) -- Offline mode doesn't require a Microsoft account - - Ability to download FTB modpacks from within the launcher ## Having a problem with the launcher? diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index b974572d1..39e993db3 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -137,15 +137,6 @@ void AccountListPage::listChanged() updateButtonStates(); } -void AccountListPage::showLegalNotice() -{ - QMessageBox::warning(this, tr("Notice"), - tr("Depending on the laws in your area, accessing Minecraft may require purchasing the game from Mojang." - "

" - "In order to limit dependence on nonfree network services, this Minecraft Launcher does not include DRM, " - "but its developers do not condone the violation of any law. ")); -} - void AccountListPage::on_actionAddMojang_triggered() { MinecraftAccountPtr account = @@ -162,7 +153,12 @@ void AccountListPage::on_actionAddMojang_triggered() void AccountListPage::on_actionAddAuthlibInjector_triggered() { if (m_accounts->count() == 0) { - showLegalNotice(); + QMessageBox::warning(this, tr("Error"), + tr("You must add a Microsoft or Mojang account that owns Minecraft before you can add an account on a custom " + "authentication server." + "

" + "If you have lost your account you can contact Microsoft for support.")); + return; } MinecraftAccountPtr account = AuthlibInjectorLoginDialog::newAccount( @@ -197,7 +193,11 @@ void AccountListPage::on_actionAddMicrosoft_triggered() void AccountListPage::on_actionAddOffline_triggered() { if (m_accounts->count() == 0) { - showLegalNotice(); + QMessageBox::warning(this, tr("Error"), + tr("You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account." + "

" + "If you have lost your account you can contact Microsoft for support.")); + return; } MinecraftAccountPtr account = diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h index 344b1d144..4166257c2 100644 --- a/launcher/ui/pages/global/AccountListPage.h +++ b/launcher/ui/pages/global/AccountListPage.h @@ -90,7 +90,6 @@ class AccountListPage : public QMainWindow, public BasePage { void ShowContextMenu(const QPoint& pos); private: - void showLegalNotice(); void changeEvent(QEvent* event) override; QMenu* createPopupMenu() override; shared_qobject_ptr m_accounts;