From 8130cb8ede8c7ad8f8e16cfed8efc8a7308fe24c Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sat, 17 Apr 2021 09:09:27 -0300 Subject: [PATCH] fix deprecated/experimental warn --- build.gradle.kts | 1 + src/main/kotlin/com/viaversion/aas/Util.kt | 1 + .../kotlin/com/viaversion/aas/handler/state/HandshakeState.kt | 2 +- .../com/viaversion/aas/provider/AspirinVersionProvider.kt | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 06b91c8..2ce4bd2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ version = "0.2.2-SNAPSHOT+" + try { extra.set("archivesBaseName", "VIAaaS") repositories { + //mavenLocal() mavenCentral() maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://repo.viaversion.com/") diff --git a/src/main/kotlin/com/viaversion/aas/Util.kt b/src/main/kotlin/com/viaversion/aas/Util.kt index 4fdadcd..b1673f5 100644 --- a/src/main/kotlin/com/viaversion/aas/Util.kt +++ b/src/main/kotlin/com/viaversion/aas/Util.kt @@ -72,6 +72,7 @@ fun mcCfb8(key: ByteArray, mode: Int): Cipher { } // https://github.com/VelocityPowered/Velocity/blob/6467335f74a7d1617512a55cc9acef5e109b51ac/api/src/main/java/com/velocitypowered/api/util/UuidUtils.java +@OptIn(ExperimentalUnsignedTypes::class) fun parseUndashedId(string: String): UUID { Preconditions.checkArgument(string.length == 32, "Length is incorrect") return UUID( diff --git a/src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt b/src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt index 150864c..9ec42d0 100644 --- a/src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt +++ b/src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt @@ -42,7 +42,7 @@ class HandshakeState : MinecraftConnectionState { throw StacklessException("Rate-limited") } val virtualPort = packet.port - val extraData = packet.address.substringAfter(0.toChar(), missingDelimiterValue = "") // todo + val extraData = packet.address.substringAfter(0.toChar(), missingDelimiterValue = "").ifEmpty { null } // todo val virtualHostNoExtra = packet.address.substringBefore(0.toChar()) val parsed = VIAaaSConfig.hostName.map { diff --git a/src/main/kotlin/com/viaversion/aas/provider/AspirinVersionProvider.kt b/src/main/kotlin/com/viaversion/aas/provider/AspirinVersionProvider.kt index 04f91ec..ffcdd4a 100644 --- a/src/main/kotlin/com/viaversion/aas/provider/AspirinVersionProvider.kt +++ b/src/main/kotlin/com/viaversion/aas/provider/AspirinVersionProvider.kt @@ -8,6 +8,6 @@ object AspirinVersionProvider : BaseVersionProvider() { override fun getClosestServerProtocol(connection: UserConnection): Int { val ver = connection.channel!!.pipeline().get(MinecraftHandler::class.java).data.viaBackServerVer if (ver != null) return ver - return super.getServerProtocol(connection) + return super.getClosestServerProtocol(connection) } }