Skip to content
This repository was archived by the owner on Dec 12, 2025. It is now read-only.

Commit 5023b2c

Browse files
author
Imeguras
committed
Added Minecart as an option to autoremount
1 parent 879fbaf commit 5023b2c

File tree

1 file changed

+19
-9
lines changed
  • src/main/kotlin/com/lambda/client/module/modules/movement

1 file changed

+19
-9
lines changed

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import com.lambda.client.util.TimeUnit
77
import com.lambda.client.util.threads.safeListener
88
import net.minecraft.entity.Entity
99
import net.minecraft.entity.item.EntityBoat
10+
import net.minecraft.entity.item.EntityMinecartEmpty
11+
1012
import net.minecraft.entity.passive.*
1113
import net.minecraft.util.EnumHand
1214
import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -17,6 +19,7 @@ object AutoRemount : Module(
1719
category = Category.MOVEMENT
1820
) {
1921
private val boat by setting("Boats", true)
22+
private val minecart by setting("Minecarts", true)
2023
private val horse by setting("Horse", true)
2124
private val skeletonHorse by setting("Skeleton Horse", true)
2225
private val donkey by setting("Donkey", true)
@@ -25,7 +28,7 @@ object AutoRemount : Module(
2528
private val llama by setting("Llama", true)
2629
private val range by setting("Range", 2.0f, 1.0f..5.0f, 0.5f)
2730
private val remountDelay by setting("Remount Delay", 5, 0..10, 1)
28-
31+
2932
private val remountTimer = TickTimer(TimeUnit.TICKS)
3033

3134
init {
@@ -50,13 +53,20 @@ object AutoRemount : Module(
5053
}
5154

5255
private fun isValidEntity(entity: Entity): Boolean {
53-
return boat && entity is EntityBoat
54-
|| entity is EntityAnimal && !entity.isChild // FBI moment
55-
&& (horse && entity is EntityHorse
56-
|| skeletonHorse && entity is EntitySkeletonHorse
57-
|| donkey && entity is EntityDonkey
58-
|| mule && entity is EntityMule
59-
|| pig && entity is EntityPig && entity.saddled
60-
|| llama && entity is EntityLlama)
56+
//check if entity is an animal and not a child
57+
var matureAnimalCheck: Boolean = entity is EntityAnimal && !entity.isChild; //FBI moment
58+
when(entity){
59+
is EntityBoat -> return boat;
60+
is EntityMinecartEmpty -> return minecart;
61+
62+
is EntityHorse -> return horse && matureAnimalCheck;
63+
is EntitySkeletonHorse -> return skeletonHorse && matureAnimalCheck;
64+
is EntityDonkey -> return donkey && matureAnimalCheck;
65+
is EntityMule -> return mule && matureAnimalCheck;
66+
is EntityPig -> return pig && entity.saddled && matureAnimalCheck;
67+
is EntityLlama -> return llama && matureAnimalCheck;
68+
else -> return false;
69+
70+
}
6171
}
6272
}

0 commit comments

Comments
 (0)