diff --git a/build.gradle.kts b/build.gradle.kts index ab0fc4c..27a91b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,17 +19,6 @@ base { dependencies { implementation(project(":eco-core:core-plugin")) - implementation(project(":eco-core:core-nms:v1_17_R1")) - implementation(project(":eco-core:core-nms:v1_18_R1")) - implementation(project(":eco-core:core-nms:v1_18_R2")) - implementation(project(":eco-core:core-nms:v1_19_R1")) - implementation(project(":eco-core:core-nms:v1_19_R2")) - implementation(project(":eco-core:core-nms:v1_19_R3")) - implementation(project(":eco-core:core-nms:v1_20_R1")) - implementation(project(":eco-core:core-nms:v1_20_R2")) - implementation(project(":eco-core:core-nms:v1_20_R3")) - implementation(project(":eco-core:core-nms:v1_21")) - implementation(project(":eco-core:core-nms:v1_21_3")) implementation(project(":eco-core:core-nms:v1_21_4")) implementation(project(":eco-core:core-nms:v1_21_5")) implementation(project(":eco-core:core-nms:v1_21_7")) @@ -52,7 +41,7 @@ allprojects { } dependencies { - compileOnly("com.willfp:eco:6.75.0") + compileOnly("com.willfp:eco:6.77.0") compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0") } diff --git a/eco-core/core-nms/v1_17_R1/build.gradle.kts b/eco-core/core-nms/v1_17_R1/build.gradle.kts deleted file mode 100644 index c6ccb9c..0000000 --- a/eco-core/core-nms/v1_17_R1/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.17-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_17_R1/ActionBarCompatibility.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_17_R1/ActionBarCompatibility.kt deleted file mode 100644 index 6f2836d..0000000 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_17_R1/ActionBarCompatibility.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_17_R1 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import com.willfp.ecoskills.actionbar.pausePersistentActionBar -import net.minecraft.network.chat.ChatMessageType -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -import net.minecraft.network.protocol.game.PacketPlayOutChat -import org.bukkit.entity.Player - -class ActionBarCompatibility : ActionBarCompatibilityProxy { - override fun onSend(event: PacketEvent) { - val player = event.player - - when (val packet = event.packet.handle) { - is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is PacketPlayOutChat -> if (packet.c() == ChatMessageType.c) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_18_R1/build.gradle.kts b/eco-core/core-nms/v1_18_R1/build.gradle.kts deleted file mode 100644 index c2c8cf2..0000000 --- a/eco-core/core-nms/v1_18_R1/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.18-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R1/ActionBarCompatibility.kt b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R1/ActionBarCompatibility.kt deleted file mode 100644 index 1b9ff9f..0000000 --- a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R1/ActionBarCompatibility.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_18_R1 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import com.willfp.ecoskills.actionbar.pausePersistentActionBar -import net.minecraft.network.chat.ChatMessageType -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -import net.minecraft.network.protocol.game.PacketPlayOutChat - -class ActionBarCompatibility : ActionBarCompatibilityProxy { - override fun onSend(event: PacketEvent) { - val player = event.player - - when (val packet = event.packet.handle) { - is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is PacketPlayOutChat -> if (packet.c() == ChatMessageType.c) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_18_R2/build.gradle.kts b/eco-core/core-nms/v1_18_R2/build.gradle.kts deleted file mode 100644 index afeaf76..0000000 --- a/eco-core/core-nms/v1_18_R2/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.18.2-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R2/ActionBarCompatibility.kt b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R2/ActionBarCompatibility.kt deleted file mode 100644 index 8c38002..0000000 --- a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R2/ActionBarCompatibility.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_18_R2 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import com.willfp.ecoskills.actionbar.pausePersistentActionBar -import net.minecraft.network.chat.ChatMessageType -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -import net.minecraft.network.protocol.game.PacketPlayOutChat - -class ActionBarCompatibility : ActionBarCompatibilityProxy { - override fun onSend(event: PacketEvent) { - val player = event.player - - when (val packet = event.packet.handle) { - is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is PacketPlayOutChat -> if (packet.c() == ChatMessageType.c) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_19_R1/build.gradle.kts b/eco-core/core-nms/v1_19_R1/build.gradle.kts deleted file mode 100644 index 5001f8b..0000000 --- a/eco-core/core-nms/v1_19_R1/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.19.1-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt deleted file mode 100644 index 39ef0f6..0000000 --- a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_19_R1 - -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.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_19_R2/build.gradle.kts b/eco-core/core-nms/v1_19_R2/build.gradle.kts deleted file mode 100644 index 2f549b2..0000000 --- a/eco-core/core-nms/v1_19_R2/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.19.3-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt deleted file mode 100644 index 33d0642..0000000 --- a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_19_R2 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_19_R3/build.gradle.kts b/eco-core/core-nms/v1_19_R3/build.gradle.kts deleted file mode 100644 index 8237b46..0000000 --- a/eco-core/core-nms/v1_19_R3/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.19.4-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt deleted file mode 100644 index f92dd54..0000000 --- a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_19_R3 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_20_R1/build.gradle.kts b/eco-core/core-nms/v1_20_R1/build.gradle.kts deleted file mode 100644 index 5f14477..0000000 --- a/eco-core/core-nms/v1_20_R1/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.20-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_20_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R1/ActionBarCompatibility.kt b/eco-core/core-nms/v1_20_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R1/ActionBarCompatibility.kt deleted file mode 100644 index 2cf1fa6..0000000 --- a/eco-core/core-nms/v1_20_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R1/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_20_R1 - -import com.willfp.eco.core.packet.PacketEvent -import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_20_R2/build.gradle.kts b/eco-core/core-nms/v1_20_R2/build.gradle.kts deleted file mode 100644 index 3ab5fda..0000000 --- a/eco-core/core-nms/v1_20_R2/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.20.2-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R2/ActionBarCompatibility.kt b/eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R2/ActionBarCompatibility.kt deleted file mode 100644 index fb9cced..0000000 --- a/eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R2/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_20_R2 - -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.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_20_R3/build.gradle.kts b/eco-core/core-nms/v1_20_R3/build.gradle.kts deleted file mode 100644 index 2245fbc..0000000 --- a/eco-core/core-nms/v1_20_R3/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.20.4-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R3/ActionBarCompatibility.kt b/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R3/ActionBarCompatibility.kt deleted file mode 100644 index 17da6c5..0000000 --- a/eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R3/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_20_R3 - -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.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_21/build.gradle.kts b/eco-core/core-nms/v1_21/build.gradle.kts deleted file mode 100644 index 4b8d22f..0000000 --- a/eco-core/core-nms/v1_21/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.21.1-R0.1-SNAPSHOT" - -dependencies { - compileOnly("org.spigotmc:spigot:$spigotVersion") -} - -configurations.compileOnly { - resolutionStrategy { - force("org.spigotmc:spigot:$spigotVersion") - } -} \ No newline at end of file diff --git a/eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21/ActionBarCompatibility.kt b/eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21/ActionBarCompatibility.kt deleted file mode 100644 index 8751216..0000000 --- a/eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21/ActionBarCompatibility.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_21 - -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.ClientboundSetActionBarTextPacket -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 ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() - is ClientboundSystemChatPacket -> if (packet.isActionBar) player.pausePersistentActionBar() - } - } -} diff --git a/eco-core/core-nms/v1_21_3/build.gradle.kts b/eco-core/core-nms/v1_21_3/build.gradle.kts deleted file mode 100644 index b94628a..0000000 --- a/eco-core/core-nms/v1_21_3/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -group = "com.willfp" -version = rootProject.version - -val spigotVersion = "1.21.3-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_3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_3/ActionBarCompatibility.kt b/eco-core/core-nms/v1_21_3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_3/ActionBarCompatibility.kt deleted file mode 100644 index 9232e2a..0000000 --- a/eco-core/core-nms/v1_21_3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_3/ActionBarCompatibility.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.willfp.ecoskills.proxy.v1_21_3 - -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/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt index 608aed6..b617462 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt @@ -1,7 +1,6 @@ package com.willfp.ecoskills.skills.display import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.Prerequisite import com.willfp.eco.core.entities.Entities import com.willfp.eco.core.entities.impl.EmptyTestableEntity import com.willfp.eco.core.integrations.hologram.HologramManager @@ -85,10 +84,8 @@ class DamageIndicatorListener( return } - if (Prerequisite.HAS_1_19.isMet) { - if (entity is Allay) { - return - } + if (entity is Allay) { + return } val location = entity.location.clone() diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index 7def7a2..2c5aad9 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: ${pluginName} version: ${version} main: com.willfp.ecoskills.EcoSkillsPlugin -api-version: 1.17 +api-version: 1.21.4 authors: [ Auxilor ] website: willfp.com depend: diff --git a/settings.gradle.kts b/settings.gradle.kts index 96c1dce..003ca47 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,17 +17,6 @@ rootProject.name = "EcoSkills" include(":eco-core") include(":eco-core:core-plugin") include(":eco-core:core-nms") -include(":eco-core:core-nms:v1_17_R1") -include(":eco-core:core-nms:v1_18_R1") -include(":eco-core:core-nms:v1_18_R2") -include(":eco-core:core-nms:v1_19_R1") -include(":eco-core:core-nms:v1_19_R2") -include(":eco-core:core-nms:v1_19_R3") -include(":eco-core:core-nms:v1_20_R1") -include(":eco-core:core-nms:v1_20_R2") -include(":eco-core:core-nms:v1_20_R3") -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_7")