Skip to content

feat(KillAura): Add Target Named Entities to targeting setting #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beanbag44 merged 5 commits into from
Apr 6, 2026
Merged

feat(KillAura): Add Target Named Entities to targeting setting #270

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b348bd2
Add Target Named Entities to targeting setting
IceTank Mar 15, 2026
1e48948
Only apply named setting to none player like entities
IceTank Mar 18, 2026
20abcba
Update comment for targetNamed setting description
IceTank Mar 29, 2026
db9bfd4
Merge branch '1.21.11' into feature/targetNamed-setting-in-killaura
IceTank Mar 29, 2026
a668fe9
fixes
beanbag44 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/kotlin/com/lambda/config/groups/Targeting.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import net.minecraft.client.network.ClientPlayerEntity
import net.minecraft.client.network.OtherClientPlayerEntity
import net.minecraft.entity.Entity
import net.minecraft.entity.LivingEntity
import net.minecraft.entity.PlayerLikeEntity
import java.util.*

/**
Expand All @@ -44,7 +45,7 @@ import java.util.*
* are targetable, the range of targeting, and various other conditions for targeting.
*
* @param c The [Configurable] instance used to get and set configuration options for targeting.
* @param vis The predicate used to determine whether the targeting settings are visible and active.
* @param visibility The predicate used to determine whether the targeting settings are visible and active.
* @param defaultRange The default range within which entities can be targeted.
* @param maxRange The maximum range within which entities can be targeted.
*/
Expand Down Expand Up @@ -101,6 +102,11 @@ abstract class Targeting(
*/
val priority by c.setting("${prefix}Priority", Priority.Distance, visibility = visibility).group(*baseGroup).index()

/**
* Whether to target named entities that are not players. Configurable with default set to `true`.
*/
val targetNamed by c.setting("${prefix}Target Named Entities", false, visibility = visibility).group(*baseGroup).index()

/**
* Validates whether a given entity is targetable for combat based on the field of view limit and other settings.
*
Expand All @@ -111,7 +117,8 @@ abstract class Targeting(
override fun validate(player: ClientPlayerEntity, entity: Entity): Boolean {
if (fov < 180 && player.rotation dist player.eyePos.rotationTo(entity.pos) > fov) return false
if (entity.uuid in illegalTargets) return false
if ((entity as? LivingEntity)?.isDead == true) return false
if (entity.hasCustomName() && entity !is PlayerLikeEntity && !targetNamed) return false
if ((entity as? LivingEntity)?.isDead == true) return false
return super.validate(player, entity)
}

Expand Down