Merge functions for java

Author: emyfops

common/src/main/kotlin/com/lambda/util/world/WorldUtils.kt

@@ -40,18 +40,6 @@ import kotlin.math.ceil
  *
  */
 object WorldUtils {
-    /**
-     * Gets the closest entity of type [T] within a specified range.
-     */
-    inline fun <reified T : Entity> SafeContext.getClosestEntity(
-        type: Class<out T>, // This is a class reference, not an instance of the class.
-        pos: Vec3d,
-        range: Double,
-        predicate: (T) -> Boolean = { true },
-    ): T? {
-        return getClosestEntity(pos, range, predicate)
-    }
-
     /**
      * Gets the closest entity of type [T] within a specified range.
      *
@@ -67,6 +55,7 @@ object WorldUtils {
         pos: Vec3d,
         range: Double,
         predicate: (T) -> Boolean = { true },
+        type: Class<out T> = T::class.java,
     ): T? {
         var closest: T? = null
         var closestDistance = Double.MAX_VALUE
@@ -84,20 +73,6 @@ object WorldUtils {
         return closest
     }
 
-    /**
-     * Gets all entities of type [T] within a specified distance from a position.
-     */
-    inline fun <T : Entity> SafeContext.getFastEntities(
-        type: Class<out T>, // This is a class reference, not an instance of the class.
-        pos: Vec3d,
-        distance: Double,
-        pointer: MutableList<Entity>? = null,
-        iterator: (Entity, Int) -> Unit = { _, _ -> },
-        predicate: (Entity) -> Boolean = { true },
-    ) {
-        return getFastEntities(pos, distance, pointer, iterator, predicate)
-    }
-
     /**
      * Gets all entities of type [T] within a specified distance from a position.
      *
@@ -132,6 +107,7 @@ object WorldUtils {
         pointer: MutableList<T>? = null,
         iterator: (T, Int) -> Unit = { _, _ -> },
         predicate: (T) -> Boolean = { true },
+        type: Class<out T> = T::class.java,
     ) {
         val chunks = ceil(distance / 16).toInt()
         val sectionX = pos.x.toInt() shr 4
@@ -157,20 +133,6 @@ object WorldUtils {
         }
     }
 
-    /**
-     * Gets all entities of type [T] within a specified distance from a position.
-     */
-    inline fun <reified T : Entity> SafeContext.getEntities(
-        type: Class<out T>, // This is a class reference, not an instance of the class.
-        pos: Vec3d,
-        distance: Double,
-        pointer: MutableList<Entity>? = null,
-        iterator: (Entity, Int) -> Unit = { _, _ -> },
-        predicate: (Entity) -> Boolean = { true },
-    ) {
-        return getEntities(pos, distance, pointer, iterator, predicate)
-    }
-
     /**
      * Gets all entities of type [T] within a specified distance from a position.
      *
@@ -187,6 +149,7 @@ object WorldUtils {
         pointer: MutableList<T>? = null,
         iterator: (T, Int) -> Unit = { _, _ -> },
         predicate: (T) -> Boolean = { true },
+        type: Class<out T> = T::class.java,
     ) {
         world.entities.filterPointer(pointer, iterator) { entity ->
             entity != player &&