From 8acd085b2b55bed7a18fa7f4d92d1e97136285b5 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 16 Mar 2015 16:45:51 +0100 Subject: [PATCH] allow robots to use modded pickaxes, closes #2555 --- common/buildcraft/robotics/boards/BoardRobotLumberjack.java | 2 +- common/buildcraft/robotics/boards/BoardRobotMiner.java | 4 ++-- common/buildcraft/robotics/boards/BoardRobotShovelman.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/robotics/boards/BoardRobotLumberjack.java b/common/buildcraft/robotics/boards/BoardRobotLumberjack.java index 85b3715f..36c9d322 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLumberjack.java +++ b/common/buildcraft/robotics/boards/BoardRobotLumberjack.java @@ -34,7 +34,7 @@ public class BoardRobotLumberjack extends BoardRobotGenericBreakBlock { @Override public boolean isExpectedTool(ItemStack stack) { - return stack != null && stack.getItem() instanceof ItemAxe; + return stack != null && stack.getItem().getToolClasses(stack).contains("axe"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotMiner.java b/common/buildcraft/robotics/boards/BoardRobotMiner.java index db635b17..77850705 100755 --- a/common/buildcraft/robotics/boards/BoardRobotMiner.java +++ b/common/buildcraft/robotics/boards/BoardRobotMiner.java @@ -39,7 +39,7 @@ public class BoardRobotMiner extends BoardRobotGenericBreakBlock { private void detectHarvestLevel() { ItemStack stack = robot.getHeldItem(); - if (stack != null && stack.getItem() instanceof ItemPickaxe) { + if (stack != null && stack.getItem().getToolClasses(stack).contains("pickaxe")) { ItemPickaxe pickaxe = (ItemPickaxe) stack.getItem(); harvestLevel = pickaxe.getHarvestLevel(stack, "pickaxe"); @@ -53,7 +53,7 @@ public class BoardRobotMiner extends BoardRobotGenericBreakBlock { @Override public boolean isExpectedTool(ItemStack stack) { - return stack != null && stack.getItem() instanceof ItemPickaxe; + return stack != null && stack.getItem().getToolClasses(stack).contains("pickaxe"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelman.java b/common/buildcraft/robotics/boards/BoardRobotShovelman.java index 4687a015..715d7310 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelman.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelman.java @@ -31,7 +31,7 @@ public class BoardRobotShovelman extends BoardRobotGenericBreakBlock { @Override public boolean isExpectedTool(ItemStack stack) { - return stack != null && stack.getItem() instanceof ItemSpade; + return stack != null && stack.getItem().getToolClasses(stack).contains("shovel"); } @Override