Fix: Entity utils returning player in list

Author: emyfops

common/src/main/kotlin/com/lambda/module/modules/combat/CrystalAura.kt

@@ -0,0 +1,70 @@
+package com.lambda.module.modules.combat
+
+import com.lambda.config.InteractionSettings
+import com.lambda.config.RotationSettings
+import com.lambda.event.events.RotationEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.concurrentListener
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.Communication.info
+import com.lambda.util.combat.Explosion.velocity
+import com.lambda.util.world.EntityUtils.getClosestEntity
+import com.lambda.util.world.EntityUtils.getFastEntities
+import net.minecraft.entity.Entity
+import net.minecraft.entity.LivingEntity
+import net.minecraft.util.Hand
+import net.minecraft.world.explosion.Explosion
+
+object CrystalAura : Module(
+    name = "CrystalAura",
+    description = "Automatically attacks entities with crystals",
+    defaultTags = setOf(ModuleTag.COMBAT),
+) {
+    private val page by setting("Page", Page.General)
+
+    /* Rotation */
+    private val rotation = RotationSettings(this) { page == Page.Targeting }
+
+    /* Placing */
+    private val swap by setting("Swap", Hand.MAIN_HAND, "Automatically swap to crystals") { page == Page.Placing }
+    private val multiPlace by setting("Multi Place", true, "Place multiple crystals") { page == Page.Placing }
+    private val placeDelay by setting("Place Delay", 0, 0..20, 1, "Delay between crystal placements", unit = "ticks", visibility = { page == Page.Placing })
+    private val placeRange by setting("Place Range", 5.0, 0.1..7.0, 0.1, "Range to place crystals from the player eyes", visibility = { page == Page.Placing })
+    private val placeRangeWalls by setting("Place Range Walls", 3.5, 0.1..7.0, 0.1, "Range to place crystals through walls", visibility = { page == Page.Placing })
+    private val placeMinHealth by setting("Place Min Health", 10.0, 0.0..20.0, 0.5, "Minimum health to place a crystal", visibility = { page == Page.Placing })
+    private val placeMaxSelfDamage by setting("Place Max Self Damage", 8.0, 0.0..20.0, 0.5, "Maximum self damage to place a crystal", visibility = { page == Page.Placing })
+    private val placeMinDamage by setting("Place Min Damage", 6.0, 0.0..20.0, 0.5, "Minimum damage to place a crystal", visibility = { page == Page.Placing })
+
+    /* Exploding */
+    private val explode by setting("Explode", true, "Explode crystals") { page == Page.Exploding }
+    private val explodeDelay by setting("Explode Delay", 0, 0..20, 1, "Delay between crystal explosions", unit = "ticks", visibility = { page == Page.Exploding })
+    private val explodeRange by setting("Explode Range", 5.0, 0.1..7.0, 0.1, "Range to explode crystals", visibility = { page == Page.Exploding })
+    private val explodeRangeWalls by setting("Explode Range Walls", 3.5, 0.1..7.0, 0.1, "Range to explode crystals through walls", visibility = { page == Page.Exploding })
+    private val preventDeath by setting("Prevent Death", true, "Prevent death from crystal explosions", visibility = { page == Page.Exploding })
+    private val explodeMinDamage by setting("Explode Min Damage", 6.0, 0.0..20.0, 0.5, "Minimum damage to explode a crystal", visibility = { page == Page.Exploding })
+    private val noWeakness by setting("No Weakness", true, "Switch to a weapon when you have a weakness effect", visibility = { page == Page.Exploding })
+
+    /* Rendering */
+
+
+    /* Interaction */
+    private val interac = InteractionSettings(this) // Canadian interbank meme
+
+    private enum class Page {
+        General, Targeting, Placing, Exploding, Rendering
+    }
+
+    init {
+        concurrentListener<TickEvent.Pre> {}
+
+        /*listener<RotationEvent.Pre> { event ->
+            event.lookAtEntity(rotation, interac, getClosestEntity<LivingEntity>(player.eyePos, placeRange) ?: return@listener)
+        }*/
+
+        listener<TickEvent.Pre> {
+            getClosestEntity<LivingEntity>(player.eyePos, 64.0)
+        }
+    }
+}

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

@@ -28,7 +28,7 @@ object EntityUtils {
             if (range > 64) getEntities(predicate)
             else getFastEntities(pos, range, predicate)
 
-        return entities.minByOrNull { it.squaredDistanceTo(pos) } // There is probably a faster way to do this
+        return entities.minByOrNull { it.squaredDistanceTo(pos) }
     }
 
     /**
@@ -78,7 +78,9 @@ object EntityUtils {
             for (y in sectionY - chunks..sectionY + chunks) {
                 for (z in sectionZ - chunks..sectionZ + chunks) {
                     val section = world.entityManager.cache.findTrackingSection(ChunkSectionPos.asLong(x, y, z)) ?: continue
-                    section.collection.filterIsInstanceTo(entities, predicate)
+                    section.collection.filterIsInstanceTo(entities) { entity ->
+                        entity != player && predicate(entity)
+                    }
                 }
             }
         }