From 313b49181f4621add1ebab006552fe9992a2f2da Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 15 Jul 2014 20:59:11 +0200 Subject: [PATCH 1/2] Make calculateStrength of harvestTool public (was package? forgotten access modifier?) --- src/main/java/tconstruct/library/tools/HarvestTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 41d32eb2..10b42d60 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -49,7 +49,7 @@ public abstract class HarvestTool extends ToolCore return super.getDigSpeed(stack, block, meta); } - float calculateStrength (NBTTagCompound tags, Block block, int meta) + public float calculateStrength (NBTTagCompound tags, Block block, int meta) { float mineSpeed = tags.getInteger("MiningSpeed"); int heads = 1; From 92f6e1405fabd8728b0d5a9c0f70b4dce4d379f6 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 15 Jul 2014 21:18:09 +0200 Subject: [PATCH 2/2] Add a public isEffective to HarvestTool. Allows outside checking whether a tool is effective vs. a material. --- .../tconstruct/library/tools/HarvestTool.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 10b42d60..bbf59e50 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -90,12 +90,7 @@ public abstract class HarvestTool extends ToolCore { return true; } - for (Material m : getEffectiveMaterials()) - { - if (m == block.getMaterial()) - return true; - } - return false; + return isEffective(block.getMaterial()); } @Override @@ -114,6 +109,15 @@ public abstract class HarvestTool extends ToolCore protected abstract String getHarvestType (); + public boolean isEffective(Material material) + { + for(Material m : getEffectiveMaterials()) + if(m == material) + return true; + + return false; + } + //Right-click @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ)