Skip to content

Commit 964470e

Browse files
committed
Fix EntitySpeed rotations and more specific settings
1 parent 4396adf commit 964470e

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

src/main/kotlin/com/lambda/client/module/modules/misc/EntityTools.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object EntityTools : Module(
3636
}
3737
Mode.INFO -> {
3838
val tag = NBTTagCompound().apply { it.entityHit.writeToNBT(this) }
39-
MessageSendHelper.sendChatMessage("""$chatName &6Entity Tags:$tag""".trimIndent())
39+
MessageSendHelper.sendChatMessage("""$chatName &6ID: ${it.entityHit.entityId} Tags:$tag""".trimIndent())
4040
}
4141
}
4242
}

src/main/kotlin/com/lambda/client/module/modules/movement/EntitySpeed.kt

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,26 @@ object EntitySpeed : Module(
1616
category = Category.MOVEMENT,
1717
description = "Abuse client-sided movement to shape sound barrier breaking rideables"
1818
) {
19-
private val speed by setting("Speed", 1.0f, 0.1f..25.0f, 0.1f)
19+
private val boatSpeed by setting("Boat Speed", 1.4f, 0.1f..10.0f, 0.05f)
20+
private val abstractHorseSpeed by setting("Horse Types Speed", 0.7f, 0.1f..10.0f, 0.05f)
21+
private val pigSpeed by setting("Pig Speed", 1.0f, 0.1f..10.0f, 0.05f)
2022
private val antiStuck by setting("Anti Stuck", true)
21-
private val flight by setting("Flight", false)
22-
private val glideSpeed by setting("Glide Speed", 0.1f, 0.0f..1.0f, 0.01f, { flight })
23-
private val upSpeed by setting("Up Speed", 1.0f, 0.0f..5.0f, 0.1f, { flight })
2423

2524
init {
2625
safeListener<PlayerTravelEvent> {
2726
player.ridingEntity?.let { entity ->
28-
if (entity is EntityPig
29-
|| entity is AbstractHorse && entity.controllingPassenger == player
30-
|| entity is EntityBoat && entity.controllingPassenger == player) {
27+
var tamper = false
28+
val speed = when {
29+
entity is AbstractHorse && entity.controllingPassenger == player -> abstractHorseSpeed.also { tamper = true }
30+
entity is EntityBoat && entity.controllingPassenger == player -> boatSpeed.also { tamper = true }
31+
entity is EntityPig -> pigSpeed.also { tamper = true }
32+
else -> .0f
33+
}
34+
if (tamper) {
3135
steerEntity(entity, speed, antiStuck)
32-
33-
if (entity is EntityHorse) {
34-
entity.rotationYaw = player.rotationYaw
35-
}
36-
37-
if (flight) fly(entity)
36+
entity.rotationYaw = player.rotationYaw
3837
}
3938
}
4039
}
4140
}
42-
43-
private fun fly(entity: Entity) {
44-
if (!entity.isInWater) entity.motionY = -glideSpeed.toDouble()
45-
if (mc.gameSettings.keyBindJump.isKeyDown) entity.motionY += upSpeed / 2.0
46-
}
4741
}

src/main/kotlin/com/lambda/client/util/EntityUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ object EntityUtils {
165165
fun SafeClientEvent.getDroppedItems(itemId: Int, range: Float): ArrayList<EntityItem> {
166166
val entityList = ArrayList<EntityItem>()
167167
for (entity in world.loadedEntityList) {
168-
if (entity !is EntityItem) continue /* Entites that are dropped item */
168+
if (entity !is EntityItem) continue /* Entities that are dropped item */
169169
if (entity.item.item.id != itemId) continue /* Dropped items that are has give item id */
170170
if (entity.getDistance(player) > range) continue /* Entities within specified blocks radius */
171171

0 commit comments

Comments
 (0)