feat(compat): 添加了MythicMobs的O-RANGE目标选择器

refactor(api): 将API接口中的函数参数从Kotlin函数类型改为Java Function类型

chore(deps): 更新Nodens和RedisChannel依赖至最新版本

chore(version): 将项目版本更新至1.24.58

refactor(utils): 将`Vector.direction`函数的可见性从private改为internal

Author: zhibeigg

build.gradle.kts

@@ -88,8 +88,8 @@ dependencies {
     compileOnly("ink.ptms.core:v11200:11200")
     compileOnly("ink.ptms:nms-all:1.0.0")
 
-    compileOnly("org.gitee.nodens:Nodens:1.10.14:api")
-    compileOnly("com.gitee.redischannel:RedisChannel:1.10.6:api")
+    compileOnly("org.gitee.nodens:Nodens:latest.release:api")
+    compileOnly("com.gitee.redischannel:RedisChannel:latest.release:api")
     compileOnly("ink.ptms.adyeshach:plugin:2.0.26:api")
     compileOnly("com.github.retrooper:packetevents-spigot:2.7.0")
     compileOnly("org.eldergod.ext:DragonCore:2.6.2.9")

gradle.properties

@@ -1,3 +1,3 @@
 group = org.gitee.orryx
-version = 1.23.58
+version = 1.24.58
 org.gradle.jvmargs=-Dfile.encoding=UTF-8

src/main/kotlin/org/gitee/orryx/api/JobAPI.kt

@@ -11,12 +11,19 @@ import taboolib.common.LifeCycle
 import taboolib.common.platform.Awake
 import taboolib.common.platform.PlatformFactory
 import java.util.concurrent.CompletableFuture
+import java.util.function.Function
 
 class JobAPI: IJobAPI {
 
-    override fun <T> modifyJob(player: Player, job: String?, function: (job: IPlayerJob) -> T): CompletableFuture<T?> {
+    override fun <T> modifyJob(player: Player, job: String?, function: Function<IPlayerJob, T>): CompletableFuture<T?> {
         return player.orryxProfile { profile ->
-            job?.let { player.job(profile.id, it, function) } ?: player.job(function)
+            job?.let {
+                player.job(profile.id, it) { job ->
+                    function.apply(job)
+                }
+            } ?: player.job { job ->
+                function.apply(job)
+            }
         }
     }
 

src/main/kotlin/org/gitee/orryx/api/ProfileAPI.kt

@@ -24,8 +24,10 @@ import java.util.function.Function
 
 class ProfileAPI: IProfileAPI {
 
-    override fun <T> modifyProfile(player: Player, function: (skill: IPlayerProfile) -> T): CompletableFuture<T?> {
-        return player.orryxProfileTo(function)
+    override fun <T> modifyProfile(player: Player, function: Function<IPlayerProfile, T>): CompletableFuture<T?> {
+        return player.orryxProfileTo {
+            function.apply(it)
+        }
     }
 
     override fun isSuperBody(player: Player): Boolean {

src/main/kotlin/org/gitee/orryx/api/SkillAPI.kt

@@ -13,18 +13,23 @@ import taboolib.common.LifeCycle
 import taboolib.common.platform.Awake
 import taboolib.common.platform.PlatformFactory
 import java.util.concurrent.CompletableFuture
+import java.util.function.Function
 
 class SkillAPI: ISkillAPI {
 
     override fun <T> modifySkill(
         player: Player,
         skill: String,
         job: IPlayerJob?,
-        function: (skill: IPlayerSkill) -> T
+        function: Function<IPlayerSkill, T>
     ): CompletableFuture<T?> {
         return job?.let {
-            player.skill(it, skill, false, function)
-        } ?: player.skill(skill, false, function)
+            player.skill(it, skill, false) { skill ->
+                function.apply(skill)
+            }
+        } ?: player.skill(skill, false) {
+            function.apply(it)
+        }
     }
 
     override fun castSkill(player: Player, skill: String, level: Int) {

src/main/kotlin/org/gitee/orryx/api/interfaces/IJobAPI.kt

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player
 import org.gitee.orryx.core.job.IJob
 import org.gitee.orryx.core.job.IPlayerJob
 import java.util.concurrent.CompletableFuture
+import java.util.function.Function
 
 interface IJobAPI {
 
@@ -15,7 +16,7 @@ interface IJobAPI {
      * @param function 获取到职业后执行
      * @return [function]的返回值
      * */
-    fun <T> modifyJob(player: Player, job: String? = null, function: (job: IPlayerJob) -> T) : CompletableFuture<T?>
+    fun <T> modifyJob(player: Player, job: String? = null, function: Function<IPlayerJob, T>) : CompletableFuture<T?>
 
     fun getJob(job: String): IJob?
 }

src/main/kotlin/org/gitee/orryx/api/interfaces/IProfileAPI.kt

@@ -3,6 +3,7 @@ package org.gitee.orryx.api.interfaces
 import org.bukkit.entity.Player
 import org.gitee.orryx.api.events.damage.DamageType
 import org.gitee.orryx.api.events.damage.OrryxDamageEvents
+import org.gitee.orryx.core.job.IPlayerJob
 import org.gitee.orryx.core.profile.IPlayerProfile
 import java.util.concurrent.CompletableFuture
 import java.util.function.Consumer
@@ -17,7 +18,7 @@ interface IProfileAPI {
      * @param function 获取到玩家信息后执行
      * @return [function]的返回值
      * */
-    fun <T> modifyProfile(player: Player, function: (skill: IPlayerProfile) -> T) : CompletableFuture<T?>
+    fun <T> modifyProfile(player: Player, function: Function<IPlayerProfile, T>) : CompletableFuture<T?>
 
     /**
      * 是否在霸体状态

src/main/kotlin/org/gitee/orryx/api/interfaces/ISkillAPI.kt

@@ -2,10 +2,12 @@ package org.gitee.orryx.api.interfaces
 
 import org.bukkit.entity.Player
 import org.gitee.orryx.core.job.IPlayerJob
+import org.gitee.orryx.core.profile.IPlayerProfile
 import org.gitee.orryx.core.skill.CastResult
 import org.gitee.orryx.core.skill.IPlayerSkill
 import org.gitee.orryx.core.skill.ISkill
 import java.util.concurrent.CompletableFuture
+import java.util.function.Function
 
 interface ISkillAPI {
 
@@ -18,7 +20,7 @@ interface ISkillAPI {
      * @param function 获取到职业后执行
      * @return [function]的返回值
      * */
-    fun <T> modifySkill(player: Player, skill: String, job: IPlayerJob? = null, function: (skill: IPlayerSkill) -> T) : CompletableFuture<T?>
+    fun <T> modifySkill(player: Player, skill: String, job: IPlayerJob? = null, function: Function<IPlayerSkill, T>) : CompletableFuture<T?>
 
     fun castSkill(player: Player, skill: String, level: Int)
 

src/main/kotlin/org/gitee/orryx/compat/mythicmobs/MechanicRegister.kt

@@ -8,6 +8,7 @@ import org.gitee.orryx.compat.mythicmobs.condition.MythicMobsJobCondition
 import org.gitee.orryx.compat.mythicmobs.condition.MythicMobsLevelCondition
 import org.gitee.orryx.compat.mythicmobs.condition.MythicMobsManaCondition
 import org.gitee.orryx.compat.mythicmobs.mechanic.MythicMobsCastMechanic
+import org.gitee.orryx.compat.mythicmobs.targeter.MythicMobsOrryxRangeTargeter
 import org.gitee.orryx.compat.mythicmobs.targeter.MythicMobsSelectorEntityTargeter
 import org.gitee.orryx.compat.mythicmobs.targeter.MythicMobsSelectorLocationTargeter
 import taboolib.common.platform.Ghost
@@ -40,6 +41,7 @@ object MechanicRegister {
         when (event.targeterName.uppercase()) {
             "O-SELECTORL" -> { event.register(MythicMobsSelectorLocationTargeter(event.config)) }
             "O-SELECTORE" -> { event.register(MythicMobsSelectorEntityTargeter(event.config)) }
+            "O-RANGE" -> { event.register(MythicMobsOrryxRangeTargeter(event.config)) }
         }
     }
 }

src/main/kotlin/org/gitee/orryx/compat/mythicmobs/targeter/MythicMobsOrryxRangeTargeter.kt

@@ -0,0 +1,38 @@
+package org.gitee.orryx.compat.mythicmobs.targeter
+
+import io.lumine.xikage.mythicmobs.MythicMobs
+import io.lumine.xikage.mythicmobs.adapters.AbstractEntity
+import io.lumine.xikage.mythicmobs.io.MythicLineConfig
+import io.lumine.xikage.mythicmobs.skills.SkillMetadata
+import io.lumine.xikage.mythicmobs.skills.targeters.IEntitySelector
+import org.gitee.orryx.utils.direction
+import taboolib.common.platform.Ghost
+
+@Ghost
+class MythicMobsOrryxRangeTargeter(mlc: MythicLineConfig): IEntitySelector(mlc) {
+
+    private val radius = mlc.getDouble(arrayOf("radius", "r"), 1.0)
+    private val offsetX = mlc.getDouble(arrayOf("offsetx", "ox"), 0.0)
+    private val offsetY = mlc.getDouble(arrayOf("offsety", "oy"), 0.0)
+    private val offsetZ = mlc.getDouble(arrayOf("offsetz", "oz"), 0.0)
+
+    override fun getEntities(data: SkillMetadata): HashSet<AbstractEntity?> {
+        val am = data.caster
+        val targets = HashSet<AbstractEntity?>()
+
+        val vector = am.entity.bukkitEntity.location.direction.direction(offsetX, offsetY, offsetZ, false)
+        val newCenter = am.entity.bukkitEntity.location.clone().add(vector)
+
+        val radiusSq: Double = radius * radius
+        for (p in MythicMobs.inst().entityManager.getPlayers(am.entity.world)) {
+            if (p.world != am.entity.world) {
+                continue
+            }
+            if (newCenter.distanceSquared(p.bukkitEntity.location) >= radiusSq) {
+                continue
+            }
+            targets.add(p)
+        }
+        return targets
+    }
+}