diff --git a/eco-core/core-nms/v1_21_6/build.gradle.kts b/eco-core/core-nms/v1_21_6/build.gradle.kts new file mode 100644 index 0000000..b08f13b --- /dev/null +++ b/eco-core/core-nms/v1_21_6/build.gradle.kts @@ -0,0 +1,28 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + +group = "com.willfp" +version = rootProject.version + +val spigotVersion = "1.21.6-R0.1-SNAPSHOT" + +dependencies { + compileOnly("org.spigotmc:spigot:$spigotVersion") +} + +configurations.compileOnly { + resolutionStrategy { + force("org.spigotmc:spigot:$spigotVersion") + } +} + +tasks { + compileJava { + options.release = 21 + } + + compileKotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_21) + } + } +} diff --git a/eco-core/core-nms/v1_21_6/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_6/ActionBarCompatibility.kt b/eco-core/core-nms/v1_21_6/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_6/ActionBarCompatibility.kt new file mode 100644 index 0000000..5efcf49 --- /dev/null +++ b/eco-core/core-nms/v1_21_6/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_6/ActionBarCompatibility.kt @@ -0,0 +1,22 @@ +package com.willfp.ecoskills.proxy.v1_21_6 + +import com.willfp.eco.core.packet.PacketEvent +import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy +import com.willfp.ecoskills.actionbar.pausePersistentActionBar +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket + +class ActionBarCompatibility : ActionBarCompatibilityProxy { + private val ClientboundSystemChatPacket.isActionBar: Boolean + get() = this::class.java.declaredFields + .first { it.type == Boolean::class.java } + .apply { isAccessible = true } + .get(this) as Boolean + + override fun onSend(event: PacketEvent) { + val player = event.player + + when (val packet = event.packet.handle) { + is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() + } + } +} diff --git a/gradle.properties b/gradle.properties index 51e5854..29a7ccd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ kotlin.code.style=official kotlin.daemon.jvmargs=-Xmx2g -XX\:+UseG1GC -XX\:MaxMetaspaceSize\=512m libreforge-version=4.75.0 org.gradle.parallel=true -version=3.63.1 +version=3.63.2 diff --git a/settings.gradle.kts b/settings.gradle.kts index 133d98e..4dd3250 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,3 +30,4 @@ include(":eco-core:core-nms:v1_21") include(":eco-core:core-nms:v1_21_3") include(":eco-core:core-nms:v1_21_4") include(":eco-core:core-nms:v1_21_5") +include(":eco-core:core-nms:v1_21_6")