remove redundant anti-break functionality

Author: chri-k

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoWeapon.java

@@ -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;
@@ -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.");
     }
@@ -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;

src/main/java/meteordevelopment/meteorclient/systems/modules/player/ToolSaver.java

@@ -100,6 +100,7 @@ private static ToolType toolType(ItemStack is) {
         if (is.isIn(ItemTags.SWORDS)) return ToolType.SWORD;
         if (is.getItem() instanceof ShearsItem) return ToolType.SHEAR;
         if (is.getItem() instanceof MaceItem) return ToolType.MACE;
+        if (is.getItem() instanceof FlintAndSteelItem) return ToolType.FLINT_AND_STEEL;
         return ToolType.NONE;
     }
 
@@ -181,5 +182,6 @@ public enum ToolType {
         SWORD,
         MACE,
         SHEAR,
+        FLINT_AND_STEEL,
     }
 }

src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoShearer.java

@@ -12,6 +12,7 @@
 import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.systems.modules.player.ToolSaver;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.player.PlayerUtils;
@@ -33,13 +34,6 @@ public class AutoShearer extends Module {
         .build()
     );
 
-    private final Setting<Boolean> antiBreak = sgGeneral.add(new BoolSetting.Builder()
-        .name("anti-break")
-        .description("Prevents shears from being broken.")
-        .defaultValue(false)
-        .build()
-    );
-
     private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
         .name("rotate")
         .description("Automatically faces towards the animal being sheared.")
@@ -66,7 +60,7 @@ private void onTick(TickEvent.Pre event) {
         for (Entity entity : mc.world.getEntities()) {
             if (!(entity instanceof SheepEntity) || ((SheepEntity) entity).isSheared() || ((SheepEntity) entity).isBaby() || !PlayerUtils.isWithin(entity, distance.get())) continue;
 
-            FindItemResult findShear = InvUtils.findInHotbar(itemStack -> itemStack.getItem() == Items.SHEARS && (!antiBreak.get() || itemStack.getDamage() < itemStack.getMaxDamage() - 1));
+            FindItemResult findShear = InvUtils.findInHotbar(itemStack -> itemStack.getItem() == Items.SHEARS && ToolSaver.canUse(itemStack));
             if (!InvUtils.swap(findShear.slot(), true)) return;
 
             this.hand = findShear.getHand();

src/main/java/meteordevelopment/meteorclient/systems/modules/world/Flamethrower.java

@@ -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.misc.HorizontalDirection;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
@@ -39,13 +40,6 @@ public class Flamethrower extends Module {
         .build()
     );
 
-    private final Setting<Boolean> antiBreak = sgGeneral.add(new BoolSetting.Builder()
-        .name("anti-break")
-        .description("Prevents flint and steel from being broken.")
-        .defaultValue(false)
-        .build()
-    );
-
     private final Setting<Boolean> putOutFire = sgGeneral.add(new BoolSetting.Builder()
         .name("put-out-fire")
         .description("Tries to put out the fire when animal is low health, so the items don't burn.")
@@ -111,7 +105,7 @@ private void onTick(TickEvent.Pre event) {
             if (!targetBabies.get() && entity instanceof LivingEntity livingEntity && livingEntity.isBaby()) continue;
 
             FindItemResult item = InvUtils.findInHotbar(itemStack -> (itemStack.isOf(Items.FLINT_AND_STEEL) || itemStack.isOf(Items.FIRE_CHARGE)) &&
-                (!itemStack.isDamageable() || !antiBreak.get() || itemStack.getDamage() < itemStack.getMaxDamage() - 1));
+                ToolSaver.canUse(itemStack));
             if (!InvUtils.swap(item.slot(), true)) return;
 
             this.hand = item.getHand();