From b31a4ec1c0f4704506813f78778693487e9d14a4 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Sat, 24 Jul 2021 12:57:02 -0300
Subject: [PATCH] fix 1.7

---
 build.gradle.kts                                              | 2 +-
 .../kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt    | 3 +--
 .../aas/protocol/id47toid5/packets/EntityPackets.kt           | 4 ++--
 .../aas/protocol/id47toid5/packets/PlayerPackets.kt           | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6bd381d..544e0a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
 
     val vvVer = "4.0.2-SNAPSHOT"
     val vbVer = "4.0.2-SNAPSHOT"
-    val vrVer = "066c6f16f4"
+    val vrVer = "b67f637"
     implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false }
     implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false }
     implementation("com.github.ViaVersion.ViaRewind:viarewind-all:$vrVer") { isTransitive = false }
diff --git a/src/main/kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt b/src/main/kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt
index 5c90d27..cd5de09 100644
--- a/src/main/kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt
+++ b/src/main/kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt
@@ -7,6 +7,5 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 // cursed 1.7 -> 1.8 from https://github.com/Gerrygames/ClientViaVersion
 // + https://github.com/creeper123123321/ViaRewind/tree/17to18
 fun registerAspirinProtocols() {
-    // todo fix
-    //Via.getManager().protocolManager.registerProtocol(Protocol1_8To1_7_6, ProtocolVersion.v1_8, ProtocolVersion.v1_7_6)
+    Via.getManager().protocolManager.registerProtocol(Protocol1_8To1_7_6, ProtocolVersion.v1_8, ProtocolVersion.v1_7_6)
 }
diff --git a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/EntityPackets.kt b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/EntityPackets.kt
index 072c3e7..e878493 100644
--- a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/EntityPackets.kt
+++ b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/EntityPackets.kt
@@ -221,7 +221,7 @@ fun Protocol1_8To1_7_6.registerEntityPackets() {
         }
     })
 
-    this.registerClientbound(ClientboundPackets1_7.ENTITY_HEAD_LOOK, object : PacketRemapper() {
+    this.registerClientbound(ClientboundPackets1_7.ENTITY_ROTATION, object : PacketRemapper() {
         override fun registerMap() {
             map(Type.INT, Type.VAR_INT) //Entity Id
             map(Type.BYTE) //yaw
@@ -254,7 +254,7 @@ fun Protocol1_8To1_7_6.registerEntityPackets() {
         }
     })
 
-    this.registerClientbound(ClientboundPackets1_7.ENTITY_ROTATION, object : PacketRemapper() {
+    this.registerClientbound(ClientboundPackets1_7.ENTITY_HEAD_LOOK, object : PacketRemapper() {
         override fun registerMap() {
             map(Type.INT, Type.VAR_INT) //Entity Id
             map(Type.BYTE) //Head yaw
diff --git a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/PlayerPackets.kt b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/PlayerPackets.kt
index 445bb81..4f6cc78 100644
--- a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/PlayerPackets.kt
+++ b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/PlayerPackets.kt
@@ -472,4 +472,5 @@ fun Protocol1_8To1_7_6.registerPlayerPackets() {
     })
 
     this.cancelServerbound(ServerboundPackets1_8.SPECTATE)
+    this.cancelServerbound(ServerboundPackets1_8.RESOURCE_PACK_STATUS)
 }