Skip to content

auto-tool improvements, split anti-break into its own module #5708

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

auto-tool improvements, split anti-break into its own module #5708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c0ac27
[feat] add tool-saver; adjust auto-tool
chri-k Sep 20, 2025
378b66d
remove redundant anti-break functionality
chri-k Sep 20, 2025
c50139f
[feat] auto-tool silk-touch-for-glass
chri-k Sep 20, 2025
d2e3364
[feat] auto-tool inventory swap support
chri-k Sep 20, 2025
2671b97
[fix] 6 squashed commits
chri-k Sep 20, 2025
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
3 changes: 2 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import meteordevelopment.meteorclient.systems.modules.render.*;
import meteordevelopment.meteorclient.systems.modules.render.blockesp.BlockESP;
import meteordevelopment.meteorclient.systems.modules.render.marker.Marker;
import meteordevelopment.meteorclient.systems.modules.world.Timer;
import meteordevelopment.meteorclient.systems.modules.world.*;
import meteordevelopment.meteorclient.systems.modules.world.Timer;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.misc.Keybind;
import meteordevelopment.meteorclient.utils.misc.ValueComparableMap;
Expand Down Expand Up @@ -449,6 +449,7 @@ private void initPlayer() {
add(new Reach());
add(new Rotation());
add(new SpeedMine());
add(new ToolSaver());
}

