[feature] Added OnlySword option to KillAura

Closes #1297

Signed-off-by: Dominika <sokolov.dominika@gmail.com>
This commit is contained in:
Dominika 2020-12-30 00:41:05 -05:00
parent 7d41c7dc61
commit 1251e8cc7c
No known key found for this signature in database
GPG Key ID: B4A5A6DCA70F861F
1 changed files with 11 additions and 1 deletions

View File

@ -11,6 +11,8 @@ import me.zeroeightsix.kami.util.math.RotationUtils
import me.zeroeightsix.kami.util.math.RotationUtils.faceEntityClosest
import me.zeroeightsix.kami.util.math.Vec2f
import net.minecraft.entity.Entity
import net.minecraft.item.ItemAxe
import net.minecraft.item.ItemSword
import net.minecraft.util.EnumHand
import net.minecraftforge.fml.common.gameevent.TickEvent
import org.kamiblue.event.listener.listener
@ -32,6 +34,7 @@ object KillAura : Module() {
val range = register(Settings.floatBuilder("Range").withValue(5f).withRange(0f, 8f).withStep(0.25f))
private val tpsSync = register(Settings.b("TPSSync", false))
private val autoTool = register(Settings.b("AutoWeapon", true))
private val onlySword = register(Settings.booleanBuilder("OnlySword").withValue(false).withVisibility { !autoTool.value })
private val prefer = register(Settings.enumBuilder(CombatUtils.PreferWeapon::class.java).withName("Prefer").withValue(CombatUtils.PreferWeapon.SWORD).withVisibility { autoTool.value })
private val disableOnDeath = register(Settings.b("DisableOnDeath", false))
@ -96,7 +99,14 @@ object KillAura : Module() {
}
private fun attack(e: Entity) {
if (autoTool.value) CombatUtils.equipBestWeapon(prefer.value as CombatUtils.PreferWeapon)
val item = mc.player.heldItemMainhand.item
if (autoTool.value) {
CombatUtils.equipBestWeapon(prefer.value as CombatUtils.PreferWeapon)
} else if (onlySword.value && item !is ItemSword && item !is ItemAxe) {
return
}
mc.playerController.attackEntity(mc.player, e)
mc.player.swingArm(EnumHand.MAIN_HAND)
}