mirror of
https://gitlab.bixilon.de/bixilon/minosoft.git
synced 2025-09-14 01:48:04 -04:00
fix microsoft account stay logged in, hud: title position fixes, bossbar center fixes
This commit is contained in:
parent
a03f63b874
commit
2efe05d61b
@ -25,8 +25,7 @@ import java.util.*
|
||||
class MicrosoftAccount(
|
||||
val uuid: UUID,
|
||||
username: String,
|
||||
@Json(name = "user_hash") private val userHash: String,
|
||||
@Json(name = "xsts_token") private val xstsToken: String,
|
||||
@Json(name = "authorization_token") private val authorizationToken: String,
|
||||
) : Account(username) {
|
||||
@Transient var accessToken: String? = null
|
||||
override val id: String = uuid.toString()
|
||||
@ -42,6 +41,9 @@ class MicrosoftAccount(
|
||||
if (accessToken != null) {
|
||||
return
|
||||
}
|
||||
val (xboxLiveToken, userHash) = MicrosoftOAuthUtils.getXboxLiveToken(authorizationToken)
|
||||
val xstsToken = MicrosoftOAuthUtils.getXSTSToken(xboxLiveToken)
|
||||
|
||||
accessToken = MicrosoftOAuthUtils.getMinecraftBearerAccessToken(userHash, xstsToken)
|
||||
}
|
||||
|
||||
@ -49,8 +51,7 @@ class MicrosoftAccount(
|
||||
return mapOf(
|
||||
"uuid" to uuid,
|
||||
"username" to username,
|
||||
"user_hash" to userHash,
|
||||
"xsts_token" to xstsToken,
|
||||
"authorization_token" to authorizationToken,
|
||||
"type" to type,
|
||||
)
|
||||
}
|
||||
|
@ -46,9 +46,10 @@ class BossbarElement(
|
||||
}
|
||||
|
||||
override fun forceRender(offset: Vec2i, z: Int, consumer: GUIVertexConsumer, options: GUIVertexOptions?): Int {
|
||||
val size = size
|
||||
val titleSize = titleElement.size
|
||||
titleElement.render(offset + Vec2i(HorizontalAlignments.CENTER.getOffset(size.x, titleSize.x), 0), z, consumer, options)
|
||||
progress.render(offset + Vec2i(0, titleSize.y), z, consumer, options)
|
||||
progress.render(offset + Vec2i(HorizontalAlignments.CENTER.getOffset(size.x, progress.size.x), titleSize.y), z, consumer, options)
|
||||
|
||||
return TextElement.LAYERS
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ class TitleHUDElement(hudRenderer: HUDRenderer) : LayoutedHUDElement<TitleElemen
|
||||
val scaledSize = hudRenderer.scaledSize
|
||||
|
||||
layoutOffset.x = (scaledSize.x - layout.size.x / 2) / 2
|
||||
layoutOffset.y = (scaledSize.y - layout.title.size.y) / 2
|
||||
layoutOffset.y = (scaledSize.y / 2 - layout.title.size.y)
|
||||
|
||||
return layoutOffset
|
||||
}
|
||||
|
@ -46,8 +46,7 @@ object MicrosoftOAuthUtils {
|
||||
val account = MicrosoftAccount(
|
||||
uuid = accountInfo.id.asUUID(),
|
||||
username = accountInfo.name,
|
||||
userHash = userHash,
|
||||
xstsToken = xstsToken,
|
||||
authorizationToken = authorizationToken,
|
||||
)
|
||||
|
||||
account.accessToken = accessToken
|
||||
|
Loading…
x
Reference in New Issue
Block a user