From 8f12d79cb9268df8a3384846a3858c24268db13b Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Sat, 7 Dec 2024 14:48:48 +0100
Subject: [PATCH] use paperweight for 1.21.3

---
 build.gradle.kts                              |  1 +
 .../packet/versions/V1_21R2_PacketManager.kt  |  1 -
 nms/v1_21R3/build.gradle.kts                  | 10 ++----
 .../packet/versions/V1_21R3_PacketManager.kt  | 32 +++++++++----------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d1ab663..044244e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     `maven-publish`
     signing
     id("cn.lalaki.central").version("1.2.5")
+    // Paper
     id("io.papermc.paperweight.userdev") version "1.7.3" apply false
 }
 
diff --git a/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R2_PacketManager.kt b/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R2_PacketManager.kt
index 1486559..9d88c20 100644
--- a/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R2_PacketManager.kt
+++ b/nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R2_PacketManager.kt
@@ -7,7 +7,6 @@ import org.bukkit.entity.Player
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
 
-// Todo: replace it by the mojang mapped version when paper dev bundle release
 class V1_21R2_PacketManager : PacketManagerBase(), PacketManager {
     override val canSetInstantBuild: Boolean
         get() = true
diff --git a/nms/v1_21R3/build.gradle.kts b/nms/v1_21R3/build.gradle.kts
index 222bdd4..19d2ffd 100644
--- a/nms/v1_21R3/build.gradle.kts
+++ b/nms/v1_21R3/build.gradle.kts
@@ -3,24 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 group = rootProject.group
 version = rootProject.version
 
-//TODO uncomment when paperDevBundle 1.21.4 release
-/*plugins {
+plugins {
     id("io.papermc.paperweight.userdev")
-}*/
+}
 
 dependencies {
     implementation(project(":nms:nms-common"))
 
     // Used for nms
-    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT") //TODO remove when paperDevBundle 1.21.4 release
-    compileOnly("org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT") //TODO remove when paperDevBundle 1.21.4 release
-    //paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") //TODO uncomment when paperDevBundle 1.21.4 release
+    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
 }
 
 repositories {
     maven("https://repo.papermc.io/repository/maven-public/")
 
-    mavenLocal() //TODO remove when paperDevBundle 1.21.4 release
 }
 
 // minecraft 1.21 java version is 21.
diff --git a/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R3_PacketManager.kt b/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R3_PacketManager.kt
index ae769a7..0f581d9 100644
--- a/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R3_PacketManager.kt
+++ b/nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R3_PacketManager.kt
@@ -1,8 +1,8 @@
 package xyz.alexcrea.cuanvil.dependency.packet.versions
 
-import net.minecraft.network.protocol.game.PacketPlayOutAbilities
-import net.minecraft.world.entity.player.PlayerAbilities
-import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer
+import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
+import net.minecraft.world.entity.player.Abilities
+import org.bukkit.craftbukkit.entity.CraftPlayer
 import org.bukkit.entity.Player
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
@@ -13,21 +13,21 @@ class V1_21R3_PacketManager : PacketManagerBase(), PacketManager {
 
     override fun setInstantBuild(player: Player, instantBuild: Boolean) {
         val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities = nmsPlayer.gj()
-        val sendedAbilities: PlayerAbilities
-        if (playerAbilities.d == instantBuild) {
+        val playerAbilities = nmsPlayer.abilities
+        val sendedAbilities: Abilities
+        if (playerAbilities.instabuild == instantBuild) {
             sendedAbilities = playerAbilities
         } else {
-            sendedAbilities = PlayerAbilities()
-            sendedAbilities.a = playerAbilities.a
-            sendedAbilities.b = playerAbilities.b
-            sendedAbilities.c = playerAbilities.c
-            sendedAbilities.d = instantBuild
-            sendedAbilities.e = playerAbilities.e
-            sendedAbilities.f = playerAbilities.f
-            sendedAbilities.g = playerAbilities.g
+            sendedAbilities = Abilities()
+            sendedAbilities.invulnerable = playerAbilities.invulnerable
+            sendedAbilities.flying = playerAbilities.flying
+            sendedAbilities.mayfly = playerAbilities.mayfly
+            sendedAbilities.instabuild = instantBuild
+            sendedAbilities.mayBuild = playerAbilities.mayBuild
+            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
+            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
         }
-        val packet = PacketPlayOutAbilities(sendedAbilities)
-        nmsPlayer.f.sendPacket(packet)
+        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
+        nmsPlayer.connection.send(packet)
     }
 }