AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 10:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

account util: MinecraftNotPurchasedError

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-29 12:16:16 +01:00
parent 3adc8d919e
commit 978c2f06ad
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/util/account/AccountUtil.kt
View File

@ -15,6 +15,7 @@ package de.bixilon.minosoft.util.account
import de.bixilon.kutil.uuid.UUIDUtil.trim import de.bixilon.kutil.uuid.UUIDUtil.trim
import de.bixilon.minosoft.util.account.microsoft.minecraft.MinecraftAPIException import de.bixilon.minosoft.util.account.microsoft.minecraft.MinecraftAPIException
import de.bixilon.minosoft.util.account.microsoft.minecraft.MinecraftNotPurchasedError
import de.bixilon.minosoft.util.account.microsoft.minecraft.MinecraftProfile import de.bixilon.minosoft.util.account.microsoft.minecraft.MinecraftProfile
import de.bixilon.minosoft.util.account.minecraft.MinecraftPrivateKey import de.bixilon.minosoft.util.account.minecraft.MinecraftPrivateKey
import de.bixilon.minosoft.util.account.minecraft.MinecraftTokens import de.bixilon.minosoft.util.account.minecraft.MinecraftTokens
@ -36,11 +37,11 @@ object AccountUtil {
"Authorization" to "Bearer ${token.accessToken}", "Authorization" to "Bearer ${token.accessToken}",
)) ))
if (response.statusCode != 200) { when (response.statusCode) {
throw MinecraftAPIException(response) // 404 means that the account has not purchased minecraft 404 -> throw MinecraftNotPurchasedError()
200 -> return Jackson.MAPPER.convertValue(response.body, MinecraftProfile::class.java)
else -> throw MinecraftAPIException(response)
} }
return Jackson.MAPPER.convertValue(response.body, MinecraftProfile::class.java)
} }
fun joinMojangServer(accessToken: String, profile: UUID, serverId: String) { fun joinMojangServer(accessToken: String, profile: UUID, serverId: String) {

16
src/main/java/de/bixilon/minosoft/util/account/microsoft/minecraft/MinecraftNotPurchasedError.kt Normal file
View File

@ -0,0 +1,16 @@
/*
* Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger
*
* 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, either version 3 of the License, or (at your option) any later version.
*
* 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 software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.util.account.microsoft.minecraft
class MinecraftNotPurchasedError : Exception("This microsoft account must have minecraft java edition purchased!")