Updated to eco 6.77.0

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")
     }

eco-core/core-nms/v1_17_R1/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_17_R1/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_18_R1/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R1/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_18_R2/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_18_R2/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_19_R1/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_19_R2/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_19_R3/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_20_R1/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_20_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R1/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_20_R2/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_20_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R2/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_20_R3/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_20_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_20_R3/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_21/build.gradle.kts

@@ -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")
-    }
-}

eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

eco-core/core-nms/v1_21_3/build.gradle.kts

@@ -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)
-        }
-    }
-}

eco-core/core-nms/v1_21_3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_21_3/ActionBarCompatibility.kt

@@ -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()
-        }
-    }
-}

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) {
-            if (entity is Allay) {
+            return
-                return
-            }
         }
 
         val location = entity.location.clone()

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:

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")