From 9bee04d5d828599be0b41b8902995d4ef136a52c Mon Sep 17 00:00:00 2001
From: ZacSharp <68165024+ZacSharp@users.noreply.github.com>
Date: Sun, 4 Jan 2026 22:15:43 +0100
Subject: [PATCH] Use `SWORDS` / `minecraft:swords` item tag instead of
 instance check

On later versions we check for the `WEAPON` data component instead, which matches
every tool as well, making the setting pretty useless.
---
 src/main/java/baritone/utils/ToolSet.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java
index ed4b166cf..a9982bb09 100644
--- a/src/main/java/baritone/utils/ToolSet.java
+++ b/src/main/java/baritone/utils/ToolSet.java
@@ -19,6 +19,7 @@
 
 import baritone.Baritone;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.SwordItem;
@@ -125,7 +126,7 @@ possible, this lets us make pathing depend on the actual tool to be used (if aut
         BlockState blockState = b.defaultBlockState();
         for (int i = 0; i < 9; i++) {
             ItemStack itemStack = player.getInventory().getItem(i);
-            if (!Baritone.settings().useSwordToMine.value && itemStack.getItem() instanceof SwordItem) {
+            if (!Baritone.settings().useSwordToMine.value && itemStack.is(ItemTags.SWORDS)) {
                 continue;
             }