Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Vanilla elytra flight rewrite and AutoOffhand changes #540

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
merged 10 commits into from
Aug 8, 2023
Merged

Vanilla elytra flight rewrite and AutoOffhand changes #540

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d40edc5
Added Speed Threshold to Vanilla efly mode
nickcat1 May 22, 2023
ed8a7f9
Elytra gains hight
nickcat1 May 23, 2023
0bba35b
Improved pitch controls
nickcat1 May 25, 2023
f2da0e2
Fixed playerSpeed
nickcat1 May 29, 2023
e8af92d
fixed toggles and added conditional to AutoOffhand
nickcat1 May 30, 2023
e0c2b7e
Added Align Coords to Coordinates
nickcat1 May 30, 2023
353b646
Efly can be used with timer
nickcat1 Jun 12, 2023
826e4f9
Merge branch 'lambda-client:master' into master
nickcat1 Jul 9, 2023
a769992
Minor style changes
Avanatiker Aug 8, 2023
204a936
Merge remote-tracking branch 'origin/master'
Avanatiker Aug 8, 2023
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
Prev Previous commit
Next Next commit
fixed toggles and added conditional to AutoOffhand
  • Loading branch information
@nickcat1
nickcat1 committed May 30, 2023
commit e8af92d972c1c4eaaa2fc4bf1af32d7e22f0f19b
81 changes: 39 additions & 42 deletions src/main/kotlin/com/lambda/client/module/modules/combat/AutoOffhand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,38 +34,39 @@ object AutoOffhand : Module(
description = "Manages item in your offhand",
category = Category.COMBAT
) {
// General
private val switchMessage by setting("Switch Message", true)
private val priority by setting("Priority", Priority.HOTBAR)
private val conditional by setting("Conditional", false)
private val type by setting("Type", Type.TOTEM)

// Totem
private val hpThreshold by setting("Hp Threshold", 5f, 1f..36f, 0.5f, { type == Type.TOTEM })
private val offhandTotem by setting("Offhand Totem", true, { type == Type.TOTEM })
private val bindTotem by setting("Bind Totem", Bind(), { type == Type.TOTEM })
private val checkDamage by setting("Check Damage", true, { type == Type.TOTEM })
private val mob by setting("Mob", true, { type == Type.TOTEM && checkDamage })
private val player by setting("Player", true, { type == Type.TOTEM && checkDamage })
private val crystal by setting("Crystal", true, { type == Type.TOTEM && checkDamage })
private val falling by setting("Falling", true, { type == Type.TOTEM && checkDamage })
private val hpThreshold by setting("Hp Threshold", 5f, 1f..36f, 0.5f, { type == Type.TOTEM && offhandTotem && conditional })
private val checkDamage by setting("Check Damage", true, { type == Type.TOTEM && offhandTotem && conditional })
private val mob by setting("Mob", true, { type == Type.TOTEM && offhandTotem && checkDamage && conditional })
private val player by setting("Player", true, { type == Type.TOTEM && offhandTotem && checkDamage && conditional })
private val crystal by setting("Crystal", true, { type == Type.TOTEM && offhandTotem && checkDamage && conditional })
private val falling by setting("Falling", true, { type == Type.TOTEM && offhandTotem && checkDamage && conditional })

// Gapple
private val offhandGapple by setting("Offhand Gapple", false, { type == Type.GAPPLE })
private val bindGapple by setting("Bind Gapple", Bind(), { type == Type.GAPPLE && offhandGapple })
private val checkAuraG by setting("Check Aura G", true, { type == Type.GAPPLE && offhandGapple })
private val checkWeaponG by setting("Check Weapon G", false, { type == Type.GAPPLE && offhandGapple })
private val checkCAGapple by setting("Check CrystalAura G", true, { type == Type.GAPPLE && offhandGapple && !offhandCrystal })
private val bindGapple by setting("Bind Gapple", Bind(), { type == Type.GAPPLE })
private val checkAuraG by setting("Check Aura G", true, { type == Type.GAPPLE && offhandGapple && conditional })
private val checkWeaponG by setting("Check Weapon G", false, { type == Type.GAPPLE && offhandGapple && conditional })
private val checkCAGapple by setting("Check CrystalAura G", true, { type == Type.GAPPLE && offhandGapple && !offhandCrystal && conditional })

// Strength
private val offhandStrength by setting("Offhand Strength", false, { type == Type.STRENGTH })
private val bindStrength by setting("Bind Strength", Bind(), { type == Type.STRENGTH && offhandStrength })
private val checkAuraS by setting("Check Aura S", true, { type == Type.STRENGTH && offhandStrength })
private val checkWeaponS by setting("Check Weapon S", false, { type == Type.STRENGTH && offhandStrength })
private val bindStrength by setting("Bind Strength", Bind(), { type == Type.STRENGTH })
private val checkAuraS by setting("Check Aura S", true, { type == Type.STRENGTH && offhandStrength && conditional })
private val checkWeaponS by setting("Check Weapon S", false, { type == Type.STRENGTH && offhandStrength && conditional })

// Crystal
private val offhandCrystal by setting("Offhand Crystal", false, { type == Type.CRYSTAL })
private val bindCrystal by setting("Bind Crystal", Bind(), { type == Type.CRYSTAL && offhandCrystal })
private val checkCACrystal by setting("Check Crystal Aura C", false, { type == Type.CRYSTAL && offhandCrystal })

// General
private val priority by setting("Priority", Priority.HOTBAR)
private val switchMessage by setting("Switch Message", true)
private val bindCrystal by setting("Bind Crystal", Bind(), { type == Type.CRYSTAL })
private val checkCACrystal by setting("Check Crystal Aura C", false, { type == Type.CRYSTAL && offhandCrystal && conditional })

// Represents the remaining number of items of type AutoOffhandType in the inventory
private var hudInfo = ""
Expand Down Expand Up @@ -100,7 +101,7 @@ object AutoOffhand : Module(

updateDamage()

switchToType(getType(), true)
if (player.heldItemOffhand.isEmpty) switchToType(getType())

hudInfo = player.allSlots.countByStack { type.filter(it) }.toString()
}
Expand All @@ -113,26 +114,27 @@ object AutoOffhand : Module(
checkStrength() -> Type.STRENGTH
checkGapple() -> Type.GAPPLE
checkCrystal() -> Type.CRYSTAL
player.heldItemOffhand.isEmpty -> Type.TOTEM
else -> null
}

private fun SafeClientEvent.checkTotem() = player.scaledHealth < hpThreshold
|| (checkDamage && player.scaledHealth - maxDamage < hpThreshold)
//The conditional code is difficult to read
private fun SafeClientEvent.checkTotem() = offhandTotem && (!conditional || (
player.scaledHealth < hpThreshold ||
(checkDamage && player.scaledHealth - maxDamage < hpThreshold)))

private fun SafeClientEvent.checkGapple() = offhandGapple
&& (checkAuraG && CombatManager.isActiveAndTopPriority(KillAura)
|| checkWeaponG && player.heldItemMainhand.item.isWeapon
|| (checkCAGapple && !offhandCrystal) && CombatManager.isOnTopPriority(CrystalAura))
private fun SafeClientEvent.checkGapple() = offhandGapple && (!conditional || (
(checkAuraG && CombatManager.isActiveAndTopPriority(KillAura) ||
checkWeaponG && player.heldItemMainhand.item.isWeapon ||
(checkCAGapple && !offhandCrystal) && CombatManager.isOnTopPriority(CrystalAura))))

private fun checkCrystal() = offhandCrystal
&& checkCACrystal && CrystalAura.isEnabled && CombatManager.isOnTopPriority(CrystalAura)
private fun checkCrystal() = offhandCrystal && (!conditional || (
checkCACrystal && CrystalAura.isEnabled && CombatManager.isOnTopPriority(CrystalAura)))

private fun SafeClientEvent.checkStrength() = offhandStrength
&& !player.isPotionActive(MobEffects.STRENGTH)
&& player.inventoryContainer.inventory.any(Type.STRENGTH.filter)
&& (checkAuraS && CombatManager.isActiveAndTopPriority(KillAura)
|| checkWeaponS && player.heldItemMainhand.item.isWeapon)
private fun SafeClientEvent.checkStrength() = offhandStrength && (!conditional || (
!player.isPotionActive(MobEffects.STRENGTH) &&
player.inventoryContainer.inventory.any(Type.STRENGTH.filter) &&
(checkAuraS && CombatManager.isActiveAndTopPriority(KillAura) ||
checkWeaponS && player.heldItemMainhand.item.isWeapon)))

private fun SafeClientEvent.switchToType(typeOriginal: Type?, alternativeType: Boolean = false) {
// First check for whether player is holding the right item already or not
Expand All @@ -153,11 +155,8 @@ object AutoOffhand : Module(

private fun SafeClientEvent.getItemSlot(type: Type, attempts: Int): Pair<Slot, Type>? =
getSlot(type)?.to(type)
?: if (attempts > 1) {
getItemSlot(type.next(), attempts - 1)
} else {
null
}
?: if (attempts > 1) {getItemSlot(type.next(), attempts - 1)}
else null

private fun SafeClientEvent.getSlot(type: Type): Slot? {
return player.offhandSlot.takeIf(filter(type))
Expand All @@ -175,9 +174,7 @@ object AutoOffhand : Module(
private fun List<Slot>.findItemByType(type: Type) =
find(filter(type))

private fun filter(type: Type) = { it: Slot ->
type.filter(it.stack)
}
private fun filter(type: Type) = { it: Slot -> type.filter(it.stack)}

private fun SafeClientEvent.updateDamage() {
maxDamage = 0f
Expand Down