make item checker the same on every version

Author: DerpDerpling

versions/1.21.1/src/client/java/derp/immersivehotbar/util/ItemChecker.java

@@ -1,15 +1,17 @@
 package derp.immersivehotbar.util;
 
-import net.minecraft.item.*;
-import org.spongepowered.asm.mixin.Unique;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.item.ShearsItem;
+import net.minecraft.registry.tag.ItemTags;
 
 public class ItemChecker {
-    @Unique
+
     public static boolean isTool(ItemStack stack) {
-        return stack.getItem() instanceof ShovelItem || stack.getItem() instanceof AxeItem || stack.getItem() instanceof PickaxeItem || stack.getItem() instanceof HoeItem || stack.getItem() instanceof ShearsItem;
+        return stack.isIn(ItemTags.PICKAXES) || stack.isIn(ItemTags.SHOVELS) || stack.isIn(ItemTags.AXES) || stack.isIn(ItemTags.HOES) || stack.getItem() instanceof ShearsItem;
     }
-    @Unique
+
     public static boolean isWeapon(ItemStack stack) {
-        return stack.getItem() instanceof CrossbowItem || stack.getItem() instanceof SwordItem || stack.getItem() instanceof BowItem || stack.getItem() instanceof TridentItem || stack.getItem() instanceof MaceItem;
+        return stack.isIn(ItemTags.SWORDS) || stack.isOf(Items.BOW) || stack.isOf(Items.CROSSBOW) || stack.isOf(Items.TRIDENT) || stack.isOf(Items.MACE);
     }
 }

versions/1.21.2/src/client/java/derp/immersivehotbar/util/ItemChecker.java

@@ -1,15 +1,17 @@
 package derp.immersivehotbar.util;
 
-import net.minecraft.item.*;
-import org.spongepowered.asm.mixin.Unique;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.item.ShearsItem;
+import net.minecraft.registry.tag.ItemTags;
 
 public class ItemChecker {
-    @Unique
+
     public static boolean isTool(ItemStack stack) {
-        return stack.getItem() instanceof ShovelItem || stack.getItem() instanceof AxeItem || stack.getItem() instanceof PickaxeItem || stack.getItem() instanceof HoeItem || stack.getItem() instanceof ShearsItem;
+        return stack.isIn(ItemTags.PICKAXES) || stack.isIn(ItemTags.SHOVELS) || stack.isIn(ItemTags.AXES) || stack.isIn(ItemTags.HOES) || stack.isOf(Items.SHEARS);
     }
-    @Unique
+
     public static boolean isWeapon(ItemStack stack) {
-        return stack.getItem() instanceof CrossbowItem || stack.getItem() instanceof SwordItem || stack.getItem() instanceof BowItem || stack.getItem() instanceof TridentItem || stack.getItem() instanceof MaceItem;
+        return stack.isIn(ItemTags.SWORDS) || stack.isOf(Items.BOW) || stack.isOf(Items.CROSSBOW) || stack.isOf(Items.TRIDENT) || stack.isOf(Items.MACE);
     }
 }