use paperweight for 1.21.3

This commit is contained in:
alexcrea 2024-12-07 14:48:48 +01:00
parent 6f2b15a0bc
commit 8f12d79cb9
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
4 changed files with 20 additions and 24 deletions

View file

@ -11,6 +11,7 @@ plugins {
`maven-publish` `maven-publish`
signing signing
id("cn.lalaki.central").version("1.2.5") id("cn.lalaki.central").version("1.2.5")
// Paper
id("io.papermc.paperweight.userdev") version "1.7.3" apply false id("io.papermc.paperweight.userdev") version "1.7.3" apply false
} }

View file

@ -7,7 +7,6 @@ import org.bukkit.entity.Player
import xyz.alexcrea.cuanvil.dependency.packet.PacketManager import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase 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 { class V1_21R2_PacketManager : PacketManagerBase(), PacketManager {
override val canSetInstantBuild: Boolean override val canSetInstantBuild: Boolean
get() = true get() = true

View file

@ -3,24 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
group = rootProject.group group = rootProject.group
version = rootProject.version version = rootProject.version
//TODO uncomment when paperDevBundle 1.21.4 release plugins {
/*plugins {
id("io.papermc.paperweight.userdev") id("io.papermc.paperweight.userdev")
}*/ }
dependencies { dependencies {
implementation(project(":nms:nms-common")) implementation(project(":nms:nms-common"))
// Used for nms // Used for nms
compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT") //TODO remove when paperDevBundle 1.21.4 release paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
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
} }
repositories { repositories {
maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.papermc.io/repository/maven-public/")
mavenLocal() //TODO remove when paperDevBundle 1.21.4 release
} }
// minecraft 1.21 java version is 21. // minecraft 1.21 java version is 21.

View file

@ -1,8 +1,8 @@
package xyz.alexcrea.cuanvil.dependency.packet.versions package xyz.alexcrea.cuanvil.dependency.packet.versions
import net.minecraft.network.protocol.game.PacketPlayOutAbilities import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
import net.minecraft.world.entity.player.PlayerAbilities import net.minecraft.world.entity.player.Abilities
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer import org.bukkit.craftbukkit.entity.CraftPlayer
import org.bukkit.entity.Player import org.bukkit.entity.Player
import xyz.alexcrea.cuanvil.dependency.packet.PacketManager import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
@ -13,21 +13,21 @@ class V1_21R3_PacketManager : PacketManagerBase(), PacketManager {
override fun setInstantBuild(player: Player, instantBuild: Boolean) { override fun setInstantBuild(player: Player, instantBuild: Boolean) {
val nmsPlayer = (player as CraftPlayer).handle val nmsPlayer = (player as CraftPlayer).handle
val playerAbilities = nmsPlayer.gj() val playerAbilities = nmsPlayer.abilities
val sendedAbilities: PlayerAbilities val sendedAbilities: Abilities
if (playerAbilities.d == instantBuild) { if (playerAbilities.instabuild == instantBuild) {
sendedAbilities = playerAbilities sendedAbilities = playerAbilities
} else { } else {
sendedAbilities = PlayerAbilities() sendedAbilities = Abilities()
sendedAbilities.a = playerAbilities.a sendedAbilities.invulnerable = playerAbilities.invulnerable
sendedAbilities.b = playerAbilities.b sendedAbilities.flying = playerAbilities.flying
sendedAbilities.c = playerAbilities.c sendedAbilities.mayfly = playerAbilities.mayfly
sendedAbilities.d = instantBuild sendedAbilities.instabuild = instantBuild
sendedAbilities.e = playerAbilities.e sendedAbilities.mayBuild = playerAbilities.mayBuild
sendedAbilities.f = playerAbilities.f sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
sendedAbilities.g = playerAbilities.g sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
} }
val packet = PacketPlayOutAbilities(sendedAbilities) val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
nmsPlayer.f.sendPacket(packet) nmsPlayer.connection.send(packet)
} }
} }