Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0 (Imcomplete) list of changes in 8.0 relevant to PollyMC: - Prism has dropped support for Mojang accounts - https://github.com/PrismLauncher/PrismLauncher/pull/1656 - Added it back to PollyMC primarily since the Mojang authentication code is also used for authlib-injector accounts. Some users may also still want to be able to log in to Mojang accounts for some reason: https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658, even if they do not provide authentication to multiplayer servers. - To my surprise, I could still log in to a Mojang account, get its skin, and launch the game. Authentication to servers, of course, did not work. - Tested: logging into authlib-injector, Mojang, and MSA accounts and launching the game. - Prism has added a built-in updater for Windows and Linux that I assume provides similar functionality to Sparkle on macOS: https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies the repo checked by the updater. I have changed this to the PollyMC repository, and since PollyMC follows almost the same CI/release patterns as Prism Launcher, it might work with PollyMC, too, but I have not tested it yet. - Add macOS support to Nix - https://github.com/PrismLauncher/PrismLauncher/pull/1485 - Untested - The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts. - Removed Windows MSVC Legacy builds - Removed Quilt Beacon toggle, the beacon is now always disabled: https://github.com/PrismLauncher/PrismLauncher/pull/1547, https://github.com/PrismLauncher/meta/pull/23 - Prism removed FTB support in 7.0, but I tested creating an FTB instance to make sure it still works in 8.0 Signed-off-by: Evan Goode <mail@evangoo.de>
135 lines
4.0 KiB
C
135 lines
4.0 KiB
C
// SPDX-License-Identifier: GPL-3.0-only
|
|
/*
|
|
* Prism Launcher - Minecraft Launcher
|
|
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
|
*
|
|
* 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
|
|
* the Free Software Foundation, version 3.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
* This file incorporates work covered by the following copyright and
|
|
* permission notice:
|
|
*
|
|
* Copyright 2013-2021 MultiMC Contributors
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
#include <katabasis/Bits.h>
|
|
#include <QByteArray>
|
|
#include <QJsonObject>
|
|
#include <QString>
|
|
#include <QVector>
|
|
|
|
struct Skin {
|
|
QString id;
|
|
QString url;
|
|
QString variant;
|
|
|
|
QByteArray data;
|
|
};
|
|
|
|
struct Cape {
|
|
QString id;
|
|
QString url;
|
|
QString alias;
|
|
|
|
QByteArray data;
|
|
};
|
|
|
|
struct MinecraftEntitlement {
|
|
bool ownsMinecraft = false;
|
|
bool canPlayMinecraft = false;
|
|
Katabasis::Validity validity = Katabasis::Validity::None;
|
|
};
|
|
|
|
struct MinecraftProfile {
|
|
QString id;
|
|
QString name;
|
|
Skin skin;
|
|
QString currentCape;
|
|
QMap<QString, Cape> capes;
|
|
Katabasis::Validity validity = Katabasis::Validity::None;
|
|
};
|
|
|
|
enum class AccountType { MSA, Mojang, AuthlibInjector, Offline };
|
|
|
|
enum class AccountState { Unchecked, Offline, Working, Online, Disabled, Errored, Expired, Gone };
|
|
|
|
struct AccountData {
|
|
QJsonObject saveState() const;
|
|
bool resumeStateFromV3(QJsonObject data);
|
|
|
|
bool usesCustomApiServers() const;
|
|
QString authServerUrl() const;
|
|
QString accountServerUrl() const;
|
|
QString sessionServerUrl() const;
|
|
QString servicesServerUrl() const;
|
|
|
|
//! userName for Mojang accounts, gamertag for MSA
|
|
QString accountDisplayString() const;
|
|
|
|
//! Only valid for Mojang accounts. MSA does not preserve this information
|
|
QString userName() const;
|
|
|
|
//! Only valid for Mojang accounts.
|
|
QString clientToken() const;
|
|
void setClientToken(QString clientToken);
|
|
void invalidateClientToken();
|
|
void generateClientTokenIfMissing();
|
|
|
|
//! Yggdrasil access token, as passed to the game.
|
|
QString accessToken() const;
|
|
|
|
QString profileId() const;
|
|
QString profileName() const;
|
|
|
|
QString lastError() const;
|
|
|
|
AccountType type = AccountType::MSA;
|
|
bool legacy = false;
|
|
bool canMigrateToMSA = false;
|
|
|
|
QString customAuthServerUrl;
|
|
QString customAccountServerUrl;
|
|
QString customSessionServerUrl;
|
|
QString customServicesServerUrl;
|
|
QString authlibInjectorUrl;
|
|
QString authlibInjectorMetadata;
|
|
|
|
QString msaClientID;
|
|
Katabasis::Token msaToken;
|
|
Katabasis::Token userToken;
|
|
Katabasis::Token xboxApiToken;
|
|
Katabasis::Token mojangservicesToken;
|
|
|
|
Katabasis::Token yggdrasilToken;
|
|
MinecraftProfile minecraftProfile;
|
|
MinecraftEntitlement minecraftEntitlement;
|
|
Katabasis::Validity validity_ = Katabasis::Validity::None;
|
|
|
|
// runtime only information (not saved with the account)
|
|
QString internalId;
|
|
QString errorString;
|
|
AccountState accountState = AccountState::Unchecked;
|
|
};
|