From 45acee184f6337bd8c694cd1f2453cdde0f64b4e Mon Sep 17 00:00:00 2001 From: expvintl Date: Mon, 20 Oct 2025 21:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9B=B4=E7=81=B5=E6=B4=BB?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E5=93=81=E5=88=A4=E6=96=AD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mctools/commands/CAutoToolCommand.java | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java b/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java index a4d1383..0bd0a28 100644 --- a/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java +++ b/src/main/java/com/expvintl/mctools/commands/CAutoToolCommand.java @@ -136,35 +136,10 @@ public class CAutoToolCommand { } } public boolean isSwordItem(Item item){ - return item==Items.STONE_SWORD||item==Items.DIAMOND_SWORD||item==Items.GOLDEN_SWORD||item==Items.IRON_SWORD||item==Items.NETHERITE_SWORD||item==Items.WOODEN_SWORD||item==Items.COPPER_SWORD; + return item.getComponents().contains(DataComponentTypes.WEAPON); } public boolean isToolItem(Item item){ - return item == Items.WOODEN_PICKAXE || item == Items.STONE_PICKAXE || item == Items.IRON_PICKAXE || item == Items.GOLDEN_PICKAXE || item == Items.DIAMOND_PICKAXE || item == Items.NETHERITE_PICKAXE - || item == Items.WOODEN_AXE || item == Items.STONE_AXE || item == Items.IRON_AXE || item == Items.GOLDEN_AXE || item == Items.DIAMOND_AXE || item == Items.NETHERITE_AXE - || item == Items.WOODEN_SHOVEL || item == Items.STONE_SHOVEL || item == Items.IRON_SHOVEL || item == Items.GOLDEN_SHOVEL || item == Items.DIAMOND_SHOVEL || item == Items.NETHERITE_SHOVEL - || item == Items.WOODEN_HOE || item == Items.STONE_HOE || item == Items.IRON_HOE || item == Items.GOLDEN_HOE || item == Items.DIAMOND_HOE || item == Items.NETHERITE_HOE - || item == Items.WOODEN_SWORD || item == Items.STONE_SWORD || item == Items.IRON_SWORD || item == Items.GOLDEN_SWORD || item == Items.DIAMOND_SWORD || item == Items.NETHERITE_SWORD - || item == Items.COPPER_SWORD || item == Items.COPPER_AXE || item == Items.COPPER_HOE ||item == Items.COPPER_SHOVEL ||item == Items.COPPER_PICKAXE; - } - public boolean isOreBlock(Item item) { - return item == Items.COAL_ORE || // 煤矿石 - item == Items.DEEPSLATE_COAL_ORE || // 深层煤矿石 - item == Items.IRON_ORE || // 铁矿石 - item == Items.DEEPSLATE_IRON_ORE || // 深层铁矿石 - item == Items.COPPER_ORE || // 铜矿石 - item == Items.DEEPSLATE_COPPER_ORE || // 深层铜矿石 - item == Items.GOLD_ORE || // 金矿石 - item == Items.DEEPSLATE_GOLD_ORE || // 深层金矿石 - item == Items.REDSTONE_ORE || // 红石矿石 - item == Items.DEEPSLATE_REDSTONE_ORE ||// 深层红石矿石 - item == Items.EMERALD_ORE || // 绿宝石矿石 - item == Items.DEEPSLATE_EMERALD_ORE ||// 深层绿宝石矿石 - item == Items.LAPIS_ORE || // 青金石矿石 - item == Items.DEEPSLATE_LAPIS_ORE || // 深层青金石矿石 - item == Items.DIAMOND_ORE || // 钻石矿石 - item == Items.DEEPSLATE_DIAMOND_ORE ||// 深层钻石矿石 - item == Items.NETHER_GOLD_ORE || // 下界金矿石 - item == Items.NETHER_QUARTZ_ORE; // 下界石英矿石 + return item.getComponents().contains(DataComponentTypes.TOOL); } private boolean isBlockFortune(Block block) { if (block == Blocks.COAL_ORE || block == Blocks.DEEPSLATE_COAL_ORE ||