[feat] auto-tool silk-touch-for-glass

Author: chri-k

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

@@ -162,7 +162,9 @@ private void onStartBreakingBlock(StartBreakingBlockEvent event) {
             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(), ToolSaver::canUse);
+            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) {
@@ -195,7 +197,8 @@ public static double getScore(ItemStack itemStack, BlockState state, boolean sil
 
         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
@@ -226,6 +229,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());
     }