From 9a99fb4620bb4a8f68ff334ec63fe6e570d5e0f6 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Sun, 17 Jul 2022 15:19:33 -0300
Subject: [PATCH] update viaver, fix deprecations

---
 build.gradle.kts                                 |  4 ++--
 .../aas/codec/packet/login/LoginSuccess.kt       |  4 ++--
 .../id47toid5/metadata/MetadataRewriter.kt       | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index eedf0de..32c6538 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -57,8 +57,8 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    val vvVer = "4.4.0-1.19.1-pre4-SNAPSHOT"
-    val vbVer = "4.4.0-1.19.1-pre4-SNAPSHOT"
+    val vvVer = "4.4.0-1.19.1-pre5-SNAPSHOT"
+    val vbVer = "4.4.0-1.19.1-pre5-SNAPSHOT"
     val vrVer = "d189537"
     implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false }
     implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false }
diff --git a/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt b/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt
index e2f56b1..9aa8c20 100644
--- a/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt
+++ b/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt
@@ -17,7 +17,7 @@ class LoginSuccess : Packet {
     override fun decode(byteBuf: ByteBuf, protocolVersion: Int) {
         id = when {
             protocolVersion >= ProtocolVersion.v1_16.version -> {
-                Type.UUID_INT_ARRAY.read(byteBuf)
+                Type.UUID.read(byteBuf)
             }
             protocolVersion >= ProtocolVersion.v1_7_6.version || protocolVersion == 1 -> {
                 UUID.fromString(Type.STRING.read(byteBuf))
@@ -33,7 +33,7 @@ class LoginSuccess : Packet {
     override fun encode(byteBuf: ByteBuf, protocolVersion: Int) {
         when {
             protocolVersion >= ProtocolVersion.v1_16.version -> {
-                Type.UUID_INT_ARRAY.write(byteBuf, id)
+                Type.UUID.write(byteBuf, id)
             }
             protocolVersion >= ProtocolVersion.v1_7_6.version || protocolVersion == 1 -> {
                 Type.STRING.write(byteBuf, id.toString())
diff --git a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt
index 0aef0e1..f20b1cb 100644
--- a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt
+++ b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt
@@ -19,8 +19,7 @@ object MetadataRewriter {
                 }
 
                 entry.setId(metaIndex.newIndex)
-                entry.setMetaTypeUnsafe(metaIndex.newType)
-                when (metaIndex.newType) {
+                val newValue = when (metaIndex.newType) {
                     MetaType1_8.Byte -> {
                         var byteValue = (oldValue as Number).toByte()
 
@@ -28,15 +27,16 @@ object MetadataRewriter {
                             val cape = byteValue.toInt() == 2
                             byteValue = (if (cape) 127 else 125).toByte()
                         }
-                        entry.value = byteValue
+                        byteValue
                     }
-                    MetaType1_8.Int -> entry.value = (oldValue as Number).toInt()
-                    MetaType1_8.Short -> entry.value = (oldValue as Number).toShort()
-                    MetaType1_8.Float -> entry.value = (oldValue as Number).toFloat()
-                    MetaType1_8.String -> entry.value = oldValue.toString()
-                    MetaType1_8.Slot, MetaType1_8.Position, MetaType1_8.Rotation -> entry.value = oldValue
+                    MetaType1_8.Int -> (oldValue as Number).toInt()
+                    MetaType1_8.Short -> (oldValue as Number).toShort()
+                    MetaType1_8.Float -> (oldValue as Number).toFloat()
+                    MetaType1_8.String -> oldValue.toString()
+                    MetaType1_8.Slot, MetaType1_8.Position, MetaType1_8.Rotation -> oldValue
                     else -> throw Exception("unknown metatype ${metaIndex.newType}")
                 }
+                entry.setTypeAndValue(metaIndex.newType, newValue)
             } catch (e: Exception) {
                 if (!Via.getPlatform().conf.isSuppressMetadataErrors) {
                     Via.getPlatform().logger.warning("Metadata Exception: $e $list")