private void initMovement() {
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoWeapon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.player.ToolSaver;
import meteordevelopment.meteorclient.utils.entity.DamageUtils;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.orbit.EventHandler;
Expand All @@ -34,13 +35,6 @@ public class AutoWeapon extends Module {
.build()
);

private final Setting<Boolean> antiBreak = sgGeneral.add(new BoolSetting.Builder()
.name("anti-break")
.description("Prevents you from breaking your weapon.")
.defaultValue(false)
.build()
);

public AutoWeapon() {
super(Categories.Combat, "auto-weapon", "Finds the best weapon to use in your hotbar.");
}
Expand All @@ -62,14 +56,14 @@ private int getBestWeapon(LivingEntity target) {
for (int i = 0; i < 9; i++) {
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.isIn(ItemTags.SWORDS)
&& (!antiBreak.get() || (stack.getMaxDamage() - stack.getDamage()) > 10)) {
&& ToolSaver.canUse(stack)) {
currentDamageS = DamageUtils.getAttackDamage(mc.player, target, stack);
if (currentDamageS > damageS) {
damageS = currentDamageS;
slotS = i;
}
} else if (stack.getItem() instanceof AxeItem
&& (!antiBreak.get() || (stack.getMaxDamage() - stack.getDamage()) > 10)) {
&& ToolSaver.canUse(stack)) {
currentDamageA = DamageUtils.getAttackDamage(mc.player, target, stack);
if (currentDamageA > damageA) {
damageA = currentDamageA;
Expand Down
107 changes: 80 additions & 27 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import meteordevelopment.meteorclient.systems.modules.world.InfinityMiner;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.player.SlotUtils;
import meteordevelopment.meteorclient.utils.world.BlockUtils;
import meteordevelopment.orbit.EventHandler;
import meteordevelopment.orbit.EventPriority;
Expand Down Expand Up @@ -51,37 +52,59 @@ public class AutoTool extends Module {
.build()
);

private final Setting<Boolean> silkTouchForGlass = sgGeneral.add(new BoolSetting.Builder()
.name("silk-touch-for-glass")
.description("Prefer to mine glass with silk touch")
.defaultValue(true)
.build()
);

private final Setting<Boolean> fortuneForOresCrops = sgGeneral.add(new BoolSetting.Builder()
.name("fortune-for-ores-and-crops")
.description("Mines Ores and crops only with the Fortune enchantment.")
.defaultValue(false)
.build()
);

private final Setting<Boolean> antiBreak = sgGeneral.add(new BoolSetting.Builder()
.name("anti-break")
.description("Stops you from breaking your tool.")
private final Setting<Boolean> switchBack = sgGeneral.add(new BoolSetting.Builder()
.name("switch-back")
.description("Switches your hand to whatever was selected when releasing your attack key.")
.defaultValue(false)
.build()
);

private final Setting<Integer> breakDurability = sgGeneral.add(new IntSetting.Builder()
.name("anti-break-percentage")
.description("The durability percentage to stop using a tool.")
.defaultValue(10)
.range(1, 100)
.sliderRange(1, 100)
.visible(antiBreak::get)
private final Setting<Boolean> switchAway = sgGeneral.add(new BoolSetting.Builder()
.name("switch-away")
.description("Switch to hand when no correct tool is found")
.defaultValue(true)
.build()
);

private final Setting<Boolean> switchBack = sgGeneral.add(new BoolSetting.Builder()
.name("switch-back")
.description("Switches your hand to whatever was selected when releasing your attack key.")
private final Setting<Boolean> invSwap = sgGeneral.add(new BoolSetting.Builder()
.name("swap-from-inventory")
.description("Search tools in the entire inventory")
.defaultValue(false)
.build()
);

private final Setting<Integer> invSwapSlot = sgGeneral.add(new IntSetting.Builder()
.name("swap-slot")
.description("Slot to swap tools from inventory into")
.defaultValue(8)
.range(0, 8)
.noSlider()
.visible(invSwap::get)
.build()
);

private final Setting<Boolean> invSwapReturn = sgGeneral.add(new BoolSetting.Builder()
.name("return-swapped-tool-back")
.description("Swap the tool back into the inventory")
.defaultValue(false)
.visible(invSwap::get)
.build()
);

private final Setting<Integer> switchDelay = sgGeneral.add((new IntSetting.Builder()
.name("switch-delay")
.description("Delay in ticks before switching tools.")
Expand Down Expand Up @@ -118,6 +141,7 @@ public class AutoTool extends Module {
private boolean shouldSwitch;
private int ticks;
private int bestSlot;
private int toolWasIn;

public AutoTool() {
super(Categories.Player, "auto-tool", "Automatically switches to the most effective tool when performing an action.");
Expand All @@ -127,6 +151,12 @@ public AutoTool() {
private void onTick(TickEvent.Post event) {
if (Modules.get().isActive(InfinityMiner.class)) return;

if (invSwapReturn.get() && !mc.options.attackKey.isPressed() && wasPressed && toolWasIn != -1) {
InvUtils.quickSwap().fromId(invSwapSlot.get()).to(toolWasIn);
toolWasIn = -1;
return;
}

if (switchBack.get() && !mc.options.attackKey.isPressed() && wasPressed && InvUtils.previousSlot != -1) {
InvUtils.swapBack();
wasPressed = false;
Expand Down Expand Up @@ -158,13 +188,17 @@ private void onStartBreakingBlock(StartBreakingBlockEvent event) {
double bestScore = -1;
bestSlot = -1;

for (int i = 0; i < 9; i++) {
int max = invSwap.get() ? SlotUtils.MAIN_END : 9;

for (int i = 0; i < max; i++) {
ItemStack itemStack = mc.player.getInventory().getStack(i);

if (listMode.get() == ListMode.Whitelist && !whitelist.get().contains(itemStack.getItem())) continue;
if (listMode.get() == ListMode.Blacklist && blacklist.get().contains(itemStack.getItem())) continue;

double score = getScore(itemStack, blockState, silkTouchForEnderChest.get(), fortuneForOresCrops.get(), prefer.get(), itemStack2 -> !shouldStopUsing(itemStack2));
EnchantPreference pref = isGlass(blockState.getBlock()) && silkTouchForGlass.get() ? EnchantPreference.SilkTouch : prefer.get();

double score = getScore(itemStack, blockState, silkTouchForEnderChest.get(), fortuneForOresCrops.get(), pref, ToolSaver::canUse);
if (score < 0) continue;

if (score > bestScore) {
Expand All @@ -173,31 +207,46 @@ private void onStartBreakingBlock(StartBreakingBlockEvent event) {
}
}

if ((bestSlot != -1 && (bestScore > getScore(currentStack, blockState, silkTouchForEnderChest.get(), fortuneForOresCrops.get(), prefer.get(), itemStack -> !shouldStopUsing(itemStack))) || shouldStopUsing(currentStack) || !isTool(currentStack))) {
if (bestSlot == -1 && ToolSaver.isTool(mc.player.getMainHandStack()) && switchAway.get()) {
for (int i = 0; i < 9; i++) {
if (!ToolSaver.isTool(mc.player.getInventory().getStack(i))) {
bestSlot = i;
bestScore = 0;
break;
}
}
}

int returnToolTo = toolWasIn;

if (bestSlot > 8) {
toolWasIn = bestSlot;
bestSlot = invSwapSlot.get();
}

if ((bestSlot != -1 && (bestScore > getScore(currentStack, blockState, silkTouchForEnderChest.get(), fortuneForOresCrops.get(), prefer.get(), itemStack -> ToolSaver.canUse(itemStack) || ToolSaver.canUse(currentStack) || !isTool(currentStack))))) {
ticks = switchDelay.get();

if (invSwapReturn.get() && returnToolTo > 8) InvUtils.quickSwap().fromId(invSwapSlot.get()).to(returnToolTo);

if (ticks == 0) InvUtils.swap(bestSlot, true);
else shouldSwitch = true;
}

// Anti break
currentStack = mc.player.getMainHandStack();

if (shouldStopUsing(currentStack) && isTool(currentStack)) {
mc.options.attackKey.setPressed(false);
event.cancel();
if (toolWasIn > 8) {
if (bestSlot == invSwapSlot.get()) InvUtils.quickSwap().fromId(invSwapSlot.get()).to(toolWasIn);
else toolWasIn = -1;
}
}
}

private boolean shouldStopUsing(ItemStack itemStack) {
return antiBreak.get() && (itemStack.getMaxDamage() - itemStack.getDamage()) < (itemStack.getMaxDamage() * breakDurability.get() / 100);
}

public static double getScore(ItemStack itemStack, BlockState state, boolean silkTouchEnderChest, boolean fortuneOre, EnchantPreference enchantPreference, Predicate<ItemStack> good) {
if (!good.test(itemStack) || !isTool(itemStack)) return -1;

if (!itemStack.isSuitableFor(state) &&
!(itemStack.isIn(ItemTags.SWORDS) && (state.getBlock() instanceof BambooBlock || state.getBlock() instanceof BambooShootBlock)) &&
!(itemStack.getItem() instanceof ShearsItem && state.getBlock() instanceof LeavesBlock || state.isIn(BlockTags.WOOL)))
!(itemStack.getItem() instanceof ShearsItem && state.getBlock() instanceof LeavesBlock || state.isIn(BlockTags.WOOL)) &&
!(isGlass(state.getBlock()) && enchantPreference == EnchantPreference.SilkTouch && Utils.getEnchantmentLevel(itemStack, Enchantments.SILK_TOUCH) > 0))
return -1;

if (silkTouchEnderChest
Expand Down Expand Up @@ -228,6 +277,10 @@ && isFortunable(state.getBlock())
return score;
}

private static boolean isGlass(Block b) {
return b == Blocks.GLASS || b == Blocks.GLASS_PANE || b instanceof StainedGlassBlock || b instanceof StainedGlassPaneBlock || b instanceof TintedGlassBlock;
}

public static boolean isTool(Item item) {
return isTool(item.getDefaultStack());
}
Expand Down
Loading