diff options
Diffstat (limited to 'src/main/kotlin/apis')
| -rw-r--r-- | src/main/kotlin/apis/Profiles.kt | 6 | ||||
| -rw-r--r-- | src/main/kotlin/apis/UrsaManager.kt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/kotlin/apis/Profiles.kt b/src/main/kotlin/apis/Profiles.kt index ec4a6e4..f36fbb2 100644 --- a/src/main/kotlin/apis/Profiles.kt +++ b/src/main/kotlin/apis/Profiles.kt @@ -12,8 +12,8 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers import kotlin.reflect.KProperty1 -import net.minecraft.util.DyeColor -import net.minecraft.util.Formatting +import net.minecraft.world.item.DyeColor +import net.minecraft.ChatFormatting import moe.nea.firmament.repo.RepoManager import moe.nea.firmament.util.LegacyFormattingCode import moe.nea.firmament.util.SkyblockId @@ -182,7 +182,7 @@ data class PlayerData( fun getDisplayName(name: String = playerName) = rankData?.let { ("§${it.color}[${it.tag}${rankPlusDyeColor.modern}" + "${it.plus ?: ""}§${it.color}] $name") - } ?: "${Formatting.GRAY}$name" + } ?: "${ChatFormatting.GRAY}$name" } diff --git a/src/main/kotlin/apis/UrsaManager.kt b/src/main/kotlin/apis/UrsaManager.kt index e5d519e..31ac36b 100644 --- a/src/main/kotlin/apis/UrsaManager.kt +++ b/src/main/kotlin/apis/UrsaManager.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.withContext import kotlinx.serialization.DeserializationStrategy import kotlin.jvm.optionals.getOrNull -import net.minecraft.client.MinecraftClient +import net.minecraft.client.Minecraft import moe.nea.firmament.Firmament import moe.nea.firmament.util.net.HttpUtil @@ -46,10 +46,10 @@ object UrsaManager { val request = HttpUtil.request(url) if (token == null) { withContext(Dispatchers.IO) { - val mc = MinecraftClient.getInstance() + val mc = Minecraft.getInstance() val serverId = UUID.randomUUID().toString() - mc.apiServices.sessionService.joinServer(mc.session.uuidOrNull, mc.session.accessToken, serverId) - request.header("x-ursa-username", mc.session.username) + mc.services().sessionService.joinServer(mc.user.profileId, mc.user.accessToken, serverId) + request.header("x-ursa-username", mc.user.name) request.header("x-ursa-serverid", serverId) } } else { |