From a0fafc510fd2b0f9e122d7947906bd59270713f8 Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 7 Apr 2020 09:17:51 -0400 Subject: [PATCH] autoremount improvements and inventorymove default speed --- .../module/modules/movement/AutoRemount.java | 34 +++++++++++++++---- .../modules/movement/InventoryMove.java | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoRemount.java b/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoRemount.java index 57948efe..bff8bcb4 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoRemount.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoRemount.java @@ -4,21 +4,43 @@ import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntityDonkey; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.util.EnumHand; +/** + * @author S-B99 + * Created by S-B99 on 05/04/20 + * Updated by S-B99 on 07/04/20 + */ @Module.Info(name = "AutoRemount", description = "Automatically remounts your horse", category = Module.Category.MOVEMENT) public class AutoRemount extends Module { + private Setting modeSetting = register(Settings.e("Mode", Mode.HORSE)); private Setting range = register(Settings.floatBuilder("Range").withMinimum(1.0f).withValue(1.5f).withMaximum(10.0f).build()); + private enum Mode { HORSE, DONKEY } + public void onUpdate() { - for (Entity e : mc.world.getLoadedEntityList()) { - if (e instanceof EntityHorse && !(mc.player.isRidingHorse())) { - final EntityHorse horse = (EntityHorse) e; - if (mc.player.getDistance(horse) <= range.getValue()) { - mc.playerController.interactWithEntity(mc.player, horse, EnumHand.MAIN_HAND); + switch (modeSetting.getValue()) { + case HORSE: + for (Entity e : mc.world.getLoadedEntityList()) { + if (e instanceof EntityHorse && !(mc.player.isRidingHorse())) { + final EntityHorse horse = (EntityHorse) e; + if (mc.player.getDistance(horse) <= range.getValue()) { + mc.playerController.interactWithEntity(mc.player, horse, EnumHand.MAIN_HAND); + } + } + } + case DONKEY: + for (Entity e : mc.world.getLoadedEntityList()) { + if (e instanceof EntityDonkey && !(mc.player.isRidingHorse())) { + final EntityDonkey donkey = (EntityDonkey) e; + if (mc.player.getDistance(donkey) <= range.getValue()) { + mc.playerController.interactWithEntity(mc.player, donkey, EnumHand.MAIN_HAND); + } + } } - } } + } } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/InventoryMove.java b/src/main/java/me/zeroeightsix/kami/module/modules/movement/InventoryMove.java index b91825c8..f1bb182e 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/InventoryMove.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/InventoryMove.java @@ -13,7 +13,7 @@ import org.lwjgl.input.Keyboard; */ @Module.Info(name = "InventoryMove", description = "Allows you to walk around with GUIs opened", category = Module.Category.MOVEMENT) public class InventoryMove extends Module { - private Setting speed = register(Settings.i("Look speed", 20)); + private Setting speed = register(Settings.i("Look speed", 10)); public void onUpdate() { if (mc.player == null || mc.currentScreen == null || mc.currentScreen instanceof GuiChat) return; if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {